diff --git a/01-TestCase/tsg_ui/ui_proxy/Proxy.robot b/01-TestCase/tsg_ui/ui_proxy/Proxy.robot index 27955fc..64b9223 100644 --- a/01-TestCase/tsg_ui/ui_proxy/Proxy.robot +++ b/01-TestCase/tsg_ui/ui_proxy/Proxy.robot @@ -71,9 +71,9 @@ ProxyPolicy-Deny-HTTP-MaxCombination-Drop-403 ProxyPolicy.Create-name ProxyPolicy-Deny-MaxCombination-403 ProxyPolicy.Create-action deny ProxyPolicy.Create-Source-Button - ProxyPolicy.Create-Source type1=Ip CreateOrSearch=Create Add=Address name=zdhip001 ipclienttext1=192.168.100.2 post=1 + SourceAndDestination.Create-Source policytype=/html/body/div[1]/div/div[3]/div[2]/div/div[1]/form/div/div[4] type1=Ip CreateOrSearch=Create Add=Address name=zdhip001 ipclienttext1=192.168.100.2 post=1 ProxyPolicy.Create-Destination-Button - ProxyPolicy.Create-Destination type1=Ip CreateOrSearch=Create Add=Address name=zdhip001 ipclienttext1=192.168.100.3 post=1 + SourceAndDestination.Create-Destination policytype=/html/body/div[1]/div/div[3]/div[2]/div/div[1]/form/div/div[5] type1=Ip CreateOrSearch=Create Add=Address name=zdhip001 ipclienttext1=192.168.100.3 post=1 ${filter} create list Host URL Request Header Response Header Request Content ProxyPolicy.Create-Filter Application=HTTP Filter=${filter} Hostname=${hostname} URLname=${urlname} Request Headername=${RequestHeadername} Response Headername=${ResponseHeadername} ... Request Contentname=${RequestContentname} @@ -84,7 +84,7 @@ ProxyPolicy-Deny-HTTP-MaxCombination-Drop-403 Enabled open Proxy-Policies-OK Proxy-Source Name ProxyPolicy-Deny-MaxCombination-403 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/p + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p Should Be Equal As Strings ${text} ProxyPolicy-Deny-MaxCombination-403 ${PolicyName} set variable SecurityPolicy-Deny-HTTP-MaxCombination diff --git a/01-TestCase/tsg_ui/ui_security/Security.robot b/01-TestCase/tsg_ui/ui_security/Security.robot index bf493b5..2667022 100644 --- a/01-TestCase/tsg_ui/ui_security/Security.robot +++ b/01-TestCase/tsg_ui/ui_security/Security.robot @@ -62,7 +62,7 @@ SecurityPolicy-Deny-HTTP-MaxCombination-Drop Enabled open Security-Policies-OK sleep 1 - 修改策略,修改策略相当于再进行一遍新增 + #修改策略,修改策略相当于再进行一遍新增 Comment 修改策略 Menu policys Security Policy Security-Source Name SecurityPolicy-Deny-HTTP-MaxCombination @@ -85,9 +85,9 @@ SecurityPolicy-Deny-HTTP-MaxCombination-Drop LogSession 1 Enabled open Security-Policies-OK - Security-Source Name SecurityPolicy-Deny-HTTP-MaxCombination + Security-Source Name SecurityPolicy-Deny-SSL-MaxCombination-Drop ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/p - Should Be Equal As Strings ${text} SecurityPolicy-Deny-HTTP-MaxCombination + Should Be Equal As Strings ${text} SecurityPolicy-Deny-SSL-MaxCombination-Drop #一下用例没有进行Teardown清理,可以根据上面用例完善一下 # SecurityPolicy-Deny-HTTP-MaxCombination-RST diff --git a/02-Keyword/tsg_ui/proxyPolicy/ProxyPolicy.robot b/02-Keyword/tsg_ui/proxyPolicy/ProxyPolicy.robot index 5b88557..c88a9cf 100644 --- a/02-Keyword/tsg_ui/proxyPolicy/ProxyPolicy.robot +++ b/02-Keyword/tsg_ui/proxyPolicy/ProxyPolicy.robot @@ -440,6 +440,7 @@ Create-Object-Search Proxy-Source [Arguments] ${SourceType} ${SourceValue} + Wait Until Element Is Enabled xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[1]/span/div/div/div[2]/div/div 10 sleep 3 click element xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[1]/span/div/div/div[2]/div/div sleep 1 @@ -543,7 +544,7 @@ Forname sleep 2 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 ${i} #输入搜索内容 + 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 ${i} #输入搜索内容 sleep 2 click element xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[1]/span/div/i #点击搜索按钮 sleep 2 diff --git a/02-Keyword/tsg_ui/proxyTCPOptions/ProxyTCPOptions.robot b/02-Keyword/tsg_ui/proxyTCPOptions/ProxyTCPOptions.robot index 314e495..4576a2f 100644 --- a/02-Keyword/tsg_ui/proxyTCPOptions/ProxyTCPOptions.robot +++ b/02-Keyword/tsg_ui/proxyTCPOptions/ProxyTCPOptions.robot @@ -178,7 +178,7 @@ Proxy-TCP-Options-Search sleep 1 #判断是使用name搜索还是id搜索 run keyword if "${search}"=="Name" run keywords sleep 1 - ... AND click element xpath=/html/body/div/div[1]/div[1]/ul/li[3] //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[1]/span/div/div/div[2]/div/div[1]/div[3]/div/input + ... AND click element xpath=/html/body/div/div[1]/div[1]/ul/li[3] ... AND input text xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[1]/span/div/div/div[2]/div/div[1]/div[3]/div/input ${value} ... ELSE IF "${search}"=="ID" run keywords sleep 1 ... AND click element xpath=/html/body/div/div[1]/div[1]/ul/li[2]