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

提交Objects关键字和用例的修改

Browse Source
This commit is contained in:
lyf
2021-01-19 18:23:16 +08:00
parent bb4f191a24
commit d80da19959
8 changed files with 138 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
02-Keyword/tsg_ui/objects/NewObject.robot
View File

@@ -68,23 +68,27 @@ Create-item
... AND sleep 1
... AND click element id=interceptionadd_allcancelobject
... AND sleep 1
run keyword if "${objectform}"=="FQDN" or "${objectform}"=="URL" or "${objectform}"=="Account" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div[1]
run keyword if "${objectform}"=="FQDN" or "${objectform}"=="URL" or "${objectform}"=="Account" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div[1]
... AND sleep 1
... AND Create-keyword-text ${objectform} ${keywordtext}
... AND sleep 1
... AND Create-item-ok ${objectform}
run keyword if '${objectform}'=='Key' run keywords click element id=objectAddItemAdd
run keyword if '${objectform}'=='Key' run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div[1]
... AND sleep 1
... AND Create-Key-text ${keywordtext}
... AND Create-Key-hexmode ${hex}
... AND Create-item-ok ${objectform}
run keyword if '${objectform}'=='HTTPSignature' run keywords click element id=objectAddItemAdd
run keyword if '${objectform}'=='HTTPSignature' run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div[1]/i
... AND sleep 1
... AND Create-ReqRes-type ${reqrestype}
... AND Create-ReqRes-header ${reqrestype} ${reqresheader}
... AND Create-ReqRes-text ${keywordtext}
... AND Create-ReqRes-hexmode ${hex}
... AND Create-item-ok ${objectform}
run keyword if '${objectform}'=='SubscriberID' run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div[1]/i
... AND sleep 1
... AND Create-SubscriberID-text ${keywordtext}
... AND sleep 1
Create-item--groupadd
@@ -305,7 +309,7 @@ Create-keyword-text
... ELSE IF "${type}"=="Category" run keywords sleep 1
... AND input text id=object_fqdn0 ${keywordtext}
... ELSE IF "${type}"=="Account" run keywords sleep 1
... AND input text id=object_account0 ${keywordtext}
... AND input text xpath=/html/body/div[1]/div/div[3]/div[2]/div/div[1]/div[7]/div[1]/div[1]/form/div/div/div/div/div[1]/input ${keywordtext}
... ELSE log 2
Create-keyword-text-group
[Arguments] ${type} ${keywordtext}
@@ -349,7 +353,7 @@ Create-ReqRes-text
Create-ReqRes-hexmode
[Arguments] ${hex}
sleep 1
run keyword if "${hex}"=="open" click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[6]/div[1]/div[1]/form/div/div[4]/div/div/span
run keyword if "${hex}"=="open" click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[4]/div[1]/div[1]/form/div/div[4]/div/div/span
sleep 1
Create-Key-text
@@ -361,7 +365,13 @@ Create-Key-text
Create-Key-hexmode
[Arguments] ${hex}
sleep 1
run keyword if "${hex}"=="open" click element xpath=//*[@id="objects_httpBodyKeywords1"]/div[1]/div[1]/form/div/div[2]/div/div/span
run keyword if "${hex}"=="open" click element xpath=//*[@id="objects_httpBodyKeywords1"]/div[1]/div[1]/form/div/div[2]/div/div
sleep 1
Create-SubscriberID-text
[Arguments] ${keywordtext}
sleep 1
input text xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div[4]/div[1]/div[1]/div[2]/div[1]/div/form/div[1]/div/div[1]/input ${keywordtext}
sleep 1
objects-delete
@@ -378,9 +388,9 @@ object-edit-fqdn
Sleep 2
NewObject.Create-name ${name}
Sleep 1
click element id=objectAddEdit
click element id=editForm0
Sleep 1
input text id=object_fqdn0 ${keywordtext}
input text id=object_fqdn0${name} ${keywordtext}
Sleep 1
click element id=objectAddItemFqdnOk
Sleep 1
@@ -394,11 +404,9 @@ object-edit-Subscriber-ID
Sleep 2
NewObject.Create-name ${name}
Sleep 1
click element id=objectAddEdit
click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[4]/div/div[4]/div[1]/div[1]/div[2]/div[1]/div[2]/div/div[2]/i[1]
Sleep 1
input text id=object_sub0 ${keywordtext}
Sleep 1
click element id=objectAddItemSubOk
input text xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[4]/div/div[4]/div[1]/div[1]/div[2]/div[1]/div[2]/div/div[1]/form/div/div/div/div[2]/div/input ${keywordtext}
Sleep 1
click element id=objectAdd_ok
Sleep 2
@@ -410,9 +418,9 @@ object-edit-url
Sleep 2
NewObject.Create-name ${name}
Sleep 1
click element id=objectAddEdit
click element id=editForm0
Sleep 1
input text id=object_url0 ${keywordtext}
input text xpath=/html/body/div[1]/div/div[3]/div[2]/div/div[1]/div[5]/div[1]/div[1]/form/div/div/div/div/div/input ${keywordtext}
Sleep 1
click element id=objectAddItemUrlOk
Sleep 1
@@ -426,9 +434,9 @@ object-edit-account
Sleep 2
NewObject.Create-name ${name}
Sleep 1
click element id=objectAddEdit
click element id=editForm0
Sleep 1
input text id=object_account0 ${keywordtext}
input text xpath=/html/body/div[1]/div/div[3]/div[2]/div/div[1]/div[7]/div[1]/div[1]/form/div/div/div/div/div/input ${keywordtext}
Sleep 1
click element id=objectItemAccountOk
Sleep 1
@@ -442,9 +450,9 @@ object-edit-keywords
Sleep 2
NewObject.Create-name ${name}
Sleep 1
click element id=objectAddEdit
click element id=editForm0
Sleep 1
input text id=object_key0 ${keywordtext}
input text id=object_url0${name} ${keywordtext}
Sleep 1
NewObject.Create-Key-hexmode ${hex}
Sleep 1
@@ -455,19 +463,29 @@ object-edit-keywords
ui-object-search-name
[Arguments] ${name}
sleep 2
click element xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[1]/span/div/div/div[2]/div/div/div/input #点击输入框
sleep 2
click element xpath=/html/body/div/div[1]/div[1]/ul/li[3] #点击name为搜索类型
click element xpath=/html/body/div/div[1]/div[1]/ul/li[3] #点击name为搜索类型
sleep 2
input text xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[1]/span/div/div/div[2]/div/div[1]/div[3]/div/input ${name} #输入搜索内容
sleep 2
click element xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[1]/span/div/i #点击搜索按钮
sleep 2
click element xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1] #选择搜索到的列表
click element xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/span #选择搜索到的列表
sleep 2
clear-object-search
[Arguments] ${type}
sleep 2
run keyword if "${type}"=="Key" click element id=sidebarObjects_keywords
run keyword if "${type}"=="Account" click element id=sidebarObjects_account
run keyword if "${type}"=="URL" click element id=sidebarObjects_url
run keyword if "${type}"=="HTTPSignature" click element id=sidebarObjects_http_signature
run keyword if "${type}"=="SubscriberID" click element id=sidebarObjects_subscriberid
run keyword if "${type}"=="FQDN" click element id=sidebarObjects_fqdn
run keyword if "${type}"=="IP" click element id=sidebarObjects_ip
object-edit-HTTPSignature
[Arguments] ${name} ${reqrestype} ${reqresheader} ${keywordtext} ${hex}=close
Sleep 2
@@ -475,7 +493,7 @@ object-edit-HTTPSignature
Sleep 2
Create-name ${name}
Sleep 1
click element id=objectAddEdit
click element id=editForm0
Sleep 1
Create-ReqRes-type ${reqrestype}
Create-ReqRes-header ${reqrestype} ${reqresheader}
@@ -531,58 +549,58 @@ Cerate-Group
run keyword if "${objectform}"=="IP" and "${groupadd}"!="open" run keywords Select-ip_type ${ip_type}
... AND sleep 1
... AND click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[4]/div/div/div[2]
... AND click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[4]/div/div/div[2]
... AND Create-Sub-Objects ${object_name}
run keyword if "${objectform}"=="IP" and "${groupadd}"=="open" run keywords Select-ip_type ${ip_type}
... AND sleep 1
... AND click element xpath=//*[@id="objectAddSubAdd"]
... AND click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[4]/div/div/div[2]
... AND Create-Sub-Objects-groupadd ${buildType} ${groupaddType} ${name} ${objectform} ${groupadd} ${object_name} ${objectform} ${ip_type} ${ipclienttext1} ${keywordtext} ${hex} ${reqrestype} ${reqresheader} ${post} ${Country} ${City}
run keyword if "${objectform}"=="HTTPSignature" and "${groupadd}"!="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
run keyword if "${objectform}"=="HTTPSignature" and "${groupadd}"!="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
... AND sleep 1
... AND Create-Sub-Objects ${object_name}
run keyword if "${objectform}"=="HTTPSignature" and "${groupadd}"=="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
run keyword if "${objectform}"=="HTTPSignature" and "${groupadd}"=="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
... AND sleep 1
... AND Create-Sub-Objects-groupadd ${buildType} ${groupaddType} ${name} ${objectform} ${groupadd} ${object_name} ${objectform} ${ip_type} ${ipclienttext1} ${keywordtext} ${hex} ${reqrestype} ${reqresheader} ${post} ${Country} ${City}
... AND sleep 1
run keyword if "${objectform}"=="FQDN" and "${groupadd}"=="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
run keyword if "${objectform}"=="FQDN" and "${groupadd}"=="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
... AND sleep 1
... AND Create-Sub-Objects-groupadd ${buildType} ${groupaddType} ${name} ${objectform} ${groupadd} ${object_name} ${objectform} ${ip_type} ${ipclienttext1} ${keywordtext} ${hex} ${reqrestype} ${reqresheader} ${post} ${Country} ${City}
... AND sleep 1
run keyword if "${objectform}"=="FQDN" and "${groupadd}"!="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
run keyword if "${objectform}"=="FQDN" and "${groupadd}"!="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
... AND sleep 1
... AND Create-Sub-Objects ${object_name}
run keyword if "${objectform}"=="SubscriberID" and "${groupadd}"!="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
run keyword if "${objectform}"=="SubscriberID" and "${groupadd}"!="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
... AND sleep 1
... AND Create-Sub-Objects ${object_name}
run keyword if "${objectform}"=="SubscriberID" and "${groupadd}"=="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
run keyword if "${objectform}"=="SubscriberID" and "${groupadd}"=="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
... AND sleep 1
... AND Create-Sub-Objects-groupadd ${buildType} ${groupaddType} ${name} ${objectform} ${groupadd} ${object_name} ${objectform} ${ip_type} ${ipclienttext1} ${keywordtext} ${hex} ${reqrestype} ${reqresheader} ${post} ${Country} ${City}
... AND sleep 1
run keyword if "${objectform}"=="Key" and "${groupadd}"!="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
run keyword if "${objectform}"=="Key" and "${groupadd}"!="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
... AND sleep 1
... AND Create-Sub-Objects ${object_name}
run keyword if "${objectform}"=="Key" and "${groupadd}"=="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
run keyword if "${objectform}"=="Key" and "${groupadd}"=="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
... AND sleep 1
... AND Create-Sub-Objects-groupadd ${buildType} ${groupaddType} ${name} ${objectform} ${groupadd} ${object_name} ${objectform} ${ip_type} ${ipclienttext1} ${keywordtext} ${hex} ${reqrestype} ${reqresheader} ${post} ${Country} ${City}
... AND sleep 1
run keyword if "${objectform}"=="URL" and "${groupadd}"!="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
run keyword if "${objectform}"=="URL" and "${groupadd}"!="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
... AND sleep 1
... AND Create-Sub-Objects ${object_name}
run keyword if "${objectform}"=="URL" and "${groupadd}"=="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
run keyword if "${objectform}"=="URL" and "${groupadd}"=="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
... AND sleep 1
... AND Create-Sub-Objects-groupadd ${buildType} ${groupaddType} ${name} ${objectform} ${groupadd} ${object_name} ${objectform} ${ip_type} ${ipclienttext1} ${keywordtext} ${hex} ${reqrestype} ${reqresheader} ${post} ${Country} ${City}
... AND sleep 1
run keyword if "${objectform}"=="Category" and "${groupadd}"!="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
run keyword if "${objectform}"=="Category" and "${groupadd}"!="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
... AND sleep 1
... AND Create-Sub-Objects ${object_name}
run keyword if "${objectform}"=="Category" and "${groupadd}"=="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
run keyword if "${objectform}"=="Category" and "${groupadd}"=="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
... AND sleep 1
... AND Create-Sub-Objects-groupadd ${buildType} ${groupaddType} ${name} ${objectform} ${groupadd} ${object_name} ${objectform} ${ip_type} ${ipclienttext1} ${keywordtext} ${hex} ${reqrestype} ${reqresheader} ${post} ${Country} ${City}
... AND sleep 1
run keyword if "${objectform}"=="Account" and "${groupadd}"!="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
run keyword if "${objectform}"=="Account" and "${groupadd}"!="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
... AND sleep 1
... AND Create-Sub-Objects ${object_name}
run keyword if "${objectform}"=="Account" and "${groupadd}"=="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[3]/div/div/div[2]
run keyword if "${objectform}"=="Account" and "${groupadd}"=="open" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[1]/div[2]/form/div[3]/div/div/div[2]
... AND sleep 1
... AND Create-Sub-Objects-groupadd ${buildType} ${groupaddType} ${name} ${objectform} ${groupadd} ${object_name} ${objectform} ${ip_type} ${ipclienttext1} ${keywordtext} ${hex} ${reqrestype} ${reqresheader} ${post} ${Country} ${City}
... AND sleep 1