From e99188759990523370433eedbd58fdf7a7b9e328 Mon Sep 17 00:00:00 2001 From: byb11 Date: Mon, 1 Mar 2021 10:03:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B=EF=BC=8C=E5=B0=86=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84Name=E7=94=B1=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E5=80=BC=E6=94=B9=E4=B8=BA=E9=9A=8F=E6=9C=BA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui_administration/AuditLogsCase.robot | 3 +- .../tsg_ui/ui_administration/RolesCase.robot | 23 +++---- .../tsg_ui/ui_administration/UsersCase.robot | 12 ++-- .../ui_settings/DecryptionKeyringsCase.robot | 4 +- .../tsg_ui/ui_settings/IPLibrariesCase.robot | 62 +++++++++++-------- .../ui_settings/SSLFingerprintCase.robot | 53 +++++++++------- .../tsg_ui/ui_settings/VPNAccountsCase.robot | 19 +++--- .../administration/Administration.robot | 33 +++++++++- 02-Keyword/tsg_ui/setting/Settings.robot | 9 ++- 9 files changed, 139 insertions(+), 79 deletions(-) diff --git a/01-TestCase/tsg_ui/ui_administration/AuditLogsCase.robot b/01-TestCase/tsg_ui/ui_administration/AuditLogsCase.robot index 6a1a8bd..dcd1405 100644 --- a/01-TestCase/tsg_ui/ui_administration/AuditLogsCase.robot +++ b/01-TestCase/tsg_ui/ui_administration/AuditLogsCase.robot @@ -317,10 +317,9 @@ AuditLogsMailServer EditMailServer smtp.163.com 465 open test_name l1157517579@163.com XEYQVHEMTOBOJSAP open AdminOpenPages sidebarsystem_PolicyConfigurationLog sidebarsystem_PolicyConfigurationLog AuditLogsSearch 1 Mail Server - Wait Until Element Is Enabled xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div 1 Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div Mail Server - Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[4]/td[2]/div/div Update + Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span Update AuditLogsLDAPServer [Tags] Positive UI LDAP Server Administration AuditLogs diff --git a/01-TestCase/tsg_ui/ui_administration/RolesCase.robot b/01-TestCase/tsg_ui/ui_administration/RolesCase.robot index 6fa38f3..15955da 100644 --- a/01-TestCase/tsg_ui/ui_administration/RolesCase.robot +++ b/01-TestCase/tsg_ui/ui_administration/RolesCase.robot @@ -221,9 +221,10 @@ RolesNotPoliciesAndSSLDecrptionExcelusionAndPolicyVerfyAndProxyTCPOptionAuthorit ... //*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[3]/div/div[2]/div/ul/li[6]/ul/li[3]/ul/li[3]/div/i ... //*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[3]/div/div[2]/div/ul/li[6]/ul/li[4]/div/i ... //*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[3]/div/div[2]/div/ul/li[6]/ul/li[5]/div/i - CreateRoles ReferenceCountNotShow 自动化测试 ${list} + ${a} evaluate random.randint(1000,9999) random + CreateRoles ReferenceCountNotShow${a} 自动化测试 ${list} Wait Until Element Is Enabled id=profilesTabs_Profile_Insert 20 - RoleSearch ReferenceCountNotShow + RoleSearch ReferenceCountNotShow${a} click element xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr sleep 1 click element id=appEdit @@ -235,9 +236,9 @@ RolesNotPoliciesAndSSLDecrptionExcelusionAndPolicyVerfyAndProxyTCPOptionAuthorit sleep 1 click element id=rolesOk Wait Until Element Is Enabled id=app_create 20 - ${a} evaluate random.randint(1000,9999) random - UserCreatePage 0000 ${a} 111111 log 30 log ReferenceCountNotShow - Login ${a} 111111 + ${b} evaluate random.randint(1000,9999) random + UserCreatePage 0000 ${b} 111111 log 30 log ReferenceCountNotShow${a} + Login ${b} 111111 sleep 1 AdminOpenPages sidebarProxy_Profiles profilesTabs_Profile_ResponsePages Amenu=children6 click element xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[1]/span/div/div/div[2]/div/div/div[1]/input #点击搜索框 @@ -247,14 +248,13 @@ RolesNotPoliciesAndSSLDecrptionExcelusionAndPolicyVerfyAndProxyTCPOptionAuthorit sleep 1 click element xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[1]/span/div/i Wait Until Element Is Enabled id=quotefrequency 20 - click element id=quotefrequency - sleep 2 - ${text} Get Element Attribute xpath=//*[@id="profile_referenceCount1"]/div/div/div[3] class - Should Be Equal As Strings ${text} el-loading-mask + click element id=quotefrequency + sleep 3 + Page Should Not Contain byb-自动化测试勿动 #断言该元素未出现 Login ${username} ${password} sleep 2 AdminOpenPages sidebarsystem_accounts profilesTabs_Profile_Insert - RoleSearch ReferenceCountNotShow + RoleSearch ReferenceCountNotShow${a} RolesDelete RolesCreateNameMinSize @@ -271,7 +271,8 @@ RolesCreateNameMaxSize [Tags] Boundary UI Administration Roles ${list} Create list //*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[3]/div/div[2]/div/ul/li[1]/div/i ... //*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[3]/div/div[2]/div/ul/li[2]/div/i - CreateRoles RolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMax 自动化测试 ${list} + ${b} evaluate random.randint(1000,9999) random + CreateRoles RolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNam${b} 自动化测试 ${list} Wait Until Element Is Enabled id=profilesTabs_Profile_Insert 20 RoleSearch RolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMax Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/span/span RolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMax diff --git a/01-TestCase/tsg_ui/ui_administration/UsersCase.robot b/01-TestCase/tsg_ui/ui_administration/UsersCase.robot index 8f2f3e2..dd9a8ae 100644 --- a/01-TestCase/tsg_ui/ui_administration/UsersCase.robot +++ b/01-TestCase/tsg_ui/ui_administration/UsersCase.robot @@ -116,18 +116,16 @@ UsersCreatePasswordExpirationMax ${name} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[4]/div/div Should Be Equal As Strings ${name} 0000 -UsersCreateUserNameRepeat +UsersCreateUserNameRepeat [Tags] Negtive UI Administration Users - Menu administration Accounts - UserCreatePage UsersCreateUserNameRepeat byb 111111 log 30 log superuser + UserCreatePageErrorVerification UsersCreateUserNameRepeat byb 111111 log 30 log superuser sleep 1 ${text} get text xpath=/html/body/div[last()]/p Should Be Equal As Strings ${text} User already exists UsersCreatePasswordFormatError [Tags] Negtive UI Administration Users - Menu administration Accounts - UserCreatePage UsersCreateUserNameRepeat byb @#￥%……&*（*-++ log 30 log superuser + UserCreatePageErrorVerification UsersCreateUserNameRepeat byb @#￥%……&*（*-++ log 30 log superuser sleep 1 ${text1} get text xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[3]/div/div[2] ${text2} get text xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[4]/div/div[2] @@ -152,14 +150,14 @@ UsersCreatePasswordDifferent UsersCreatePasswordExpirationFormatError [Tags] Negtive UI Administration Users ${a} evaluate random.randint(1000,9999) random - UserCreatePage 0000 ${a} 111111 open 2147483648 log superuser + UserCreatePageErrorVerification 0000 ${a} 111111 open 2147483648 log superuser ${text} get text xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[6]/div/div[2] Should Be Equal As Strings ${text} Cannot be 0, exceed maximum 2147483647, and be empty UsersCreatePasswordExpirationIs0 [Tags] Negtive UI Administration Users ${a} evaluate random.randint(1000,9999) random - UserCreatePage 0000 ${a} 111111 open 0 log superuser + UserCreatePageErrorVerification 0000 ${a} 111111 open 0 log superuser ${text} get text xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[6]/div/div[2] Should Be Equal As Strings ${text} Cannot be 0, exceed maximum 2147483647, and be empty diff --git a/01-TestCase/tsg_ui/ui_settings/DecryptionKeyringsCase.robot b/01-TestCase/tsg_ui/ui_settings/DecryptionKeyringsCase.robot index 5e8ebc7..714533e 100644 --- a/01-TestCase/tsg_ui/ui_settings/DecryptionKeyringsCase.robot +++ b/01-TestCase/tsg_ui/ui_settings/DecryptionKeyringsCase.robot @@ -158,8 +158,8 @@ DecryptionKeyringsAllSearch ${id} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div/p/span OpenPages sidebarProxy_CertificateManagement //*[@id="proxyTabs"]/div/ul/li[2] xpath DecryptionKeyringsSearch ${id} ${TEST NAME} - Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div/p/span ${id} - Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span ${TEST NAME} + SettingsAssertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div/p/span ${id} + SettingsAssertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span ${TEST NAME} click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span DeleteKeyrings_del diff --git a/01-TestCase/tsg_ui/ui_settings/IPLibrariesCase.robot b/01-TestCase/tsg_ui/ui_settings/IPLibrariesCase.robot index 48c7eac..848cac7 100644 --- a/01-TestCase/tsg_ui/ui_settings/IPLibrariesCase.robot +++ b/01-TestCase/tsg_ui/ui_settings/IPLibrariesCase.robot @@ -7,77 +7,84 @@ Library OperatingSystem IPLibrariesCreateCountry [Tags] Positive UI Settings IPLibraries ${iplist} create list 10.1.1.1-20.1.1.1 20.1.1.1-30.1.1.1 - CreateIpLibraries Geo Name Country Africa 115111 L1111 ${iplist} j=2 Country=L1 Longitude=1 Latitude=2 + ${a}= RandomNumber + CreateIpLibraries Geo Name Country Africa ${a} ${a} ${iplist} j=2 Country=${a} Longitude=1 Latitude=2 DeleteIPLibraries IPLibrariesCreateCity [Tags] Positive UI Settings IPLibraries + ${a}= RandomNumber ${iplist} create list 240e:370:7000::-240e:370:73ff:ffff:ffff:ffff:ffff:ffff - CreateIpLibraries Geo Name City 1 548451 548451 ${iplist} Longitude=-1 Latitude=12.13 + CreateIpLibraries Geo Name City 1 ${a} ${a} ${iplist} Longitude=-1 Latitude=12.13 DeleteIPLibraries IPLibrariesCreateIPV6 [Tags] Positive UI Settings IPLibraries ${iplist} create list 1.1.1.1-2.2.2.2 - CreateIpLibraries Geo Name City 1 2281 2281 ${iplist} Longitude=-1 Latitude=12.13 + ${a}= RandomNumber + CreateIpLibraries Geo Name City 1 ${a} ${a} ${iplist} Longitude=-1 Latitude=12.13 DeleteIPLibraries IPLibrariesEditCity [Tags] Positive UI Settings IPLibraries ${iplist} create list 1.1.1.1-2.2.2.2 - #新建国家 - CreateIpLibraries Geo Name City Algeria 548452 548452 ${iplist} Longitude=-1 Latitude=12.13 - EditIpLibraries Geo Name 548452 Longitude=-2 Latitude=12.13 + ${a}= RandomNumber + CreateIpLibraries Geo Name City Algeria ${a} ${a} ${iplist} Longitude=-1 Latitude=12.13 + EditIpLibraries Geo Name ${a} Longitude=-2 Latitude=12.13 DeleteIPLibraries IPLibrariesEditCountry [Tags] Positive UI Settings IPLibraries ${iplist} create list 1.1.1.1-2.2.2.2 - #新建国家 - CreateIpLibraries Geo Name Country Africa 548454 548454 ${iplist} Country=5845214 Longitude=-1 Latitude=12.13 + ${a}= RandomNumber + CreateIpLibraries Geo Name Country Africa ${a} ${a} ${iplist} Country=${a} Longitude=-1 Latitude=12.13 EditIpLibraries Geo Name 548454 Longitude=-2 Latitude=12.13 DeleteIPLibraries IPLibrariesSearchGeoName [Tags] Positive UI Settings IPLibraries ${iplist} create list 10.1.1.1-20.1.1.1 20.1.1.1-30.1.1.1 - CreateIpLibraries Geo Name Country Africa 548455 548455 ${iplist} j=2 Country=L1 Longitude=1 Latitude=2 + ${a}= RandomNumber + CreateIpLibraries Geo Name Country Africa ${a} ${a} ${iplist} j=2 Country=L${a} Longitude=1 Latitude=2 OpenPages sidebarAdvanced Advanced/ipLibrary - Settings-Search 548455 GeoName + Settings-Search ${a} GeoName sleep 1 ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div - Should Be Equal As Strings ${text} 548455 + Should Be Equal As Strings ${text} ${a} click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr DeleteIPLibraries IPLibrariesSearchCountryandRegion [Tags] Positive UI Settings IPLibraries ${iplist} create list 10.1.1.1-20.1.1.1 20.1.1.1-30.1.1.1 - CreateIpLibraries Geo Name Country Africa 548456 548456 ${iplist} j=2 Country=548456 Longitude=1 Latitude=2 + ${a}= RandomNumber + CreateIpLibraries Geo Name Country Africa ${a} ${a} ${iplist} j=2 Country=${a} Longitude=1 Latitude=2 OpenPages sidebarAdvanced Advanced/ipLibrary - Settings-Search 548456 CountryandRegion + Settings-Search ${a} CountryandRegion sleep 1 ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div - Should Be Equal As Strings ${text} 548456 + Should Be Equal As Strings ${text} ${a} click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr DeleteIPLibraries IPLibrariesSearchCity [Tags] Positive UI Settings IPLibraries ${iplist} create list 10.1.1.1-20.1.1.1 20.1.1.1-30.1.1.1 - CreateIpLibraries Geo Name Country Africa 548457 548457 ${iplist} j=2 Country=548457 Longitude=1 Latitude=2 + ${a}= RandomNumber + CreateIpLibraries Geo Name Country Africa ${a} ${a} ${iplist} j=2 Country=${a} Longitude=1 Latitude=2 OpenPages sidebarAdvanced Advanced/ipLibrary - Settings-Search 548457 City + Settings-Search ${a} City sleep 1 ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[4]/div/div/div - Should Be Equal As Strings ${text} 548457 + Should Be Equal As Strings ${text} ${a} click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr DeleteIPLibraries IPLibrariesClickAll [Tags] Positive UI Settings IPLibraries ${iplist} create list 10.1.1.1-20.1.1.1 20.1.1.1-30.1.1.1 - CreateIpLibraries Geo Name Country Africa 548461 548461 ${iplist} j=2 Country=548461 Longitude=180 Latitude=90 + ${a}= RandomNumber + CreateIpLibraries Geo Name Country Africa ${a} ${a} ${iplist} j=2 Country=${a} Longitude=180 Latitude=90 OpenPages sidebarAdvanced Advanced/ipLibrary click xpath=//*[@id="IPLibraryAll0"]/span sleep 1 @@ -88,26 +95,27 @@ IPLibrariesClickAll OpenPages sidebarAdvanced Advanced/ipLibrary click xpath=//*[@id="IPLibraryAll0"]/span sleep 1 - Settings-Search 548461 GeoName + Settings-Search ${a} GeoName sleep 1 ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div - Should Be Equal As Strings ${text} 548461 + Should Be Equal As Strings ${text} ${a} click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr DeleteIPLibraries - + IPLibrariesClickBuilt-in [Tags] Positive UI Settings IPLibraries ${iplist} create list 10.1.1.1-20.1.1.1 20.1.1.1-30.1.1.1 - CreateIpLibraries Geo Name Country Africa 548462 548462 ${iplist} j=2 Country=L1 Longitude=180 Latitude=90 + ${a}= RandomNumber + CreateIpLibraries Geo Name Country Africa ${a} ${a} ${iplist} j=2 Country=${a} Longitude=180 Latitude=90 OpenPages sidebarAdvanced Advanced/ipLibrary click xpath=//*[@id="IPLibraryAll1"]/span sleep 1 - Settings-Search 548462 GeoName + Settings-Search ${a} GeoName sleep 1 ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/div/span Should Be Equal As Strings ${text} No Data OpenPages sidebarAdvanced Advanced/ipLibrary - Settings-Search 548462 GeoName + Settings-Search ${a} GeoName sleep 1 click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr DeleteIPLibraries @@ -125,7 +133,8 @@ IPLibrariesClickImported IPLibrariesSearchIP [Tags] Positive UI Settings IPLibraries ${iplist} create list 20.1.1.1-30.1.1.1 1.1.1.1-2.2.2.2 - CreateIpLibraries Geo Name Country Africa 548463 548463 ${iplist} j=2 Country=L1 Longitude=180 Latitude=90 + ${a}= RandomNumber + CreateIpLibraries Geo Name Country Africa ${a} ${a} ${iplist} j=2 Country=${a} Longitude=180 Latitude=90 click id=tagEdit sleep 2 input id=IPseach 1.1.1.1 @@ -135,7 +144,7 @@ IPLibrariesSearchIP ${text} get text xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[3]/form/div[3]/div/div[2]/div[2]/ul/li/div/form/div/div/div Should Be Equal As Strings ${text} 1.1.1.1-2.2.2.2 OpenPages sidebarAdvanced Advanced/ipLibrary - Settings-Search 548463 GeoName + Settings-Search ${a} GeoName sleep 1 click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr DeleteIPLibraries @@ -154,6 +163,7 @@ IPLibrariesPagingDisplay IPLibrariesCreateGeoNameIDMaxSize [Tags] Boundary UI Settings IPLibraries ${iplist} create list 10.1.1.1-20.1.1.1 20.1.1.1-30.1.1.1 + ${a}= RandomNumber CreateIpLibraries Geo Name Country Africa 2147483647 548458 ${iplist} j=2 Country=548458 Longitude=1 Latitude=2 DeleteIPLibraries diff --git a/01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot b/01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot index ce8c621..07062b2 100644 --- a/01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot +++ b/01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot @@ -7,33 +7,38 @@ Library OperatingSystem *** Test Cases *** SSLFingerprintCreatePinning [Tags] Positive UI Pinning Settings SSLFingerprint - CreateSSLFingerprint aaaaaa4db3e351bbd8d38b64c41fffff Yes JA3Hash Description=test + ${a}= RandomNumber + CreateSSLFingerprint aaa${a}db3e351bbd8d38b64c41fffff Yes JA3Hash Description=test click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr DeleteSSLFingerprint SSLFingerprintCreateNotPinning [Tags] Positive UI NotPinning Settings SSLFingerprint - CreateSSLFingerprint bbbbbb4db3e351bbd8d38b64c41aaaaa No JA3Hash Description=test + ${a}= RandomNumber + CreateSSLFingerprint bbbb${a}b3e351bbd8d38b64c41aaaaa No JA3Hash Description=test click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr DeleteSSLFingerprint SSLFingerprintEditPingningSearchID [Tags] Positive UI Pinning Settings SSLFingerprint - CreateSSLFingerprint cccccc4db3e351bbd8d38b64c41fffff Yes JA3Hash Description=test + ${a}= RandomNumber + CreateSSLFingerprint cccc${a}b3e351bbd8d38b64c41fffff Yes JA3Hash Description=test ${ID} Get Text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div/div/span - EditSSLFingerprint ${ID} a75de44db3e351bbd8d3ffffffffffff No id Description=test1111 + EditSSLFingerprint ${ID} a75de44${a}351bbd8d3ffffffffffff No id Description=test1111 click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr DeleteSSLFingerprint SSLFingerprintEditNotPingningSearchJA3Hash [Tags] Positive UI Pinning Settings SSLFingerprint - CreateSSLFingerprint dddddd4db3e351bbd8d38b64c41fffff No JA3Hash Description=test - EditSSLFingerprint dddddd4db3e351bbd8d38b64c41fffff a75de44db3e351bbd8d3ffffffffffff Yes JA3Hash Description=test1111 + ${a}= RandomNumber + CreateSSLFingerprint dddddd${a}e351bbd8d38b64c41fffff No JA3Hash Description=test + EditSSLFingerprint dddddd${a}e351bbd8d38b64c41fffff a75${a}db3e351bbd8d3ffffffffffff Yes JA3Hash Description=test1111 click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr DeleteSSLFingerprint SSLFingerprintImportUserAgent [Tags] Positive UI UserAgent Settings SSLFingerprint + ${a}= RandomNumber CreateSSLFingerprint 599f223c2c9ee5702f5762913889dc21 No JA3Hash Description=test ${ID} Get Text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/div/span SSLFingerprintImportUserAgent ${ID} ${path}SSLFingerprint_files/UserAgent.json 1 771,49162-49161-52393-49200-49199-49172-49171-52392,0-13-5-11-43-10,23-24,0 @@ -79,49 +84,53 @@ SSLFingerprintDownloadExample SSLFingerprintShowAll [Tags] Positive UI Settings SSLFingerprint - CreateSSLFingerprint bfff09a26951912be7dba376398abc3b No JA3Hash Description=test - CreateSSLFingerprint b32309a26951912be7dba376398abfff Yes JA3Hash Description=test + ${a}= RandomNumber + ${b}= RandomNumber + CreateSSLFingerprint bfff09a${a}1912be7dba376398abc3b No JA3Hash Description=test + CreateSSLFingerprint b32309a2${b}912be7dba376398abfff Yes JA3Hash Description=test OpenPages sidebarProxy_CertificateManagement //*[@id="proxyTabs"]/div/ul/li[5] Targeting=xpath click id=Fingerprint_built0 sleep 1 - Settings-Search bfff09a26951912be7dba376398abc3b JA3Hash + Settings-Search bfff09a${a}1912be7dba376398abc3b JA3Hash ${text} Get Text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/div/span/div[2]/span click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr DeleteSSLFingerprint sleep 1 OpenPages sidebarProxy_CertificateManagement //*[@id="proxyTabs"]/div/ul/li[5] Targeting=xpath - Settings-Search b32309a26951912be7dba376398abfff JA3Hash + Settings-Search b32309a2${b}912be7dba376398abfff JA3Hash ${text1} Get Text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/div/span/div[2]/span click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr DeleteSSLFingerprint - Should Be Equal As Strings ${text} bfff09a26951912be7dba376398abc3b - Should Be Equal As Strings ${text1} b32309a26951912be7dba376398abfff + Should Be Equal As Strings ${text} bfff09a${a}1912be7dba376398abc3b + Should Be Equal As Strings ${text1} b32309a2${b}912be7dba376398abfff SSLFingerprintShowPinning - [Tags] Positive UI Settings SSLFingerprint - CreateSSLFingerprint bfff09a26951912be7dba376398abc3b No JA3Hash Description=test + [Tags] Positive UI Settings SSLFingerprint + ${a}= RandomNumber + CreateSSLFingerprint bfff09a26${a}12be7dba376398abc3b No JA3Hash Description=test OpenPages sidebarProxy_CertificateManagement //*[@id="proxyTabs"]/div/ul/li[5] Targeting=xpath click id=Fingerprint_built1 sleep 1 - Settings-Search bfff09a26951912be7dba376398abc3b JA3Hash + Settings-Search bfff09a26${a}12be7dba376398abc3b JA3Hash ${text} Get Text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/div/span OpenPages sidebarProxy_CertificateManagement //*[@id="proxyTabs"]/div/ul/li[5] Targeting=xpath - Settings-Search bfff09a26951912be7dba376398abc3b JA3Hash + Settings-Search bfff09a26${a}12be7dba376398abc3b JA3Hash sleep 1 click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr DeleteSSLFingerprint Should Be Equal As Strings ${text} No Data SSLFingerprintShowNotPinning - [Tags] Positive UI Settings SSLFingerprint - CreateSSLFingerprint bfff09a26951912be7dba376398abc3b Yes JA3Hash Description=test + [Tags] Positive UI Settings SSLFingerprint + ${a}= RandomNumber + CreateSSLFingerprint bfff09a2695${a}be7dba376398abc3b Yes JA3Hash Description=test OpenPages sidebarProxy_CertificateManagement //*[@id="proxyTabs"]/div/ul/li[5] Targeting=xpath click id=Fingerprint_built2 sleep 1 - Settings-Search bfff09a26951912be7dba376398abc3b JA3Hash + Settings-Search bfff09a2695${a}be7dba376398abc3b JA3Hash ${text} Get Text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/div/span OpenPages sidebarProxy_CertificateManagement //*[@id="proxyTabs"]/div/ul/li[5] Targeting=xpath - Settings-Search bfff09a26951912be7dba376398abc3b JA3Hash + Settings-Search bfff09a2695${a}be7dba376398abc3b JA3Hash sleep 1 click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr DeleteSSLFingerprint @@ -140,7 +149,8 @@ SSLFingerprintCreateJa3NotCombined SSLFingerprintCreateNullDescription [Tags] Boundary UI JA3Hash Settings SSLFingerprint - CreateSSLFingerprint a75de44db3e351bbd8d38b64c41fffff No JA3Hash + ${a}= RandomNumber + CreateSSLFingerprint a75de44db3e351bb${a}8b64c41fffff No JA3Hash click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr DeleteSSLFingerprint @@ -206,6 +216,7 @@ SSLFingerprintImportLackLast_seen SSLFingerprintImportRepeatJA3 [Tags] Negtive UI Settings SSLFingerprint + ${a}= RandomNumber CreateSSLFingerprint d8c87baaaaaaaaaaaa9e41242626c2f3 Yes JA3Hash Description=test SSLFingerprintImportJA3 ${path}SSLFingerprint_files/InportSSLFingerprint.csv ${text} Get Text xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[1]/div[2]/div[2]/div/div[1]/div/div/div[1]/div/div[2]/div[2]/div[1]/div[3]/table/tbody/tr/td[3]/div diff --git a/01-TestCase/tsg_ui/ui_settings/VPNAccountsCase.robot b/01-TestCase/tsg_ui/ui_settings/VPNAccountsCase.robot index 7aa825f..c8b4cb5 100644 --- a/01-TestCase/tsg_ui/ui_settings/VPNAccountsCase.robot +++ b/01-TestCase/tsg_ui/ui_settings/VPNAccountsCase.robot @@ -7,13 +7,15 @@ Library OperatingSystem *** Test Cases *** VPNAccountsCreate [Tags] Positive UI Settings VPNAccounts - CreateVPNAccounts VPNAccountsCreate_-. 111111 name + ${a}= RandomNumber + CreateVPNAccounts VPNAccountsCreate${a} 111111 name VPNAccountsDelete VPNAccountsEditPassword [Tags] Positive UI Password Settings VPNAccounts - CreateVPNAccounts EditVPNAccountsName-01 111111 name - EditVPNAccounts EditVPNAccountsName-01 222222 name + ${a}= RandomNumber + CreateVPNAccounts EditVPNAccountsName${a} 111111 name + EditVPNAccounts EditVPNAccountsName${a} 222222 name VPNAccountsDelete VPNAccountsTurnPages @@ -29,22 +31,25 @@ VPNAccountsPagingDisplay VPNAccountsCreateNameMinSize [Tags] Boundary UI name Settings VPNAccounts - CreateVPNAccounts 1 111111 name + CreateVPNAccounts a 111111 name VPNAccountsDelete VPNAccountsCreateNameMaxSize [Tags] Boundary UI name Settings VPNAccounts - CreateVPNAccounts VPNAccountsCreateNameMaxSizeVPNAccountsCreateNameMaxSizeCreateVP 111111 name + ${a}= RandomNumber + CreateVPNAccounts VPNAccountsCreateNameMaxSizeVPNAccountsCreateNameMaxSizeCrea${a} 111111 name VPNAccountsDelete VPNAccountsCreatePasswordMinSize [Tags] Boundary UI Password Settings VPNAccounts - CreateVPNAccounts VPNAccountsCreatePasswordMinSize 1 name + ${a}= RandomNumber + CreateVPNAccounts VPNAccountsCreatePasswordMin${a} 1 name VPNAccountsDelete VPNAccountsCreatePasswordMaxSize [Tags] Boundary UI Password Settings VPNAccounts - CreateVPNAccounts VPNAccountsCreateNameMaxSizeVPNAccountsCreateNameMaxSizeCreateVP aaaaaaaa11111111 name + ${a}= RandomNumber + CreateVPNAccounts VPNAccounts${a} aaaaaaaa11111111 name VPNAccountsDelete VPNAccountsCreateNameSpecialChar diff --git a/02-Keyword/tsg_ui/administration/Administration.robot b/02-Keyword/tsg_ui/administration/Administration.robot index a3161fc..2d0e094 100644 --- a/02-Keyword/tsg_ui/administration/Administration.robot +++ b/02-Keyword/tsg_ui/administration/Administration.robot @@ -56,6 +56,37 @@ UserCreatePage click button xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[2]/button[1] Wait Until Element Is Enabled id=profilesTabs_Profile_ResponsePages 20 +UserCreatePageErrorVerification + [Arguments] ${name} ${username} ${accPasswd} ${Required_Password_Change} ${day} ${accEnable} ${role} + Menu administration Accounts + Wait Until Element Is Enabled id=userAdd 10 + Click element id=userAdd + sleep 2 + input text xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[1]/div/div[1]/input ${name} + sleep 1 + input text xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[2]/div/div[1]/input ${username} + sleep 1 + input text xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[3]/div/div/input ${accPasswd} + sleep 1 + input text xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[4]/div/div/input ${accPasswd} + sleep 1 + run keyword if "${accEnable}"=="close" run keywords click element xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[6]/div/div + ... AND sleep 1 + ... ELSE log 不操作 + sleep 1 + run keyword if "${Required_Password_Change}"=="open" Run Keywords click element xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[5]/div/div + ... AND sleep 1 + ... AND input text xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[6]/div/div/input ${day} + ... ELSE log 不开启密码过期验证 + Click element xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[last()]/div/div/div/span/span/i + sleep 1 + Execute Javascript window.scrollTo(0, document.body.scrollHeight) + sleep 1 + click element //span[.="${role}"] + sleep 1 + click button xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[2]/button[1] + sleep 2 + UserEdit [Arguments] ${password} ${enable} Sleep 2 @@ -430,7 +461,7 @@ OpenMyAccountPage [Documentation] 打开MyAccount侧滑框 sleep 1 Mouse Hover xpath=//*[@id="app"]/div/div[1]/div[2]/div/span/div/span - sleep 1 + Wait Until Element Is Enabled id=editInfo 20 click element id=editInfo sleep 2 diff --git a/02-Keyword/tsg_ui/setting/Settings.robot b/02-Keyword/tsg_ui/setting/Settings.robot index 9f8f44c..a7035e5 100644 --- a/02-Keyword/tsg_ui/setting/Settings.robot +++ b/02-Keyword/tsg_ui/setting/Settings.robot @@ -141,7 +141,7 @@ EditSNATIPPools run keyword if "${type}"=="null" log 不做更改 sleep 1 click id=wanAdd_ok #点击ok - Wait Until Element Is Visible id=app_create 20 + Wait Until Element Is Enabled id=app_create 20 ${status} Run Keyword And Return Status Page Should Contain Go to #判断页面是否包含该文本 Should Be Equal As Strings ${status} True #断言 @@ -391,7 +391,7 @@ TrafficMirrorProfilesValidationError input id=trafficmirror_addrArray0 ${shuru} sleep 2 click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[2]/button[1] #点击OK - Wait Until Element Is Enabled id=trafficMirrorAdd 20 + sleep 2 ${text1} Get Text xpath=/html/body/div[last()]/p #获取点击后页面提示信息 Should Be Equal As Strings ${text1} ${PromptInformation} #断言 @@ -2615,6 +2615,11 @@ SortButton ${text3} get text xpath=${assert} Should Not Be Equal ${text1} ${text2} Should Not Be Equal ${text2} ${text3} + +RandomNumber + [Documentation] 生成随机数 + ${a} evaluate random.randint(1000,9999) random + [RETURN] ${a}