调整Ui自动化代码

4 files changed, 7 insertions, 18 deletions

diff --git a/01-TestCase/tsg_ui/ui_administration/AuditLogsCase.robot b/01-TestCase/tsg_ui/ui_administration/AuditLogsCase.robot
index 9a86fff..219a9cd 100644
--- a/01-TestCase/tsg_ui/ui_administration/AuditLogsCase.robot
+++ b/01-TestCase/tsg_ui/ui_administration/AuditLogsCase.robot
@@ -13,7 +13,6 @@ AuditLogsResponsePage
     Edit-Response-Pages    ${id}    EditAuditLogsResponsePage    ${path}response_pages_files\\Create-ResponsePages-test-1.html    id
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/span
     DeleteresinseDel
-    Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    ${sleep_Wait}
     AdminOpenPages    sidebarsystem_PolicyConfigurationLog    sidebarsystem_PolicyConfigurationLog
     AuditLogsSearch    ${id}    Response Page
     Wait Until Element Is Enabled    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div    ${sleep_Wait}
@@ -30,7 +29,6 @@ AuditLogsInsertScript
     EditInsertScripts    ${id}    EditAuditLogsInsertScript    ${path}insert_files\\Create-Insert Scripts-test.css    css    id
     click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[2]/div/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
     Delete
-    Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    ${sleep_Wait}
     AdminOpenPages    sidebarsystem_PolicyConfigurationLog    sidebarsystem_PolicyConfigurationLog
     AuditLogsSearch    ${id}    Insert Script
     Wait Until Element Is Enabled    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div    ${sleep_Wait}
@@ -47,7 +45,6 @@ AuditLogsHijackFile
     EditHijackFiles    ${id}    EditAuditLogsHijackFile    ${path}hijack_files\\Create-Hijack Files-test.apk    id=application/vnd.android.package-archive0    id
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/span
     DeletehijackDel
-    Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    ${sleep_Wait}
     AdminOpenPages    sidebarsystem_PolicyConfigurationLog    sidebarsystem_PolicyConfigurationLog
     AuditLogsSearch    ${id}    Hijack File
     Wait Until Element Is Enabled    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div    ${sleep_Wait}
@@ -89,7 +86,6 @@ AuditLogsDecryptionProfile
     EditDecryptionProfile    ${id}    EditAuditLogsDecryptionProfile    id    ${dict1}
     click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[2]/div/div/div[2]/div/div[3]/table/tbody/tr/td[2]/div/div/span
     Delete
-    Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    ${sleep_Wait}
     AdminOpenPages    sidebarsystem_PolicyConfigurationLog    sidebarsystem_PolicyConfigurationLog
     AuditLogsSearch    ${id}    Decryption Profile
     Wait Until Element Is Enabled    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div    ${sleep_Wait}
@@ -106,7 +102,6 @@ AuditLogsSNATIPPools
     ${id}    get text    xpath=//*[@id="wannat-table"]/div[3]/table/tbody/tr[1]/td[1]/div/div/span    
     EditSNATIPPools    SNAT_IP_Pools_Create-001    Name    EditSNATIPPoolsSName    null
     SNATIPDelete    EditSNATIPPoolsSName    Name
-    Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    ${sleep_Wait}
     AdminOpenPages    sidebarsystem_PolicyConfigurationLog    sidebarsystem_PolicyConfigurationLog
     AuditLogsSearch    ${id}    SNAT IP Pools
     Wait Until Element Is Enabled    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div    ${sleep_Wait}
@@ -122,7 +117,6 @@ AuditLogsVPNAccounts
     CreateVPNAccounts    ${TEST NAME}${a}    111111    name
     EditVPNAccounts    ${TEST NAME}${a}    222222    name
     VPNAccountsDelete
-    Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    ${sleep_Wait}
     AdminOpenPages    sidebarsystem_PolicyConfigurationLog    sidebarsystem_PolicyConfigurationLog
     AuditLogsSearch-NotID    VPN Accounts
     Wait Until Element Is Enabled    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div    ${sleep_Wait}
@@ -139,7 +133,6 @@ AuditLogsTrustedCertificateAuthorities
     Wait Until Element Is Visible    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span    ${sleep_Wait}
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span
     DeleteAuthorities_del
-    Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    ${sleep_Wait}
     AdminOpenPages    sidebarsystem_PolicyConfigurationLog    sidebarsystem_PolicyConfigurationLog
     AuditLogsSearch    ${id}    Trusted Certificate Authorities
     Wait Until Element Is Enabled    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div    ${sleep_Wait}
@@ -157,7 +150,6 @@ AuditLogsDecryptionKeyrings
     ...    id=certificateType_select0    id=keyringsadd_publicKeyAlgoSelet1    id
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span
     DeleteKeyrings_del
-    Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    ${sleep_Wait}
     AdminOpenPages    sidebarsystem_PolicyConfigurationLog    sidebarsystem_PolicyConfigurationLog
     AuditLogsSearch    ${id}    Decryption Keyrings
     Wait Until Element Is Enabled    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div    ${sleep_Wait}
