diff --git a/01-TestCase/tsg_ui/ui_accounts/Accountscase.robot b/01-TestCase/tsg_ui/ui_accounts/Accountscase.robot index c34073a..8c18f9a 100644 --- a/01-TestCase/tsg_ui/ui_accounts/Accountscase.robot +++ b/01-TestCase/tsg_ui/ui_accounts/Accountscase.robot @@ -7,14 +7,14 @@ Resource ../../../02-Keyword/tsg_ui/accounts/Accounts.robot *** Test Cases *** create-user-001 #新建Accounts - CreatePage 0000 ssjjyy 111111 log + CreatePage 0000 ssjjyy2 111111 log 30 log #验证新建是否成功 - Ui-User-Search-Name 0000 + Ui-User-Search-Name 0000 Name ${name} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[4]/div/div/span/span log ${name} Should Be Equal As Strings ${name} 0000 #删除对象 - User-Delete + create-user-002 #新建Accounts @@ -30,40 +30,40 @@ create-user-004 #新建Accounts CreatePage xiaohong kkkkkk aaaa log #验证新建是否成功 - Ui-User-Search-Name xiaohong + Ui-User-Search-Name xiaohong Name ${name} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[4]/div/div/span/span log ${name} Should Be Equal As Strings ${name} xiaohong #删除对象 - User-Delete + create-user-005 #新建Accounts CreatePage 小红 小红 a1@й log #验证新建是否成功 - Ui-User-Search-Name 小红 + Ui-User-Search-Name 小红 Name ${name} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[4]/div/div/span/span log ${name} Should Be Equal As Strings ${name} 小红 #删除对象 - User-Delete + create-user-006 #新建Accounts CreatePage малый малый малый log #验证新建是否成功 - Ui-User-Search-Name малый + Ui-User-Search-Name малый Name ${name} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[4]/div/div/span/span log ${name} Should Be Equal As Strings ${name} малый #删除对象 - User-Delete + edit-user-007 #新建Accounts CreatePage 修改 edit 111111 log #验证新建是否成功 - Ui-User-Search-Name 修改 + Ui-User-Search-Name 修改 Name ${name} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[4]/div/div/span/span log ${name} Should Be Equal As Strings ${name} 修改 @@ -72,24 +72,24 @@ edit-user-007 #查询修改对象 Ui-User-Search-Name edit-1 #删除对象 - User-Delete + create-user-008 #新建Accounts CreatePage @#!&* *^%$ *^%$ log #验证新建是否成功 - Ui-User-Search-Name @#!&* + Ui-User-Search-Name @#!&* Name ${name} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[4]/div/div/span/span log ${name} Should Be Equal As Strings ${name} @#!&* #删除对象 - User-Delete + edit-user-009 #新建Accounts - CreatePage 修改 edit 111111 log + CreatePage 修改ss edit 111111 log #验证新建是否成功 - Ui-User-Search-Name 修改 + Ui-User-Search-Name 修改ss Name ${name} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[4]/div/div/span/span log ${name} Should Be Equal As Strings ${name} 修改 @@ -98,18 +98,18 @@ edit-user-009 #查询修改对象 Ui-User-Search-Name 要修改了啊 #删除对象 - User-Delete + create-user-010 #新建Accounts CreatePage @#!&* *^%$ *^%$ log #验证新建是否成功 - Ui-User-Search-Username * + Ui-User-Search-Name * User Name ${name} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[4]/div/div/span/span #log ${name} #Should Be Equal As Strings ${name} * #删除对象 - User-Delete + create-user-011 #新建Accounts @@ -120,7 +120,7 @@ create-user-011 #log ${name} #Should Be Equal As Strings ${name} @ #删除对象 - User-Delete + delete-user-012 #新建Accounts @@ -131,7 +131,7 @@ delete-user-012 log ${name} Should Be Equal As Strings ${name} @#!&* #删除对象 - User-Delete + user-013 diff --git a/01-TestCase/tsg_ui/ui_audit/Auditcase.robot b/01-TestCase/tsg_ui/ui_audit/Auditcase.robot index 9a88b6c..06477f3 100644 --- a/01-TestCase/tsg_ui/ui_audit/Auditcase.robot +++ b/01-TestCase/tsg_ui/ui_audit/Auditcase.robot @@ -5,12 +5,13 @@ Library OperatingSystem Resource ../../../02-Keyword/tsg_ui/Menu.robot *** Test Cases *** -search-user-001 +search-autid-001 #打开界面 Ui-login #查找 - Ui-User-Search-Name - + ${valuelist} create list 2020-12-01 00:00:00 2020-12-02 00:00:00 + Ui-Audit-Search Time ${valuelist} +#下面的用例都是错的 参照这一个 search-user-002 #打开界面 Ui-login diff --git a/01-TestCase/tsg_ui/ui_ldap/Ldapcase.robot b/01-TestCase/tsg_ui/ui_ldap/Ldapcase.robot index a909b7b..999f0cc 100644 --- a/01-TestCase/tsg_ui/ui_ldap/Ldapcase.robot +++ b/01-TestCase/tsg_ui/ui_ldap/Ldapcase.robot @@ -9,7 +9,7 @@ create-user-001 #界面 #Ui-login #新建 - CreatePage test localhost 25 test ou=People,dc=bifang,dc=com uid 111111 + CreatePage test 192.168.40.130 389 cn=root,dc=bifang,dc=com uid ou=dev,dc=bifang,dc=com 111111 create-user-002 #界面 diff --git a/01-TestCase/tsg_ui/ui_login/Logincase.robot b/01-TestCase/tsg_ui/ui_login/Logincase.robot index 22b7779..e21ef7c 100644 --- a/01-TestCase/tsg_ui/ui_login/Logincase.robot +++ b/01-TestCase/tsg_ui/ui_login/Logincase.robot @@ -9,7 +9,7 @@ search-user-001 #打开界面 Ui-login #查找 - Ui-User-Search-Name + Ui-User-login-Search-Name lyf search-user-002 diff --git a/01-TestCase/tsg_ui/ui_mail/Mailcase.robot b/01-TestCase/tsg_ui/ui_mail/Mailcase.robot index 8316d1b..05ef78e 100644 --- a/01-TestCase/tsg_ui/ui_mail/Mailcase.robot +++ b/01-TestCase/tsg_ui/ui_mail/Mailcase.robot @@ -8,7 +8,7 @@ Resource ../../../02-Keyword/tsg_ui/mail/Mailpages.robot create-001 #新建 - CreatePage 192.168.40.204 25 test yytest@mail.test.com 111111 + CreatePage smtp.163.com 465 test_name l1157517579@163.com XEYQVHEMTOBOJSAP create-002 diff --git a/01-TestCase/tsg_ui/ui_settings/IP_Libraries_Case.robot b/01-TestCase/tsg_ui/ui_settings/IP_Libraries_Case.robot index 3e8e2bf..95c3cda 100644 --- a/01-TestCase/tsg_ui/ui_settings/IP_Libraries_Case.robot +++ b/01-TestCase/tsg_ui/ui_settings/IP_Libraries_Case.robot @@ -8,122 +8,119 @@ IP_Libraries_Create_Country-001 #ip段 ${iplist} create list 10.1.1.1-20.1.1.1 20.1.1.1-30.1.1.1 #新建国家 - Create_Ip_Libraries Country Africa 115 L ${iplist} j=2 Country=L Longitude=1 Latitude=2 + Create_Ip_Libraries Geo Name Country Africa 1151 L1 ${iplist} j=2 Country=L1 Longitude=1 Latitude=2 #删除 - Delete_IP_Libraries 115 + Delete_IP_Libraries IP_Libraries_Create_Country-002 #新建ip归属地-国家（输入框最小值） #ip段 ${iplist} create list 1.1.1.1-2.2.2.2 #新建国家 - Create_Ip_Libraries Country Africa 1 1 ${iplist} Country=1 + Create_Ip_Libraries Geo Name Country Africa 199 1 ${iplist} Country=1 #删除 - Delete_IP_Libraries 1 + Delete_IP_Libraries IP_Libraries_Create_Country-003 #新建ip归属地-国家 #ip段 ${iplist} create list 1.1.1.1-2.2.2.2 #新建国家 - Create_Ip_Libraries Country Africa 112 lyf ${iplist} Country=lyf Longitude=1.222222 Latitude=1.222222 + Create_Ip_Libraries Geo Name Country Africa 112 lyf ${iplist} Country=lyf Longitude=1.222222 Latitude=1.222222 #删除 - Delete_IP_Libraries 112 + Delete_IP_Libraries Geo Name 112 112 IP_Libraries_Create_Country-004 #新建ip归属地-国家，经纬度输入负数 #ip段 ${iplist} create list 1.1.1.1-2.2.2.2 #新建国家 - Create_Ip_Libraries Country Africa 113 lyf ${iplist} Country=lyf Longitude=-1 Latitude=-1 + Create_Ip_Libraries Geo Name Country Africa 113 lyf ${iplist} Country=lyf Longitude=-1 Latitude=-1 #删除 - Delete_IP_Libraries 113 + Delete_IP_Libraries Geo Name 113 113 IP_Libraries_Create_Country-005 #新建ip归属地-国家（输入框最大值） #ip段 ${iplist} create list 1.1.1.1-2.2.2.2 #新建国家 - Create_Ip_Libraries Country Africa 1111111112 qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ${iplist} Country=qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa Longitude=180 Latitude=90 + Create_Ip_Libraries Geo Name Country Africa 1111111112 qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ${iplist} Country=qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa Longitude=180 Latitude=90 #删除 - Delete_IP_Libraries 1111111112 + Delete_IP_Libraries Geo Name 1111111112 1111111112 IP_Libraries_Create_Country-006 #新建ip归属地-国家（输入多个ip组合） #ip段 ${iplist} create list 1.1.1.1-2.2.2.2 0.0.0.0-255.255.255.255 ::-FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF 1234:3456::AAAA-AAAA:BBBB::FFFF #新建国家 - Create_Ip_Libraries Country Africa 116 lyf ${iplist} j=4 Country=lyf + Create_Ip_Libraries Geo Name Country Africa 116 lyf ${iplist} j=4 Country=lyf #删除 - Delete_IP_Libraries 116 + Delete_IP_Libraries Geo Name 116 116 IP_Libraries_Create_Country-007 #新建ip归属地-城市（国家选择内置国家） #ip段 ${iplist} create list 1.1.1.1-2.2.2.2 #新建国家 - Create_Ip_Libraries Country Africa 126 Garbahaarrey ${iplist} Country=Somalia + Create_Ip_Libraries Geo Name Country Africa 126 Garbahaarrey ${iplist} Country=Somalia #删除 - Delete_IP_Libraries 126 + Delete_IP_Libraries Geo Name 126 126 IP_Libraries_Create_Country-008 #新建ip归属地-城市（国家选择非内置国家） #ip段 ${iplist} create list 1.1.1.1-2.2.2.2 #新建国家 - Create_Ip_Libraries City 1 228 1 ${iplist} + Create_Ip_Libraries Geo Name City 1 228 1 ${iplist} #删除 - Delete_IP_Libraries 228 + Delete_IP_Libraries Geo Name 228 228 IP_Libraries_Create_Country-009 #修改ip归属地城市 #ip段 ${iplist} create list 1.1.1.1-2.2.2.2 #新建国家 - Create_Ip_Libraries City 1 268 1 ${iplist} - Edit_Ip_Libraries 268 Longitude=-1 Latitude=-1 + Create_Ip_Libraries Geo Name City 1 268 1 ${iplist} + Edit_Ip_Libraries Geo Name 268 Longitude=-1 Latitude=-1 #删除 - Delete_IP_Libraries 268 + Delete_IP_Libraries Geo Name 268 268 IP_Libraries_Create_Country-010 #使用Geo Name为搜索条件查找ip归属地信息 ${iplist} create list 1.1.1.1-2.2.2.2 #新建国家 - Create_Ip_Libraries City 1 181 1 ${iplist} - Switch_GeoName 181 - Delete_IP_Libraries 181 + Create_Ip_Libraries Geo Name City 1 181 1 ${iplist} + Delete_IP_Libraries Geo Name 181 181 IP_Libraries_Create_Country-011 #使用Country为搜索条件查找ip归属地信息 ${iplist} create list 1.1.1.1-2.2.2.2 #新建国家 - Create_Ip_Libraries City 1 284 1 ${iplist} - Switch_Country 1 - Delete_IP_Libraries 284 + Create_Ip_Libraries Geo Name City 1 284 1 ${iplist} + Delete_IP_Libraries Geo Name 284 284 IP_Libraries_Create_Country-012 #使用City为搜索条件查找ip归属地信息 ${iplist} create list 1.1.1.1-2.2.2.2 #新建国家 - Create_Ip_Libraries City 1 286 1 ${iplist} - Switch_City 1 - Delete_IP_Libraries 286 + Create_Ip_Libraries Geo Name City 1 286 1 ${iplist} + Delete_IP_Libraries Geo Name 286 285 IP_Libraries_Create_Country-013 #删除非内置的归属地信息列表 #ip段 ${iplist} create list 1.1.1.1-2.2.2.2 #新建国家 - Create_Ip_Libraries City 1 158 1 ${iplist} + Create_Ip_Libraries Geo Name City 1 158 1 ${iplist} #删除 - Delete_IP_Libraries 158 + Delete_IP_Libraries Geo Name 158 158 IP_Libraries_Create_Country-014 #新建国家或城市，添加两个以上的iprange #ip段 ${iplist} create list 1.1.1.1-2.2.2.2 1.2.2.2-3.2.2.2 10.10.10.10-20.20.20.20 15.15.15.15-25.25.25.25 13.13.13.13-26.26.26.26 #新建国家 - Create_Ip_Libraries City Algeria 127 1 ${iplist} j=5 Longitude=-1 Latitude=12.13 + Create_Ip_Libraries Geo Name City Algeria 127 1 ${iplist} j=5 Longitude=-1 Latitude=12.13 ALL IP_Libraries_Create_Country-015 @@ -136,77 +133,77 @@ IP_Libraries_Create_Country-016 #ip段 ${iplist} create list 1.1.1.1-2.2.2.2 #新建国家 - Create_Ip_Libraries City Algeria 117 1 ${iplist} Longitude=-1 Latitude=12.13 - Edit_Ip_Libraries 117 Longitude=-2 Latitude=12.13 - Delete_IP_Libraries 117 + Create_Ip_Libraries Geo Name City Algeria 117 1 ${iplist} Longitude=-1 Latitude=12.13 + Edit_Ip_Libraries Geo Name 117 Longitude=-2 Latitude=12.13 + Delete_IP_Libraries Geo Name 117 117 IP_Libraries_Create_Country-017 #p归属地新建国家或者城市，Iprange中搜索框功能 #ip段 ${iplist} create list 1.1.1.1-2.2.2.2 1.2.2.2-3.2.2.2 10.10.10.10-20.20.20.20 15.15.15.15-25.25.25.25 13.13.13.13-26.26.26.26 #新建国家 - Create_Ip_Libraries City Algeria 129 1 ${iplist} j=5 Longitude=-1 Latitude=12.13 - Delete_IP_Libraries 129 + Create_Ip_Libraries Geo Name City Algeria 129 1 ${iplist} j=5 Longitude=-1 Latitude=12.13 + Delete_IP_Libraries Geo Name 129 129 IP_Libraries_Create_Country-018 #新建国家Country输入中文 ${iplist} create list 1.1.1.1-2.2.2.2 #新建国家 - Create_Ip_Libraries Country Africa 185 中文 ${iplist} Country=中文 Longitude=-1 Latitude=-1 - Delete_IP_Libraries 185 + Create_Ip_Libraries Geo Name Country Africa 185 中文 ${iplist} Country=中文 Longitude=-1 Latitude=-1 + Delete_IP_Libraries Geo Name 185 185 IP_Libraries_Create_Country-019 #新建国家Country输入英文 ${iplist} create list 1.1.1.1-2.2.2.2 #新建国家 - Create_Ip_Libraries Country Africa 185 english ${iplist} Country=english Longitude=-1 Latitude=-1 - Delete_IP_Libraries 185 + Create_Ip_Libraries Geo Name Country Africa 185 english ${iplist} Country=english Longitude=-1 Latitude=-1 + Delete_IP_Libraries Geo Name 185 185 IP_Libraries_Create_Country-020 #新建国家Country输入俄文 ${iplist} create list 1.1.1.1-2.2.2.2 #新建国家 - Create_Ip_Libraries Country Africa 185 упражнение ${iplist} Country=упражнение Longitude=-1 Latitude=-1 - Delete_IP_Libraries 185 + Create_Ip_Libraries Geo Name Country Africa 185 упражнение ${iplist} Country=упражнение Longitude=-1 Latitude=-1 + Delete_IP_Libraries Geo Name 184 184 IP_Libraries_Create_Country-021 #新建国家Country输入特殊字符 ${iplist} create list 1.1.1.1-2.2.2.2 #新建国家 - Create_Ip_Libraries Country Africa 185 @^& ${iplist} Country=@^& Longitude=-1 Latitude=-1 - Delete_IP_Libraries 185 + Create_Ip_Libraries Geo Name Country Africa 185 @^& ${iplist} Country=@^& Longitude=-1 Latitude=-1 + Delete_IP_Libraries Geo Name 185 185 IP_Libraries_Create_Country-022 #修改国家Country输入中文 #ip段 ${iplist} create list 1.1.1.1-2.2.2.2 #新建国家 - Create_Ip_Libraries Country Africa 186 1 ${iplist} Country=中文 Longitude=-1 Latitude=12.13 - Edit_Ip_Libraries 186 City=中文 - Delete_IP_Libraries 186 + Create_Ip_Libraries Geo Name Country Africa 186 1 ${iplist} Country=中文 Longitude=-1 Latitude=12.13 + Edit_Ip_Libraries Geo Name 186 City=中文 + Delete_IP_Libraries Geo Name 186 186 IP_Libraries_Create_Country-023 #修改国家Country输入英文 #ip段 ${iplist} create list 1.1.1.1-2.2.2.2 #新建国家 - Create_Ip_Libraries Country Africa 187 1 ${iplist} Country=english Longitude=-1 Latitude=12.13 - Edit_Ip_Libraries 187 City=english - Delete_IP_Libraries 187 + Create_Ip_Libraries Geo Name Country Africa 187 1 ${iplist} Country=english Longitude=-1 Latitude=12.13 + Edit_Ip_Libraries Geo Name 187 City=english + Delete_IP_Libraries Geo Name 187 187 IP_Libraries_Create_Country-024 #修改国家Country输入俄文 #ip段 ${iplist} create list 1.1.1.1-2.2.2.2 #新建国家 - Create_Ip_Libraries Country Africa 188 1 ${iplist} Country=упражнение Longitude=-1 Latitude=12.13 - Edit_Ip_Libraries 188 City=упражнение - Delete_IP_Libraries 188 + Create_Ip_Libraries Geo Name Country Africa 188 1 ${iplist} Country=упражнение Longitude=-1 Latitude=12.13 + Edit_Ip_Libraries Geo Name 188 City=упражнение + Delete_IP_Libraries Geo Name 188 188 IP_Libraries_Create_Country-025 #修改国家Country输入特殊字符 #ip段 ${iplist} create list 1.1.1.1-2.2.2.2 #新建国家 - Create_Ip_Libraries Country Africa 189 1 ${iplist} Country=@^& Longitude=-1 Latitude=12.13 - Edit_Ip_Libraries 189 City=@^& - Delete_IP_Libraries 189 \ No newline at end of file + Create_Ip_Libraries Geo Name Country Africa 189 1 ${iplist} Country=@^& Longitude=-1 Latitude=12.13 + Edit_Ip_Libraries Geo Name 189 City=@^& + Delete_IP_Libraries Geo Name 189 189 \ No newline at end of file diff --git a/02-Keyword/tsg_ui/Menu.robot b/02-Keyword/tsg_ui/Menu.robot index b8b41c1..ad08ace 100644 --- a/02-Keyword/tsg_ui/Menu.robot +++ b/02-Keyword/tsg_ui/Menu.robot @@ -6,7 +6,7 @@ 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=children5 administartion=children6 + ${dict} create dictionary dashboard=children0 policy&objects=children1 log=children2 report=children3 device=children4 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 ${log} create dictionary Security Event Logs=sidebarLog_SecurityEventLogs Proxy Event Logs=sidebarLog_ProxyEventLogs Session Records=sidebarLog_SesssionRecords Radius Logs=sidebarLog_RadiusLogs diff --git a/02-Keyword/tsg_ui/accounts/Accounts.robot b/02-Keyword/tsg_ui/accounts/Accounts.robot index 62800c0..3c6110a 100644 --- a/02-Keyword/tsg_ui/accounts/Accounts.robot +++ b/02-Keyword/tsg_ui/accounts/Accounts.robot @@ -76,34 +76,23 @@ User-Edit sleep 2 Ui-User-Search-Name - [Arguments] ${name} + [Arguments] ${name} ${type} sleep 2 - Wait Until Page Contains Element id=one-input 20 - click element id=one-input + Wait Until Page Contains Element xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/span/div/div/div[2]/div/div/div/input 20 + click element xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/span/div/div/div[2]/div/div/div/input sleep 2 - click element id=input_list_li2 + run keyword if "${type}"=="Name" run keywords click element xpath=/html/body/div/div[1]/div[1]/ul/li[3] + ... AND sleep 1 + run keyword if "${type}"=="User Name" run keywords click element xpath=/html/body/div/div[1]/div[1]/ul/li[2] + ... AND sleep 1 sleep 2 - input text id=sreach_input ${name} + input text //*[@id="app"]/div/div[3]/div[2]/div/div/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/div[1]/span/div/i sleep 2 - click element xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table + click element xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1] sleep 2 -Ui-User-Search-Username - [Arguments] ${name} - sleep 2 - #Wait Until Page Contains Element id=one-input 10 - click element id=one-input - sleep 3 - click element id=input_list_li1 - 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 - sleep 2 login Input Text xpath=//*[@id="app"]/div/div[2]/div/div[2]/div/input sjy diff --git a/02-Keyword/tsg_ui/accounts/Accountspages.robot b/02-Keyword/tsg_ui/accounts/Accountspages.robot index e0a3b6b..1f43cc4 100644 --- a/02-Keyword/tsg_ui/accounts/Accountspages.robot +++ b/02-Keyword/tsg_ui/accounts/Accountspages.robot @@ -6,24 +6,23 @@ Library Collections *** Keywords *** CreatePage - [Arguments] ${name} ${username} ${accPasswd} ${accEnable} + [Arguments] ${name} ${username} ${accPasswd} ${Required_Password_Change} ${day} ${accEnable} Menu administartion Accounts - sleep 3 Accounts.CreateButton Accounts.Create-Name ${name} Accounts.Create-Username ${username} Accounts.Create-Password ${accPasswd} + input text xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[4]/div/div[1]/input ${accPasswd} + run keyword if "${Required_Password_Change}"=="open" Run Keywords click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[5]/div/div + ... AND sleep 1 + ... ELSE log 不开启密码过期验证 + input text xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[6]/div/div/input ${day} Accounts.Create-Enable ${accEnable} Accounts.Create-Ok 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 - Accounts.SelectOne Accounts.DeleteButton 1 Accounts.Delete-Delete diff --git a/02-Keyword/tsg_ui/audit/Audit.robot b/02-Keyword/tsg_ui/audit/Audit.robot index c374653..e4dbb1a 100644 --- a/02-Keyword/tsg_ui/audit/Audit.robot +++ b/02-Keyword/tsg_ui/audit/Audit.robot @@ -3,17 +3,32 @@ Library Selenium2Library *** Keywords *** -Ui-User-Search-Name +Ui-Audit-Search + [Arguments] ${type} ${value} sleep 2 - click element id=one-input + click element //*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/span/div/div/div[2]/div/div/div[1]/input sleep 2 - click element id=input_list_li1 + run keyword if "${type}"=="ID" Run Keywords click element xpath=/html/body/div/div[1]/div[1]/ul/li[2] + ... AND sleep 1 + ... AND input text xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/span/div/div/div[2]/div/div[1]/div[3]/div/input ${value} + run keyword if "${type}"=="Operator" Run Keywords click element xpath=/html/body/div/div[1]/div[1]/ul/li[3] + ... AND sleep 1 + ... AND input text xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/span/div/div/div[2]/div/div[1]/div[3]/div/input ${value} + ... AND sleep 1 + ... AND click element xpath=/html/body/div/div[1]/div[1]/ul/li[1] + run keyword if "${type}"=="Time" Run Keywords click element xpath=/html/body/div/div[1]/div[1]/ul/li[4] + ... AND sleep 1 + ... AND input text xpath=/html/body/div/div[1]/div/div[1]/span[1]/span[1]/div/input ${value}[0] + ... AND sleep 1 + ... AND input text xpath=/html/body/div/div[1]/div/div[1]/span[1]/span[2]/div[1]/input ${value}[1] + ... AND sleep 1 + ... AND input text xpath=/html/body/div/div[1]/div/div[1]/span[3]/span[1]/div/input ${value}[2] + ... AND sleep 1 + ... AND input text xpath=/html/body/div/div[1]/div/div[1]/span[3]/span[2]/div[1]/input ${value}[3] + ... AND sleep 1 + ... AND click element xpath=/html/body/div/div[2]/button[2] sleep 2 - click element id=update_sreach0 - sleep 2 - click element id=OperatorInfo01 - sleep 2 - click element id=select_new_search_btn + click element xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/span/div/i sleep 2 Ui-User-Search diff --git a/02-Keyword/tsg_ui/login/Login.robot b/02-Keyword/tsg_ui/login/Login.robot index a695d47..f1afb75 100644 --- a/02-Keyword/tsg_ui/login/Login.robot +++ b/02-Keyword/tsg_ui/login/Login.robot @@ -58,18 +58,18 @@ Ui-login click element id=sidebarsystem_LoginLog sleep 2 -Ui-User-Search-Name - click element id=one-input +Ui-User-login-Search-Name + [Arguments] ${value} + click element xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/span/div/div/div[2]/div/div/div/input sleep 2 - click element id=input_list_li1 + click element xpath=/html/body/div/div[1]/div[1]/ul/li[2] + sleep 1 + input text xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/span/div/div/div[2]/div/div/div[3]/div/div/input ${value} + sleep 1 + click element xpath=/html/body/div/div[1]/div[1]/ul/li[124] sleep 2 - click element id=update_sreach0 + click element xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/span/div/i sleep 2 - click element id=OperatorInfo01 - sleep 2 - click element id=select_new_search_btn - sleep 2 - Ui-User-Search click element id=one-input diff --git a/02-Keyword/tsg_ui/setting/Settings.robot b/02-Keyword/tsg_ui/setting/Settings.robot index 33a7569..368b428 100644 --- a/02-Keyword/tsg_ui/setting/Settings.robot +++ b/02-Keyword/tsg_ui/setting/Settings.robot @@ -1143,11 +1143,13 @@ Req_Res_Body \ ... AND input id=attributeValue_string ${dict}[${key}] Create_Ip_Libraries - [Arguments] ${type} ${Continent/Country} ${GeoNameID} ${City} ${ip} ${j}=1 ${Country}=null ${Longitude}=null ${Latitude}=null + [Arguments] ${type1} ${type} ${Continent/Country} ${GeoNameID} ${City} ${ip} ${j}=1 ${Country}=null ${Longitude}=null ${Latitude}=null Sleep 1 - click id=children5 #点击一级目录Settings + click id=children6 #点击一级目录Settings Sleep 1 - click id=sidebarIP_Libraries #点击二级目录IP_Libraries + click id=sidebarAdvanced + sleep 1 + click id=Advanced/ipLibrary #点击二级目录IP_Libraries Sleep 2 click id=tagAdd #点击Create按钮 sleep 2 @@ -1179,13 +1181,13 @@ Create_Ip_Libraries click id=IP_library_add sleep 2 #验证新建是否成功 - Switch_GeoName ${GeoNameID} + Switch_IP_Libraries ${type1} ${GeoNameID} ${GeoNameID} ${GeoNameText} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div sleep 2 Should Be Equal As Strings ${GeoNameText} ${GeoNameID} #断言 Edit_Ip_Libraries - [Arguments] ${GeoNameID} ${City}=null ${ip}=null ${j}=1 ${Country}=null ${Longitude}=null ${Latitude}=null ${type}=null ${type1}=null + [Arguments] ${type} ${GeoNameID} ${City}=null ${ip}=null ${j}=1 ${Country}=null ${Longitude}=null ${Latitude}=null ${type}=null ${type1}=null click id=tagEdit #点击Edit按钮 sleep 2 run keyword if "${City}"!="null" input id=ip_geography_City ${City} @@ -1209,7 +1211,7 @@ Edit_Ip_Libraries click id=IP_library_add sleep 2 #验证修改是否成功 - Switch_GeoName ${GeoNameID} + Switch_IP_Libraries ${type} ${GeoNameID} ${GeoNameID} ${GeoNameText} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div sleep 2 Should Be Equal As Strings ${GeoNameText} ${GeoNameID} #断言 @@ -1222,7 +1224,7 @@ Switch_Geographic_Locations sleep 2 click xpath=//*[@id="right_locationList"]/div[2]/div[1]/div[2]/div/div sleep 1 - click id=interceptionadd_allcancelobject + click id=interceptionadd_allcancelobject9 sleep 1 Ip_Range_Create [Arguments] ${j} ${ip} @@ -1243,80 +1245,43 @@ Ip_Range_Edit_Create \ input id=ip_input${i} ${ip}[${i}] \ sleep 1 sleep 1 -Switch_GeoName - [Arguments] ${GeoName} - sleep 2 - click id=clear_input_btm - sleep 1 - input id=one-input ${GeoName} - sleep 1 - click id=select_new_search_btn - sleep 1 - click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div - sleep 1 + Delete_IP_Libraries - [Arguments] ${GeoName} - Switch_GeoName ${GeoName} + click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1] sleep 2 click id=tagDel sleep 2 click xpath=/html/body/div/div/div[3]/button[2] sleep 2 -Switch_GeoName1 - [Arguments] ${GeoName} +Switch_IP_Libraries + [Arguments] ${type} ${value} ${GeoName} sleep 2 - click id=clear_input_btm + 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/input + sleep 2 + run keyword if "${type}"=="Geo Name" Run Keywords click xpath=/html/body/div/div[1]/div[1]/ul/li[2] + ... AND sleep 1 + ... AND input xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[1]/span/div/div/div[2]/div/div[1]/div[3]/div/input ${value} + run keyword if "${type}"=="Country and Region" Run Keywords click xpath=/html/body/div/div[1]/div[1]/ul/li[3] + ... AND sleep 1 + ... AND input xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[1]/span/div/div/div[2]/div/div[1]/div[3]/div/input ${value} + run keyword if "${type}"=="City" Run Keywords click xpath=/html/body/div/div[1]/div[1]/ul/li[4] + ... AND sleep 1 + ... AND input xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[1]/span/div/div/div[2]/div/div[1]/div[3]/div/input ${value} + run keyword if "${type}"=="Operator" Run Keywords click xpath=/html/body/div/div[1]/div[1]/ul/li[5] + ... AND sleep 1 + ... AND input xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[1]/span/div/div/div[2]/div/div[1]/div[3]/div/input ${value} + ... AND sleep 1 + ... AND click xpath=/html/body/div[2]/div[1]/div[1]/ul/li[1] sleep 1 - click id=one-input sleep 1 - click id=input_list_li1 + click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[1]/span/div/i sleep 1 - input id=sreach_input ${GeoName} sleep 1 - click id=select_new_search_btn - sleep 1 - click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div - sleep 1 - ${GeoNameText} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div + ${GeoNameText} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div sleep 2 Should Be Equal As Strings ${GeoNameText} ${GeoName} #断言 -Switch_Country - [Arguments] ${Country} - sleep 2 - click id=clear_input_btm - sleep 1 - click id=one-input - sleep 1 - click id=input_list_li2 - sleep 1 - input id=sreach_input ${Country} - sleep 1 - click id=select_new_search_btn - sleep 1 - click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div - sleep 1 - ${CountryText} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div - sleep 2 - Should Match ${CountryText} ${Country} #断言 -Switch_City - [Arguments] ${City} - sleep 2 - click id=clear_input_btm - sleep 1 - click id=one-input - sleep 1 - click id=input_list_li3 - sleep 1 - input id=sreach_input ${City} - sleep 1 - click id=select_new_search_btn - sleep 1 - click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div - sleep 1 - ${CCityText} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[4]/div/div/div - sleep 2 - Should Match ${CityText} ${City} #断言 + Pages [Arguments] Sleep 1