gfwleak/dongxiaoyan-tsg-autotest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

根据测试报告调整自动化代码

Browse Source
This commit is contained in:
byb11
2021-04-23 14:24:07 +08:00
parent 0df38e620a
commit 623e60fdeb
8 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
01-TestCase/tsg_ui/ui_administration/AuditLogsCase.robot
View File

@@ -265,7 +265,7 @@ AuditLogsIPLibraries
CreateIpLibraries Geo Name City Algeria ${a} ${a} ${iplist} Longitude=-1 Latitude=12.13 CreateIpLibraries Geo Name City Algeria ${a} ${a} ${iplist} Longitude=-1 Latitude=12.13
EditIpLibraries Geo Name ${a} Longitude=-2 Latitude=12.13 EditIpLibraries Geo Name ${a} Longitude=-2 Latitude=12.13
DeleteIPLibraries DeleteIPLibraries
Wait Until Element Is Enabled xpath=/html/body/div[last()]/p ${sleep_Wait} Wait Until Element Is Enabled xpath=//*[@id="app"]/following-sibling::div/p ${sleep_Wait}
AdminOpenPages sidebarsystem_PolicyConfigurationLog sidebarsystem_PolicyConfigurationLog AdminOpenPages sidebarsystem_PolicyConfigurationLog sidebarsystem_PolicyConfigurationLog
AuditLogsSearch ${a} IP Libraries AuditLogsSearch ${a} IP Libraries
Wait Until Element Is Enabled xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div ${sleep_Wait} Wait Until Element Is Enabled xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div ${sleep_Wait}

2
01-TestCase/tsg_ui/ui_administration/MyAccountCase.robot
View File

@@ -70,7 +70,7 @@ MyAccountPasswordNotModified
[Tags] Negtive UI Administration My Account [Tags] Negtive UI Administration My Account
OpenMyAccountPage OpenMyAccountPage
EditMyAccount ${username} ${password} ${password} EditMyAccount ${username} ${password} ${password}
Wait Until Element Is Enabled xpath=/html/body/div[last()]/p ${sleep_Wait} Wait Until Element Is Enabled xpath=//*[@id="app"]/following-sibling::div/p ${sleep_Wait}
Assertion /html/body/div[last()]/p The password setting cannot be the same as the previous one. Assertion /html/body/div[last()]/p The password setting cannot be the same as the previous one.
MyAccountTwoPasswordsAreInconsistent MyAccountTwoPasswordsAreInconsistent

2
01-TestCase/tsg_ui/ui_settings/CachedIntermediateCertificatesCase.robot
View File

@@ -32,7 +32,7 @@ CachedIntermediateCertificatesSearchIssuer
OpenPages sidebarProxy_CertificateManagement //*[@id="proxyTabs"]/div/ul/li[4] xpath OpenPages sidebarProxy_CertificateManagement //*[@id="proxyTabs"]/div/ul/li[4] xpath
${Issuer} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/p/span ${Issuer} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/p/span
sleep ${sleep} sleep ${sleep}
CachedIntermediateCertificatesSearch ${Issuer} //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/p/span Issuer CachedIntermediateCertificatesSearch ${Issuer} //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/p/span Issuer
CachedIntermediateCertificatesSearchCertificateFingerprint CachedIntermediateCertificatesSearchCertificateFingerprint
[Tags] Positive UI Settings CachedIntermediateCertificates [Tags] Positive UI Settings CachedIntermediateCertificates

12
01-TestCase/tsg_ui/ui_settings/DecryptionKeyringsCase.robot
View File

