From 74ace4ce6dfced31fbe988a3c9f26acb9ff8fbb2 Mon Sep 17 00:00:00 2001 From: byb11 Date: Wed, 24 Feb 2021 18:28:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=A0=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=AF=BC=E8=87=B4=E6=B5=8B=E8=AF=95=E7=94=A8?= =?UTF-8?q?=E4=BE=8B=E6=89=A7=E8=A1=8C=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui_administration/AuditLogsCase.robot | 20 ++++--- .../LoginRestrictionsCase.robot | 7 +-- .../tsg_ui/ui_administration/RolesCase.robot | 55 +++++++++++-------- .../TrustedCertificateAuthoritiesCase.robot | 2 +- 02-Keyword/tsg_ui/setting/Settings.robot | 6 +- 5 files changed, 47 insertions(+), 43 deletions(-) diff --git a/01-TestCase/tsg_ui/ui_administration/AuditLogsCase.robot b/01-TestCase/tsg_ui/ui_administration/AuditLogsCase.robot index 5283d03..6a1a8bd 100644 --- a/01-TestCase/tsg_ui/ui_administration/AuditLogsCase.robot +++ b/01-TestCase/tsg_ui/ui_administration/AuditLogsCase.robot @@ -241,7 +241,7 @@ AuditLogsDPacketCapture EditPacketCapture PacketCaptureEditSearchID IPV6 fe80::3cf8:a41c:122a:b3bd UDP Karaganda 20 20 8080 fe80::3cf8:a41c:122a:b3 80 sleep 2 click element xpath=/html/body/div[1]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[2]/div/div[3]/table/tbody/tr/td[2]/div/div/div/span/i[2] - sleep 1 + Wait Until Element Is Enabled xpath=/html/body/div[last()]/p 20 click element xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1] DeletePacketCapture Wait Until Element Is Enabled xpath=/html/body/div[last()]/p 20 @@ -257,15 +257,16 @@ AuditLogsDPacketCapture AuditLogsIPLibraries [Tags] Positive UI IP Libraries Administration AuditLogs + ${a} evaluate random.randint(100000,999999) random ${iplist} create list 1.1.1.1-2.2.2.2 - CreateIpLibraries Geo Name City Algeria 548488 548452 ${iplist} Longitude=-1 Latitude=12.13 - EditIpLibraries Geo Name 548488 Longitude=-2 Latitude=12.13 + CreateIpLibraries Geo Name City Algeria ${a} ${a} ${iplist} Longitude=-1 Latitude=12.13 + EditIpLibraries Geo Name ${a} Longitude=-2 Latitude=12.13 DeleteIPLibraries Wait Until Element Is Enabled xpath=/html/body/div[last()]/p 20 AdminOpenPages sidebarsystem_PolicyConfigurationLog sidebarsystem_PolicyConfigurationLog - AuditLogsSearch 548488 IP Libraries + AuditLogsSearch ${a} IP Libraries Wait Until Element Is Enabled xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div 20 - Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div 548488 + Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div ${a} Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div IP Libraries Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[3]/td[2]/div/div Add Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[2]/td[2]/div/div Update @@ -294,12 +295,13 @@ AuditLogsRoles [Tags] Positive UI Roles Administration AuditLogs ${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 RolesEditName 自动化测试 ${list} + ${a} evaluate random.randint(10000,99990) random + CreateRoles RolesEditName${a} 自动化测试 ${list} Wait Until Element Is Enabled id=profilesTabs_Profile_Insert 20 - RoleSearch RolesEditName + RoleSearch RolesEditName${a} Click element xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr - EditRoles name=RolesEditName - RoleSearch RolesEditName + EditRoles name=EditRolesEditName${a} + RoleSearch EditRolesEditName${a} RolesDelete Wait Until Element Is Enabled xpath=/html/body/div[last()]/p 20 AdminOpenPages sidebarsystem_PolicyConfigurationLog sidebarsystem_PolicyConfigurationLog diff --git a/01-TestCase/tsg_ui/ui_administration/LoginRestrictionsCase.robot b/01-TestCase/tsg_ui/ui_administration/LoginRestrictionsCase.robot index 619a089..fb87b74 100644 --- a/01-TestCase/tsg_ui/ui_administration/LoginRestrictionsCase.robot +++ b/01-TestCase/tsg_ui/ui_administration/LoginRestrictionsCase.robot @@ -28,6 +28,7 @@ LoginRestrictionsNotWhitelistLogin LoginRestrictions-SearchIP 192.168.32.1/24 LoginRestrictions-DeleteIP Login ${username} ${password} + Wait Until Element Is Enabled xpath=/html/body/div[last()]/p 20 Assertion /html/body/div[last()]/p Unauthorized source IP. UpdataLoginRestrictionsSQLIP ${Whitelist} sleep 2 @@ -76,12 +77,6 @@ MaximumLoginAttemeptsMax EditMaximumLoginAttemepts 10 Wait Until Element Is Enabled xpath=/html/body/div[last()]/p 20 -MaximumLoginAttemeptsMinimum - [Tags] Boundary UI Administration Login Restrictions - AdminOpenPages sidebarLogin_Restrictions sidebarLogin_Restrictions - EditLockTime 1 - Wait Until Element Is Enabled xpath=/html/body/div[last()]/p 20 - MaximumLoginAttemeptsMax [Tags] Boundary UI Administration Login Restrictions AdminOpenPages sidebarLogin_Restrictions sidebarLogin_Restrictions diff --git a/01-TestCase/tsg_ui/ui_administration/RolesCase.robot b/01-TestCase/tsg_ui/ui_administration/RolesCase.robot index 8aafe24..6fa38f3 100644 --- a/01-TestCase/tsg_ui/ui_administration/RolesCase.robot +++ b/01-TestCase/tsg_ui/ui_administration/RolesCase.robot @@ -6,23 +6,25 @@ Resource ../../../03-Variable/bifangapivariable.txt *** Test Cases *** RolesCreateReadOnly - [Tags] Positive UI Administration Roles + [Tags] Positive UI Administration Roles + ${a} evaluate random.randint(1000,9999) random ${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 Uizidonghua 自动化测试 ${list} + CreateRoles Uizidonghua${a} 自动化测试 ${list} Wait Until Element Is Enabled id=profilesTabs_Profile_Insert 20 - RoleSearch Uizidonghua + RoleSearch Uizidonghua${a} RolesVerification //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/div[1]/div/div/ul/li[2]/div/i ReadOnly sleep 1 RolesDelete RolesCreateDisable [Tags] Positive UI Administration Roles + ${a} evaluate random.randint(1000,9999) random ${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 Uizidonghua 自动化测试 ${list} + CreateRoles Uizidonghua${a} 自动化测试 ${list} Wait Until Element Is Enabled id=profilesTabs_Profile_Insert 20 - RoleSearch Uizidonghua + RoleSearch Uizidonghua${a} RolesVerification //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/div[1]/div/div/ul/li[1]/div/i Disable RolesDelete @@ -30,38 +32,41 @@ RolesEditName [Tags] Positive 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 RolesEditName 自动化测试 ${list} + ${a} evaluate random.randint(1000,9999) random + CreateRoles RolesEditName${a} 自动化测试 ${list} Wait Until Element Is Enabled id=profilesTabs_Profile_Insert 20 - RoleSearch RolesEditName + RoleSearch RolesEditName${a} Click element xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr - EditRoles name=RolesEditName - RoleSearch RolesEditName - Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/span/span RolesEditName + EditRoles name=RolesEditName${a} + RoleSearch RolesEditName${a} + Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/span/span RolesEditName${a} RolesDelete RolesEditDescription [Tags] Positive UI Administration Roles + ${a} evaluate random.randint(1000,9999) random ${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 RolesEditDescription 自动化测试 ${list} + CreateRoles RolesEditDescription${a} 自动化测试 ${list} Wait Until Element Is Enabled id=profilesTabs_Profile_Insert 20 - RoleSearch RolesEditDescription + RoleSearch RolesEditDescription${a} Click element xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr EditRoles description=RolesEditName - RoleSearch RolesEditDescription + RoleSearch RolesEditDescription${a} Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div RolesEditName RolesDelete RolesEditAuthority [Tags] Positive UI Administration Roles + ${a} evaluate random.randint(1000,9999) random ${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 RolesEditAuthority 自动化测试 ${list} + CreateRoles RolesEditAuthority${a} 自动化测试 ${list} Wait Until Element Is Enabled id=profilesTabs_Profile_Insert 20 - RoleSearch RolesEditAuthority + RoleSearch RolesEditAuthority${a} Click element xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr EditRoles Authority=1 Authorityxpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[3]/div/div[2]/div/ul/li[4]/div/i - RoleSearch RolesEditAuthority + RoleSearch RolesEditAuthority${a} RolesVerification //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/div[1]/div/div/ul/li[4]/div/i Disable RolesDelete @@ -130,14 +135,15 @@ RolesDisable RolesReadOnly [Tags] Positive 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[2]/div/i - CreateRoles RolesReadOnly 自动化测试 ${list} + ${b} evaluate random.randint(1000,9999) random + CreateRoles RolesReadOnly${b} 自动化测试 ${list} Wait Until Element Is Enabled id=profilesTabs_Profile_Insert 20 ${a} evaluate random.randint(1000,9999) random - UserCreatePage 0000 ${a} 111111 log 30 log RolesReadOnly + UserCreatePage 0000 ${a} 111111 log 30 log RolesReadOnly${b} Login ${a} 111111 sleep 1 AdminOpenPages sidebarObjects_ip sidebarObjects_ip Amenu=children2 - Wait Until Element Is Enabled xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/span/span[1]/div/label/span[1]/span ${} + Wait Until Element Is Enabled xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/span/span[1]/div/label/span[1]/span 20 click element xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/span/span[1]/div/label/span[1]/span sleep 1 ${text1} Get Element Attribute id=objectCreate class @@ -149,7 +155,7 @@ RolesReadOnly sleep 1 Login ${username} ${password} AdminOpenPages sidebarsystem_accounts profilesTabs_Profile_Insert - RoleSearch RolesReadOnly + RoleSearch RolesReadOnly${b} RolesDelete RolesNotSettingsAuthority @@ -181,10 +187,11 @@ RolesNotSettingsAuthority RolesNotPolicies&ObjectsAuthority [Tags] Positive UI Administration Roles + ${b} evaluate random.randint(1000,9999) random ${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[2]/div/i - CreateRoles RolesNotPolicies&ObjectsAuthority 自动化测试 ${list} + CreateRoles RolesNotPolicies&ObjectsAuthority${b} 自动化测试 ${list} Wait Until Element Is Enabled id=profilesTabs_Profile_Insert 20 - RoleSearch RolesNotPolicies&ObjectsAuthority + RoleSearch RolesNotPolicies&ObjectsAuthority${b} click element xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr sleep 1 click element id=appEdit @@ -194,7 +201,7 @@ RolesNotPolicies&ObjectsAuthority 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 RolesNotPolicies&ObjectsAuthority + UserCreatePage 0000 ${a} 111111 log 30 log RolesNotPolicies&ObjectsAuthority${b} Login ${a} 111111 sleep 1 AdminOpenPages sidebarLog_SecurityEventLogs sidebarLog_SecurityEventLogs Amenu=children3 @@ -205,7 +212,7 @@ RolesNotPolicies&ObjectsAuthority sleep 2 Login ${username} ${password} AdminOpenPages sidebarsystem_accounts profilesTabs_Profile_Insert - RoleSearch RolesNotPolicies&ObjectsAuthority + RoleSearch RolesNotPolicies&ObjectsAuthority${b} RolesDelete RolesNotPoliciesAndSSLDecrptionExcelusionAndPolicyVerfyAndProxyTCPOptionAuthority diff --git a/01-TestCase/tsg_ui/ui_settings/TrustedCertificateAuthoritiesCase.robot b/01-TestCase/tsg_ui/ui_settings/TrustedCertificateAuthoritiesCase.robot index 4479eab..09d0d85 100644 --- a/01-TestCase/tsg_ui/ui_settings/TrustedCertificateAuthoritiesCase.robot +++ b/01-TestCase/tsg_ui/ui_settings/TrustedCertificateAuthoritiesCase.robot @@ -134,7 +134,7 @@ TrustedCertificateAuthoritiesCertificateExpirationDelay Settings-Search CertificateExpirationDelay name ${text} get text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[3]/td[6]/div/div/div/span Should Be Equal As Strings Expired ${text} - + TrustedCertificateAuthoritiesCreateNameMinSize [Tags] Boundary UI name Settings TrustedCertificateAuthorities importTrustedCertificateAuthorities test ${path}keyrings//root//ca-cer.pem name diff --git a/02-Keyword/tsg_ui/setting/Settings.robot b/02-Keyword/tsg_ui/setting/Settings.robot index b5b8216..9f8f44c 100644 --- a/02-Keyword/tsg_ui/setting/Settings.robot +++ b/02-Keyword/tsg_ui/setting/Settings.robot @@ -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 - Sleep 2 + Wait Until Element Is Enabled id=trafficMirrorAdd 20 ${text1} Get Text xpath=/html/body/div[last()]/p #获取点击后页面提示信息 Should Be Equal As Strings ${text1} ${PromptInformation} #断言 @@ -415,7 +415,7 @@ CreateTrafficMirrorProfiles input id=trafficmirror_addrArray0 ${shuru} sleep 2 click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[2]/button[1] #点击OK - Sleep 2 + Wait Until Element Is Enabled id=trafficMirrorAdd 20 Settings-Search ${name} ${search} #搜索框的关键字 Sleep 1 ${text1} Get Text xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span #获取点击后页面文本信息 @@ -609,7 +609,7 @@ EditTrafficMirrorProfiles input id=trafficmirror_addrArray0 ${shuju} #输入内容 sleep 1 click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[2]/button[1] #点击ok - Sleep 2 + Wait Until Element Is Enabled id=trafficMirrorAdd 20 run keyword if "${search}"=="id" run keywords sleep 1 ... AND Settings-Search ${id-name} ${search} #搜索框的关键字 ... ELSE IF "${search}"=="name" run keywords sleep 1