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

新增Voip测试用例，修改UIPolicy关键字

Browse Source
This commit is contained in:
byb11
2021-03-04 18:33:55 +08:00
parent e684c3eb1c
commit acb74f1b38
2 changed files with 231 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
02-Keyword/tsg_ui/policy/UIPolicy.robot
View File

@@ -103,7 +103,7 @@ UIAddPolicies
... ELSE ProxyEnabled ${PolicyEnabled}
Run Keyword If "${PolicyType}"=="Security Policy" Security-Policies-OK
... ELSE Proxy-Policies-OK
Wait Until Element Is Enabled id=app_create
Wait Until Element Is Enabled id=app_create 20
Security-Source Name ${PolicyName}
Run Keyword If "${PolicyType}"=="Security Policy" SecurityAssert ${PolicyName}
... ELSE ProxyAssert ${PolicyName}
@@ -179,7 +179,7 @@ UIUpdataPolicies
UIPolicy.Create-Application-Button ${PolicyType} ${ApplicationSearchV} ${PolicyAction}
#编辑filter
Run Keyword If "${EditFilterInfo}"=="${EMPTY}" or "${EditFilterInfo}"=="null" log there is no FilterInfo
... ELSE Create-Filter-SecurityOrProxy ${PolicyType} ${ApplicationFilter} ${EditFilterInfo}
... ELSE Create-Filter-SecurityOrProxy ${PolicyType} ${ApplicationSearchV}[0] ${EditFilterInfo}
Run Keyword If "${CreateOrDeleteFilterInfo}"=="${EMPTY}" or "${CreateOrDeleteFilterInfo}"=="null" log there is no FilterInfo
... ELSE Edit-Filter-SecurityOrProxy ${PolicyType} ${CreateOrDeleteFilterInfo}
@@ -204,6 +204,7 @@ UIUpdataPolicies
... ELSE ProxyEnabled ${PolicyEnabled}
Run Keyword If "${PolicyType}"=="Security Policy" Security-Policies-OK
... ELSE Proxy-Policies-OK
Wait Until Element Is Enabled id=app_create 20
Security-Source Name ${PolicyEditName}
Run Keyword If "${PolicyType}"=="Security Policy" SecurityAssert ${PolicyEditName}
... ELSE ProxyAssert ${PolicyEditName}
@@ -560,16 +561,14 @@ Create-Application-Button
... AND sleep ${sleep}
run keyword if "${PolicyType}"=="Proxy Policy" ProxyApplicationSearch ${Action} ${ApplicationSearchV}
SecurityApplicationFor
[Arguments] ${ApplicationSearchV}
${a} set variable ${ApplicationSearchV}[0]
FOR ${i} IN @{ApplicationSearchV}
run keyword if "${a}" != "${i}" run keywords sleep ${sleep}
... AND click element xpath=//*[@id="interceptionadd_application"]/i
click element id=interceptionadd_application
SecurityApplicationSearch ${i}
${a} set variable ${i}
END
SecurityApplicationSearch
[Arguments] ${Application}
[Documentation] 调用次关键字前需要添加必填参数：
@@ -582,12 +581,10 @@ SecurityApplicationSearch
sleep ${sleep}
click element xpath=/html/body/div[1]/div/div[3]/div[2]/div/div[5]/div[2]/div[2]/div/div[3]/div/div/ul/li[1]
sleep ${sleep}
${status} Run Keyword And Return Status Page Should Contain Element xpath=/html/body/div[last()]/div/div[3]/button[2]
${status} Run Keyword And Return Status Page Should Contain element xpath=/html/body/div/div/div[3]/button[2]/span #xpath=/html/body/div/div/div[3]/button[2]
log ${status}
run keyword if "${status}" == "True" run keywords sleep 1
... AND click element xpath=/html/body/div/div/div[3]/button[2]
... AND sleep ${sleep}
... ELSE log 未检测弹出框不操作
${return} Run Keyword And Ignore Error JudgmentPopup ${status}
# ... ELSE log 未检测弹出框不操作
# ${style}= Get Element Attribute class=el-message-box__wrapper style
# log ${style}1111111111111
# ${c} Evaluate "display: none" in """${style}"""
@@ -596,7 +593,13 @@ SecurityApplicationSearch
# sleep ${sleep}
click element id=check_list_allcancelobject
sleep ${sleep}
JudgmentPopup
[Arguments] ${status}
Comment 判断弹出框
run keyword if "${status}" == "True" run keywords click element xpath=/html/body/div/div/div[3]/button[2]
... AND sleep ${sleep}
ProxyApplicationSearch
[Arguments] ${Action} ${HttpOrDoh}
[Documentation] 调用次关键字前需要添加必填参数：
@@ -707,7 +710,7 @@ Create-SecurityFilter-judge
... ${Filter}:是一个列表，列表中填入filter类型，例如Host或URL等
... name:各个对象名称的列表
... 判断filter是否可以点击
${class}= Get Element Attribute xpath=/html/body/div[1]/div/div[3]/div[2]/div/div[1]/form/div/div[8]/div[1]/div/div class
${class}= Get Element Attribute id=interceptionadd_add_filter class
run keyword if "${class}"=="addobject addobject-long-list obj-content-null filter-width-style cursor addobject-long-list-disabled" log filter不可点击，不可添加filter
run keyword if "${class}"=="addobject addobject-long-list obj-content-null filter-width-style cursor" run keywords sleep ${sleep}
... AND Create-SecurityFilter ${Application} ${Filter} ${Hostname} ${URLname} ${Request Headername} ${Response Headername} ${Request Contentname}