@@ -247,7 +239,6 @@ AuditLogsDPacketCapture
     Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    ${sleep_Wait}             
     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    ${sleep_Wait}
     AdminOpenPages    sidebarsystem_PolicyConfigurationLog    sidebarsystem_PolicyConfigurationLog
     AuditLogsSearch    ${id}    Packet Capture
     Wait Until Element Is Enabled    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div    ${sleep_Wait}
@@ -265,7 +256,6 @@ AuditLogsIPLibraries
     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=//*[@id="app"]/following-sibling::div/p    ${sleep_Wait}
     AdminOpenPages    sidebarsystem_PolicyConfigurationLog    sidebarsystem_PolicyConfigurationLog
     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    ${sleep_Wait}
@@ -306,7 +296,6 @@ AuditLogsRoles
     EditRoles    name=EditRolesEditName${a}
     RoleSearch    EditRolesEditName${a}
     RolesDelete
-    Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    ${sleep_Wait}
     AdminOpenPages    sidebarsystem_PolicyConfigurationLog    sidebarsystem_PolicyConfigurationLog
     AuditLogsSearch-NotID    Roles
     Wait Until Element Is Enabled    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div    ${sleep_Wait}
@@ -337,7 +326,6 @@ AuditLogsLDAPServer
     sleep    ${sleep_min}
     click element    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/span/div/i
     DeleteLDAPServer
-    Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    ${sleep_Wait}
     AdminOpenPages    sidebarsystem_PolicyConfigurationLog    sidebarsystem_PolicyConfigurationLog
     AuditLogsSearch    ${id}    LDAP Server
     Wait Until Element Is Enabled    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div    ${sleep_Wait}
diff --git a/01-TestCase/tsg_ui/ui_administration/MyAccountCase.robot b/01-TestCase/tsg_ui/ui_administration/MyAccountCase.robot
index 1e96062..ca4937e 100644
--- a/01-TestCase/tsg_ui/ui_administration/MyAccountCase.robot
+++ b/01-TestCase/tsg_ui/ui_administration/MyAccountCase.robot
@@ -70,8 +70,8 @@ MyAccountPasswordNotModified
     [Tags]    Negtive    UI    Administration    My Account
     OpenMyAccountPage
     EditMyAccount    ${username}    ${password}    ${password}
-    Wait Until Element Is Enabled    xpath=//*[@id="app"]/following-sibling::div/p    ${sleep_Wait}
-    Assertion    //*[@id="app"]/following-sibling::div/p    The password setting cannot be the same as the previous one.
+    Wait Until Page Contains Element    xpath=//*[@id="app"]/following-sibling::div/p    ${sleep_Wait}
+    Assertion    /html/body/div[last()]/p    The password setting cannot be the same as the previous one.
     
 MyAccountTwoPasswordsAreInconsistent
     [Tags]    Negtive    UI    Administration    My Account
diff --git a/02-Keyword/tsg_ui/administration/Administration.robot b/02-Keyword/tsg_ui/administration/Administration.robot
index b64eba5..21d4d41 100644
--- a/02-Keyword/tsg_ui/administration/Administration.robot
+++ b/02-Keyword/tsg_ui/administration/Administration.robot
@@ -201,7 +201,7 @@ RolesDelete
     Click element    id=appDel

     sleep    ${sleep_min}

     Click element    xpath=/html/body/div/div/div[3]/button[2]

-    sleep    ${sleep_min}

+    sleep    ${sleep}

     

 AuditLogsSearch

     [Arguments]    ${id}    ${TargetType}    ${ip}=null

@@ -460,6 +460,8 @@ EditLockTime
 OpenMyAccountPage

     [Documentation]    打开MyAccount侧滑框

     sleep    ${sleep_min}

+    click element    id=children0

+    sleep    ${sleep_min}    

     Mouse Hover    xpath=//*[@id="app"]/div/div[1]/div[2]/div/span/div/span

     Wait Until Element Is Enabled    id=editInfo    ${sleep_Wait}

     click element    id=editInfo

@@ -486,7 +488,7 @@ EditMyAccount
     ...    ELSE    log    不修改密码提醒按钮

     sleep    ${sleep_min}

     click element    id=userOk

-    sleep    ${sleep}

+    sleep    ${sleep_min}

     

 

 LoginRestrictionsObtainSQLIP

diff --git a/02-Keyword/tsg_ui/setting/Settings.robot b/02-Keyword/tsg_ui/setting/Settings.robot
index 91808a1..2d95e4b 100644
--- a/02-Keyword/tsg_ui/setting/Settings.robot
+++ b/02-Keyword/tsg_ui/setting/Settings.robot
@@ -765,8 +765,7 @@ DecryptionKeyringsErrorVerification
     click    ${type1}    #选择加密解密类型
     sleep    ${sleep_min}
     click    id=keyringsadd_sub    #点击OK缇交
-    Wait Until Page Contains Element    xpath=${Positioning}    ${sleep_Wait}
-    sleep    ${sleep}
+    sleep    ${sleep_min}
     ${text1}    Get Text    xpath=${Positioning}    #获取点击后页面文本信息
     Should Be Equal As Strings    ${text1}    ${Assertion}    #断言