From b131d98ef8c3dd690cc23601f6039f4e84e5b066 Mon Sep 17 00:00:00 2001 From: hebingning Date: Wed, 30 Dec 2020 11:48:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=B0=86=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E9=94=99=E8=AF=AF=E6=8E=A5=E5=8F=A3=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=A1=8C=E6=95=B0=E4=B8=8E=E4=BC=A0=E5=85=A5?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=94=99=E8=AF=AF=E8=A1=8C=E6=95=B0=E4=B9=8B?= =?UTF-8?q?=E9=97=B4=E5=85=B3=E7=B3=BB=E7=94=B1=E5=AD=90=E9=9B=86=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E6=94=B9=E4=B8=BA=E5=AE=8C=E5=85=A8=E7=9B=B8=E5=90=8C?= =?UTF-8?q?=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../policy_object/ExportAndImport.robot | 77 ++++++++++++------- 1 file changed, 49 insertions(+), 28 deletions(-) diff --git a/01-TestCase/tsg_bfapi/policy_object/ExportAndImport.robot b/01-TestCase/tsg_bfapi/policy_object/ExportAndImport.robot index 8658a99..034eb22 100644 --- a/01-TestCase/tsg_bfapi/policy_object/ExportAndImport.robot +++ b/01-TestCase/tsg_bfapi/policy_object/ExportAndImport.robot @@ -702,7 +702,7 @@ Object-Import-v1-ip_error ${objectIds} Set Variable ${EMPTY} log ${objectIds} ${rescode} ${objectType} ${importRes} ImportObject uploadFiles ip_error.txt ip ${EMPTY} ${EMPTY} - ${duplicateLine} Set Variable ${importRes['data']['duplicateData'][0]['line'][0]} + ${duplicateLine} Set Variable ${importRes['data']['duplicateData'][0]['line']} ${invaidData} Set Variable ${importRes['data']['invalidData']} ${len} get Length ${invaidData} @{invaidDataLine} create list ${EMPTY} @@ -711,13 +711,16 @@ Object-Import-v1-ip_error Insert Into List ${invaidDataLine} ${n+1} ${importRes['data']['invalidData'][${n}]['line']} END Remove From List ${invaidDataLine} 0 - Insert Into List ${invaidDataLine} 0 ${duplicateLine} + ${resErrorLines} Combine Lists ${invaidDataLine} ${duplicateLine} log ${invaidDataLine} - ${errorline} Create List 7 12 17 5 + ${errorline} Create List 7 12 17 5 12 ${errorline} Evaluate list(map(int,${errorline})) #Should Be Equal ${invaidDataLine} ${errorline} - ${judgeValue} Evaluate set(${errorline}) <= set(${invaidDataLine}) - ${rescode} ${response} QueryObject ?pageSize=20&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType} + Sort List ${resErrorLines} + Sort List ${errorline} + Should Be Equal ${resErrorLines} ${errorline} + #${judgeValue} Evaluate set(${errorline}) <= set(${invaidDataLine}) + ${rescode} ${response} QueryObject pageSize=20&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType} log pssssssssssssssssssssssssssssssssssssssssssssssssssss ${objectIds} Create List ${response['data']['list'][0]['objectId']} sleep 5 @@ -743,8 +746,10 @@ Object-Import-v1-fqdn_error_andReachlimit log ${resErrorLines} ${errorline} Create List 99989 99988 99990 99991 99992 99993 99977 99984 99985 99986 ${errorline} Evaluate list(map(int,${errorline})) - #Should Be Equal ${invaidDataLine} ${errorline} - ${judgeValue} Evaluate set(${errorline}) <= set(${resErrorLines}) + Sort List ${resErrorLines} + Sort List ${errorline} + Should Be Equal ${resErrorLines} ${errorline} + #${judgeValue} Evaluate set(${errorline}) <= set(${resErrorLines}) ${rescode} ${response} QueryObject pageSize=2&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType} log pssssssssssssssssssssssssssssssssssssssssssssssssssss ${objectIds} Create List ${response['data']['list'][0]['objectId']} @@ -769,10 +774,12 @@ Object-Import-v1-subid_error_andReachlimit ${resErrorLines} Combine Lists ${invaidDataLine} ${duplicateLine} #Insert Into List ${invaidDataLine} 0 ${duplicateLine} log ${resErrorLines} - ${errorline} Create List 8165 8167 22037 22044 + ${errorline} Create List 8165 8167 22037 22044 22037 ${errorline} Evaluate list(map(int,${errorline})) - #Should Be Equal ${invaidDataLine} ${errorline} - ${judgeValue} Evaluate set(${errorline}) <= set(${resErrorLines}) + Sort List ${resErrorLines} + Sort List ${errorline} + Should Be Equal ${resErrorLines} ${errorline} + #${judgeValue} Evaluate set(${errorline}) <= set(${resErrorLines}) ${rescode} ${response} QueryObject pageSize=2&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType} log pssssssssssssssssssssssssssssssssssssssssssssssssssss ${objectIds} Create List ${response['data']['list'][0]['objectId']} @@ -785,7 +792,7 @@ Object-Import-v1-HTTP Signatures_error_andReachlimit ${objectIds} Set Variable ${EMPTY} log ${objectIds} ${rescode} ${objectType} ${importRes} ImportObject uploadFiles httpsig10w.txt http_signature ${EMPTY} ${EMPTY} - ${duplicateLine} Set Variable ${importRes['data']['duplicateData'][0]['line'][0]} + ${duplicateLine} Set Variable ${importRes['data']['duplicateData'][0]['line']} ${invaidData} Set Variable ${importRes['data']['invalidData']} ${len} get Length ${invaidData} @{invaidDataLine} create list ${EMPTY} @@ -794,12 +801,15 @@ Object-Import-v1-HTTP Signatures_error_andReachlimit Insert Into List ${invaidDataLine} ${n+1} ${importRes['data']['invalidData'][${n}]['line']} END Remove From List ${invaidDataLine} 0 - Insert Into List ${invaidDataLine} 0 ${duplicateLine} + ${resErrorLines} Combine Lists ${invaidDataLine} ${duplicateLine} log ${invaidDataLine} - ${errorline} Create List 16 99993 76520 76507 76508 + ${errorline} Create List 16 99996 76522 76507 ${errorline} Evaluate list(map(int,${errorline})) + Sort List ${resErrorLines} + Sort List ${errorline} + Should Be Equal ${resErrorLines} ${errorline} #Should Be Equal ${invaidDataLine} ${errorline} - ${judgeValue} Evaluate set(${errorline}) <= set(${invaidDataLine}) + #${judgeValue} Evaluate set(${errorline}) <= set(${invaidDataLine}) ${rescode} ${response} QueryObject pageSize=20&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType} log pssssssssssssssssssssssssssssssssssssssssssssssssssss ${objectIds} Create List ${response['data']['list'][0]['objectId']} @@ -812,7 +822,7 @@ Object-Import-v1-Keywords_error_andReachlimit ${objectIds} Set Variable ${EMPTY} log ${objectIds} ${rescode} ${objectType} ${importRes} ImportObject uploadFiles keyword_10w.txt keywords ${EMPTY} ${EMPTY} - ${duplicateLine} Set Variable ${importRes['data']['duplicateData'][0]['line'][0]} + ${duplicateLine} Set Variable ${importRes['data']['duplicateData'][0]['line']} ${invaidData} Set Variable ${importRes['data']['invalidData']} ${len} get Length ${invaidData} @{invaidDataLine} create list ${EMPTY} @@ -821,13 +831,16 @@ Object-Import-v1-Keywords_error_andReachlimit Insert Into List ${invaidDataLine} ${n+1} ${importRes['data']['invalidData'][${n}]['line']} END Remove From List ${invaidDataLine} 0 - Insert Into List ${invaidDataLine} 0 ${duplicateLine} - log ${invaidDataLine} + #Insert Into List ${invaidDataLine} 0 ${duplicateLine} + ${resErrorLines} Combine Lists ${invaidDataLine} ${duplicateLine} + log ${resErrorLines} ${errorline} Create List 34 41 70 72454 ${errorline} Evaluate list(map(int,${errorline})) - #Should Be Equal ${invaidDataLine} ${errorline} - ${judgeValue} Evaluate set(${errorline}) <= set(${invaidDataLine}) - ${rescode} ${response} QueryObject ?pageSize=20&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType} + Sort List ${resErrorLines} + Sort List ${errorline} + Should Be Equal ${resErrorLines} ${errorline} + #${judgeValue} Evaluate set(${errorline}) <= set(${invaidDataLine}) + ${rescode} ${response} QueryObject pageSize=20&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType} log pssssssssssssssssssssssssssssssssssssssssssssssssssss ${objectIds} Create List ${response['data']['list'][0]['objectId']} sleep 5 @@ -839,7 +852,7 @@ Object-Import-v1-URLs_error_andReachlimit ${objectIds} Set Variable ${EMPTY} log ${objectIds} ${rescode} ${objectType} ${importRes} ImportObject uploadFiles url_1000000.txt url ${EMPTY} ${EMPTY} - ${duplicateLine} Set Variable ${importRes['data']['duplicateData'][0]['line'][0]} + ${duplicateLine} Set Variable ${importRes['data']['duplicateData'][0]['line']} ${invaidData} Set Variable ${importRes['data']['invalidData']} ${len} get Length ${invaidData} @{invaidDataLine} create list ${EMPTY} @@ -848,13 +861,18 @@ Object-Import-v1-URLs_error_andReachlimit Insert Into List ${invaidDataLine} ${n+1} ${importRes['data']['invalidData'][${n}]['line']} END Remove From List ${invaidDataLine} 0 - Insert Into List ${invaidDataLine} 0 ${duplicateLine} + ${resErrorLines} Combine Lists ${invaidDataLine} ${duplicateLine} + log ${resErrorLines} + #Insert Into List ${invaidDataLine} 0 ${duplicateLine} log ${invaidDataLine} ${errorline} Create List 8 9424 9425 9426 9427 9428 9429 9430 9431 9432 9433 9423 ${errorline} Evaluate list(map(int,${errorline})) + Sort List ${resErrorLines} + Sort List ${errorline} + Should Be Equal ${resErrorLines} ${errorline} #Should Be Equal ${invaidDataLine} ${errorline} - ${judgeValue} Evaluate set(${errorline}) <= set(${invaidDataLine}) - ${rescode} ${response} QueryObject ?pageSize=20&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType} + #${judgeValue} Evaluate set(${errorline}) <= set(${invaidDataLine}) + ${rescode} ${response} QueryObject pageSize=20&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType} log pssssssssssssssssssssssssssssssssssssssssssssssssssss ${objectIds} Create List ${response['data']['list'][0]['objectId']} sleep 5 @@ -866,7 +884,7 @@ Object-Import-v1-Accounts_error_andReachlimit ${objectIds} Set Variable ${EMPTY} log ${objectIds} ${rescode} ${objectType} ${importRes} ImportObject uploadFiles account10w.txt account ${EMPTY} ${EMPTY} - ${duplicateLine} Set Variable ${importRes['data']['duplicateData'][0]['line'][0]} + ${duplicateLine} Set Variable ${importRes['data']['duplicateData'][0]['line']} ${invaidData} Set Variable ${importRes['data']['invalidData']} ${len} get Length ${invaidData} @{invaidDataLine} create list ${EMPTY} @@ -875,13 +893,16 @@ Object-Import-v1-Accounts_error_andReachlimit Insert Into List ${invaidDataLine} ${n+1} ${importRes['data']['invalidData'][${n}]['line']} END Remove From List ${invaidDataLine} 0 - Insert Into List ${invaidDataLine} 0 ${duplicateLine} + ${resErrorLines} Combine Lists ${invaidDataLine} ${duplicateLine} log ${invaidDataLine} ${errorline} Create List 13 14 15 20 ${errorline} Evaluate list(map(int,${errorline})) + Sort List ${resErrorLines} + Sort List ${errorline} + Should Be Equal ${resErrorLines} ${errorline} #Should Be Equal ${invaidDataLine} ${errorline} - ${judgeValue} Evaluate set(${errorline}) <= set(${invaidDataLine}) - ${rescode} ${response} QueryObject ?pageSize=20&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType} + #${judgeValue} Evaluate set(${errorline}) <= set(${invaidDataLine}) + ${rescode} ${response} QueryObject pageSize=20&pageNo=1&isExclusion=0&isInitialize=0&objectType=${objectType} log pssssssssssssssssssssssssssssssssssssssssssssssssssss ${objectIds} Create List ${response['data']['list'][0]['objectId']} sleep 5