From 2f720e814cc4e1625c5eef68c500da6502500a9e Mon Sep 17 00:00:00 2001 From: byb11 Date: Tue, 16 Mar 2021 13:48:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Settings=E5=8F=8AAdministrato?= =?UTF-8?q?r=E7=9A=84=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E5=8F=8A?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97=E5=AE=9A=E4=BD=8DID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui_administration/LDAPServerCase.robot | 6 +++--- .../SSLDecryptionExclusionCase.robot | 2 +- .../ui_settings/SSLFingerprintCase.robot | 6 +++--- .../TrustedCertificateAuthoritiesCase.robot | 4 ++-- 02-Keyword/tsg_ui/setting/Settings.robot | 18 +++++++++--------- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/01-TestCase/tsg_ui/ui_administration/LDAPServerCase.robot b/01-TestCase/tsg_ui/ui_administration/LDAPServerCase.robot index 3283112..670c470 100644 --- a/01-TestCase/tsg_ui/ui_administration/LDAPServerCase.robot +++ b/01-TestCase/tsg_ui/ui_administration/LDAPServerCase.robot @@ -122,19 +122,19 @@ CreateLDAPServerErrorHost CreateLDAPServerErrorPort [Tags] Negtive UI Administration LDAP Server - ${list} Create List ${TEST NAME} 192.168.40.12 38 cn=root,dc=bifang,dc=com uid dc=bifang,dc=com 111111 21 + ${list} Create List ${TEST NAME} 192.168.40.120 38 cn=root,dc=bifang,dc=com uid dc=bifang,dc=com 111111 21 CreateLDAPServer ${list} NoOKButton=2 Assertion /html/body/div[last()]/p Test connection failed CreateLDAPServerErrorUserName [Tags] Negtive UI Administration LDAP Server - ${list} Create List ${TEST NAME} 192.168.40.12 389 test uid dc=bifang,dc=com 111111 21 + ${list} Create List ${TEST NAME} 192.168.40.120 389 test uid dc=bifang,dc=com 111111 21 CreateLDAPServer ${list} NoOKButton=2 Assertion /html/body/div[last()]/p Test connection failed CreateLDAPServerErrorPassword [Tags] Negtive UI Administration LDAP Server - ${list} Create List ${TEST NAME} 192.168.40.12 389 cn=root,dc=bifang,dc=com ui dc=bifang,dc 11 21 + ${list} Create List ${TEST NAME} 192.168.40.120 389 cn=root,dc=bifang,dc=com ui dc=bifang,dc 11 21 CreateLDAPServer ${list} NoOKButton=2 Assertion /html/body/div[last()]/p Test connection failed diff --git a/01-TestCase/tsg_ui/ui_settings/SSLDecryptionExclusionCase.robot b/01-TestCase/tsg_ui/ui_settings/SSLDecryptionExclusionCase.robot index c4dbe2f..90e76b2 100644 --- a/01-TestCase/tsg_ui/ui_settings/SSLDecryptionExclusionCase.robot +++ b/01-TestCase/tsg_ui/ui_settings/SSLDecryptionExclusionCase.robot @@ -20,7 +20,7 @@ SSLDecryptionExclusionCreateSuffixMatching SSLDecryptionExclusionEditSearchID [Tags] Positive UI 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 + ${id} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/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 diff --git a/01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot b/01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot index df3fb98..054a4d5 100644 --- a/01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot +++ b/01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot @@ -222,16 +222,16 @@ SSLFingerprintImportLackLast_seen [Tags] Negtive UI Settings SSLFingerprint UploadFilesSize SSLFingerprint 1 ${path}SSLFingerprint_files/LackLast_seen.json line1 : JA3 UA time of last discovery cannot be empty -SSLFingerprintImportRepeatJA3 +SSLFingerprintImportRepeatJA3 [Tags] Negtive UI Settings SSLFingerprint ${a}= RandomNumber - CreateSSLFingerprint d8c87baaaaaaaaaaaa9e41242626c2f3 Yes JA3Hash Description=test + CreateSSLFingerprint d8c87baaaaaaaaaaaa9e41${a}26c2f3 Yes JA3Hash Description=test SSLFingerprintImportJA3 ${path}SSLFingerprint_files/InportSSLFingerprint.csv ${text} Get Text xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[1]/div[2]/div[2]/div/div[1]/div/div/div[1]/div/div[2]/div[2]/div[1]/div[3]/table/tbody/tr/td[3]/div Should Be Equal As Strings ${text} JA3 Hash repeat click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[1]/div[2]/div[2]/div/div[1]/div/div/div[2]/div[2]/button sleep ${sleep_min} - Settings-Search d8c87baaaaaaaaaaaa9e41242626c2f3 JA3Hash + Settings-Search d8c87baaaaaaaaaaaa9e41${a}26c2f3 JA3Hash sleep ${sleep_min} click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr DeleteSSLFingerprint diff --git a/01-TestCase/tsg_ui/ui_settings/TrustedCertificateAuthoritiesCase.robot b/01-TestCase/tsg_ui/ui_settings/TrustedCertificateAuthoritiesCase.robot index 8e18470..b6ccd46 100644 --- a/01-TestCase/tsg_ui/ui_settings/TrustedCertificateAuthoritiesCase.robot +++ b/01-TestCase/tsg_ui/ui_settings/TrustedCertificateAuthoritiesCase.robot @@ -185,8 +185,8 @@ TrustedCertificateAuthoritiesInportEmptyFile TrustedCertificateAuthoritiesInportErrorFile [Tags] Negtive UI Settings TrustedCertificateAuthorities - UploadFilesSize TrustedCertificateAuthorities InportErrorFile ${path}keyrings//root//Error.pem save trusted certificate authorities failure: The uploaded certificate is incorrect. - + UploadFilesSize TrustedCertificateAuthorities InportErrorFile ${path}keyrings//root//Error.pem save trusted certificate authorities failure : The uploaded certificate is incorrect. + TrustedCertificateAuthoritiesImportDuplicateCertificate [Tags] Negtive UI Settings TrustedCertificateAuthorities importTrustedCertificateAuthorities InportDuplicateCertificate01 ${path}keyrings//root//ca-cer.pem name diff --git a/02-Keyword/tsg_ui/setting/Settings.robot b/02-Keyword/tsg_ui/setting/Settings.robot index 324b1df..dc755f0 100644 --- a/02-Keyword/tsg_ui/setting/Settings.robot +++ b/02-Keyword/tsg_ui/setting/Settings.robot @@ -662,7 +662,7 @@ importTrustedCertificateAuthoritiesErrorVerification sleep ${sleep} click id=Authorities_create #点击Import sleep ${sleep} - input id=authoritiesAdd_name ${name} #输入name + input id=authoritiesAdd_name1 ${name} #输入name sleep ${sleep} Choose File xpath=//*[@id="upload_dome"]/div/input ${file} #上传文件 sleep ${sleep} @@ -695,7 +695,7 @@ CreateDecryptionKeyrings sleep ${sleep_min} click id=app_create #点击Create sleep ${sleep} - input id=keyringsadd_name ${name} #输入name + input id=keyringsadd_name1 ${name} #输入name sleep ${sleep} Choose File xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[2]/div[2]/form/div[2]/div/div/div/input ${file} #上传文件 sleep ${sleep} @@ -748,7 +748,7 @@ DecryptionKeyringsErrorVerification sleep ${sleep_min} click id=app_create #点击Create sleep ${sleep} - input id=keyringsadd_name ${name} #输入name + input id=keyringsadd_name1 ${name} #输入name sleep ${sleep} Choose File xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[2]/div[2]/form/div[2]/div/div/div/input ${file} #上传文件 sleep ${sleep} @@ -799,7 +799,7 @@ CreateSSLDecryptionExclusion sleep ${sleep_min} click id=ssl_create #点击Create sleep ${sleep} - input id=sslAdd_name ${name} #输入name + input id=sslAdd_name1 ${name} #输入name sleep ${sleep} input id=sslAdd_itemDesc ${value} #输入内容 sleep ${sleep} @@ -827,7 +827,7 @@ CreateSSLDecryptionExclusionErrorVerification sleep ${sleep_min} click id=ssl_create #点击Create sleep ${sleep} - input id=sslAdd_name ${name} #输入name + input id=sslAdd_name1 ${name} #输入name sleep ${sleep} input id=sslAdd_itemDesc ${value} #输入内容 sleep ${sleep} @@ -942,9 +942,9 @@ EditSSLDecryptionExclusion sleep ${sleep_min} click id=ssl_edit #点击Edit sleep ${sleep_min} - Clear Element Text id=sslAdd_name #清空name输入框 + Clear Element Text id=sslAdd_name1 #清空name输入框 sleep ${sleep_min} - input id=sslAdd_name ${name} #输入name + input id=sslAdd_name1 ${name} #输入name sleep ${sleep_min} input id=sslAdd_itemDesc ${value1} #输入内容 sleep ${sleep_min} @@ -989,7 +989,7 @@ CreateSSLFingerprint sleep ${sleep_min} click id=Fingerprint_create #点击Create sleep ${sleep_min} - input id=authoritiesAdd_name ${Ja3} + input id=authoritiesAdd_name1 ${Ja3} run keyword if "${Pinning}"=="Yes" run keywords sleep ${sleep_min} ... AND click id=pinningStateYes run keyword if "${Pinning}"=="No" run keywords sleep ${sleep_min} @@ -1025,7 +1025,7 @@ EditSSLFingerprint sleep ${sleep_min} click id=Fingerprint_edit sleep ${sleep_min} - input id=authoritiesAdd_name ${NewJa3} + input id=authoritiesAdd_name1 ${NewJa3} run keyword if "${Pinning}"=="Yes" run keywords sleep ${sleep_min} ... AND click id=pinningStateYes run keyword if "${Pinning}"=="No" run keywords sleep ${sleep_min}