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

1.修改Case 2.修改及增加关键字

Browse Source
This commit is contained in:
byb11
2021-01-22 18:40:29 +08:00
parent 6d6cc7b310
commit 070594503a
12 changed files with 277 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -750,7 +750,7 @@ importTrustedCertificateAuthorities
Sleep 1
click id=sidebarProxy_CertificateManagement #点击二级目录Trusted Certificate Authorities
Sleep 2
click id=Authorities_create #点击Import
click id=app_create #点击Import
Sleep 2
input id=authoritiesAdd_name ${name} #输入name
Sleep 2
@@ -789,16 +789,18 @@ importTrustedCertificateAuthoritiesErrorVerification
Should Be Equal As Strings ${text} ${PromptInformation} #断言
CreateDecryptionKeyrings
[Arguments] ${name} ${file} ${file1} ${1or2} ${type} ${type1} ${search}
... ${shift}=close
[Arguments] ${name} ${file} ${file1} ${ExpiryHours1or2} ${type} ${type1} ${search}
... ${shift}=close ${PrivateKeyType}=PrivateKeyFile
[Documentation] 引用次关键字，填入必填参数
... 必填参数：
... ${name}:新建页面name输入框里的内容
... ${file}：上传文件所在本地的路径
... ${file1}:上传文件所在本地的路径
... ${1or2}:填入1 或者其他
... ${ExpiryHours1or2}:根证书时间填入1：自定义定义 2:原时间
... ${type}:上传证书类型的元素
... ${type1}:上传证书加密解密算法的元素
... ${shift}:是否打开客户端包含证书按钮
... ${PrivateKeyType}：私钥类型
#打开浏览器
#ui-login lyf 111111
Sleep 1
@@ -808,29 +810,33 @@ CreateDecryptionKeyrings
Sleep 2
click xpath=//*[@id="proxyTabs"]/div/ul/li[2] #点击Decryption Keyrings
sleep 1
click id=Keyrings_create #点击Create
click id=app_create #点击Create
Sleep 2
input id=keyringsadd_name ${name} #输入name
Sleep 2
Choose File xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[2]/div/div/div/input ${file} #上传文件
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 2
Choose File xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[3]/div/div[2]/div/div/input ${file1} #上传文件
${select} Set Variable ${1or2}
Choose File xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[2]/div[2]/form/div[3]/div/div[2]/div/div/input ${file1} #上传文件
${select} Set Variable ${ExpiryHours1or2}
Run Keyword If '${select}'=='1' click id=keyringsadd_customized
Run Keyword If '${select}'=='1' input id=reissueExpiryDate 10
sleep 1
click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[6]/div/div/div[1]/span/span/i #点击下拉框
click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[2]/div[2]/form/div[6]/div/div/div[1]/span/span/i #点击下拉框
sleep 1
click ${type} #选择证书类型
sleep 1
click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[7]/div/div/div[1]/span/span/i #点击下拉框
click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[2]/div[2]/form/div[7]/div/div/div[1]/span/span/i #点击下拉框
sleep 1
click ${type1} #选择加密解密类型
sleep 1
${root} Set Variable ${shift}
run keyword if "${root}"=="open" run keywords sleep 1
... AND click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[9]/div/div/span
... AND click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[2]/div[2]/form/div[9]/div/div/span
... ELSE IF "${root}"=="close" log "go on"
Run Keyword If '${PrivateKeyType}'=='HSM' run keywords sleep 1
... AND click id=privateHSM
... AND sleep 1
... AND input id=keyringsadd_slotid 10
sleep 1
click id=keyringsadd_sub #点击OK缇交
Sleep 2
@@ -838,6 +844,45 @@ CreateDecryptionKeyrings
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} #断言
DecryptionKeyringsErrorVerification
[Arguments] ${name} ${file} ${file1} ${type} ${type1} ${Positioning} ${Assertion}
[Documentation] 用于验证导入证书和类型不匹配的错误验证
... 必填参数：
... ${name}:新建页面name输入框里的内容
... ${file}：上传文件所在本地的路径
... ${file1}:上传文件所在本地的路径
... ${type}:上传证书类型的元素
... ${type1}:上传证书加密解密算法的元素
... ${Positioning}:获取文本的xpath定位
... ${Assertion}：断言信息
Sleep 1
click id=children6 #点击一级目录Settings
Sleep 1
click id=sidebarProxy_CertificateManagement #点击二级目录Trusted Certificate Authorities
Sleep 2
click xpath=//*[@id="proxyTabs"]/div/ul/li[2] #点击Decryption Keyrings
sleep 1
click id=app_create #点击Create
Sleep 2
input id=keyringsadd_name ${name} #输入name
Sleep 2
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 2
Choose File xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[2]/div[2]/form/div[3]/div/div[2]/div/div/input ${file1} #上传文件
sleep 1
click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[2]/div[2]/form/div[6]/div/div/div[1]/span/span/i #点击下拉框
sleep 1
click ${type} #选择证书类型
sleep 1
click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[2]/div[2]/form/div[7]/div/div/div[1]/span/span/i #点击下拉框
sleep 1
click ${type1} #选择加密解密类型
sleep 1
click id=keyringsadd_sub #点击OK缇交
Sleep 2
${text1} Get Text xpath=${Positioning} #获取点击后页面文本信息
Should Be Equal As Strings ${text1} ${Assertion} #断言
CreateSSLDecryptionExclusion
[Arguments] ${name} ${value} ${name1} ${search}
@@ -894,7 +939,7 @@ EditTrustedCertificateAuthorities
sleep 1
click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr #点击搜索列表
sleep 1
click id=Authorities_edit #点击Edit按钮
click id=appEdit #点击Edit按钮
sleep 1
Clear Element Text id=authoritiesAdd_name #清空name输入框
sleep 1
@@ -927,7 +972,7 @@ EditDecryptionKeyrings
sleep 1
click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr #点击搜索列表
sleep 1
click id=Keyrings_edit #点击Edit按钮
click id=appEdit #点击Edit按钮
sleep 1
Clear Element Text id=keyringsadd_name #清空name输入框
sleep 1
@@ -1746,7 +1791,7 @@ Req_Res_Body
\ ... AND sleep 1
\ ... AND input id=attributeValue_string ${dict}[${key}]
Create_Ip_Libraries
CreateIpLibraries
[Arguments] ${type1} ${type} ${Continent/Country} ${GeoNameID} ${City} ${ip} ${j}=1 ${Country}=null ${Longitude}=null ${Latitude}=null
Sleep 1
click id=children6 #点击一级目录Settings
@@ -1790,7 +1835,7 @@ Create_Ip_Libraries
sleep 2
Should Be Equal As Strings ${GeoNameText} ${GeoNameID} #断言
Edit_Ip_Libraries
EditIpLibraries
[Arguments] ${type} ${GeoNameID} ${City}=null ${ip}=null ${j}=1 ${Country}=null ${Longitude}=null ${Latitude}=null ${type1}=null ${type2}=null
click id=tagEdit #点击Edit按钮
sleep 2
@@ -1850,13 +1895,14 @@ Ip_Range_Edit_Create
\ sleep 1
sleep 1
Delete_IP_Libraries
DeleteIPLibraries
click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]
sleep 2
click id=tagDel
sleep 2
click xpath=/html/body/div/div/div[3]/button[2]
sleep 2
Switch_IP_Libraries
[Arguments] ${type} ${value} ${GeoName}
sleep 2
@@ -1940,7 +1986,7 @@ ALL
DeleteKeyrings_del
sleep 2
click id=Keyrings_del
click id=appDel
sleep 2
click xpath=/html/body/div/div/div[3]/button[2]
sleep 2
@@ -1975,7 +2021,7 @@ DeletetrafficMirrorDel
DeleteAuthorities_del
sleep 2
click id=Authorities_del
click id=appDel
sleep 2
click xpath=/html/body/div/div/div[3]/button[2]
sleep 2
@@ -2068,6 +2114,19 @@ UploadFilesSize
... AND sleep 2
... AND click id=Import_ua_Ok
... AND sleep 1
run keyword if "${Page}" == "TrustedCertificateAuthorities" run keywords sleep 1
... AND click id=children6
... AND sleep 1
... AND click id=sidebarProxy_CertificateManagement #点击二级目录Trusted Certificate Authorities
... AND Sleep 2
... AND click id=app_create #点击Import
... AND Sleep 2
... AND input id=authoritiesAdd_name ${name} #输入name
... AND Sleep 2
... AND Choose File xpath=//*[@id="upload_dome"]/div/input ${file} #上传文件
... AND Sleep 2
... AND click id=authoritiesAdd_sub #点击OK缇交
... AND Sleep 2
${text} get text xpath=/html/body/div[last()]/p
Should Be Equal As Strings ${text} ${Promptinfor}
@@ -2076,8 +2135,6 @@ DownLoadFile
[Documentation]
... ${UploadFilePath}:上传文件路径
... ${DownloadFilePath}:文件下载路径
sleep 1
click id=dowmloadi
sleep 3
${a} get_md5_01 ${UploadFilePath}
sleep 1
@@ -2085,6 +2142,8 @@ DownLoadFile
sleep 1
Should Be Equal As Strings ${a} ${b}
sleep 2
Remove File ${DownloadFilePath}
sleep 2
#Run_Keyword_And_Continue_On_Failure File_Should_Exist ${DownloadFilePath} #出错后继续执行，如文件在指定路径存在则通过
DeleteReferencedData