@@ -234,32 +234,32 @@ DecryptionKeyringsNameCreateSpecialChar
DecryptionKeyringsCARootFileCAMiddleType DecryptionKeyringsCARootFileCAMiddleType
[Tags] Negtive UI Settings DecryptionKeyrings [Tags] Negtive UI Settings DecryptionKeyrings
DecryptionKeyringsErrorVerification CARootFileCAMiddleType ${path}keyrings//root//ca-cer.pem ${path}keyrings//root//ca.key id=certificateType_select1 id=keyringsadd_publicKeyAlgoSelet3 DecryptionKeyringsErrorVerification CARootFileCAMiddleType ${path}keyrings//root//ca-cer.pem ${path}keyrings//root//ca.key id=certificateType_select1 id=keyringsadd_publicKeyAlgoSelet3
... /html/body/div[last()]/p Incorrect certificate chain length (root certificate must be 1, intermediate certificate and end entity certificate must be greater than 2.) ... //*[@id="app"]/following-sibling::div/p Incorrect certificate chain length (root certificate must be 1, intermediate certificate and end entity certificate must be greater than 2.)
DecryptionKeyringsCARootFileCAEntityType DecryptionKeyringsCARootFileCAEntityType
[Tags] Negtive UI Settings DecryptionKeyrings [Tags] Negtive UI Settings DecryptionKeyrings
DecryptionKeyringsErrorVerification CARootFileCAEntityType ${path}keyrings//root//ca-cer.pem ${path}keyrings//root//ca.key id=certificateType_select2 id=keyringsadd_publicKeyAlgoSelet3 DecryptionKeyringsErrorVerification CARootFileCAEntityType ${path}keyrings//root//ca-cer.pem ${path}keyrings//root//ca.key id=certificateType_select2 id=keyringsadd_publicKeyAlgoSelet3
... /html/body/div[last()]/p Incorrect certificate chain length (root certificate must be 1, intermediate certificate and end entity certificate must be greater than 2.) ... //*[@id="app"]/following-sibling::div/p Incorrect certificate chain length (root certificate must be 1, intermediate certificate and end entity certificate must be greater than 2.)
DecryptionKeyringsCAMiddleFileCARootType DecryptionKeyringsCAMiddleFileCARootType
[Tags] Negtive UI Settings DecryptionKeyrings [Tags] Negtive UI Settings DecryptionKeyrings
DecryptionKeyringsErrorVerification CAMiddleFileCARootType ${path}keyrings//Intermediate//camiddle.chain.pem ${path}keyrings//Intermediate//camiddle.key id=certificateType_select0 id=keyringsadd_publicKeyAlgoSelet3 DecryptionKeyringsErrorVerification CAMiddleFileCARootType ${path}keyrings//Intermediate//camiddle.chain.pem ${path}keyrings//Intermediate//camiddle.key id=certificateType_select0 id=keyringsadd_publicKeyAlgoSelet3
... /html/body/div[last()]/p Incorrect certificate chain length (root certificate must be 1, intermediate certificate and end entity certificate must be greater than 2.) ... //*[@id="app"]/following-sibling::div/p Incorrect certificate chain length (root certificate must be 1, intermediate certificate and end entity certificate must be greater than 2.)
DecryptionKeyringsCAMiddleFileCAEntityType DecryptionKeyringsCAMiddleFileCAEntityType
[Tags] Negtive UI Settings DecryptionKeyrings [Tags] Negtive UI Settings DecryptionKeyrings
DecryptionKeyringsErrorVerification CAMiddleFileCAEntityType ${path}keyrings//Intermediate//camiddle.chain.pem ${path}keyrings//Intermediate//camiddle.key id=certificateType_select2 id=keyringsadd_publicKeyAlgoSelet3 DecryptionKeyringsErrorVerification CAMiddleFileCAEntityType ${path}keyrings//Intermediate//camiddle.chain.pem ${path}keyrings//Intermediate//camiddle.key id=certificateType_select2 id=keyringsadd_publicKeyAlgoSelet3
... /html/body/div[last()]/p Incorrect certificate type ... //*[@id="app"]/following-sibling::div/p Incorrect certificate type
DecryptionKeyringsCAEntityFileCARootType DecryptionKeyringsCAEntityFileCARootType
[Tags] Negtive UI Settings DecryptionKeyrings [Tags] Negtive UI Settings DecryptionKeyrings
DecryptionKeyringsErrorVerification CAEntityFileCARootType ${path}keyrings//end-entity//caentity.chain.pem ${path}keyrings//end-entity//caentity.key id=certificateType_select0 id=keyringsadd_publicKeyAlgoSelet3 DecryptionKeyringsErrorVerification CAEntityFileCARootType ${path}keyrings//end-entity//caentity.chain.pem ${path}keyrings//end-entity//caentity.key id=certificateType_select0 id=keyringsadd_publicKeyAlgoSelet3
... /html/body/div[last()]/p Incorrect certificate chain length (root certificate must be 1, intermediate certificate and end entity certificate must be greater than 2.) ... //*[@id="app"]/following-sibling::div/p Incorrect certificate chain length (root certificate must be 1, intermediate certificate and end entity certificate must be greater than 2.)
DecryptionKeyringsCAEntityFileCAMiddleType DecryptionKeyringsCAEntityFileCAMiddleType
[Tags] Negtive UI Settings DecryptionKeyrings [Tags] Negtive UI Settings DecryptionKeyrings
DecryptionKeyringsErrorVerification CAEntityFileCAMiddleType ${path}keyrings//end-entity//caentity.chain.pem ${path}keyrings//end-entity//caentity.key id=certificateType_select1 id=keyringsadd_publicKeyAlgoSelet3 DecryptionKeyringsErrorVerification CAEntityFileCAMiddleType ${path}keyrings//end-entity//caentity.chain.pem ${path}keyrings//end-entity//caentity.key id=certificateType_select1 id=keyringsadd_publicKeyAlgoSelet3
... /html/body/div[last()]/p Incorrect certificate type ... //*[@id="app"]/following-sibling::div/p Incorrect certificate type
DecryptionKeyringsNullName DecryptionKeyringsNullName
[Tags] Negtive UI Settings DecryptionKeyrings [Tags] Negtive UI Settings DecryptionKeyrings

