diff --git a/01-TestCase/tsg_ui/ui_objects/Object_Fqdn_Case.robot b/01-TestCase/tsg_ui/ui_objects/Object_Fqdn_Case.robot index 09b7d0b..88ba458 100644 --- a/01-TestCase/tsg_ui/ui_objects/Object_Fqdn_Case.robot +++ b/01-TestCase/tsg_ui/ui_objects/Object_Fqdn_Case.robot @@ -11,7 +11,7 @@ edit-fqdn-001 CreatePage FQDN single *.com keywordtext=*.com #验证新建是否成功 ui-object-search-name *.com - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} *.com #修改 object-edit-fqdn *.com $www.baidu.com @@ -24,7 +24,7 @@ create-fqdn-002 CreatePage FQDN single *.com keywordtext=*.com #验证新建是否成功 ui-object-search-name *.com - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} *.com #删除对象 objects-delete @@ -34,7 +34,7 @@ create-fqdn-003 CreatePage FQDN single *.123-456_abc keywordtext=*.123-456_abc #验证新建是否成功 ui-object-search-name *.123-456_abc - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} *.123-456_abc #删除对象 objects-delete @@ -44,7 +44,7 @@ create-fqdn-004 CreatePage FQDN single $www.baidu.com keywordtext=$www.baidu.com #验证新建是否成功 ui-object-search-name $www.baidu.com - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} $www.baidu.com #删除对象 objects-delete @@ -54,7 +54,7 @@ create-fqdn-005 CreatePage FQDN single $支持中文 keywordtext=$www.baidu.com #验证新建是否成功 ui-object-search-name $支持中文 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} $支持中文 #删除对象 objects-delete @@ -64,7 +64,7 @@ create-fqdn-006 CreatePage FQDN single w keywordtext=*www.baidu.com #验证新建是否成功 ui-object-search-name w - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} w #删除对象 objects-delete @@ -74,7 +74,7 @@ create-fqdn-007 CreatePage FQDN single 11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 keywordtext=*www.node.cn #验证新建是否成功 ui-object-search-name 11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} 11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 #删除对象 objects-delete diff --git a/01-TestCase/tsg_ui/ui_objects/Object_Ip_Case.robot b/01-TestCase/tsg_ui/ui_objects/Object_Ip_Case.robot index c8599f8..7a5b6b5 100644 --- a/01-TestCase/tsg_ui/ui_objects/Object_Ip_Case.robot +++ b/01-TestCase/tsg_ui/ui_objects/Object_Ip_Case.robot @@ -8,10 +8,10 @@ Resource ../../../02-Keyword/tsg_ui/objects/NewObject.robot *** Test Cases *** create-address-ipv4-001 #新建ipv4，range,name输入最小值(1位) - CreatePage IP single 1 ip_type=Ip ipclienttext1=192.168.100.1-192.168.200.1 post=0 + CreatePage IP single 1 ip_type=Ip ipclienttext1=192.168.100.1-192.168.200.1 post=1 #验证新建是否成功 ui-object-search-name 1 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} 1 #删除对象 objects-delete @@ -20,16 +20,16 @@ create-address-ipv4-002 CreatePage IP single create-address-ipv4-002 ip_type=Ip ipclienttext1=192.168.100.1 post=1 #验证新建是否成功 ui-object-search-name create-address-ipv4-002 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} create-address-ipv4-002 #删除对象 objects-delete create-address-ipv4-003 #新建ipv4,CIDR最小值，post最小值 - CreatePage IP single create-address-ipv4-003 ip_type=Ip ipclienttext1=192.168.100.1/0 post=0 + CreatePage IP single create-address-ipv4-003 ip_type=Ip ipclienttext1=192.168.100.1/0 post=1 #验证新建是否成功 ui-object-search-name create-address-ipv4-003 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} create-address-ipv4-003 #删除对象 objects-delete @@ -38,7 +38,7 @@ create-address-ipv4-004 CreatePage IP single create-address-ipv4-004 ip_type=Ip ipclienttext1=192.168.100.1/32 post=65535 #验证新建是否成功 ui-object-search-name create-address-ipv4-004 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} create-address-ipv4-004 #删除对象 objects-delete @@ -47,7 +47,7 @@ create-address-ipv6-005 CreatePage IP single create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres ip_type=Ip ipclienttext1=AAAA::AAAA-FFFF::FFFF post=65535 #验证新建是否成功 ui-object-search-name create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres #删除对象 objects-delete @@ -56,16 +56,16 @@ create-address-ipv6-006 CreatePage IP single create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres ip_type=Ip ipclienttext1=AAAA::AAAA post=65535 #验证新建是否成功 ui-object-search-name create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres #删除对象 objects-delete create-address-ipv6-007 #新建ipv6，CIRD最小值，和post最小值，name输入最大值(128位) - CreatePage IP single create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres ip_type=Ip ipclienttext1=AAAA::AAAA/0 post=0 + CreatePage IP single create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres ip_type=Ip ipclienttext1=AAAA::AAAA/0 post=1 #验证新建是否成功 ui-object-search-name create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres #删除对象 objects-delete @@ -75,7 +75,7 @@ create-address-ipv6-008 CreatePage IP single create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres ip_type=Ip ipclienttext1=AAAA::AAAA/128 post=65535 #验证新建是否成功 ui-object-search-name create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres #删除对象 objects-delete @@ -86,7 +86,7 @@ create-address-geography-country-009 CreatePage IP single create-address-geography-country-008 ip_type=Geography Country=${Country} #验证新建是否成功 ui-object-search-name create-address-geography-country-008 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} create-address-geography-country-008 #删除对象 objects-delete @@ -97,7 +97,7 @@ create-address-geography-city-010 CreatePage IP single create-address-geography-city-010 ip_type=Geography City=${City} #验证新建是否成功 ui-object-search-name create-address-geography-city-010 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} create-address-geography-city-010 #删除对象 objects-delete @@ -109,7 +109,7 @@ create-address-geography-countryandcity-011 CreatePage IP single create-address-geography-countryandcity-011 ip_type=Geography Country=${Country} City=${City} #验证新建是否成功 ui-object-search-name create-address-geography-countryandcity-011 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} create-address-geography-countryandcity-011 #删除对象 objects-delete @@ -122,7 +122,7 @@ create-addressgroup-ip-012 CreatePage IP group create-addressgroup-ip-012 ip_type=Ip object_name=${objects_name} #验证新建是否成功 ui-object-search-name create-addressgroup-ip-012 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} create-addressgroup-ip-012 #删除对象 objects-delete @@ -139,7 +139,7 @@ create-addressgroup-ip-013 CreatePage IP group create-addressgroup-ip-013 ip_type=Ip object_name=${objects_name} #验证新建是否成功 ui-object-search-name create-addressgroup-ip-013 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} create-addressgroup-ip-013 #删除对象 objects-delete @@ -156,7 +156,7 @@ create-addressgroup-ip-014 CreatePage IP group L ip_type=Ip object_name=${objects_name} #验证新建是否成功 ui-object-search-name L - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} L #删除对象 objects-delete @@ -186,7 +186,7 @@ create-addressgroup-ip-016 CreatePage IP group 中abcДдБб!@#123 ip_type=Ip object_name=${objects_name} #验证新建是否成功 ui-object-search-name 中abcДдБб!@#123 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} 中abcДдБб!@#123 #删除对象 objects-delete @@ -202,7 +202,7 @@ create-addressgroup-geography-017 CreatePage IP group 中abcДдБб!@#123 ip_type=Geography object_name=${objects_name} #验证新建是否成功 ui-object-search-name 中abcДдБб!@#123 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} 中abcДдБб!@#123 #删除对象 objects-delete @@ -222,7 +222,7 @@ create-addressgroup-geography-018 CreatePage IP group 中abcДдБб!@#123 ip_type=Geography object_name=${objects_name} #验证新建是否成功 ui-object-search-name 中abcДдБб!@#123 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} 中abcДдБб!@#123 #删除对象 objects-delete @@ -235,10 +235,10 @@ edit-address-ipv4-019 CreatePage IP single create-address-ipv4-004 ip_type=Ip ipclienttext1=192.168.100.1/32 post=65535 #验证新建是否成功 ui-object-search-name create-address-ipv4-004 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} create-address-ipv4-004 #修改对象 - object-edit-ip Edit 192.168.100.100 post=0/100 + object-edit-ip Edit 192.168.100.100 post=1/100 #验证修改 ui-object-search-name Edit #删除对象 @@ -250,7 +250,7 @@ edit-address-geography-countryandcity-020 CreatePage IP single create-address-geography-countryandcity-011 ip_type=Geography Country=${Country} City=${City} #验证新建是否成功 ui-object-search-name create-address-geography-countryandcity-011 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/div/span Should Be Equal As Strings ${text} create-address-geography-countryandcity-011 #修改对象 object-edit-Geography edit-address-geography-countryandcity-020 diff --git a/01-TestCase/tsg_ui/ui_settings/Proxy_TCP_Options_Case.robot b/01-TestCase/tsg_ui/ui_settings/Proxy_TCP_Options_Case.robot new file mode 100644 index 0000000..d5832e6 --- /dev/null +++ b/01-TestCase/tsg_ui/ui_settings/Proxy_TCP_Options_Case.robot @@ -0,0 +1,8 @@ +*** Settings *** +Force Tags tsg-ui settings Proxy TCP Options +Resource ../../../03-Variable/bifangapivariable.txt +Resource ../../../02-Keyword/tsg_ui/setting/Settings.robot +Library OperatingSystem +Resource ../../../02-Keyword/tsg_ui/objects/NewObjectPages.robot +Resource ../../../02-Keyword/tsg_ui/objects/NewObject.robot +*** Test Cases *** \ No newline at end of file diff --git a/02-Keyword/tsg_ui/Menu.robot b/02-Keyword/tsg_ui/Menu.robot index ad08ace..ce1b779 100644 --- a/02-Keyword/tsg_ui/Menu.robot +++ b/02-Keyword/tsg_ui/Menu.robot @@ -6,9 +6,10 @@ Menu [Arguments] ${menuOne} ${menuTwo} Wait Until Element Is Enabled id=children0 10 # 一级菜单 - ${dict} create dictionary dashboard=children0 policy&objects=children1 log=children2 report=children3 device=children4 settings=children6 administartion=children7 + ${dict} create dictionary dashboard=children0 policys=children1 objects=children2 log=children3 report=children4 device=children5 settings=children6 administartion=children7 # 二级菜单 - ${policy&objects} create dictionary Security Policy=sidebarObjects_ProxyInterception Proxy Policy=sidebarObjects_ProxyManipulation Objects=sidebarObjects_Objects Schedules=sidebarObjects_Schedule Tags=sidebarObjects_Tags + ${policys} create dictionary Security Policy=sidebarObjects_ProxyInterception Proxy Policy=sidebarObjects_ProxyManipulation WAN NAT=sidebarWan_nat Schedules=sidebarObjects_Schedule Tags=sidebarObjects_Tags + ${objects} create dictionary IP=sidebarObjects_ip FQDN=sidebarObjects_fqdn SubscriberID=sidebarObjects_subscriberid HTTPSignature=sidebarObjects_http_signature Key=sidebarObjects_keywords URL=sidebarObjects_url Category=sidebarObjects_fqdn_category Account=sidebarObjects_account Applications=sidebarApplication ${log} create dictionary Security Event Logs=sidebarLog_SecurityEventLogs Proxy Event Logs=sidebarLog_ProxyEventLogs Session Records=sidebarLog_SesssionRecords Radius Logs=sidebarLog_RadiusLogs ${administartion} create dictionary Accounts=sidebarsystem_UserManagement Audit Log=sidebarsystem_PolicyConfigurationLog Login Log =sidebarsystem_LoginLog Mail Server=sidebarsystem_MailServer LDAP Server=sidebarsystem_LadpServer diff --git a/02-Keyword/tsg_ui/objects/NewObject.robot b/02-Keyword/tsg_ui/objects/NewObject.robot index f8b6cd2..674de7a 100644 --- a/02-Keyword/tsg_ui/objects/NewObject.robot +++ b/02-Keyword/tsg_ui/objects/NewObject.robot @@ -15,9 +15,9 @@ CreateButton CreateButton-groupadd [Arguments] ${buildType} run keyword if "${buildType}"=="singletype" run keywords sleep 2 - ... AND Click element xpath=//*[@id="objectaddress"] + ... AND Click element id=objectaddress ... ELSE IF "${buildType}"=="grouptype" run keywords sleep 2 - ... AND Click element xpath=//*[@id="objectaddress_group"] + ... AND Click element id=objectaddress_group ... ELSE IF log 对象类型有误 SelectObj [Arguments] ${objectform} @@ -56,7 +56,7 @@ 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[1]/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[1]/div[2]/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 id=objectAdd_ip1 @@ -68,7 +68,7 @@ Create-item ... AND sleep 1 ... AND click element id=interceptionadd_allcancelobject ... AND sleep 1 - run keyword if "${objectform}"=="FQDN" 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}"=="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 @@ -177,9 +177,11 @@ Create-ip-ClientIP Create-ip-ClientIP-text [Arguments] ${clientIPStart} ${port}=null sleep 2 - run keywords input text id=temporary_ip0 ${clientIPStart} - ... AND input text id=temporary_port0 ${port} - ... AND click element id=objectAdd_description + input text id=temporary_ip0 ${clientIPStart} + sleep 2 + input text id=temporary_port0 ${port} + sleep 1 + #click element id=objectAdd_description Create-ip-ClientPort @@ -299,7 +301,7 @@ Create-keyword-text run keyword if "${type}"=="FQDN" run keywords sleep 1 ... AND input text id=object_fqdn0 ${keywordtext} ... ELSE IF "${type}"=="URL" run keywords sleep 1 - ... AND input text id=object_url0 ${keywordtext} + ... AND input text id=object_url00 ${keywordtext} ... ELSE IF "${type}"=="Category" run keywords sleep 1 ... AND input text id=object_fqdn0 ${keywordtext} ... ELSE IF "${type}"=="Account" run keywords sleep 1 @@ -454,18 +456,17 @@ object-edit-keywords ui-object-search-name [Arguments] ${name} sleep 2 - click element id=one-input + 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 id=input_list_li2 + click element xpath=/html/body/div/div[1]/div[1]/ul/li[3] #点击name为搜索类型 sleep 2 - input text id=sreach_input ${name} + 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 id=select_new_search_btn + 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]/td[1] + click element xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1] #选择搜索到的列表 sleep 2 - click element id=clear_input_btm - sleep 1 + object-edit-HTTPSignature [Arguments] ${name} ${reqrestype} ${reqresheader} ${keywordtext} ${hex}=close diff --git a/02-Keyword/tsg_ui/objects/NewObjectPages.robot b/02-Keyword/tsg_ui/objects/NewObjectPages.robot index c099ddf..acc0025 100644 --- a/02-Keyword/tsg_ui/objects/NewObjectPages.robot +++ b/02-Keyword/tsg_ui/objects/NewObjectPages.robot @@ -10,9 +10,8 @@ CreatePage [Arguments] ${objectform} ${buildType} ${name} ${groupaddType}=null ${ip_type}=null ${ipclienttext1}=null ... ${keywordtext}=null ${hex}=close ${reqrestype}=null ${reqresheader}=null ${post}=null ${Country}=null ${City}=null ${groupadd}=null ${object_name}=null - Menu policy&objects Objects + Menu objects ${objectform} sleep 3 - NewObject.SelectObj ${objectform} NewObject.CreateButton ${buildType} NewObject.Create-name ${name} run keyword if "${buildType}"=="single" NewObject.Create-item ${buildType} ${name} ${objectform} ${ip_type} ${ipclienttext1} ${keywordtext} ${hex} ${reqrestype} ${reqresheader} ${post} ${Country} ${City} diff --git a/02-Keyword/tsg_ui/setting/Settings.robot b/02-Keyword/tsg_ui/setting/Settings.robot index 8b014c8..8e5ec80 100644 --- a/02-Keyword/tsg_ui/setting/Settings.robot +++ b/02-Keyword/tsg_ui/setting/Settings.robot @@ -180,7 +180,7 @@ SNAT-IP-Delete sleep 2 Create-VPN-Accounts - [Arguments] ${name} ${passwd} + [Arguments] ${name} ${passwd} ${search} Sleep 1 click id=children6 #点击一级目录Settings Sleep 1 @@ -192,8 +192,216 @@ Create-VPN-Accounts input xpath=//*[@id="wannat_vpn_password"]/div/div/input ${passwd} #输入密码 sleep 1 click id=wanAdd_ok #点击ok按钮 + VPN-Accounts-Search ${name} ${search} + ${text1} Get Text xpath=//*[@id="wannat-table"]/div[3]/table/tbody/tr/td[1]/div/div/div[2]/span #获取点击后页面文本信息 + Should Be Equal As Strings ${text1} ${name} #断言 -Create-Hijack Files +Edit-VPN-Accounts + [Arguments] ${name} ${passwd} ${search} + sleep 1 + click id=appEdit #点击修改那妞 + sleep 1 + click xpath=//*[@id="wannat_vpn_password"]/div/div/span/span/i #点击小眼睛按钮，查看密码 + sleep 1 + input xapth=//*[@id="wannat_vpn_password"]/div/div/input ${passwd} #修改密码 + sleep 1 + click id=wanAdd_ok #点击OK + VPN-Accounts-Search ${name} ${search} + ${text1} Get Text xpath=//*[@id="wannat-table"]/div[3]/table/tbody/tr/td[1]/div/div/div[2]/span #获取点击后页面文本信息 + Should Be Equal As Strings ${text1} ${name} #断言 + +VPN-Accounts-Search + [Arguments] ${value} ${search} + Wait Until Element Is Visible xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div/div[2]/div[2]/div/div/div[2]/div/div/div/input 20 + click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div/div[2]/div[2]/div/div/div[2]/div/div/div/input #点击搜索框 + sleep 1 + click xpath=/html/body/div/div[1]/div[1]/ul/li[2] #点击name + sleep 1 + input xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div/div[2]/div[2]/div/div/div[2]/div/div[1]/div[3]/div/input ${value} #输入值 + sleep 1 + click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div/div[2]/div[2]/div/i #点击搜索按钮 + sleep 1 + click xpath=//*[@id="wannat-table"]/div[3]/table/tbody/tr[1] + sleep 1 + +VPN-Accounts-Delete + click id=appDel #点击删除按钮 + sleep 2 + click xpath=/html/body/div/div/div[3]/button[2] + sleep 2 + +Create-Proxy-TCP-Options + [Arguments] ${name} ${passwd} ${search} + Sleep 1 + click id=children6 #点击一级目录Settings + Sleep 1 + click id=sidebarAdvanced #点击Advanced按钮 + sleep 1 + click id=Advanced/advanced #点击Proxy-TCP-Options + sleep 1 + click id=proxyTCPCreate #点击Create按钮 + sleep 1 + input id=advancedAdd_policyName ${name} #输入name + sleep 1 + #判断是否添加源ip，${Source}=yes,为添加源ip，否则不添加源ip + run keyword if "${Source}"=="yes" run keywords sleep 1 + ... AND click xpath=/html/body/div[1]/div/div[3]/div[2]/div/div/div[1]/div[1]/div/div[2]/form/div[2]/div[1]/div/div #点击添加源ip + ... AND sleep 1 + ... AND Source-or-Destination-Search ${ip-type} #判断添加源ip的类型 + ... AND sleep 1 + ... AND input id=objectName_seach ${ip-value} #输入搜索内容 + ... AND sleep 1 + ... AND press keys id=objectName_seach ENTER #回车搜索 + ... AND sleep 1 + ... AND click xpath=/html/body/div[1]/div/div[3]/div[2]/div/div/div[1]/div[1]/div/div[2]/form/div[5]/div[1]/div[2]/div[1]/div[2]/div[2]/div/div[2]/div/div/ul/li[1]/span/label #点击搜索到的列表 + ... AND sleep 1 + ... AND click id=interceptionadd_allcancelobjec8tSource #点击close按钮关闭侧滑 + ... ELSE log 不添加源ip + #判断是否添加目的ip，${Destination}=yes,为添加目的ip，否则不添加目的ip + run keyword if "${Destination}"=="yes" run keywords sleep 1 + ... AND click xpath=/html/body/div[1]/div/div[3]/div[2]/div/div/div[1]/div[1]/div/div[2]/form/div[3]/div[1]/div/div #点击添加源ip + ... AND sleep 1 + ... AND Source-or-Destination-Search ${ip-type1} #判断添加源ip的类型 + ... AND sleep 1 + ... AND input id=objectName_seach ${ip-value1} #输入搜索内容 + ... AND sleep 1 + ... AND press keys id=objectName_seach ENTER #回车搜索 + ... AND sleep 1 + ... AND click xpath=/html/body/div[1]/div/div[3]/div[2]/div/div/div[1]/div[1]/div/div[2]/form/div[5]/div[1]/div[2]/div[1]/div[2]/div[2]/div/div[2]/div/div/ul/li[1]/span/label #点击搜索到的列表 + ... AND sleep 1 + ... AND click id=interceptionadd_allcancelobjec8tSource #点击close按钮关闭侧滑 + ... ELSE log 不添加目的ip + #判断是否添加Filter，${Filter}=yes,为添加Filter，否则不添加Filter + run keyword if "${Filter}"=="yes" run keywords sleep 1 + ... AND click id=interceptionadd_FilterList #点击添加filter-sni + ... AND sleep 1 + ... AND click id=interceptionadd_checkappshow0 #点击SNI + ... AND sleep 1 + ... AND click id=interceptionadd_add_filter #点击添加sni的+号 + ... AND sleep + ... AND FQDN-or-Category-Search ${sni-type} #判断添加Filter的类型 + ... AND sleep 1 + ... AND input id=objectName_seach ${sni-value} #输入搜索内容 + ... AND sleep 1 + ... AND press keys id=objectName_seach ENTER #回车搜索 + ... AND sleep 1 + ... AND click xpath=/html/body/div[1]/div/div[3]/div[2]/div/div/div[1]/div[1]/div/div[2]/form/div[5]/div[1]/div[2]/div[1]/div[2]/div[2]/div/div[2]/div/div/ul/li[1]/span/label #点击搜索到的列表 + ... AND sleep 1 + ... AND click id=interceptionadd_allcancelobjec8tSource #点击close按钮关闭侧滑 + ... ELSE log 不添加Filter + #判断是否开启Enable TCP Passthrough按钮，${Enable-TCP-Passthrough}=open,为开启，否则不添开启 + run keyword if "${Enable-TCP-Passthrough}"=="open" run keywords sleep 1 + ... AND click id=proxytcpThrough1 #点击Enable-TCP-Passthrough按钮开启 + ... AND sleep 1 + ... ELSE log 不开启 + #判断是否开启Bypass Duplicated Packet按钮，${Bypass-Duplicated-Packet}=open,为开启，否则不添开启 + run keyword if "${Bypass-Duplicated-Packet}"=="open" run keywords sleep 1 + ... AND click id=proxyduplicatedPacket1 #点击Bypass-Duplicated-Packet按钮开启 + ... AND sleep 1 + ... ELSE log 不开启 + click id=tab-first #点击Client-side Parameters + sleep 1 + #判断是否开启Override MSS按钮，${Override-MSS}=open,为开启，否则不添开启 + run keyword if "${Client-Override-MSS}"=="open" run keywords sleep 1 + ... AND click xpath=//*[@id="pane-first"]/div/form/div[1]/div/div/span #点击Override-MSS按钮开启 + ... AND sleep 1 + ... AND input xpath=//*[@id="pane-first"]/div/form/div[2]/div/div/input ${Client-MSS-value} #输入MSS内容 + ... AND sleep 1 + ... ELSE log 不开启 + #判断是否开启No Delay按钮，${No-Delay}=open,为开启，否则不添开启 + run keyword if "${Client-No-Delay}"=="open" run keywords sleep 1 + ... AND click xpath=//*[@id="pane-first"]/div/form/div[2]/div/div/span #点击No-Delay按钮开启 + ... AND sleep 1 + ... ELSE log 不开启 + input xpath=//*[@id="pane-first"]/div/form/div[3]/div/div/input ${Client-ttl-value} #输入ttl内容 + sleep 1 + #判断是否开启Keepalive按钮，${Keepalive}=open,为开启，否则不添开启 + run keyword if "${Client-Keepalive}"=="open" run keywords sleep 1 + ... AND click xpath=//*[@id="pane-first"]/div/form/div[4]/div/div/span #点击Keepalive按钮开启 + ... AND sleep 1 + ... AND input xpath=//*[@id="pane-first"]/div/form/div[5]/div/form/div[1]/div/div/input ${Client-Probe-Number} #输入Probe Number内容 + ... AND sleep 1 + ... AND input xpath=//*[@id="pane-first"]/div/form/div[5]/div/form/div[2]/div/div/input ${Client-Idle-Time} #输入Idle Time内容 + ... AND sleep 1 + ... AND input xpath=//*[@id="pane-first"]/div/form/div[5]/div/form/div[3]/div/div/input ${Client-Interval} #输入Interval内容 + ... AND sleep 1 + ... ELSE log 不开启 + input xpath=//*[@id="pane-first"]/div/form/div[5]/div/div/input ${Client-User-Timeout} #输入User Timeout内容 + sleep 1 + click id=tab-second #点击Server-side Parameters + sleep 1 + #判断是否开启Override MSS按钮，${Override-MSS}=open,为开启，否则不添开启 + run keyword if "${Server-Override-MSS}"=="open" run keywords sleep 1 + ... AND click xpath=//*[@id="pane-second"]/div/form/div[1]/div/div/span #点击Override-MSS按钮开启 + ... AND sleep 1 + ... AND input xpath=//*[@id="pane-second"]/div/form/div[2]/div/div/input ${Server-MSS-value} #输入MSS内容 + ... AND sleep 1 + ... ELSE log 不开启 + #判断是否开启No Delay按钮，${No-Delay}=open,为开启，否则不添开启 + run keyword if "${Server-No-Delay}"=="open" run keywords sleep 1 + ... AND click xpath=//*[@id="pane-second"]/div/form/div[2]/div/div/span #点击No-Delay按钮开启 + ... AND sleep 1 + ... ELSE log 不开启 + input xpath=//*[@id="pane-second"]/div/form/div[3]/div/div/input ${Server-ttl-value} #输入ttl内容 + sleep 1 + #判断是否开启Keepalive按钮，${Keepalive}=open,为开启，否则不添开启 + run keyword if "${Server-Keepalive}"=="open" run keywords sleep 1 + ... AND click xpath=//*[@id="pane-second"]/div/form/div[4]/div/div/span #点击Keepalive按钮开启 + ... AND sleep 1 + ... AND input xpath=//*[@id="pane-second"]/div/form/div[5]/div/form/div[1]/div/div/input ${Server-Probe-Number} #输入Probe Number内容 + ... AND sleep 1 + ... AND input xpath=//*[@id="pane-second"]/div/form/div[5]/div/form/div[2]/div/div/input ${Server-Idle-Time} #输入Idle Time内容 + ... AND sleep 1 + ... AND input xpath=//*[@id="pane-second"]/div/form/div[5]/div/form/div[3]/div/div/input ${Server-Interval} #输入Interval内容 + ... AND sleep 1 + ... ELSE log 不开启 + input xpath=//*[@id="pane-second"]/div/form/div[5]/div/div/input ${Server-User-Timeout} #输入User Timeout内容 + sleep 1 + click id=proxyManipulationSuccess #点击OK + sleep 1 + Proxy-TCP-Options-Search ${name} ${search} #搜索刚新建的name + +Source-or-Destination-Search + [Arguments] ${value} + run keyword if "${value}"=="IP" run keywords sleep 1 + ... AND click id=tab-ip #点击ip + ... AND sleep 1 + run keyword if "${value}"=="SUB ID" run keywords sleep 1 + ... AND click id=tab-subscriberid #点击SUB ID + ... AND sleep 1 + run keyword if "${value}"=="Geography" run keywords sleep 1 + ... AND click id=tab-Geographic #点击Geography + ... AND sleep 1 + run keyword if "${value}"=="IP Learning" run keywords sleep 1 + ... AND click id=tab-ip_learning #点击IP Learning + ... AND sleep 1 + +FQDN-or-Category-Search + [Arguments] ${value} + run keyword if "${value}"=="FQDN" run keywords sleep 1 + ... AND click id=tab-fqdn #点击FQDN + ... AND sleep 1 + run keyword if "${value}"=="Category" run keywords sleep 1 + ... AND click id=tab-fqdn_category #点击category + ... AND sleep 1 + +Proxy-TCP-Options-Search + [Arguments] ${value} ${search} + Wait Until Element Is Visible xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[1]/span/div/div/div[2]/div/div/div[1]/input 20 + click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[1]/span/div/div/div[2]/div/div/div[1]/input #点击搜索框 + sleep 1 + #判断是使用name搜索还是id搜索 + run keyword if "${search}"=="Name" run keywords sleep 1 + ... AND click xpath=/html/body/div/div[1]/div[1]/ul/li[3] + ... AND input xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div/div[2]/div[2]/div/div/div[2]/div/div[1]/div[3]/div/input ${value} + ... ELSE IF "${search}"=="ID" run keywords sleep 1 + ... AND click xpath=/html/body/div/div[1]/div[1]/ul/li[2] + ... AND input xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div/div[2]/div[2]/div/div/div[2]/div/div[1]/div[3]/div/input ${value} + ... AND sleep 1 + click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[1]/span/div/i #点击搜索按钮 + sleep 1 + click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1] #点击搜索到的列表 + sleep te-Hijack Files [Arguments] ${name} ${file} ${type} ${search} ${shift}=1 ${input1}=1 Sleep 1 click id=children6 #点击一级目录Settings