diff --git a/01-TestCase/tsg_ui/ui_objects/Object-HTTPSignature-Case.robot b/01-TestCase/tsg_ui/ui_objects/Object-HTTPSignature-Case.robot index 1aaa53d..cdd8203 100644 --- a/01-TestCase/tsg_ui/ui_objects/Object-HTTPSignature-Case.robot +++ b/01-TestCase/tsg_ui/ui_objects/Object-HTTPSignature-Case.robot @@ -11,7 +11,7 @@ create-HTTPSignature-Request-User-Agent-prefix-001 CreatePage ReqRes create-HTTPSignature-Request-User-Agent-prefix-001 reqrestype=req reqresheader=ua keywordtext=Mozilla/5.0* #验证新建是否成功 ui-object-search-name create-HTTPSignature-Request-User-Agent-prefix-001 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-HTTPSignature-Request-User-Agent-prefix-001 #删除对象 objects-delete @@ -21,7 +21,7 @@ create-HTTPSignature-Request-User-Agent-sub-002 CreatePage ReqRes create-HTTPSignature-Request-User-Agent-sub-002 reqrestype=req reqresheader=ua keywordtext=Mozilla/5. #验证新建是否成功 ui-object-search-name create-HTTPSignature-Request-User-Agent-sub-002 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-HTTPSignature-Request-User-Agent-sub-002 #删除对象 objects-delete @@ -31,7 +31,7 @@ create-HTTPSignature-Request-User-Agent-exactly-003 CreatePage ReqRes create-HTTPSignature-Request-User-Agent-exactly-003 reqrestype=req reqresheader=ua keywordtext=$Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.113 Safari/537.36 #验证新建是否成功 ui-object-search-name create-HTTPSignature-Request-User-Agent-exactly-003 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-HTTPSignature-Request-User-Agent-exactly-003 #删除对象 objects-delete @@ -41,7 +41,7 @@ create-HTTPSignature-Request-User-Agent-suffix-004 CreatePage ReqRes create-HTTPSignature-Request-User-Agent-suffix-004 reqrestype=req reqresheader=ua keywordtext=*Safari/537.36 #验证新建是否成功 ui-object-search-name create-HTTPSignature-Request-User-Agent-suffix-004 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-HTTPSignature-Request-User-Agent-suffix-004 #删除对象 objects-delete @@ -51,7 +51,7 @@ create-HTTPSignature-Request-Cookie-prefix-005 CreatePage ReqRes create-HTTPSignature-Request-Cookie-prefix-005 reqrestype=req reqresheader=ck keywordtext=cookie* #验证新建是否成功 ui-object-search-name create-HTTPSignature-Request-Cookie-prefix-005 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-HTTPSignature-Request-Cookie-prefix-005 #删除对象 objects-delete @@ -61,7 +61,7 @@ create-HTTPSignature-Request-Cookie-sub-006 CreatePage ReqRes create-HTTPSignature-Request-Cookie-sub-006 reqrestype=req reqresheader=ck keywordtext=cookie #验证新建是否成功 ui-object-search-name create-HTTPSignature-Request-Cookie-sub-006 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-HTTPSignature-Request-Cookie-sub-006 #删除对象 objects-delete @@ -71,7 +71,7 @@ create-HTTPSignature-Request-Cookie-exactly-007 CreatePage ReqRes create-HTTPSignature-Request-Cookie-exactly-007 reqrestype=req reqresheader=ck keywordtext=$cookie #验证新建是否成功 ui-object-search-name create-HTTPSignature-Request-Cookie-exactly-007 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-HTTPSignature-Request-Cookie-exactly-007 #删除对象 objects-delete @@ -81,7 +81,7 @@ create-HTTPSignature-Request-Cookie-suffix-008 CreatePage ReqRes create-HTTPSignature-Request-Cookie-suffix-008 reqrestype=req reqresheader=ck keywordtext=*cookie #验证新建是否成功 ui-object-search-name create-HTTPSignature-Request-Cookie-suffix-008 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-HTTPSignature-Request-Cookie-suffix-008 #删除对象 objects-delete @@ -91,7 +91,7 @@ create-HTTPSignature-Response-Set-Cookie-prefix-009 CreatePage ReqRes create-HTTPSignature-Response-Set-Cookie-prefix-009 reqrestype=res reqresheader=sck keywordtext=set-cookie* #验证新建是否成功 ui-object-search-name create-HTTPSignature-Response-Set-Cookie-prefix-009 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-HTTPSignature-Response-Set-Cookie-prefix-009 #删除对象 objects-delete @@ -101,7 +101,7 @@ create-HTTPSignature-Response-Set-Cookie-sub-010 CreatePage ReqRes create-HTTPSignature-Response-Set-Cookie-sub-010 reqrestype=res reqresheader=sck keywordtext=set-cookie #验证新建是否成功 ui-object-search-name create-HTTPSignature-Response-Set-Cookie-sub-010 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-HTTPSignature-Response-Set-Cookie-sub-010 #删除对象 objects-delete @@ -111,7 +111,7 @@ create-HTTPSignature-Response-Set-Cookie-exactly-011 CreatePage ReqRes create-HTTPSignature-Response-Set-Cookie-exactly-011 reqrestype=res reqresheader=sck keywordtext=$set-cookie #验证新建是否成功 ui-object-search-name create-HTTPSignature-Response-Set-Cookie-exactly-011 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-HTTPSignature-Response-Set-Cookie-exactly-011 #删除对象 objects-delete @@ -121,7 +121,7 @@ create-HTTPSignature-Response-Set-Cookie-suffix-012 CreatePage ReqRes create-HTTPSignature-Response-Set-Cookie-suffix-012 reqrestype=res reqresheader=sck keywordtext=*set-cookie #验证新建是否成功 ui-object-search-name create-HTTPSignature-Response-Set-Cookie-suffix-012 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-HTTPSignature-Response-Set-Cookie-suffix-012 #删除对象 objects-delete @@ -131,7 +131,7 @@ create-HTTPSignature-Response-Content-Type-prefix-0013 CreatePage ReqRes create-HTTPSignature-Response-Content-Type-prefix-0013 reqrestype=res reqresheader=ct keywordtext=Content-Type* #验证新建是否成功 ui-object-search-name create-HTTPSignature-Response-Content-Type-prefix-0013 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-HTTPSignature-Response-Content-Type-prefix-0013 #删除对象 objects-delete @@ -141,7 +141,7 @@ create-HTTPSignature-Response-Content-Type-sub-0014 CreatePage ReqRes create-HTTPSignature-Response-Content-Type-sub-0014 reqrestype=res reqresheader=ct keywordtext=Content-Type #验证新建是否成功 ui-object-search-name create-HTTPSignature-Response-Content-Type-sub-0014 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-HTTPSignature-Response-Content-Type-sub-0014 #删除对象 objects-delete @@ -151,7 +151,7 @@ create-HTTPSignature-Response-Content-Type-exactly-0015 CreatePage ReqRes create-HTTPSignature-Response-Content-Type-exactly-0015 reqrestype=res reqresheader=ct keywordtext=$Content-Type #验证新建是否成功 ui-object-search-name create-HTTPSignature-Response-Content-Type-exactly-0015 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-HTTPSignature-Response-Content-Type-exactly-0015 #删除对象 objects-delete @@ -161,7 +161,7 @@ create-HTTPSignature-Response-Content-Type-suffix-0016 CreatePage ReqRes create-HTTPSignature-Response-Content-Type-suffix-0016 reqrestype=res reqresheader=ct keywordtext=*Content-Type #验证新建是否成功 ui-object-search-name create-HTTPSignature-Response-Content-Type-suffix-0016 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-HTTPSignature-Response-Content-Type-suffix-0016 #删除对象 objects-delete @@ -171,7 +171,7 @@ edit-HTTPSignature-017 CreatePage ReqRes create-HTTPSignature-Request-User-Agent-prefix-001 reqrestype=req reqresheader=ua keywordtext=Mozilla/5.0* #验证新建是否成功 ui-object-search-name create-HTTPSignature-Request-User-Agent-prefix-001 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-HTTPSignature-Request-User-Agent-prefix-001 #修改对象 object-edit-HTTPSignature edit-HTTPSignature-017 res sck 8f6c 6362 31 36 8fdb 5236 hex=open @@ -185,7 +185,28 @@ create-HTTPSignature-open-16-hex-0018 CreatePage ReqRes create-HTTPSignature-open-16-hex-0018 reqrestype=res reqresheader=ct keywordtext=*63 6f 6e 74 65 6e 74 hex=open #验证新建是否成功 ui-object-search-name create-HTTPSignature-open-16-hex-0018 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-HTTPSignature-open-16-hex-0018 #删除对象 objects-delete + +create-HTTPSignature-group-019 + #新建HTTPSignature + CreatePage ReqRes create-HTTPSignature-Request-User-Agent-prefix-001 reqrestype=req reqresheader=ua keywordtext=Mozilla/5.0* + #新建HTTPSignature + CreatePage ReqRes create-HTTPSignature-Request-User-Agent-sub-002 reqrestype=req reqresheader=ua keywordtext=Mozilla/5. + #新建HTTPSignature-group + ${objects_name} Create List create-HTTPSignature-Request-User-Agent-prefix-001 create-HTTPSignature-Request-User-Agent-sub-002 + CreatePage ReqRes create-HTTPSignature-group-019 group=ReqResGroup object_name=${objects_name} + #验证新建是否成功 + ui-object-search-name create-HTTPSignature-group-019 + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span + Should Be Equal As Strings ${text} create-HTTPSignature-group-019 + #删除对象 + objects-delete + #删除对象 + ui-object-search-name create-HTTPSignature-Request-User-Agent-prefix-001 + objects-delete + ui-object-search-name create-HTTPSignature-Request-User-Agent-sub-002 + objects-delete + diff --git a/01-TestCase/tsg_ui/ui_objects/Object_Account_Case.robot b/01-TestCase/tsg_ui/ui_objects/Object_Account_Case.robot index d49b168..e16a507 100644 --- a/01-TestCase/tsg_ui/ui_objects/Object_Account_Case.robot +++ b/01-TestCase/tsg_ui/ui_objects/Object_Account_Case.robot @@ -11,7 +11,7 @@ create-account-prefix-001 CreatePage Account create-account-prefix-001 keywordtext=www.* #验证新建是否成功 ui-object-search-name create-account-prefix-001 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-account-prefix-001 #删除对象 objects-delete @@ -21,7 +21,7 @@ create-account-sub-002 CreatePage Account create-account-sub-002 keywordtext=1234 #验证新建是否成功 ui-object-search-name create-account-sub-002 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/span/span[2]/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span log ${text} #删除对象 objects-delete @@ -31,7 +31,7 @@ create-account-exactly-003 CreatePage Account create-account-exactly-003 keywordtext=$1234567 #验证新建是否成功 ui-object-search-name create-account-exactly-003 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/span/span[2]/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span log ${text} #删除对象 objects-delete @@ -41,7 +41,7 @@ create-account-suffix-004 CreatePage Account create-account-suffix-004 keywordtext=*1234567 #验证新建是否成功 ui-object-search-name create-account-suffix-004 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/span/span[2]/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span log ${text} #删除对象 objects-delete @@ -51,7 +51,7 @@ edit-account-005 CreatePage Account create-account-suffix-004 keywordtext=*1234567 #验证新建是否成功 ui-object-search-name create-account-suffix-004 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/span/span[2]/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span log ${text} #修改对象 object-edit-account deit-account-005 $www.baidu.com @@ -59,3 +59,23 @@ edit-account-005 ui-object-search-name deit-account-005 #删除对象 objects-delete + +Create-account-group-006 + #新建category + CreatePage Account create-account-sub-002 keywordtext=1234 + #新建category + CreatePage Account create-account-suffix-004 keywordtext=*1234567 + #新建category + ${objects_name} Create List create-account-sub-002 create-account-suffix-004 + CreatePage Account Create-account-group-006 group=AccountGroup object_name=${objects_name} + #验证新建是否成功 + ui-object-search-name Create-account-group-006 + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span + Should Be Equal As Strings ${text} Create-account-group-006 + #删除对象 + objects-delete + #删除对象 + ui-object-search-name create-account-sub-002 + objects-delete + ui-object-search-name create-account-suffix-004 + objects-delete diff --git a/01-TestCase/tsg_ui/ui_objects/Object_Category_Case.robot b/01-TestCase/tsg_ui/ui_objects/Object_Category_Case.robot index 0cf66f8..28c92ba 100644 --- a/01-TestCase/tsg_ui/ui_objects/Object_Category_Case.robot +++ b/01-TestCase/tsg_ui/ui_objects/Object_Category_Case.robot @@ -11,7 +11,7 @@ create-category-exactly-001 CreatePage Category create-category-exactly-001 keywordtext=$www.baidu.com #验证新建是否成功 ui-object-search-name create-category-exactly-001 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-category-exactly-001 #删除对象 objects-delete @@ -21,7 +21,7 @@ create-category-suffix-002 CreatePage Category create-category-suffix-002 keywordtext=*baidu.com #验证新建是否成功 ui-object-search-name create-category-suffix-002 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-category-suffix-002 #删除对象 objects-delete @@ -31,7 +31,7 @@ edit-category-003 CreatePage Category create-category-suffix-002 keywordtext=*baidu.com #验证新建是否成功 ui-object-search-name create-category-suffix-002 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-category-suffix-002 #修改对象 object-edit-fqdn deit-category-003 $open.node.com @@ -39,3 +39,24 @@ edit-category-003 ui-object-search-name deit-category-003 #删除对象 objects-delete + +Create-category-group-004 + #新建category + CreatePage Category create-category-exactly-001 keywordtext=$www.baidu.com + #新建category + CreatePage Category create-category-suffix-002 keywordtext=*baidu.com + #新建category + ${objects_name} Create List create-category-exactly-001 create-category-suffix-002 + CreatePage category Create-category-group-004 group=CategoryGroup object_name=${objects_name} + #验证新建是否成功 + ui-object-search-name Create-category-group-004 + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span + Should Be Equal As Strings ${text} Create-category-group-004 + #删除对象 + objects-delete + #删除对象 + ui-object-search-name create-category-exactly-001 + objects-delete + ui-object-search-name create-category-exactly-001 + objects-delete + 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 6643eb4..145bd09 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 @@ create-fqdn-exactly-001 CreatePage Fqdn create-fqdn-exactly-001 keywordtext=$open.node.com #验证新建是否成功 ui-object-search-name create-fqdn-exactly-001 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-fqdn-exactly-001 #删除对象 objects-delete @@ -21,7 +21,7 @@ create-fqdn-suffix-002 CreatePage Fqdn create-fqdn-suffix-002 keywordtext=*open.node.com #验证新建是否成功 ui-object-search-name create-fqdn-suffix-002 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-fqdn-suffix-002 #删除对象 objects-delete @@ -31,21 +31,43 @@ create-fqdn-suffix-003 CreatePage Fqdn create-fqdn-suffix-003 keywordtext=*123-456_abc #验证新建是否成功 ui-object-search-name create-fqdn-suffix-003 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-fqdn-suffix-003 #删除对象 objects-delete -deit-fqdn-003 +deit-fqdn-004 #新建fqdn,exactly CreatePage Fqdn create-fqdn-suffix-002 keywordtext=*open.node.com #验证新建是否成功 ui-object-search-name create-fqdn-suffix-002 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-fqdn-suffix-002 #修改对象 - object-edit-fqdn deit-fqdn-003 $open.node.com + object-edit-fqdn deit-fqdn-004 $open.node.com #查询修改对象 - ui-object-search-name deit-fqdn-003 + ui-object-search-name deit-fqdn-004 #删除对象 objects-delete + +Create-fqdn-group-005 + #新建fqdn,exactly + CreatePage Fqdn create-fqdn-suffix-002 keywordtext=*open.node.com + #新建fqdn,exactly + CreatePage Fqdn create-fqdn-suffix-003 keywordtext=*123-456_abc + #新建fqdn + ${objects_name} Create List create-fqdn-suffix-002 create-fqdn-suffix-003 + CreatePage Fqdn create-fqdn-group-005 group=FqdnGroup object_name=${objects_name} + #验证新建是否成功 + ui-object-search-name create-fqdn-group-005 + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span + Should Be Equal As Strings ${text} create-fqdn-group-005 + #删除对象 + objects-delete + #删除对象 + ui-object-search-name create-fqdn-suffix-002 + objects-delete + ui-object-search-name create-fqdn-suffix-003 + 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 b09329b..2581407 100644 --- a/01-TestCase/tsg_ui/ui_objects/Object_Ip_Case.robot +++ b/01-TestCase/tsg_ui/ui_objects/Object_Ip_Case.robot @@ -9,10 +9,10 @@ Resource ../../../02-Keyword/tsg_ui/objects/Objects.robot create-ipv4-range-001 #新建ip，range CreatePage Ip create-ipv4-range-001 ipads=ipv4 ipclient=range ipclienttext1=192.168.1.1 ipclienttext2=192.168.1.1 - ... post=0/0 + ... post=0/0 ip_type=Ip #验证新建是否成功 ui-object-search-name create-ipv4-range-001 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-ipv4-range-001 #删除对象 objects-delete @@ -20,10 +20,10 @@ create-ipv4-range-001 create-ipv4-cidr-002 #新建ip，cidr CreatePage Ip create-ipv4-cidr-002 ipads=ipv4 ipclient=cidr ipclienttext1=192.168.1.1 ipclienttext2=24 - ... post=65535/65535 + ... post=65535/65535 ip_type=Ip #验证新建是否成功 ui-object-search-name create-ipv4-cidr-002 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-ipv4-cidr-002 #删除对象 objects-delete @@ -31,10 +31,10 @@ create-ipv4-cidr-002 create-ipv4-masks-003 #新建ip，masks CreatePage Ip create-ipv4-masks-003 ipads=ipv4 ipclient=masks ipclienttext1=192.168.1.1 ipclienttext2=255.255.255.0 - ... post=1/1 + ... post=1/1 ip_type=Ip #验证新建是否成功 ui-object-search-name create-ipv4-masks-003 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-ipv4-masks-003 #删除对象 objects-delete @@ -42,10 +42,10 @@ create-ipv4-masks-003 create-ipv6-range-004 #新建ip，range CreatePage Ip create-ipv6-range-004 ipads=ipv6 ipclient=range ipclienttext1=0:0:0:0:0:0:0:0 ipclienttext2=FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF - ... post=65535/65535 + ... post=65535/65535 ip_type=Ip #验证新建是否成功 ui-object-search-name create-ipv6-range-004 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-ipv6-range-004 #删除对象 objects-delete @@ -53,10 +53,10 @@ create-ipv6-range-004 create-ipv6-cidr-005 #新建ip，cidr CreatePage Ip create-ipv6-cidr-005 ipads=ipv6 ipclient=cidr ipclienttext1=0:0:0:0:0:0:0:0 ipclienttext2=64 - ... post=1/1 + ... post=1/1 ip_type=Ip #验证新建是否成功 ui-object-search-name create-ipv6-cidr-005 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-ipv6-cidr-005 #删除对象 objects-delete @@ -64,20 +64,20 @@ create-ipv6-cidr-005 create-ipv6-masks-006 #新建ip，masks CreatePage Ip create-ipv6-masks-006 ipads=ipv6 ipclient=masks ipclienttext1=0:0:0:0:0:0:0:0 ipclienttext2=0:0:0:0:0:0:0:0 - ... post=65535/65535 + ... post=65535/65535 ip_type=Ip #验证新建是否成功 ui-object-search-name create-ipv6-masks-006 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-ipv6-masks-006 #删除对象 objects-delete edit-ip-007 #新建ip，masks - CreatePage Ip create-ipv6-masks-007 ipads=ipv6 ipclient=masks ipclienttext1=0:0:0:0:0:0:0:0 ipclienttext2=0:0:0:0:0:0:0:0 + CreatePage Ip create-ipv6-masks-007 ipads=ipv6 ipclient=masks ipclienttext1=0:0:0:0:0:0:0:0 ipclienttext2=0:0:0:0:0:0:0:0 ip_type=Ip post=65535/65535 #验证新建是否成功 ui-object-search-name create-ipv6-masks-007 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-ipv6-masks-007 #修改对象 object-edit-ip edit-ip-007 ipv4 range 192.168.100.1 192.168.100.1 post=0/0 @@ -89,10 +89,10 @@ edit-ip-007 create-ipv6-range-008 #新建ip，range CreatePage Ip create-ipv6-range-008 ipads=ipv6 ipclient=range ipclienttext1=:: ipclienttext2=::1 - ... post=0/0 + ... post=0/0 ip_type=Ip #验证新建是否成功 ui-object-search-name create-ipv6-range-008 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-ipv6-range-008 #删除对象 objects-delete @@ -100,10 +100,10 @@ create-ipv6-range-008 create-ipv4-range-009 #新建ip，range CreatePage Ip create-ipv4-range-009 ipads=ipv4 ipclient=range ipclienttext1=0.0.0.0 ipclienttext2=255.255.255.255 - ... post=65535/65535 + ... post=65535/65535 ip_type=Ip #验证新建是否成功 ui-object-search-name create-ipv4-range-009 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-ipv4-range-009 #删除对象 objects-delete @@ -111,10 +111,10 @@ create-ipv4-range-009 create-ipv4-cidr-010 #新建ip，cidr CreatePage Ip create-ipv4-cidr-010 ipads=ipv4 ipclient=cidr ipclienttext1=0.0.0.0 ipclienttext2=0 - ... post=0/0 + ... post=0/0 ip_type=Ip #验证新建是否成功 ui-object-search-name create-ipv4-cidr-010 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-ipv4-cidr-010 #删除对象 objects-delete @@ -122,10 +122,10 @@ create-ipv4-cidr-010 create-ipv4-cidr-011 #新建ip，cidr CreatePage Ip create-ipv4-cidr-011 ipads=ipv4 ipclient=cidr ipclienttext1=255.255.255.255 ipclienttext2=32 - ... post=65535/65535 + ... post=65535/65535 ip_type=Ip #验证新建是否成功 ui-object-search-name create-ipv4-cidr-011 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-ipv4-cidr-011 #删除对象 objects-delete @@ -133,10 +133,10 @@ create-ipv4-cidr-011 create-ipv6-range-012 #新建ip，range CreatePage Ip create-ipv6-range-012 ipads=ipv6 ipclient=range ipclienttext1=:: ipclienttext2=FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF - ... post=0/0 + ... post=0/0 ip_type=Ip #验证新建是否成功 ui-object-search-name create-ipv6-range-012 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-ipv6-range-012 #删除对象 objects-delete @@ -144,10 +144,10 @@ create-ipv6-range-012 create-ipv6-cidr-013 #新建ip，range CreatePage Ip create-ipv6-cidr-013 ipads=ipv6 ipclient=cidr ipclienttext1=:: ipclienttext2=0 - ... post=0/0 + ... post=0/0 ip_type=Ip #验证新建是否成功 ui-object-search-name create-ipv6-cidr-013 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-ipv6-cidr-013 #删除对象 objects-delete @@ -155,10 +155,45 @@ create-ipv6-cidr-013 create-ipv6-cidr-014 #新建ip，range CreatePage Ip create-ipv6-cidr-014 ipads=ipv6 ipclient=cidr ipclienttext1=FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF ipclienttext2=128 - ... post=65535/65535 + ... post=65535/65535 ip_type=Ip #验证新建是否成功 ui-object-search-name create-ipv6-cidr-014 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-ipv6-cidr-014 #删除对象 objects-delete + +create-ip-group-015 + #新建ip，${objects_name}的赋值可以先新建ip，用刚新建ip的name赋值 + ${objects_name} Create List lyf-50.59 lyf-50.43 + CreatePage Ip create-ip-group-015 group=AddressGroup ip_type=Ip object_name=${objects_name} + #验证新建是否成功 + ui-object-search-name create-ip-group-015 + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span + Should Be Equal As Strings ${text} create-ip-group-015 + #删除对象 + objects-delete + +create-geography-group-016 + #新建ip，${objects_name}的赋值可以先新建geography，用刚新建geography的name赋值 + ${objects_name} Create List yyq-Hong Kong yyq-US + CreatePage Ip create-geography-group-016 group=AddressGroup ip_type=Geography object_name=${objects_name} + #验证新建是否成功 + ui-object-search-name create-geography-group-016 + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span + Should Be Equal As Strings ${text} create-geography-group-016 + #删除对象 + objects-delete + +create-geography-017 + #把要添加的国家和城市定义一个列表 + ${Country} Create List China Hong Kong + ${City} Create List Beijing + #新建归属地 + CreatePage Ip create-geography-017 ip_type=Geography Country=${Country} City=${City} + #验证新建是否成功 + ui-object-search-name create-geography-017 + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span + Should Be Equal As Strings ${text} create-geography-017 + #删除对象 + objects-delete diff --git a/01-TestCase/tsg_ui/ui_objects/Object_Keywords_Case.robot b/01-TestCase/tsg_ui/ui_objects/Object_Keywords_Case.robot index ab66498..0eee913 100644 --- a/01-TestCase/tsg_ui/ui_objects/Object_Keywords_Case.robot +++ b/01-TestCase/tsg_ui/ui_objects/Object_Keywords_Case.robot @@ -11,7 +11,7 @@ create-keywords-prefix-001 CreatePage Key create-keywords-prefix-001 keywordtext=www.* #验证新建是否成功 ui-object-search-name create-keywords-prefix-001 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-keywords-prefix-001 #删除对象 objects-delete @@ -21,7 +21,7 @@ create-keywords-sub-002 CreatePage Key create-keywords-sub-002 keywordtext=1234@#% #验证新建是否成功 ui-object-search-name create-keywords-sub-002 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-keywords-sub-002 #删除对象 objects-delete @@ -31,7 +31,7 @@ create-keywords-exactly-003 CreatePage Key create-keywords-exactly-003 keywordtext=$支持中文 #验证新建是否成功 ui-object-search-name create-keywords-exactly-003 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-keywords-exactly-003 #删除对象 objects-delete @@ -41,7 +41,7 @@ create-keywords-suffix-004 CreatePage Key create-keywords-suffix-004 keywordtext=*скрипцияк. #验证新建是否成功 ui-object-search-name create-keywords-suffix-004 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-keywords-suffix-004 #删除对象 objects-delete @@ -51,7 +51,7 @@ edit-keywords-005 CreatePage Key create-keywords-suffix-005 keywordtext=*123456 #验证新建是否成功 ui-object-search-name create-keywords-suffix-005 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-keywords-suffix-005 #修改对象 object-edit-keywords edit-keywords-005 $www.baidu.com @@ -69,3 +69,24 @@ create-keywords-open-16hex-006 log ${text} #删除对象 objects-delete + +Create-keywords-group-007 + #新建keywords + CreatePage Key create-keywords-prefix-001 keywordtext=www.* + #新建keywords + CreatePage Key create-keywords-sub-002 keywordtext=1234@#% + #新建keywords + ${objects_name} Create List create-keywords-prefix-001 create-keywords-sub-002 + CreatePage Key Create-keywords-group-007 group=KeyGroup object_name=${objects_name} + #验证新建是否成功 + ui-object-search-name Create-keywords-group-007 + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span + Should Be Equal As Strings ${text} Create-keywords-group-007 + #删除对象 + objects-delete + #删除对象 + ui-object-search-name create-keywords-prefix-001 + objects-delete + ui-object-search-name create-keywords-sub-002 + objects-delete + diff --git a/01-TestCase/tsg_ui/ui_objects/Object_Subscriber_Id_Case.robot b/01-TestCase/tsg_ui/ui_objects/Object_Subscriber_Id_Case.robot index ab5bc90..e116c00 100644 --- a/01-TestCase/tsg_ui/ui_objects/Object_Subscriber_Id_Case.robot +++ b/01-TestCase/tsg_ui/ui_objects/Object_Subscriber_Id_Case.robot @@ -11,7 +11,7 @@ create-Subscriber-ID-001 CreatePage Sub create-sub-id-001 keywordtext=$test37 #验证新建是否成功 ui-object-search-name create-sub-id-001 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-sub-id-001 #删除对象 objects-delete @@ -21,12 +21,12 @@ create-Subscriber-ID-002 CreatePage Sub create-sub-id-002 keywordtext=$abc_%$#@123中文_скрипцияк. #验证新建是否成功 ui-object-search-name create-sub-id-002 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-sub-id-002 #删除对象 objects-delete -edit-Subscriber-ID-002 +edit-Subscriber-ID-003 #新建sub-id CreatePage Sub create-sub-id-001 keywordtext=$test37 #验证新建是否成功 @@ -34,8 +34,29 @@ edit-Subscriber-ID-002 ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/span/span[2]/span log ${text} #修改对象 - object-edit-Subscriber-ID deit-sub-id-002 $test20 + object-edit-Subscriber-ID deit-sub-id-003 $test20 #查询修改对象 - ui-object-search-name deit-sub-id-002 + ui-object-search-name deit-sub-id-003 #删除对象 objects-delete + +create-Subscriber-ID-group-004 + #新建sub-id + CreatePage Sub create-sub-id-002 keywordtext=$abc_%$#@123中文_скрипцияк. + #新建sub-id + CreatePage Sub create-sub-id-001 keywordtext=$test37 + #新建sub-id-group + ${objects_name} Create List create-sub-id-002 create-sub-id-001 + CreatePage Sub create-Subscriber-ID-group-004 group=SubGroup object_name=${objects_name} + #验证新建是否成功 + ui-object-search-name create-Subscriber-ID-group-004 + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span + Should Be Equal As Strings ${text} create-Subscriber-ID-group-004 + #删除对象 + objects-delete + #删除对象 + ui-object-search-name create-sub-id-002 + objects-delete + ui-object-search-name create-sub-id-001 + objects-delete + \ No newline at end of file diff --git a/01-TestCase/tsg_ui/ui_objects/Object_Url_Case.robot b/01-TestCase/tsg_ui/ui_objects/Object_Url_Case.robot index 2810367..fe93d8e 100644 --- a/01-TestCase/tsg_ui/ui_objects/Object_Url_Case.robot +++ b/01-TestCase/tsg_ui/ui_objects/Object_Url_Case.robot @@ -11,7 +11,7 @@ create-url-prefix-001 CreatePage Url create-url-prefix-001 keywordtext=www.* #验证新建是否成功 ui-object-search-name create-url-prefix-001 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-url-prefix-001 #删除对象 objects-delete @@ -21,7 +21,7 @@ create-url-sub-002 CreatePage Url create-url-sub-002 keywordtext=1234@#% #验证新建是否成功 ui-object-search-name create-url-sub-002 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-url-sub-002 #删除对象 objects-delete @@ -31,7 +31,7 @@ create-url-exactly-003 CreatePage Url create-url-exactly-003 keywordtext=$支持中文 #验证新建是否成功 ui-object-search-name create-url-exactly-003 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-url-exactly-003 #删除对象 objects-delete @@ -41,7 +41,7 @@ create-url-suffix-004 CreatePage Url create-url-suffix-004 keywordtext=*скрипцияк. #验证新建是否成功 ui-object-search-name create-url-suffix-004 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-url-suffix-004 #删除对象 objects-delete @@ -51,7 +51,7 @@ edit-url-005 CreatePage Url create-url-suffix-005 keywordtext=*.com #验证新建是否成功 ui-object-search-name create-url-suffix-005 - ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span Should Be Equal As Strings ${text} create-url-suffix-005 #修改对象 object-edit-url deit-url-005 $www.baidu.com @@ -59,3 +59,24 @@ edit-url-005 ui-object-search-name deit-url-005 #删除对象 objects-delete + +create-url-group-006 + #新建url + CreatePage Url create-url-sub-002 keywordtext=1234@#% + #新建url + CreatePage Url create-url-exactly-003 keywordtext=$支持中文 + #新建url-group + ${objects_name} Create List create-url-sub-002 create-url-exactly-003 + CreatePage Sub create-url-group-006 group=UrlGroup object_name=${objects_name} + #验证新建是否成功 + ui-object-search-name create-url-group-006 + ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span + Should Be Equal As Strings ${text} create-url-group-006 + #删除对象 + objects-delete + #删除对象 + ui-object-search-name create-url-sub-002 + objects-delete + ui-object-search-name create-url-exactly-003 + objects-delete + diff --git a/02-Keyword/tsg_ui/objects/ObjectPages.robot b/02-Keyword/tsg_ui/objects/ObjectPages.robot index 471c393..1a9d5e4 100644 --- a/02-Keyword/tsg_ui/objects/ObjectPages.robot +++ b/02-Keyword/tsg_ui/objects/ObjectPages.robot @@ -1,71 +1,61 @@ -*** Settings *** -Library Selenium2Library -Resource Objects.robot -Resource ../Menu.robot -Library Collections - -*** Keywords *** -CreatePage - [Arguments] ${objtype} ${name} ${ipads}=null ${ipclient}=null ${ipclienttext1}=null ${ipclienttext2}=null - ... ${keywordtext}=null ${hex}=close ${reqrestype}=null ${reqresheader}=null ${post}=null - Menu policy&objects Objects - sleep 3 - Objects.CreateButton ${objtype} - Objects.Create-name ${name} - Objects.Create-item - run keyword if "${objtype}"=="Ip" run keywords Objects.Create-ip-AddressType ${ipads} - ... AND Objects.Create-ip-ClientIP ${ipclient} - ... AND Objects.Create-ip-ClientIP-text ${ipclient} ${ipclienttext1} ${ipclienttext2} ${post} - run keyword if "${objtype}"=="Fqdn" or "${objtype}"=="Sub" or "${objtype}"=="Url" or "${objtype}"=="Category" or "${objtype}"=="Account" run keywords Objects.Create-keyword-text ${objtype} ${keywordtext} - ... AND sleep 1 - run keyword if '${objtype}'=='Key' run keywords Objects.Create-Key-text ${keywordtext} - ... AND Objects.Create-Key-hexmode ${hex} - run keyword if '${objtype}'=='ReqRes' run keywords Objects.Create-ReqRes-type ${reqrestype} - ... AND Objects.Create-ReqRes-header ${reqrestype} ${reqresheader} - ... AND Objects.Create-ReqRes-text ${keywordtext} - ... AND Objects.Create-ReqRes-hexmode ${hex} - Objects.Create-item-ok ${objtype} - Objects.Create-ok - -UpdateIPPage - SelectOne - UpButton - UpName yyq_test_up - Create-item - Create-ip-ClientIP range - Create-ip-ClientIP-text range 192.168.255.255 192.168.255.255 - Create-item-ok Ip #Ip - UpOk - -DeletePage - [Arguments] ${name} - sleep 1 - click element id=clear_input_btm - sleep 1 - input text id=one-input ${name} - press keys id=one-input ENTER - Objects.SelectOne - Objects.DeleteButton - Objects.Delete-delete - -UploadPage - UploadButton - Upload-name yyq-uploadFile - Upload-objectType - Upload-uploadedFile F:\\yyq\\python\\ip_20200221080650.txt - Upload-ok - -ExportPage - ExportPage - Export-objectType ip - Export-format txt - Export-ok - -DeleteObjects - [Arguments] ${obj} - sleep 2 - Menu policy&objects Objects - : FOR ${num} ${key} IN ENUMERATE @{obj} - \ sleep 2 - \ run keyword if "${key}"!="Ip" DeletePage ${obj}[${key}] - \ sleep 1 +*** Settings *** +Library Selenium2Library +Resource Objects.robot +Resource ../Menu.robot +Library Collections + +*** Keywords *** +CreatePage + [Arguments] ${objtype} ${name} ${ip_type}=null ${ipads}=null ${ipclient}=null ${ipclienttext1}=null ${ipclienttext2}=null + ... ${keywordtext}=null ${hex}=close ${reqrestype}=null ${reqresheader}=null ${post}=null ${Country}=null ${City}=null ${group}=null ${object_name}=null + Menu policy&objects Objects + sleep 3 + Objects.CreateButton ${objtype} + Objects.Create-name ${name} + run keyword if "${group}"=="null" Objects.Create-item ${objtype} ${ip_type} ${ipads} ${ipclient} ${ipclienttext1} ${ipclienttext2} ${keywordtext} ${hex} ${reqrestype} ${reqresheader} ${post} ${Country} ${City} + run keyword if "${group}"!="null" Cerate-Group ${objtype} ${group} ${object_name} ${ip_type} + Objects.Create-ok + +UpdateIPPage + SelectOne + UpButton + UpName yyq_test_up + Create-item + Create-ip-ClientIP range + Create-ip-ClientIP-text range 192.168.255.255 192.168.255.255 + Create-item-ok Ip #Ip + UpOk + +DeletePage + [Arguments] ${name} + sleep 1 + sleep 1 + click element id=clear_input_btm + sleep 1 + input text id=one-input ${name} + press keys id=one-input ENTER + Objects.SelectOne + Objects.DeleteButton + Objects.Delete-delete + +UploadPage + UploadButton + Upload-name yyq-uploadFile + Upload-objectType + Upload-uploadedFile F:\\yyq\\python\\ip_20200221080650.txt + Upload-ok + +ExportPage + ExportPage + Export-objectType ip + Export-format txt + Export-ok + +DeleteObjects + [Arguments] ${obj} + sleep 2 + Menu policy&objects Objects + : FOR ${num} ${key} IN ENUMERATE @{obj} + \ sleep 2 + \ run keyword if "${key}"!="Ip" DeletePage ${obj}[${key}] + \ sleep 1 diff --git a/02-Keyword/tsg_ui/objects/Objects.robot b/02-Keyword/tsg_ui/objects/Objects.robot index 49725e7..6c7b7e7 100644 --- a/02-Keyword/tsg_ui/objects/Objects.robot +++ b/02-Keyword/tsg_ui/objects/Objects.robot @@ -1,400 +1,506 @@ -*** Settings *** -Library Selenium2Library - -*** Keywords *** -CreateButton - [Arguments] ${objType} - Wait Until Element Is Enabled id=objectCreate - sleep 3 - Click element id=objectCreate - run keyword if "${objType}"=="Ip" run keywords sleep 2 - ... AND Click element id=object1 - ... ELSE IF "${objType}"=="Fqdn" run keywords sleep 2 - ... AND Click element id=object2 - ... ELSE IF "${objType}"=="Sub" run keywords sleep 2 - ... AND Click element id=object3 - ... ELSE IF "${objType}"=="ReqRes" run keywords sleep 2 - ... AND Click element id=object4 - ... ELSE IF "${objType}"=="Key" run keywords sleep 2 - ... AND Click element id=object5 - ... ELSE IF "${objType}"=="Url" run keywords sleep 2 - ... AND Click element id=object6 - ... ELSE IF "${objType}"=="Category" run keywords sleep 2 - ... AND Click element id=object7 - ... ELSE IF "${objType}"=="Account" run keywords sleep 2 - ... AND Click element id=object8 - ... ELSE IF log 对象类型有误 - -Create-name - [Arguments] ${objName} - sleep 2 - input text id=objectAdd_name ${objName} - -Create-item - click element id=objectAddItemAdd - -Create-item-Add - [Arguments] ${Type} - click element id=objectAddItem${Type}Add - -Create-item-ok - [Arguments] ${Type} - sleep 2 - run keyword if "${Type}"=="Category" click element id=objectAddItemFqdnOk - ... ELSE IF "${Type}"=="Account" click element id=objectItemAccountOk - ... ELSE click element id=objectAddItem${Type}Ok - -Create-item-Cancel - [Arguments] ${Type} - click button id=objectAddItem${Type}Cancel - -Create-ip-AddressType - [Arguments] ${AdsType} - sleep 2 - click element id=objectItemIpType0 - sleep 2 - run keyword if "${AdsType}"=="ipv4" run keywords click element xpath=/html/body/div/div[1]/div[1]/ul/li[1] - ... AND sleep 1 - ... ELSE IF "${AdsType}"=="ipv6" run keywords click element xpath=/html/body/div/div[1]/div[1]/ul/li[2] - ... AND sleep 1 - ... ELSE IF run keywords log 'Address Type错误' - -Create-ip-Protocol - [Arguments] ${Protocol} - run keyword if ${Protocol}=="any" click element id=objectItemIpProtocol10 - ... ELSE IF ${Protocol}=="tcp" click element id=objectItemIpProtocol20 - ... ELSE IF ${Protocol}=="udp" click element id=objectItemIpProtocol30 - -Create-ip-Directed - [Arguments] ${Directed} - run keyword if ${Directed}=="no" click element id=objectItemIpDirection10 - ... ELSE IF ${Directed}=="yes" click element id=objectItemIpDirection20 - -Create-ip-ClientIP - [Arguments] ${clientIPType} - sleep 2 - click element id=object_ip_sourecip0 - sleep 2 - run keyword if "${clientIPType}"=="range" run keywords sleep 1 - ... AND click element id=range0Range0111111 - ... ELSE IF "${clientIPType}"=="cidr" run keywords sleep 1 - ... AND click element id=CIDR0CIDR1 - ... ELSE IF "${clientIPType}"=="masks" run keywords sleep 1 - ... AND click element id=mask0Masks2 - ... ELSE IF log 选择错误 - sleep 2 - -Create-ip-ClientIP-text - [Arguments] ${clientIPType} ${clientIPStart} ${clientIPEnd} ${port}=null - sleep 2 - run keyword if "${clientIPType}"=="range" run keywords input text id=object_ip_clientip10 ${clientIPStart} - ... AND input text id=object_ip_clientip20 ${clientIPEnd} - ... AND input text id=object_ip_clientPort110 ${port} - run keyword if "${clientIPType}"=="cidr" run keywords input text id=object_ip_clientip30 ${clientIPStart} - ... AND input text id=object_ip_clientip40 ${clientIPEnd} - ... AND input text id=object_ip_clientPort110 ${port} - run keyword if "${clientIPType}"=="masks" run keywords input text id=object_ip_clientip50 ${clientIPStart} - ... AND input text id=object_ip_clientip60 ${clientIPEnd} - ... AND input text id=object_ip_clientPort110 ${port} - -Create-ip-ClientPort - -Create-ip-ClientPort-text - -Create-ip-ServerIP - -Create-ip-ServerPort - -Create-subobjects - click element id=objectAddSubAdd - -Create-Description - [Arguments] ${objDesc} - input text id=objectAdd_description ${objDesc} - -Create-ok - sleep 1 - click button id=objectAdd_ok - -Create-cancel - click button id=objectAdd_cancel - -SelectOne - sleep 3 - click element xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1] - -UpButton - click button id=objectEdit - -DeleteButton - click button id=objectDel - -Delete-delete - sleep 2 - click button xpath=/html/body/div/div/div[3]/button[2] - -Delete-cancel - click button xpath=/html/body/div[2]/div/div[3]/button[1] - -UpName - [Arguments] ${name} - clear element text id=objectAdd_name - input text id=objectAdd_name ${name} - -UpOk - click button id=objectAdd_ok - -UploadButton - sleep 3 - click button id=objectImprt - -ExportButton - sleep 3 - click button id=objectExport - -Upload-name - [Arguments] ${name} - sleep 2 - input text xpath=//*[@id="app"]/div/div[3]/div/div/div[14]/div/div[1]/div[1]/div/input ${name} - -Upload-objectType - click button id=object_select_Import - sleep 2 - click element xpath=/html/body/div[2]/div[1]/div[1]/ul/li[1] - -Upload-uploadedFile - [Arguments] ${ads} - sleep 3 - Choose File xpath=//*[@id="app"]/div/div[3]/div/div/div[14]/div/div[2]/div/div[1]/input ${ads} - -Upload-ok - click button id=objectUploadedOk - -Export-objectType - [Arguments] ${objType} - click element id=object_select_Import1 - run keyword if "${objType}"=="ip" run keywords sleep 2 - ... AND click element xpath=/html/body/div[2]/div[1]/div[1]/ul/li[1] - ... ELSE IF "${objType}"=="fqdn" run keywords sleep 2 - ... AND Click element xpath=/html/body/div[2]/div[1]/div[1]/ul/li[2] - ... ELSE IF "${objType}"=="subscriberid" run keywords sleep 2 - ... AND Click element xpath=/html/body/div[2]/div[1]/div[1]/ul/li[3] - ... ELSE IF "${objType}"=="httpsignature" run keywords sleep 2 - ... AND Click element xpath=/html/body/div[2]/div[1]/div[1]/ul/li[4] - ... ELSE IF "${objType}"=="keywords" run keywords sleep 2 - ... AND Click element xpath=/html/body/div[2]/div[1]/div[1]/ul/li[5] - ... ELSE IF "${objType}"=="url" run keywords sleep 2 - ... AND Click element xpath=/html/body/div[2]/div[1]/div[1]/ul/li[6] - ... ELSE IF "${objType}"=="category" run keywords sleep 2 - ... AND Click element xpath=/html/body/div[2]/div[1]/div[1]/ul/li[7] - ... ELSE IF "${objType}"=="account" run keywords sleep 2 - ... AND Click element xpath=/html/body/div[2]/div[1]/div[1]/ul/li[8] - -Export-format - [Arguments] ${filetype} - sleep 2 - click element id=object_select_export - run keyword if "${filetype}"=="txt" run keywords sleep 2 - ... AND click element xpath=/html/body/div[3]/div[1]/div[1]/ul/li[1] - ... ELSE IF "${filetype}"=="csv" run keywords sleep 2 - ... AND click element xpath=/html/body/div[3]/div[1]/div[1]/ul/li[2] - -Export-ok - click button id=objectImportOk - -Export-cancel - click button id=objectImportCancel - -Create-keyword-text - [Arguments] ${type} ${keywordtext} - sleep 1 - run keyword if "${type}"=="Fqdn" run keywords sleep 1 - ... AND input text id=object_fqdn0 ${keywordtext} - ... ELSE IF "${type}"=="Sub" 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 - ... AND input text id=object_fqdn0 ${keywordtext} - ... ELSE IF "${type}"=="Account" run keywords sleep 1 - ... AND input text id=object_account0 ${keywordtext} - ... ELSE log 2 - -Create-ReqRes-type - [Arguments] ${type} - sleep 1 - run keyword if '${type}'=='req' click element xpath=//*[@id="objectAddItemReqRes"]/label[1] - ... ELSE IF '${type}'=='res' click element xpath=//*[@id="objectAddItemReqRes"]/label[2] - sleep 1 - -Create-ReqRes-header - [Arguments] ${type} ${header} - sleep 1 - run keyword if '${type}'=='req' and '${header}'=='ua' click element xpath=//*[@id="objectAddItemReqResType1"]/label[1] - ... ELSE IF '${type}'=='req' and '${header}'=='ck' click element xpath=//*[@id="objectAddItemReqResType1"]/label[2] - ... ELSE IF '${type}'=='res'and '${header}'=='sck' click element xpath=//*[@id="objectAddItemReqResType"]/label[1] - ... ELSE IF '${type}'=='res'and '${header}'=='ct' click element xpath=//*[@id="objectAddItemReqResType"]/label[2] - sleep 1 - -Create-ReqRes-text - [Arguments] ${keywordtext} - sleep 1 - input text id=object_sig0 ${keywordtext} - sleep 1 - -Create-ReqRes-hexmode - [Arguments] ${hex} - sleep 1 - run keyword if "${hex}"=="open" click element xpath=//*[@id="policy_Manipulation2"]/div[7]/div[1]/div[1]/form/div[4]/div/div - sleep 1 - -Create-Key-text - [Arguments] ${keywordtext} - sleep 1 - input text id=object_key0 ${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 - sleep 1 - -objects-delete - sleep 1 - click element id=objectDel #点击删除按钮 - sleep 1 - click element xpath=/html/body/div/div/div[3]/button[2] - #Close Browser #关闭浏览器 - -object-edit-fqdn - [Arguments] ${name} ${keywordtext} - Sleep 2 - click element id=objectEdit - Sleep 2 - Objects.Create-name ${name} - Sleep 1 - click element id=objectAddEdit - Sleep 1 - input text id=object_fqdn0 ${keywordtext} - Sleep 1 - click element id=objectAddItemFqdnOk - Sleep 1 - click element id=objectAdd_ok - Sleep 2 - -object-edit-Subscriber-ID - [Arguments] ${name} ${keywordtext} - Sleep 2 - click element id=objectEdit - Sleep 2 - Objects.Create-name ${name} - Sleep 1 - click element id=objectAddEdit - Sleep 1 - input text id=object_sub0 ${keywordtext} - Sleep 1 - click element id=objectAddItemSubOk - Sleep 1 - click element id=objectAdd_ok - Sleep 2 - -object-edit-url - [Arguments] ${name} ${keywordtext} - Sleep 2 - click element id=objectEdit - Sleep 2 - Objects.Create-name ${name} - Sleep 1 - click element id=objectAddEdit - Sleep 1 - input text id=object_url0 ${keywordtext} - Sleep 1 - click element id=objectAddItemUrlOk - Sleep 1 - click element id=objectAdd_ok - Sleep 2 - -object-edit-account - [Arguments] ${name} ${keywordtext} - Sleep 2 - click element id=objectEdit - Sleep 2 - Objects.Create-name ${name} - Sleep 1 - click element id=objectAddEdit - Sleep 1 - input text id=object_account0 ${keywordtext} - Sleep 1 - click element id=objectItemAccountOk - Sleep 1 - click element id=objectAdd_ok - Sleep 2 - -object-edit-keywords - [Arguments] ${name} ${keywordtext} ${hex}=close - Sleep 2 - click element id=objectEdit - Sleep 2 - Objects.Create-name ${name} - Sleep 1 - click element id=objectAddEdit - Sleep 1 - input text id=object_key0 ${keywordtext} - Sleep 1 - Objects.Create-Key-hexmode ${hex} - Sleep 1 - click element id=objectAddItemKeyOk - Sleep 1 - click element id=objectAdd_ok - Sleep 2 - -ui-object-search-name - [Arguments] ${name} - sleep 2 - click element id=one-input - sleep 2 - click element id=input_list_li2 - sleep 2 - input text id=sreach_input ${name} - sleep 2 - click element id=select_new_search_btn - sleep 2 - click element xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table - -object-edit-HTTPSignature - [Arguments] ${name} ${reqrestype} ${reqresheader} ${keywordtext} ${hex}=close - Sleep 2 - click element id=objectEdit - Sleep 2 - Objects.Create-name ${name} - Sleep 1 - click element id=objectAddEdit - Sleep 1 - Objects.Create-ReqRes-type ${reqrestype} - Objects.Create-ReqRes-header ${reqrestype} ${reqresheader} - input text id=object_sig0 ${keywordtext} - Sleep 1 - Objects.Create-ReqRes-hexmode ${hex} - click element id=objectAddItemReqResOk - Sleep 1 - click element id=objectAdd_ok - Sleep 2 - -object-edit-ip - [Arguments] ${name} ${ipads} ${ipclient} ${ipclienttext1} ${ipclienttext2} ${post}=null - Sleep 2 - click element id=objectEdit - Sleep 2 - Objects.Create-name ${name} - Sleep 1 - click element id=objectAddEdit - Sleep 1 - Objects.Create-ip-AddressType ${ipads} - Objects.Create-ip-ClientIP ${ipclient} - Objects.Create-ip-ClientIP-text ${ipclient} ${ipclienttext1} ${ipclienttext2} ${post} - Sleep 1 - click element id=objectAddItemIpOk - Sleep 1 - click element id=objectAdd_ok - Sleep 2 +*** Settings *** +Library Selenium2Library + +*** Keywords *** +CreateButton + [Arguments] ${objType} + Wait Until Element Is Enabled id=objectCreate + sleep 3 + Click element id=objectCreate + run keyword if "${objType}"=="Ip" run keywords sleep 2 + ... AND Click element id=object1 + ... ELSE IF "${objType}"=="Fqdn" run keywords sleep 2 + ... AND Click element id=object2 + ... ELSE IF "${objType}"=="Sub" run keywords sleep 2 + ... AND Click element id=object3 + ... ELSE IF "${objType}"=="ReqRes" run keywords sleep 2 + ... AND Click element id=object4 + ... ELSE IF "${objType}"=="Key" run keywords sleep 2 + ... AND Click element id=object5 + ... ELSE IF "${objType}"=="Url" run keywords sleep 2 + ... AND Click element id=object6 + ... ELSE IF "${objType}"=="Category" run keywords sleep 2 + ... AND Click element id=object7 + ... ELSE IF "${objType}"=="Account" run keywords sleep 2 + ... AND Click element id=object8 + ... ELSE IF log 对象类型有误 + +Create-name + [Arguments] ${objName} + sleep 2 + input text id=objectAdd_name ${objName} + +Create-item + [Arguments] ${objtype} ${ip_type} ${ipads} ${ipclient} ${ipclienttext1} ${ipclienttext2} + ... ${keywordtext} ${hex} ${reqrestype} ${reqresheader} ${post} ${Country} ${City} + run keyword if "${objtype}"=="Ip" and "${ip_type}"=="Ip" run keywords click element id=objectAddItemAdd + ... AND sleep 1 + ... AND Objects.Create-ip-AddressType ${ipads} + ... AND Objects.Create-ip-ClientIP ${ipclient} + ... AND Objects.Create-ip-ClientIP-text ${ipclient} ${ipclienttext1} ${ipclienttext2} ${post} + ... AND Create-item-ok ${objtype} + run keyword if "${objtype}"=="Ip" and "${ip_type}"=="Geography" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[2]/div/form/div[3]/div/div/label[2] + ... AND sleep 1 + ... AND click element id=objectAddItemAdd + ... AND sleep 1 + ... AND Create-Geography ${Country} ${City} + ... AND sleep 1 + ... AND click element xpath=//*[@id="policy_Manipulation2"]/div[15]/div/div/div/div[3]/div + ... AND sleep 1 + run keyword if "${objtype}"=="Fqdn" or "${objtype}"=="Sub" or "${objtype}"=="Url" or "${objtype}"=="Category" or "${objtype}"=="Account" run keywords click element id=objectAddItemAdd + ... AND sleep 1 + ... AND Objects.Create-keyword-text ${objtype} ${keywordtext} + ... AND sleep 1 + ... AND Create-item-ok ${objtype} + run keyword if '${objtype}'=='Key' run keywords click element id=objectAddItemAdd + ... AND sleep 1 + ... AND Objects.Create-Key-text ${keywordtext} + ... AND Objects.Create-Key-hexmode ${hex} + ... AND Create-item-ok ${objtype} + run keyword if '${objtype}'=='ReqRes' run keywords click element id=objectAddItemAdd + ... AND sleep 1 + ... AND Objects.Create-ReqRes-type ${reqrestype} + ... AND Objects.Create-ReqRes-header ${reqrestype} ${reqresheader} + ... AND Objects.Create-ReqRes-text ${keywordtext} + ... AND Objects.Create-ReqRes-hexmode ${hex} + ... AND Create-item-ok ${objtype} + +Create-item-Add + [Arguments] ${Type} + + click element id=objectAddItem${Type}Add + +Create-item-ok + [Arguments] ${Type} + sleep 2 + run keyword if "${Type}"=="Category" click element id=objectAddItemFqdnOk + ... ELSE IF "${Type}"=="Account" click element id=objectItemAccountOk + ... ELSE click element id=objectAddItem${Type}Ok + +Create-item-Cancel + [Arguments] ${Type} + click button id=objectAddItem${Type}Cancel + +Create-ip-AddressType + [Arguments] ${AdsType} + sleep 2 + run keyword if "${AdsType}"=="ipv4" run keywords click element id=IPv40 + ... AND sleep 1 + ... ELSE IF "${AdsType}"=="ipv6" run keywords click element id=IPv60 + ... AND sleep 1 + ... ELSE IF run keywords log 'Address Type错误' + +Create-ip-Protocol + [Arguments] ${Protocol} + run keyword if ${Protocol}=="any" click element id=objectItemIpProtocol10 + ... ELSE IF ${Protocol}=="tcp" click element id=objectItemIpProtocol20 + ... ELSE IF ${Protocol}=="udp" click element id=objectItemIpProtocol30 + +Create-ip-Directed + [Arguments] ${Directed} + run keyword if ${Directed}=="no" click element id=objectItemIpDirection10 + ... ELSE IF ${Directed}=="yes" click element id=objectItemIpDirection20 + +Create-ip-ClientIP + [Arguments] ${clientIPType} + sleep 2 + click element id=object_ip_sourecip0 + sleep 2 + run keyword if "${clientIPType}"=="range" run keywords sleep 1 + ... AND click element id=range0Range0111111 + ... ELSE IF "${clientIPType}"=="cidr" run keywords sleep 1 + ... AND click element id=CIDR0CIDR1 + ... ELSE IF "${clientIPType}"=="masks" run keywords sleep 1 + ... AND click element id=mask0Masks2 + ... ELSE IF log 选择错误 + sleep 2 + +Create-ip-ClientIP-text + [Arguments] ${clientIPType} ${clientIPStart} ${clientIPEnd} ${port}=null + sleep 2 + run keyword if "${clientIPType}"=="range" run keywords input text id=object_ip_clientip10 ${clientIPStart} + ... AND input text id=object_ip_clientip20 ${clientIPEnd} + ... AND input text id=object_ip_clientPort110 ${port} + run keyword if "${clientIPType}"=="cidr" run keywords input text id=object_ip_clientip30 ${clientIPStart} + ... AND input text id=object_ip_clientip40 ${clientIPEnd} + ... AND input text id=object_ip_clientPort110 ${port} + run keyword if "${clientIPType}"=="masks" run keywords input text id=object_ip_clientip50 ${clientIPStart} + ... AND input text id=object_ip_clientip60 ${clientIPEnd} + ... AND input text id=object_ip_clientPort110 ${port} + +Create-ip-ClientPort + +Create-ip-ClientPort-text + +Create-ip-ServerIP + +Create-ip-ServerPort + +Create-subobjects + click element id=objectAddSubAdd + +Create-Description + [Arguments] ${objDesc} + input text id=objectAdd_description ${objDesc} + +Create-ok + sleep 1 + click button id=objectAdd_ok + +Create-cancel + click button id=objectAdd_cancel + +SelectOne + sleep 3 + click element xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1] + +UpButton + click button id=objectEdit + +DeleteButton + click button id=objectDel + +Delete-delete + sleep 2 + click button xpath=/html/body/div/div/div[3]/button[2] + +Delete-cancel + click button xpath=/html/body/div[2]/div/div[3]/button[1] + +UpName + [Arguments] ${name} + clear element text id=objectAdd_name + input text id=objectAdd_name ${name} + +UpOk + click button id=objectAdd_ok + +UploadButton + sleep 3 + click button id=objectImprt + +ExportButton + sleep 3 + click button id=objectExport + +Upload-name + [Arguments] ${name} + sleep 2 + input text xpath=//*[@id="app"]/div/div[3]/div/div/div[14]/div/div[1]/div[1]/div/input ${name} + +Upload-objectType + click button id=object_select_Import + sleep 2 + click element xpath=/html/body/div[2]/div[1]/div[1]/ul/li[1] + +Upload-uploadedFile + [Arguments] ${ads} + sleep 3 + Choose File xpath=//*[@id="app"]/div/div[3]/div/div/div[14]/div/div[2]/div/div[1]/input ${ads} + +Upload-ok + click button id=objectUploadedOk + +Export-objectType + [Arguments] ${objType} + click element id=object_select_Import1 + run keyword if "${objType}"=="ip" run keywords sleep 2 + ... AND click element xpath=/html/body/div[2]/div[1]/div[1]/ul/li[1] + ... ELSE IF "${objType}"=="fqdn" run keywords sleep 2 + ... AND Click element xpath=/html/body/div[2]/div[1]/div[1]/ul/li[2] + ... ELSE IF "${objType}"=="subscriberid" run keywords sleep 2 + ... AND Click element xpath=/html/body/div[2]/div[1]/div[1]/ul/li[3] + ... ELSE IF "${objType}"=="httpsignature" run keywords sleep 2 + ... AND Click element xpath=/html/body/div[2]/div[1]/div[1]/ul/li[4] + ... ELSE IF "${objType}"=="keywords" run keywords sleep 2 + ... AND Click element xpath=/html/body/div[2]/div[1]/div[1]/ul/li[5] + ... ELSE IF "${objType}"=="url" run keywords sleep 2 + ... AND Click element xpath=/html/body/div[2]/div[1]/div[1]/ul/li[6] + ... ELSE IF "${objType}"=="category" run keywords sleep 2 + ... AND Click element xpath=/html/body/div[2]/div[1]/div[1]/ul/li[7] + ... ELSE IF "${objType}"=="account" run keywords sleep 2 + ... AND Click element xpath=/html/body/div[2]/div[1]/div[1]/ul/li[8] + +Export-format + [Arguments] ${filetype} + sleep 2 + click element id=object_select_export + run keyword if "${filetype}"=="txt" run keywords sleep 2 + ... AND click element xpath=/html/body/div[3]/div[1]/div[1]/ul/li[1] + ... ELSE IF "${filetype}"=="csv" run keywords sleep 2 + ... AND click element xpath=/html/body/div[3]/div[1]/div[1]/ul/li[2] + +Export-ok + click button id=objectImportOk + +Export-cancel + click button id=objectImportCancel + +Create-keyword-text + [Arguments] ${type} ${keywordtext} + sleep 1 + run keyword if "${type}"=="Fqdn" run keywords sleep 1 + ... AND input text id=object_fqdn0 ${keywordtext} + ... ELSE IF "${type}"=="Sub" 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 + ... AND input text id=object_fqdn0 ${keywordtext} + ... ELSE IF "${type}"=="Account" run keywords sleep 1 + ... AND input text id=object_account0 ${keywordtext} + ... ELSE log 2 + +Create-ReqRes-type + [Arguments] ${type} + sleep 1 + run keyword if '${type}'=='req' click element xpath=//*[@id="objectAddItemReqRes"]/label[1] + ... ELSE IF '${type}'=='res' click element xpath=//*[@id="objectAddItemReqRes"]/label[2] + sleep 1 + +Create-ReqRes-header + [Arguments] ${type} ${header} + sleep 1 + run keyword if '${type}'=='req' and '${header}'=='ua' click element xpath=//*[@id="objectAddItemReqResType1"]/label[1] + ... ELSE IF '${type}'=='req' and '${header}'=='ck' click element xpath=//*[@id="objectAddItemReqResType1"]/label[2] + ... ELSE IF '${type}'=='res'and '${header}'=='sck' click element xpath=//*[@id="objectAddItemReqResType"]/label[1] + ... ELSE IF '${type}'=='res'and '${header}'=='ct' click element xpath=//*[@id="objectAddItemReqResType"]/label[2] + sleep 1 + +Create-ReqRes-text + [Arguments] ${keywordtext} + sleep 1 + input text id=object_sig0 ${keywordtext} + sleep 1 + +Create-ReqRes-hexmode + [Arguments] ${hex} + sleep 1 + run keyword if "${hex}"=="open" click element xpath=//*[@id="policy_Manipulation2"]/div[7]/div[1]/div[1]/form/div[4]/div/div + sleep 1 + +Create-Key-text + [Arguments] ${keywordtext} + sleep 1 + input text id=object_key0 ${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 + sleep 1 + +objects-delete + sleep 1 + click element id=objectDel #点击删除按钮 + sleep 1 + click element xpath=/html/body/div/div/div[3]/button[2] + #Close Browser #关闭浏览器 + +object-edit-fqdn + [Arguments] ${name} ${keywordtext} + Sleep 2 + click element id=objectEdit + Sleep 2 + Objects.Create-name ${name} + Sleep 1 + click element id=objectAddEdit + Sleep 1 + input text id=object_fqdn0 ${keywordtext} + Sleep 1 + click element id=objectAddItemFqdnOk + Sleep 1 + click element id=objectAdd_ok + Sleep 2 + +object-edit-Subscriber-ID + [Arguments] ${name} ${keywordtext} + Sleep 2 + click element id=objectEdit + Sleep 2 + Objects.Create-name ${name} + Sleep 1 + click element id=objectAddEdit + Sleep 1 + input text id=object_sub0 ${keywordtext} + Sleep 1 + click element id=objectAddItemSubOk + Sleep 1 + click element id=objectAdd_ok + Sleep 2 + +object-edit-url + [Arguments] ${name} ${keywordtext} + Sleep 2 + click element id=objectEdit + Sleep 2 + Objects.Create-name ${name} + Sleep 1 + click element id=objectAddEdit + Sleep 1 + input text id=object_url0 ${keywordtext} + Sleep 1 + click element id=objectAddItemUrlOk + Sleep 1 + click element id=objectAdd_ok + Sleep 2 + +object-edit-account + [Arguments] ${name} ${keywordtext} + Sleep 2 + click element id=objectEdit + Sleep 2 + Objects.Create-name ${name} + Sleep 1 + click element id=objectAddEdit + Sleep 1 + input text id=object_account0 ${keywordtext} + Sleep 1 + click element id=objectItemAccountOk + Sleep 1 + click element id=objectAdd_ok + Sleep 2 + +object-edit-keywords + [Arguments] ${name} ${keywordtext} ${hex}=close + Sleep 2 + click element id=objectEdit + Sleep 2 + Objects.Create-name ${name} + Sleep 1 + click element id=objectAddEdit + Sleep 1 + input text id=object_key0 ${keywordtext} + Sleep 1 + Objects.Create-Key-hexmode ${hex} + Sleep 1 + click element id=objectAddItemKeyOk + Sleep 1 + click element id=objectAdd_ok + Sleep 2 + +ui-object-search-name + [Arguments] ${name} + sleep 2 + click element id=one-input + sleep 2 + click element id=input_list_li2 + sleep 2 + input text id=sreach_input ${name} + sleep 2 + click element id=select_new_search_btn + sleep 2 + click element //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1] + +object-edit-HTTPSignature + [Arguments] ${name} ${reqrestype} ${reqresheader} ${keywordtext} ${hex}=close + Sleep 2 + click element id=objectEdit + Sleep 2 + Objects.Create-name ${name} + Sleep 1 + click element id=objectAddEdit + Sleep 1 + Objects.Create-ReqRes-type ${reqrestype} + Objects.Create-ReqRes-header ${reqrestype} ${reqresheader} + input text id=object_sig0 ${keywordtext} + Sleep 1 + Objects.Create-ReqRes-hexmode ${hex} + click element id=objectAddItemReqResOk + Sleep 1 + click element id=objectAdd_ok + Sleep 2 + +object-edit-ip + [Arguments] ${name} ${ipads} ${ipclient} ${ipclienttext1} ${ipclienttext2} ${post}=null + Sleep 2 + click element id=objectEdit + Sleep 2 + Objects.Create-name ${name} + Sleep 1 + click element id=objectAddEdit + Sleep 1 + Objects.Create-ip-AddressType ${ipads} + Objects.Create-ip-ClientIP ${ipclient} + Objects.Create-ip-ClientIP-text ${ipclient} ${ipclienttext1} ${ipclienttext2} ${post} + Sleep 1 + click element id=objectAddItemIpOk + Sleep 1 + click element id=objectAdd_ok + Sleep 2 +Cerate-Group + [Arguments] ${objtype} ${group} ${object_name} ${ip_type} + run keyword if "${objtype}"=="Ip" and "${group}"=="AddressGroup" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[2]/div/form/div[2]/div/div/label[2] + ... AND sleep 1 + ... AND Create-AddressGroup-Geography ${group} ${ip_type} ${object_name} + run keyword if "${objtype}"=="Fqdn" and "${group}"=="FqdnGroup" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[2]/div/form/div[2]/div/div/label[2] + ... AND sleep 1 + ... AND Create-Sub-Objects ${object_name} + run keyword if "${objtype}"=="Sub" and "${group}"=="SubGroup" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[2]/div/form/div[2]/div/div/label[2] + ... AND sleep 1 + ... AND Create-Sub-Objects ${object_name} + run keyword if "${objtype}"=="Url" and "${group}"=="UrlGroup" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[2]/div/form/div[2]/div/div/label[2] + ... AND sleep 1 + ... AND Create-Sub-Objects ${object_name} + run keyword if "${objtype}"=="Category" and "${group}"=="CategoryGroup" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[2]/div/form/div[2]/div/div/label[2] + ... AND sleep 1 + ... AND Create-Sub-Objects ${object_name} + run keyword if "${objtype}"=="Account" and "${group}"=="AccountGroup" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[2]/div/form/div[2]/div/div/label[2] + ... AND sleep 1 + ... AND Create-Sub-Objects ${object_name} + run keyword if "${objtype}"=="Key" and "${group}"=="KeyGroup" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[2]/div/form/div[2]/div/div/label[2] + ... AND sleep 1 + ... AND Create-Sub-Objects ${object_name} + run keyword if "${objtype}"=="ReqRes" and "${group}"=="ReqResGroup" run keywords click element xpath=//*[@id="policy_Manipulation2"]/div[2]/div/form/div[2]/div/div/label[2] + ... AND sleep 1 + ... AND Create-Sub-Objects ${object_name} +Create-Sub-Objects + [Arguments] ${object_name} + click element id=objectAddSubAdd + sleep 1 + FOR ${i} IN @{object_name} + input text id=objectAddSubSearch ${i} + sleep 1 + press keys id=objectAddSubSearch ENTER + sleep 1 + click element xpath=//*[@id="objects_ip2"]/div/div[1]/div[2]/div[2]/ul/li[1]/span + sleep 1 + END +Create-Geography + [Arguments] ${Country} ${City} + run keyword if "${Country}"!="null" Create-Country ${Country} + run keyword if "${City}"!="null" Create-City ${City} +Create-Country + [Arguments] ${Country} + FOR ${i} IN @{Country} + input text xpath=//*[@id="policy_Manipulation2"]/div[15]/div/div/div/div[1]/div[3]/div[1]/div/div/input ${i} + sleep 1 + press keys xpath=//*[@id="policy_Manipulation2"]/div[15]/div/div/div/div[1]/div[3]/div[1]/div/div/input ENTER + sleep 1 + click element xpath=//*[@id="policy_Manipulation2"]/div[15]/div/div/div/div[1]/div[4]/div/div/div[1]/div/label/span + sleep 1 + END +Create-City + [Arguments] ${City} + sleep 1 + click element id=tab-city + sleep 1 + FOR ${i} IN @{City} + input text xpath=//*[@id="policy_Manipulation2"]/div[15]/div/div/div/div[1]/div[3]/div[1]/div/div/input ${i} + sleep 1 + press keys xpath=//*[@id="policy_Manipulation2"]/div[15]/div/div/div/div[1]/div[3]/div[1]/div/div/input ENTER + sleep 1 + click element xpath=//*[@id="policy_Manipulation2"]/div[15]/div/div/div/div[1]/div[4]/div/div/div[1]/div/label/span + sleep 1 + END +Create-AddressGroup-Geography + [Arguments] ${group} ${ip_type} ${object_name} + run keyword if "${group}"=="AddressGroup" and "${ip_type}"=="Geography" run keywords sleep 1 + ... AND click element xpath=//*[@id="policy_Manipulation2"]/div[2]/div/form/div[3]/div/div/label[2] + ... AND sleep 1 + ... AND Create-Sub-Objects ${object_name} + ... AND sleep 1 + run keyword if "${group}"=="AddressGroup" and "${ip_type}"=="Ip" run keywords sleep 1 + ... AND Create-Sub-Objects ${object_name} +