diff --git a/01-TestCase/tsg_ui/ui_settings/DecryptionProfileCase.robot b/01-TestCase/tsg_ui/ui_settings/DecryptionProfileCase.robot index 867cd72..a6e1432 100644 --- a/01-TestCase/tsg_ui/ui_settings/DecryptionProfileCase.robot +++ b/01-TestCase/tsg_ui/ui_settings/DecryptionProfileCase.robot @@ -149,7 +149,7 @@ CreateDecryptionProfileProtocolVersionOpen click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr/td[2]/div/div/span Delete -CreateDecryptionProfileAllow HTTP/2Open +CreateDecryptionProfileAllowHTTP/2Open [Tags] PositiveTestCase Settings DecryptionProfile ${dict} Create Dictionary Common Name=0 Issuer=0 Self-signed=0 Expiry Date=0 EV Certificat=0 ... Certificate Transparency=0 Mutual Authentication=0 On Protocol Errors=0 Certificate Pinning=0 Certificate Not Installed=0 Mirror Client Versions=0 diff --git a/01-TestCase/tsg_ui/ui_settings/SNATIPPoolsCase.robot b/01-TestCase/tsg_ui/ui_settings/SNATIPPoolsCase.robot index b1b43c5..29389d9 100644 --- a/01-TestCase/tsg_ui/ui_settings/SNATIPPoolsCase.robot +++ b/01-TestCase/tsg_ui/ui_settings/SNATIPPoolsCase.robot @@ -24,7 +24,7 @@ CreateSNATIPPoolsNameMaxSize CreateSNATIPPoolsHistoryActiveIPAdd [Tags] PositiveTestCase Settings SNATIPPools - ${iplist} create list 192.168.50.35 + ${iplist} create list 192.168.50.34 CreateSNATIPPools CreateSNATIPPoolsHistoryActiveIPAdd 2 ${iplist} SNATIPDelete CreateSNATIPPoolsHistoryActiveIPAdd Name diff --git a/01-TestCase/tsg_ui/ui_settings/SSLDecryptionExclusionCase.robot b/01-TestCase/tsg_ui/ui_settings/SSLDecryptionExclusionCase.robot new file mode 100644 index 0000000..72794b9 --- /dev/null +++ b/01-TestCase/tsg_ui/ui_settings/SSLDecryptionExclusionCase.robot @@ -0,0 +1,46 @@ +*** Settings *** +Force Tags tsg-ui settings SSL Decryption Exclusion +Resource ../../../03-Variable/bifangapivariable.txt +Resource ../../../02-Keyword/tsg_ui/setting/Settings.robot +Library OperatingSystem + +*** Test Cases *** +CreateSSLDecryptionExclusionExactlyMatching + [Tags] PositiveTestCase ExactlyMatching Settings SSLDecryptionExclusion + CreateSSLDecryptionExclusion $www.jianshu.com jianshu www.jianshu.com name + click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span + Deletessl_del + +CreateSSLDecryptionExclusionSuffixMatching + [Tags] PositiveTestCase SuffixMatching Settings SSLDecryptionExclusion + Create-SSL Decryption Exclusion *myssl.com myssl.com myssl.com name + click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span + Deletessl_del + +CreateSSLDecryptionFQDNMinSize + [Tags] PositiveTestCase name SuffixMatching Settings SSLDecryptionExclusion + CreateSSLDecryptionExclusion *abc abc abc name + click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span + Deletessl_del + +CreateSSLDecryptionFQDNMaxSize + [Tags] PositiveTestCase name SuffixMatching Settings SSLDecryptionExclusion + CreateSSLDecryptionExclusion *CreateSSLDecryptionFQDNMaxSizeCreateSSLDecryptionFQDNMaSizetest CreateSSLDecryptionFQDNMaxSizeCreateSSLDecryptionFQDNMaSizetest CreateSSLDecryptionFQDNMaxSizeCreateSSLDecryptionFQDNMaSizetest name + click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span + Deletessl_del + + +EditSSLDecryptionExclusioSearchID + [Tags] PositiveTestCase ID SuffixMatching Settings SSLDecryptionExclusion + CreateSSLDecryptionExclusion *myssl.com myssl.com myssl.com name + ${id} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div/p/span + EditSSLDecryptionExclusion ${id} $www.jianshu.com 简书 www.jianshu.com id + click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span + Deletessl_del + +EditSSLDecryptionExclusioSearchName + [Tags] PositiveTestCase name SuffixMatching Settings SSLDecryptionExclusion + CreateSSLDecryptionExclusion *myssl.com myssl.com myssl.com name + EditSSLDecryptionExclusion myssl.com $www.jianshu.com 简xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div/p/spanxpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div/p/span书 www.jianshu.com name + click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span + Deletessl_del diff --git a/01-TestCase/tsg_ui/ui_settings/SSL_Decryption_Exclusion_Case.robot b/01-TestCase/tsg_ui/ui_settings/SSL_Decryption_Exclusion_Case.robot deleted file mode 100644 index ae4fa98..0000000 --- a/01-TestCase/tsg_ui/ui_settings/SSL_Decryption_Exclusion_Case.robot +++ /dev/null @@ -1,30 +0,0 @@ -*** Settings *** -Force Tags tsg-ui settings SSL Decryption Exclusion -Resource ../../../03-Variable/bifangapivariable.txt -Resource ../../../02-Keyword/tsg_ui/setting/Settings.robot -Library OperatingSystem - -*** Test Cases *** -Create_SSL_Decryption_Exclusion-001 - Create-SSL Decryption Exclusion $www.jianshu.com jianshu www.jianshu.com name - click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span - Deletessl_del - -Create_SSL_Decryption_Exclusion-002 - Create-SSL Decryption Exclusion *myssl.com myssl.com myssl.com name - click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span - Deletessl_del - -Edit_SSL_Decryption_Exclusion-003 - Create-SSL Decryption Exclusion *myssl.com myssl.com myssl.com name - ${id} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div/p/span - Edit-SSL Decryption Exclusion ${id} $www.jianshu.com 简书 www.jianshu.com id - click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span - Deletessl_del - -Edit_SSL_Decryption_Exclusion-004 - Create-SSL Decryption Exclusion *myssl.com myssl.com myssl.com name - ${id} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div/p/span - Edit-SSL Decryption Exclusion ${id} $www.jianshu.com 简xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div/p/spanxpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div/p/span书 www.jianshu.com id - click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span - Deletessl_del diff --git a/02-Keyword/tsg_ui/setting/Settings.robot b/02-Keyword/tsg_ui/setting/Settings.robot index f4151b7..329447b 100644 --- a/02-Keyword/tsg_ui/setting/Settings.robot +++ b/02-Keyword/tsg_ui/setting/Settings.robot @@ -139,24 +139,26 @@ SNATIPRangeSearch [Arguments] ${j} ${ip} #for循环添加ip sleep 1 - : FOR ${i} IN RANGE 1 ${j} - \ sleep 1 - \ Clear Element Text id=insert_profileName #清空输入框 - \ sleep 1 - \ input xpath=xpath=//*[@id="remoteInput"]/div/div/input ${ip}[${i}] #搜索输入框输入 - \ sleep 1 - \ click xpath=//*[@id="wannat_vpn_color"]/div[1]/div/div/div/div[2]/div[3]/div/div/div[3]/table/tbody/tr/td[1]/div/span/div #点击搜索到的ip添加 - \ sleep 1 + FOR ${i} IN RANGE 1 ${j} + sleep 1 + Clear Element Text id=insert_profileName #清空输入框 + sleep 1 + input xpath=xpath=//*[@id="remoteInput"]/div/div/input ${ip}[${i}] #搜索输入框输入 + sleep 1 + click xpath=//*[@id="wannat_vpn_color"]/div[1]/div/div/div/div[2]/div[3]/div/div/div[3]/table/tbody/tr/td[1]/div/span/div #点击搜索到的ip添加 + sleep 1 + END SNATIPRangeCreate [Arguments] ${j} ${ip} #for循环添加ip sleep 1 - : FOR ${i} IN RANGE 0 ${j} - \ sleep 1 - \ click id=temporary_form - \ sleep 2 - \ input id=statusInputedit ${ip}[${i}] - \ sleep 1 + FOR ${i} IN RANGE 0 ${j} + sleep 1 + click id=temporary_form + sleep 2 + input id=statusInputedit ${ip}[${i}] + sleep 1 + END SNATIPSearch [Arguments] ${value} ${search} @@ -809,7 +811,7 @@ CreateDecryptionKeyrings ${text1} Get Text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span #获取点击后页面文本信息 Should Be Equal As Strings ${text1} ${name} #断言 -Create-SSL Decryption Exclusion +CreateSSLDecryptionExclusion [Arguments] ${name} ${value} ${name1} ${search} [Documentation] 引用次关键字，填入必填参数 ... 必填参数： @@ -928,7 +930,7 @@ EditDecryptionKeyrings ${text1} Get Text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span #获取点击后页面文本信息 Should Be Equal As Strings ${text1} ${name} #断言 -Edit-SSL Decryption Exclusion +EditSSLDecryptionExclusion [Arguments] ${id-name} ${name} ${value1} ${name1} ${search} [Documentation] 引用关键字，填入必填参数 ... ${search}:id或者name的元素 @@ -954,7 +956,10 @@ Edit-SSL Decryption Exclusion sleep 1 click id=ssl_ok #点击OK缇交 Sleep 2 - Settings-Search ${id-name} ${search} + run keyword if "${search}"=="id" run keywords sleep 1 + ... AND Settings-Search ${id-name} ${search} + ... ELSE IF "${search}"=="name" run keywords sleep 1 + ... AND Settings-Search ${name1} ${search} Sleep 1 ${text1} Get Text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span #获取点击后页面文本信息 Should Be Equal As Strings ${text1} ${name} #断言