2
01-TestCase/tsg_ui/ui_settings/InsertScriptCase.robot
View File

@@ -45,7 +45,7 @@ InsertScriptsEditSearchId
click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[2]/div/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[2]/div/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
Delete Delete
InsertScriptsEditSearchName InsertScriptsEditSearchName
[Tags] Positive UI Settings InsertScript [Tags] Positive UI Settings InsertScript
CreateInsertScripts 1234 ${path}insert_files\\Create-Insert Scripts-test.css css name CreateInsertScripts 1234 ${path}insert_files\\Create-Insert Scripts-test.css css name
${name} get text xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[2]/div/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span ${name} get text xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[2]/div/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span

12
01-TestCase/tsg_ui/ui_settings/SNATIPPoolsCase.robot
View File

@@ -10,12 +10,12 @@ CreateSNATIPPoolsEnter
CreateSNATIPPools ${TEST NAME} 1 ${iplist} j=2 CreateSNATIPPools ${TEST NAME} 1 ${iplist} j=2
SNATIPDelete ${TEST NAME} Name SNATIPDelete ${TEST NAME} Name
CreateSNATIPPoolsHistoryActiveIP # CreateSNATIPPoolsHistoryActiveIP
[Tags] Positive UI Settings SNATIPPools # [Tags] Positive UI Settings SNATIPPools
${ip}= SearchHistoryActiveIP 1 # ${ip}= SearchHistoryActiveIP 1
${iplist} create list ${ip} # ${iplist} create list ${ip}
CreateSNATIPPools ${TEST NAME} 2 ${iplist} # CreateSNATIPPools ${TEST NAME} 2 ${iplist}
SNATIPDelete ${TEST NAME} Name # SNATIPDelete ${TEST NAME} Name
EditSNATIPPoolsName EditSNATIPPoolsName
[Tags] Positive name Settings SNATIPPools [Tags] Positive name Settings SNATIPPools

2
02-Keyword/tsg_ui/administration/Administration.robot
View File

@@ -422,7 +422,7 @@ LoginRestrictions-SearchIP
sleep ${sleep_min} sleep ${sleep_min}
LoginRestrictions-DeleteIP LoginRestrictions-DeleteIP
sleep ${sleep} Wait Until Element Is Enabled xpath=/html/body/div/div/div[3]/div[2]/div/div[1]/div/div[2]/div/div/form/div[2]/div/div[1]/div[2]/div[1]/div/div[last()]/div/div/div[2]/i[2] ${sleep_Wait}
${text} Get Element Attribute xpath=/html/body/div/div/div[3]/div[2]/div/div[1]/div/div[2]/div/div/form/div[2]/div/div[1]/div[2]/div[1]/div/div[last()]/div/div/div[2]/i[2] id ${text} Get Element Attribute xpath=/html/body/div/div/div[3]/div[2]/div/div[1]/div/div[2]/div/div/form/div[2]/div/div[1]/div[2]/div[1]/div/div[last()]/div/div/div[2]/i[2] id
click element id=${text} click element id=${text}
sleep ${sleep} sleep ${sleep}

23
02-Keyword/tsg_ui/setting/Settings.robot
View File

