diff --git a/01-TestCase/tsg_ui/ui_devices/HSMCase.robot b/01-TestCase/tsg_ui/ui_devices/HSMCase.robot index 8dbb4d5..fcca225 100644 --- a/01-TestCase/tsg_ui/ui_devices/HSMCase.robot +++ b/01-TestCase/tsg_ui/ui_devices/HSMCase.robot @@ -7,14 +7,14 @@ Library OperatingSystem CreateHSM [Tags] Positive UI Devices HSM - CreateHSM ${TEST NAME} ${testClentIP} ${password} Almaty + CreateHSM ${TEST NAME} ${testClentIP} 1111111 Almaty Wait Until Element Is Enabled id=insertAdd Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span/span ${TEST NAME} DdeleteHSM EditteHSM [Tags] Positive UI Devices HSM - CreateHSM CreateHSM ${testClentIP} ${password} Almaty + CreateHSM CreateHSM ${testClentIP} 1111111 Almaty Wait Until Element Is Enabled id=insertAdd EditHSM ${TEST NAME} 192.168.52.11 123456 Nur-sultan Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span/span ${TEST NAME} @@ -27,7 +27,7 @@ HSMPagingDisplay CreateHSMNameMinSize [Tags] Boundary UI Devices HSM - CreateHSM 1 ${testClentIP} ${password} Almaty + CreateHSM 1 ${testClentIP} 1111111 Almaty Wait Until Element Is Enabled id=insertAdd Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span/span 1 DdeleteHSM @@ -35,7 +35,7 @@ CreateHSMNameMinSize CreateHSMNameMaxSize [Tags] Boundary UI Devices HSM ${name} Set Variable CreateHSMNameMaxSizeCreateHSMNameMaxSizeCreateHSMNameMaxSizeCreateHSMNameMaxSizeCreateHSMNameMaxSizeCreateHSMNameMaxSizeCreateHS - CreateHSM ${name} ${testClentIP} ${password} Almaty + CreateHSM ${name} ${testClentIP} 1111111 Almaty Wait Until Element Is Enabled id=insertAdd Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span/span ${name} DdeleteHSM @@ -43,7 +43,7 @@ CreateHSMNameMaxSize CreateHSMNameSpecialChar [Tags] Boundary UI Devices HSM ${name} Set Variable 中文+absc+моряков+@#￥%……&* - CreateHSM ${name} ${testClentIP} ${password} Almaty + CreateHSM ${name} ${testClentIP} 1111111 Almaty Wait Until Element Is Enabled id=insertAdd Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span/span ${name} DdeleteHSM @@ -76,13 +76,13 @@ CreateHSMIPFormatError CreateHSMIPFormatError [Tags] Negtive UI Devices HSM - CreateHSM ${TEST NAME} 192.168.50.256 ${password} Almaty + CreateHSM ${TEST NAME} 192.168.50.256 1111111 Almaty Assertion //*[@id="policy_Manipulation_create8"]/div[2]/form/div[3]/div/div[2] IP can only be IPv4 or IPv6 CreateHSMPasswordFive [Tags] Negtive UI Devices HSM CreateHSM ${TEST NAME} ${testClentIP} 11111 Almaty - Assertion //*[@id="policy_Manipulation_create8"]/div[2]/form/div[4]/div/div[2] IP can only be IPv4 or IPv6 + Assertion //*[@id="policy_Manipulation_create8"]/div[2]/form/div[4]/div/div[2] Only English letters, numbers, underscore _, minus sign -, English dot (.) and its minimum 6 bits, maximum 16 bits. CreateHSMPasswordFormatError [Tags] Negtive UI Devices HSM @@ -90,5 +90,3 @@ CreateHSMPasswordFormatError Assertion //*[@id="policy_Manipulation_create8"]/div[2]/form/div[4]/div/div[2] Only English letters, numbers, underscore _, minus sign -, English dot (.) and its minimum 6 bits, maximum 16 bits. - - diff --git a/01-TestCase/tsg_ui/ui_settings/DecryptionKeyringsCase.robot b/01-TestCase/tsg_ui/ui_settings/DecryptionKeyringsCase.robot index e65187c..8cfc0d0 100644 --- a/01-TestCase/tsg_ui/ui_settings/DecryptionKeyringsCase.robot +++ b/01-TestCase/tsg_ui/ui_settings/DecryptionKeyringsCase.robot @@ -115,6 +115,17 @@ DecryptionKeyringsEditSearchName click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span DeleteKeyrings_del +DecryptionKeyringsEditDefaultCertificate + [Tags] Positive UI Settings DecryptionKeyrings + OpenPages sidebarProxy_CertificateManagement //*[@id="proxyTabs"]/div/ul/li[2] xpath + Settings-Search 1 id + EditDefaultCertificate 220 + Settings-Search 1 id + EditDefaultCertificate 240 + + + + DecryptionKeyringsCreateNameMinSize [Tags] Boundary UI Settings DecryptionKeyrings CreateDecryptionKeyrings test ${path}keyrings//root//ca-cer.pem ${path}keyrings//root//ca.key 23 id=certificateType_select0 id=keyringsadd_publicKeyAlgoSelet1 name @@ -151,6 +162,21 @@ DecryptionKeyringsTurnPage TurnPage //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/button[2] //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/button[1] ... //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/span[2]/div/input 2 //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span +DecryptionKeyringsCertificateExpired + [Tags] Positive UI Settings DecryptionKeyrings + DecryptionKeyringsErrorVerification ${TEST NAME} ${path}keyrings//root//zcwca-cer.pem ${path}keyrings//root//zcwca-key.pem certificateType_select0 keyringsadd_publicKeyAlgoSelet1 /html/body/div[last()]/p Certificate expired + +DecryptionKeyringsAllSearch + [Tags] Positive UI Settings DecryptionKeyrings + CreateDecryptionKeyrings ${TEST NAME} ${path}keyrings//root//ca-cer.pem ${path}keyrings//root//ca.key 2 id=certificateType_select0 id=keyringsadd_publicKeyAlgoSelet1 name + ${id} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div/p/span + OpenPages sidebarProxy_CertificateManagement //*[@id="proxyTabs"]/div/ul/li[2] xpath + DecryptionKeyringsSearch ${id} ${TEST NAME} + Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div/p/span ${id} + Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span ${TEST NAME} + click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span + DeleteKeyrings_del + DecryptionKeyringsCARootFileCAMiddleType [Tags] Negtive UI Settings DecryptionKeyrings DecryptionKeyringsErrorVerification CARootFileCAMiddleType ${path}keyrings//root//ca-cer.pem ${path}keyrings//root//ca.key id=certificateType_select1 id=keyringsadd_publicKeyAlgoSelet3 diff --git a/02-Keyword/tsg_ui/setting/Settings.robot b/02-Keyword/tsg_ui/setting/Settings.robot index a48ddc0..9de4ce4 100644 --- a/02-Keyword/tsg_ui/setting/Settings.robot +++ b/02-Keyword/tsg_ui/setting/Settings.robot @@ -764,7 +764,23 @@ DecryptionKeyringsErrorVerification Wait Until Element Is Visible xpath=${Positioning} 20 ${text1} Get Text xpath=${Positioning} #获取点击后页面文本信息 Should Be Equal As Strings ${text1} ${Assertion} #断言 - + +DecryptionKeyringsSearch + [Arguments] ${id} ${name} + sleep 2 + click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[1]/span/div/div/div[2]/div/div/div[1]/input + sleep 1 + click xpath=/html/body/div/div[1]/div[1]/ul/li[2] + input xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[1]/span/div/div/div[2]/div/div[1]/div[3]/div/input ${id} + sleep 1 + click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1] + sleep 1 + click xpath=/html/body/div/div[1]/div[1]/ul/li[2] + input xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[1]/span/div/div/div[2]/div/div[2]/div[3]/div/input ${name} + sleep 1 + click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[1]/span/div/i + sleep 2 + CreateSSLDecryptionExclusion [Arguments] ${name} ${value} ${name1} ${search} [Documentation] 引用次关键字，填入必填参数 @@ -940,6 +956,21 @@ EditSSLDecryptionExclusion ${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} #断言 +EditDefaultCertificate + [Arguments] ${time} + [Documentation] 验证修改默认证书方法 + sleep 1 + click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr + sleep 1 + click id=appEdit + sleep 2 + clear element text id=reissueExpiryDate + sleep 1 + input text id=reissueExpiryDate ${time} + sleep 1 + click id=keyringsadd_sub + Wait Until Element Is Enabled id=app_create 20 + CreateSSLFingerprint [Arguments] ${Ja3} ${Pinning} ${search} ${Description}=null [Documentation] @@ -2519,3 +2550,9 @@ DeleteReferencedData ... AND Delete ${text} get text xpath=/html/body/div[last()]/p Should Be Equal As Strings ${text} ${PromptInformation} + +Assertion + [Arguments] ${assertxpath} ${asserttext} + ${text} Get text xpath=${assertxpath} + Should Be Equal As Strings ${text} ${asserttext} + diff --git a/05-Other/keyrings/root/zcwca-cer.pem b/05-Other/keyrings/root/zcwca-cer.pem new file mode 100644 index 0000000..299c2ed --- /dev/null +++ b/05-Other/keyrings/root/zcwca-cer.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE----- +MIICdjCCAd+gAwIBAgIJAMvkFjvEOo+LMA0GCSqGSIb3DQEBCwUAMFQxCzAJBgNV +BAYTAkNOMQswCQYDVQQIDAJCSjELMAkGA1UEBwwCQkoxCzAJBgNVBAoMAk5UMQsw +CQYDVQQLDAJOVDERMA8GA1UEAwwIQ0EgVFJVU1QwHhcNMjAxMTE2MDYyNjU3WhcN +MjAxMTE3MDYyNjU3WjBUMQswCQYDVQQGEwJDTjELMAkGA1UECAwCQkoxCzAJBgNV +BAcMAkJKMQswCQYDVQQKDAJOVDELMAkGA1UECwwCTlQxETAPBgNVBAMMCENBIFRS +VVNUMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDKD1sQvzjkhobx5LSI8r2 +d4k5H0D4MbdW0Vm8m7ConqL1QNEv8yDQ01BgqVhMv4dTsUtRTGQzE5WEZWrkeQ4g +vyNecY60GJ5PaNyL3Azo1TZ6g1n6rsCddlKUnzEWgDy6YgSKNfbXUmWq+hjaaBO1 +KhSR/Sn6FJ9EPOhavRyEKQIDAQABo1AwTjAdBgNVHQ4EFgQUAxBm0kdln3d5SC6e +RxZXc+gMSr4wHwYDVR0jBBgwFoAUAxBm0kdln3d5SC6eRxZXc+gMSr4wDAYDVR0T +BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQAkmswZnY/gEYe2lI85OKgSMXf/rP1P +NFfVvzittcdEUSIlUMouPMNHAlvp7M/623PhnFd/kQz7ztRgZ1qlvpUd3QZPNjGc +o59gryyJPKLsaMRWwfd+LAyY1jiGOl9YFs0z1Dk+B32N55qM3323GT6qAW7Ni7Jc +P7SqaMDdMwlKNg== +-----END CERTIFICATE----- diff --git a/05-Other/keyrings/root/zcwca-key.pem b/05-Other/keyrings/root/zcwca-key.pem new file mode 100644 index 0000000..ea2c724 --- /dev/null +++ b/05-Other/keyrings/root/zcwca-key.pem @@ -0,0 +1,15 @@ +-----BEGIN RSA PRIVATE KEY----- +MIICXQIBAAKBgQDDKD1sQvzjkhobx5LSI8r2d4k5H0D4MbdW0Vm8m7ConqL1QNEv +8yDQ01BgqVhMv4dTsUtRTGQzE5WEZWrkeQ4gvyNecY60GJ5PaNyL3Azo1TZ6g1n6 +rsCddlKUnzEWgDy6YgSKNfbXUmWq+hjaaBO1KhSR/Sn6FJ9EPOhavRyEKQIDAQAB +AoGAWD3csBQGBtwsA/2UbIIUpqbcHED+fnr0XEQi4D5BfazlICHjtFupreKuiFZp +/6Hmjbgvxx3UfKfRRmEZGR+HfAqMsRy3LHlwOueYBLlrWkNZjsl7HgkNhw9pzDO1 +/QOi7Yclqh8961FGidi0ScYfv3n3C7UeziewfpCMCFgYDYECQQDttoqqUWCQEAVq +AOK6WBxufT22x8QsBMq8aQkmM3LCji0VcW+IKAO3xqd7hAIRYBtp9KtprrA5OVsJ +pVS3nNYZAkEA0iudPsrdx0BwnQw5+nD1f+hp+xfUAdN3l/8pt74ycYeHMNDYTmGH +j8oAFq3F7OUfdYN322Wgy7rdZiP1Y+lAkQJBAMZeiITs9+oAlKQLLSlYEhHaDcAU +II6jSRPFi08HrALTZqf4S5yR19hqvKUEWj1puDbJaKn+jyyRwnjgMTwwczECQCDt +rGlWJ4E8W2h/reXLJOuxYklw5kqS8z3hQIwFRKn87fV8Ayfkp/SjVXg4KbZ//3nN +6014ksTYti92ms/Yj8ECQQChbnhyoM0XWsyrcwbYEBhI6AyLIcibI5welKRB5P7D +N50cZIk2UREYgwCiAqgN43i+9c+PH/DLDbZPoDZvSPNF +-----END RSA PRIVATE KEY-----