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

1、提价修改的UI关键字和case

Browse Source 
2、提交Dashboard的Traffic关键字和一个case
3、提交GetTimeLibrary中新加的代码
This commit is contained in:
lyf
2020-08-18 18:02:07 +08:00
parent 1f787fded0
commit fee5a2fc89
29 changed files with 1000 additions and 683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,9 +8,9 @@ CreateButton
sleep 3
Click element id=objectCreate
run keyword if "${buildType}"=="single" run keywords sleep 2
... AND Click element xpath=//*[@id="objectaddress"]
... AND Click element id=objectaddress
... ELSE IF "${buildType}"=="group" run keywords sleep 2
... AND Click element xpath=//*[@id="objectaddress_group"]
... AND Click element id=objectaddress_group
... ELSE IF log 对象类型有误
CreateButton-groupadd
[Arguments] ${buildType}
@@ -22,21 +22,21 @@ CreateButton-groupadd
SelectObj
[Arguments] ${objectform}
run keyword if "${objectform}"=="HTTPSignature" run keywords sleep 2
... AND Click element xpath=//*[@id="app"]/div/div[3]/div/div/div[1]/div[1]/ul/li[4]
... AND Click element xpath=//*[@id="app"]/div/div[3]/div/div/div[1]/ul/li[4]
... ELSE IF "${objectform}"=="IP" run keywords sleep 2
... AND Click element xpath=//*[@id="app"]/div/div[3]/div/div/div[1]/div[1]/ul/li[1]
... AND Click element xpath=//*[@id="app"]/div/div[3]/div/div/div[1]/ul/li[1]
... ELSE IF "${objectform}"=="FQDN" run keywords sleep 2
... AND Click element xpath=//*[@id="app"]/div/div[3]/div/div/div[1]/div[1]/ul/li[2]
... AND Click element xpath=//*[@id="app"]/div/div[3]/div/div/div[1]/ul/li[2]
... ELSE IF "${objectform}"=="SubscriberID" run keywords sleep 2
... AND Click element xpath=//*[@id="app"]/div/div[3]/div/div/div[1]/div[1]/ul/li[3]
... AND Click element xpath=//*[@id="app"]/div/div[3]/div/div/div[1]/ul/li[3]
... ELSE IF "${objectform}"=="Key" run keywords sleep 2
... AND Click element xpath=//*[@id="app"]/div/div[3]/div/div/div[1]/div[1]/ul/li[5]
... AND Click element xpath=//*[@id="app"]/div/div[3]/div/div/div[1]/ul/li[5]
... ELSE IF "${objectform}"=="URL" run keywords sleep 2
... AND Click element xpath=//*[@id="app"]/div/div[3]/div/div/div[1]/div[1]/ul/li[6]
... AND Click element xpath=//*[@id="app"]/div/div[3]/div/div/div[1]/ul/li[6]
... ELSE IF "${objectform}"=="Category" run keywords sleep 2
... AND Click element xpath=//*[@id="app"]/div/div[3]/div/div/div[1]/div[1]/ul/li[7]
... AND Click element xpath=//*[@id="app"]/div/div[3]/div/div/div[1]/ul/li[7]
... ELSE IF "${objectform}"=="Account" run keywords sleep 2
... AND Click element xpath=//*[@id="app"]/div/div[3]/div/div/div[1]/div[1]/ul/li[8]
... AND Click element xpath=//*[@id="app"]/div/div[3]/div/div/div[1]/ul/li[8]
... ELSE IF log 对象类型有误
@@ -56,18 +56,19 @@ Create-item
# Click element xpath=//*[@id="el-popover-2756"]/div[1]/div[2]/div/div[8]/div
run keyword if "${objectform}"=="IP" and "${ip_type}"=="Ip" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[2]/div[2]/div/form/div[4]/div/div[1]
run keyword if "${objectform}"=="IP" and "${ip_type}"=="Ip" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[4]/div/div[1]
... AND sleep 1
... AND Create-ip-ClientIP-text ${ipclienttext1} ${post}
run keyword if "${objectform}"=="IP" and "${ip_type}"=="Geography" run keywords click element xpath=//*[@id="objectAdd_geography"]
run keyword if "${objectform}"=="IP" and "${ip_type}"=="Geography" run keywords click element id=objectAdd_ip1
... AND sleep 1
... AND click element id=objectAddItemAdd
... AND click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[4]/div/div[1]/div[2]
... AND sleep 1
... AND click element xpath=//*[@id="policy_Manipulation2"]/div[1]/div[2]/div/form/div[4]/div/div[1]/div[1]/div[3]
... AND Create-Geography ${Country} ${City}
... AND sleep 1
... AND click element id=interceptionadd_allcancelobject
... AND sleep 1
run keyword if "${objectform}"=="FQDN" or "${objectform}"=="SubscriberID" or "${objectform}"=="URL" or "${objectform}"=="Category" or "${objectform}"=="Account" run keywords click element id=objectAddItemAdd
run keyword if "${objectform}"=="FQDN" or "${objectform}"=="URL" or "${objectform}"=="Category" or "${objectform}"=="Account" run keywords click element id=objectAddItemAdd
... AND sleep 1
... AND Create-keyword-text ${objectform} ${keywordtext}
... AND sleep 1
@@ -196,7 +197,7 @@ Create-Description
input text id=objectAdd_description ${objDesc}
Create-ok
sleep 1
sleep 2
click button id=objectAdd_ok
Create-ok-groupadd
sleep 1
@@ -297,8 +298,6 @@ Create-keyword-text
sleep 1
run keyword if "${type}"=="FQDN" run keywords sleep 1
... AND input text id=object_fqdn0 ${keywordtext}
... ELSE IF "${type}"=="SubscriberID" run keywords sleep 1
... AND input text id=object_sub0 ${keywordtext}
... ELSE IF "${type}"=="URL" run keywords sleep 1
... AND input text id=object_url0 ${keywordtext}
... ELSE IF "${type}"=="Category" run keywords sleep 1
@@ -348,19 +347,19 @@ Create-ReqRes-text
Create-ReqRes-hexmode
[Arguments] ${hex}
sleep 1
run keyword if "${hex}"=="open" click element xpath=//*[@id="policy_Manipulation2"]/div[2]/div[7]/div[1]/div[1]/form/div[4]/div/div
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
sleep 1
Create-Key-text
[Arguments] ${keywordtext}
sleep 1
input text id=object_key0 ${keywordtext}
input text id=object_url0 ${keywordtext}
sleep 1
Create-Key-hexmode
[Arguments] ${hex}
sleep 1
run keyword if "${hex}"=="open" click element xpath=//*[@id="objects_httpBodyKeywords1"]/div[1]/div[1]/form/div[2]/div/div
run keyword if "${hex}"=="open" click element xpath=//*[@id="objects_httpBodyKeywords1"]/div[1]/div[1]/form/div/div[2]/div/div/span
sleep 1
objects-delete
@@ -531,57 +530,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 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 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="objectAddSubAdd"]
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]
... AND sleep 1
... AND Create-Sub-Objects ${object_name}
run keyword if "${objectform}"=="HTTPSignature" and "${groupadd}"=="open" run keywords click element xpath=//*[@id="objectAddSubAdd"]
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]
... 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="objectAddSubAdd"]
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]
... 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="objectAddSubAdd"]
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]
... AND sleep 1
... AND Create-Sub-Objects ${object_name}
run keyword if "${objectform}"=="SubscriberID" and "${groupadd}"!="open" run keywords click element xpath=//*[@id="objectAddSubAdd"]
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]
... AND sleep 1
... AND Create-Sub-Objects ${object_name}
run keyword if "${objectform}"=="SubscriberID" and "${groupadd}"=="open" run keywords click element xpath=//*[@id="objectAddSubAdd"]
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]
... 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="objectAddSubAdd"]
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]
... AND sleep 1
... AND Create-Sub-Objects ${object_name}
run keyword if "${objectform}"=="Key" and "${groupadd}"=="open" run keywords click element xpath=//*[@id="objectAddSubAdd"]
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]
... 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="objectAddSubAdd"]
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]
... AND sleep 1
... AND Create-Sub-Objects ${object_name}
run keyword if "${objectform}"=="URL" and "${groupadd}"=="open" run keywords click element xpath=//*[@id="objectAddSubAdd"]
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]
... 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="objectAddSubAdd"]
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]
... AND sleep 1
... AND Create-Sub-Objects ${object_name}
run keyword if "${objectform}"=="Category" and "${groupadd}"=="open" run keywords click element xpath=//*[@id="objectAddSubAdd"]
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]
... 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="objectAddSubAdd"]
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]
... AND sleep 1
... AND Create-Sub-Objects ${object_name}
run keyword if "${objectform}"=="Account" and "${groupadd}"=="open" run keywords click element xpath=//*[@id="objectAddSubAdd"]
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]
... 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
@@ -654,11 +654,10 @@ Select-ip_type
run keyword if "${ip_type}"=="Ip" sleep 1
run keyword if "${ip_type}"=="Geography" run keywords sleep 1
... AND click element xpath=//*[@id="objectAdd_geography"]
... AND click element id=objectAdd_ip1
... AND sleep 1
Create-Sub-Objects
[Arguments] ${object_name}
click element id=objectAddSubAdd
sleep 1
FOR ${i} IN @{object_name}
input text id=objectAddSubSearch ${i}
@@ -731,9 +730,9 @@ Ui-Pages
#sleep 2
#click element xpath=//*[@id="app"]/div/div[3]/div/div/div[10]/div/button[2]
#sleep 2
Clear Element Text xpath=//*[@id="app"]/div/div[3]/div/div/div[10]/div/span[2]/div/input
Clear Element Text xpath=//*[@id="app"]/div/div[3]/div/div/div[12]/div/span[2]/div/input
sleep 2
input text xpath=//*[@id="app"]/div/div[3]/div/div/div[10]/div/span[2]/div/input ${pages}
input text xpath=//*[@id="app"]/div/div[3]/div/div/div[12]/div/span[2]/div/input ${pages}
sleep 2
press keys xpath=//*[@id="app"]/div/div[3]/div/div/div[10]/div/span[2]/div/input ENTER
press keys xpath=//*[@id="app"]/div/div[3]/div/div/div[12]/div/span[2]/div/input ENTER
sleep 2