@@ -463,6 +463,7 @@ EditInsertScripts
... AND click //span[.="${jstype}"] ... AND click //span[.="${jstype}"]
sleep ${sleep_min} sleep ${sleep_min}
click id=insertAddOk1 #点击ok提交 click id=insertAddOk1 #点击ok提交
Wait Until Element Is Enabled id=insertAdd ${sleep_Wait}
run keyword if "${search}"=="id" run keywords sleep ${sleep_min} run keyword if "${search}"=="id" run keywords sleep ${sleep_min}
... AND Settings-Search ${id-name} ${search} #搜索框的关键字 ... AND Settings-Search ${id-name} ${search} #搜索框的关键字
... ELSE IF "${search}"=="name" run keywords sleep ${sleep_min} ... ELSE IF "${search}"=="name" run keywords sleep ${sleep_min}
@@ -687,10 +688,10 @@ CreateDecryptionKeyrings
... ${PrivateKeyType}：私钥类型 ... ${PrivateKeyType}：私钥类型
#打开浏览器 #打开浏览器
#ui-login lyf 111111 #ui-login lyf 111111
sleep ${sleep_min} sleep ${sleep}
click id=children6 #点击一级目录Settings click id=children6 #点击一级目录Settings
sleep ${sleep_min} sleep ${sleep}
click id=sidebarProxy_CertificateManagement #点击二级目录Trusted Certificate Authorities click id=sidebarProxy_CertificateManagement
sleep ${sleep} sleep ${sleep}
click xpath=//*[@id="proxyTabs"]/div/ul/li[2] #点击Decryption Keyrings click xpath=//*[@id="proxyTabs"]/div/ul/li[2] #点击Decryption Keyrings
sleep ${sleep_min} sleep ${sleep_min}
@@ -1731,11 +1732,11 @@ Req_Res_Body
CreateIpLibraries CreateIpLibraries
[Arguments] ${type1} ${type} ${Continent/Country} ${GeoNameID} ${City} ${ip} ${j}=1 ${Country}=null ${Longitude}=null ${Latitude}=null [Arguments] ${type1} ${type} ${Continent/Country} ${GeoNameID} ${City} ${ip} ${j}=1 ${Country}=null ${Longitude}=null ${Latitude}=null
sleep ${sleep_min} sleep ${sleep}
click id=children6 #点击一级目录Settings click id=children6 #点击一级目录Settings
sleep ${sleep_min} sleep ${sleep}
click id=sidebarAdvanced click id=sidebarAdvanced
sleep ${sleep_min} sleep ${sleep}
click id=Advanced/ipLibrary #点击二级目录IP_Libraries click id=Advanced/ipLibrary #点击二级目录IP_Libraries
sleep ${sleep} sleep ${sleep}
click id=tagAdd #点击Create按钮 click id=tagAdd #点击Create按钮
@@ -2198,7 +2199,7 @@ Switch_Geographic_Locations
input id=objectName_seach ${Continent/Country} input id=objectName_seach ${Continent/Country}
sleep ${sleep_min} sleep ${sleep_min}
press keys id=objectName_seach ENTER press keys id=objectName_seach ENTER
sleep ${sleep} sleep 3
click xpath=//*[@id="right_locationList"]/div[2]/div[1]/div[2]/div/div click xpath=//*[@id="right_locationList"]/div[2]/div[1]/div[2]/div/div
sleep ${sleep_min} sleep ${sleep_min}
click id=interceptionadd_allcancelobject9 click id=interceptionadd_allcancelobject9
@@ -2269,9 +2270,9 @@ OpenPages
... ${Three-levelMenu}：三级菜单 ... ${Three-levelMenu}：三级菜单
... ${Targeting} :三级菜单 定位方式 默认不输入为id ... ${Targeting} :三级菜单 定位方式 默认不输入为id
click id=children6 click id=children6
sleep ${sleep_min} sleep ${sleep}
click id=${SecondaryMenu} click id=${SecondaryMenu}
sleep ${sleep_min} sleep ${sleep}
run keyword if "${Targeting}"=="null" run keywords sleep ${sleep_min} run keyword if "${Targeting}"=="null" run keywords sleep ${sleep_min}
... AND click id=${Three-levelMenu} ... AND click id=${Three-levelMenu}
run keyword if "${Targeting}"=="xpath" run keywords sleep ${sleep_min} run keyword if "${Targeting}"=="xpath" run keywords sleep ${sleep_min}
@@ -2613,14 +2614,14 @@ SortButton
${One} Set Variable [1] ${One} Set Variable [1]
${Two} Set Variable [2] ${Two} Set Variable [2]
${assert} Set Variable if "${page}" == "Trusted Certificate Authorities" //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span ${assert} Set Variable if "${page}" == "Trusted Certificate Authorities" //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span
... "${page}" == "Decryption Keyrings" //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[3]/td[1]/div/div/div/p/span ... "${page}" == "Decryption Keyrings" //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span
... "${page}" == "Cached Intermediate Certificates" //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span ... "${page}" == "Cached Intermediate Certificates" //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span
sleep ${sleep_min} sleep ${sleep_min}
${text1} get text xpath=${assert} ${text1} get text xpath=${assert}
click xpath=${button}${One} click xpath=${button}${One}
sleep ${sleep} sleep ${sleep}
${text2} get text xpath=${assert} ${text2} get text xpath=${assert}
click xpath=${button}${Two} click xpath=${button}${One}
sleep ${sleep} sleep ${sleep}
${text3} get text xpath=${assert} ${text3} get text xpath=${assert}
Should Not Be Equal ${text1} ${text2} Should Not Be Equal ${text1} ${text2}