完善UI自动化用例，调整用例顺序

01-TestCase/tsg_ui/ui_administration/LDAPServerCase.robot

@@ -106,6 +106,14 @@ CreateLDAPServerConnectionTimeoutMax
     Assertion    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span/span    ${TEST NAME}
     DeleteLDAPServer
 
+CreateLDAPServerConnectionTimeoutExceedMax
+    [Tags]    Boundary    UI    Administration    LDAP Server
+    ${list}    Create List    ${TEST NAME}    192.168.40.120    389    cn=root,dc=bifang,dc=com    uid    dc=bifang,dc=com    111111    60
+    CreateLDAPServer       ${list}
+    LDAPServerSearch    ${TEST NAME}    name
+    Assertion    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span/span    ${TEST NAME}
+    DeleteLDAPServer
+
 CreateLDAPServerErrorHost
     [Tags]    Negtive    UI    Administration    LDAP Server
     ${list}    Create List    ${TEST NAME}    192.168.40.12    389    cn=root,dc=bifang,dc=com    uid    dc=bifang,dc=com    111111    21
@@ -140,14 +148,6 @@ CreateLDAPServerPortExceedMax
     sleep    1
     Assertion    //*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[3]/div/div[2]    save LDAP config port cannot be empty or must between 1 ~ 65535.
     
-CreateLDAPServerConnectionTimeoutExceedMax
-    [Tags]    Boundary    UI    Administration    LDAP Server
-    ${list}    Create List    ${TEST NAME}    192.168.40.120    389    cn=root,dc=bifang,dc=com    uid    dc=bifang,dc=com    111111    60
-    CreateLDAPServer       ${list}
-    LDAPServerSearch    ${TEST NAME}    name
-    Assertion    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span/span    ${TEST NAME}
-    DeleteLDAPServer
-    
 
     
 

01-TestCase/tsg_ui/ui_administration/LoginRestrictionsCase.robot

@@ -112,25 +112,25 @@ LoginRestrictionsAddIPExists
     LoginRestrictions-DeleteIP
     
 MaximumLoginAttemeptsExceedMax
-    [Tags]    Boundary    UI    Administration    Login Restrictions
+    [Tags]    Negtive    UI    Administration    Login Restrictions
     AdminOpenPages    sidebarLogin_Restrictions    sidebarLogin_Restrictions
     EditMaximumLoginAttemepts    11
     Assertion    //*[@id="policy_Manipulation2"]/div/div[2]/div/div/form/div[3]/div/div[2]    Please enter a value between 1 and 10
     
 MaximumLoginAttemeptsExceedMinimum
-    [Tags]    Boundary    UI    Administration    Login Restrictions
+    [Tags]    Negtive    UI    Administration    Login Restrictions
     AdminOpenPages    sidebarLogin_Restrictions    sidebarLogin_Restrictions
     EditMaximumLoginAttemepts    0
     Assertion    //*[@id="policy_Manipulation2"]/div/div[2]/div/div/form/div[3]/div/div[2]    Please enter a value between 1 and 10
     
 LockTimeExceedMax
-    [Tags]    Boundary    UI    Administration    Login Restrictions
+    [Tags]    Negtive    UI    Administration    Login Restrictions
     AdminOpenPages    sidebarLogin_Restrictions    sidebarLogin_Restrictions
     EditLockTime    61
     Assertion    //*[@id="policy_Manipulation2"]/div/div[2]/div/div/form/div[4]/div/div[2]    Please enter a value between 1 and 60
     
 LockTimeExceedMinimum
-    [Tags]    Boundary    UI    Administration    Login Restrictions
+    [Tags]    Negtive    UI    Administration    Login Restrictions
     AdminOpenPages    sidebarLogin_Restrictions    sidebarLogin_Restrictions
     EditLockTime    0
     Assertion    //*[@id="policy_Manipulation2"]/div/div[2]/div/div/form/div[4]/div/div[2]    Please enter a value between 1 and 60

01-TestCase/tsg_ui/ui_administration/MailServerCase.robot

@@ -19,6 +19,11 @@ EditMailServerCloseSSL
     EditMailServer    smtp.163.com    465    open    test_name    l1157517579@163.com    XEYQVHEMTOBOJSAP    close
     Assertion-ElementAttributes    //*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[7]/div/div    el-switch    class
 
+RestoreMailServer
+    [Tags]    Positive    UI    Administration    Mail Server
+    EditMailServer    smtp.163.com    465    open    test_name    l1157517579@163.com    XEYQVHEMTOBOJSAP    open
+    Assertion    /html/body/div[last()]/p    Success
+
 EditMailServerPortMin
     [Tags]    Boundary    UI    Administration    Mail Server
     EditMailServer    smtp.163.com    0    open    test_name    l1157517579@163.com    XEYQVHEMTOBOJSAP    open
@@ -45,24 +50,20 @@ EditMailServerFormatError
     Assertion    //*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[1]/div/div[2]    Server error
     
 EditMailServerPortExceedMax
-    [Tags]    Boundary    UI    Administration    Mail Server
+    [Tags]    Negtive    UI    Administration    Mail Server
     EditMailServer    smtp.163.com    65536    open    test_name    l1157517579@163.com    XEYQVHEMTOBOJSAP    open
     Assertion    //*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[2]/div/div[2]    Port error
     
 EditMailServerPortLessthanMin
-    [Tags]    Boundary    UI    Administration    Mail Server
+    [Tags]    Negtive    UI    Administration    Mail Server
     EditMailServer    smtp.163.com    -1    open    test_name    l1157517579@163.com    XEYQVHEMTOBOJSAP    open
     Assertion    //*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[2]/div/div[2]    Port error
     
 EditMailServerE-mailFormatError
-    [Tags]    Boundary    UI    Administration    Mail Server
+    [Tags]    Negtive    UI    Administration    Mail Server
     EditMailServer    smtp.163.com    -1    open    test_name    l1157517579com    XEYQVHEMTOBOJSAP    open
     Assertion    //*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[2]/form/div[5]/div/div[2]    Email error
     
-RestoreMailServer
-    [Tags]    Positive    UI    Administration    Mail Server
-    EditMailServer    smtp.163.com    465    open    test_name    l1157517579@163.com    XEYQVHEMTOBOJSAP    open
-    Assertion    /html/body/div[last()]/p    Success
     
     
 

01-TestCase/tsg_ui/ui_administration/RolesCase.robot

@@ -68,7 +68,7 @@ RolesEditAuthority
 RolesPagingDisplay
     [Tags]    Positive    UI    Administration    Roles
     AdminOpenPages    sidebarsystem_accounts    profilesTabs_Profile_Insert
-    PagingDisplay    50
+    AdministrationPagingDisplay    50
     
 RolesClickAllButton
     [Tags]    Positive    UI    Administration    Roles

01-TestCase/tsg_ui/ui_administration/UsersCase.robot

@@ -9,8 +9,8 @@ UsersCreate
     UserCreatePage    0000    ${a}    111111   log    30    log    superuser
     #验证新建是否成功
     UserSearchName    ${a}    UserName
-    ${UserName}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div
+    ${UserName1}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div
-    Should Be Equal As Strings    ${UserName}    ${a}
+    Should Be Equal As Strings    ${UserName1}    ${a}
     sleep    1
     Login    ${a}    111111
     ${text1}    get text    xpath=//*[@id="children0"]/div/span
@@ -23,8 +23,8 @@ UsersCreateOpenRequiredPasswordChange
     ${a}  evaluate  random.randint(1000,9999)  random
     UserCreatePage    0000    ${a}    111111   open    30    log    superuser
     UserSearchName    ${a}    UserName
-    ${UserName}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div
+    ${UserName1}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div
-    Should Be Equal As Strings    ${UserName}    ${a}
+    Should Be Equal As Strings    ${UserName1}    ${a}
     
 UsersCreateCloseEnableButton
     [Tags]    Positive    UI    Administration    Users   
@@ -74,7 +74,7 @@ UserTurnPage
 UserSwitchDisplayNumber
     [Tags]    Positive    UI    Administration    Users 
     Menu    administration    Accounts
-    PagingDisplay    50  
+    AdministrationPagingDisplay    50  
 
 UsersCreateNameMinSize
     [Tags]    Boundary    UI    Administration    Users

01-TestCase/tsg_ui/ui_settings/CachedIntermediateCertificatesCase.robot

@@ -3,6 +3,7 @@ Force Tags        tsg-ui    settings    Cached Intermediate Certificates
 Resource          ../../../03-Variable/bifangapivariable.txt
 Resource          ../../../02-Keyword/tsg_ui/setting/Settings.robot
 Library           OperatingSystem
+Library           SSHLibrary
 
 *** Test Cases ***
 CachedIntermediateCertificatesSearchID
@@ -54,4 +55,35 @@ CachedIntermediateCertificatesTurnPage
     [Tags]    Positive    UI    Settings    CachedIntermediateCertificates
     OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[4]    xpath
     TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[3]/div/button[2]    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[3]/div/button[1]
-    ...    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[3]/div/span[2]/div/input    2    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span
+    ...    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[3]/div/span[2]/div/input    2    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span
+
+CachedIntermediateCertificatesPagingDisplay
+    [Tags]    Positive    UI    Settings    CachedIntermediateCertificates
+    OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[4]    xpath
+    PagingDisplay    50
+
+CachedIntermediateCertificatesImportExpiredCertificate    #导入过期证书
+   [Tags]    Positive    UI    Settings    CachedIntermediateCertificates
+   OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[4]    xpath
+   ${text1}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span
+   Open Connection    192.168.44.11    port=22
+   Login    root    *#00#QAZxsw@edc
+   Write    cd /home/byb/
+   Write    ./1111.sh
+   sleep    2
+   ${text2}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span
+   Should Be Equal As Strings    ${text1}    ${text2}
+   
+CachedIntermediateCertificatesSynchronizeVerification    #验证修改证书状态 rides是否同步
+   [Tags]    Positive    UI    Settings    CachedIntermediateCertificates
+   OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[4]    xpath
+   Settings-Search    1    id
+   click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[10]/div/div/div/span
+   sleep    3
+   Open Connection    192.168.44.71    port=22
+   Login    root    Xxg-PUB<>90
+   ${Results}    Execute Command    redis-cli -h 192.168.44.71 -p 7002 keys EFF*PXY_EXCH_INTERMEDIA_CERT,1
+   sleep    1
+   Should Not Be Equal    ${Results}    EFFECTIVE_RULE:PXY_EXCH_INTERMEDIA_CERT,1
+   click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[10]/div/div/div/span
+   

01-TestCase/tsg_ui/ui_settings/DecryptionKeyringsCase.robot

@@ -121,28 +121,7 @@ DecryptionKeyringsEditDefaultCertificate
     Settings-Search    1    id
     EditDefaultCertificate    220
     Settings-Search    1    id
-    EditDefaultCertificate    240
+    EditDefaultCertificate    240 
-    
-
-    
-    
-DecryptionKeyringsCreateNameMinSize
-    [Tags]    Boundary    UI    Settings    DecryptionKeyrings
-    CreateDecryptionKeyrings    test    ${path}keyrings//root//ca-cer.pem    ${path}keyrings//root//ca.key    23    id=certificateType_select0    id=keyringsadd_publicKeyAlgoSelet1    name
-    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span
-    DeleteKeyrings_del
-
-DecryptionKeyringsCreateNameMaxSize
-    [Tags]    Boundary    UI    Settings    DecryptionKeyrings
-    CreateDecryptionKeyrings    CreateDecryptionKeyringsNameMaxSizeCreateDecryptionKeyringsNameMaxSizeCreateDecryptionKeyringsNameMaxSizeCreateDecryptionKeyring    ${path}keyrings//root//ca-cer.pem    ${path}keyrings//root//ca.key    23    id=certificateType_select0    id=keyringsadd_publicKeyAlgoSelet1    name
-    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span
-    DeleteKeyrings_del
-    
-DecryptionKeyringsNameCreateSpecialChar
-    [Tags]    Boundary    UI    Settings    DecryptionKeyrings
-    CreateDecryptionKeyrings    ВставкаСкриптов!@#$%^&(-+=‘；。，？    ${path}keyrings//root//ca-cer.pem    ${path}keyrings//root//ca.key    23    id=certificateType_select0    id=keyringsadd_publicKeyAlgoSelet1    name
-    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span
-    DeleteKeyrings_del
     
 DecryptionKeyringsDownload
     [Tags]    Positive    UI    Settings    DecryptionKeyrings
@@ -176,6 +155,29 @@ DecryptionKeyringsAllSearch
     Assertion    //*[@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
+    
+DecryptionKeyringsPagingDisplay
+    [Tags]    Positive    UI    Settings    DecryptionKeyrings
+    OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[2]    xpath
+    PagingDisplay    50
+    
+DecryptionKeyringsCreateNameMinSize
+    [Tags]    Boundary    UI    Settings    DecryptionKeyrings
+    CreateDecryptionKeyrings    test    ${path}keyrings//root//ca-cer.pem    ${path}keyrings//root//ca.key    23    id=certificateType_select0    id=keyringsadd_publicKeyAlgoSelet1    name
+    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span
+    DeleteKeyrings_del
+
+DecryptionKeyringsCreateNameMaxSize
+    [Tags]    Boundary    UI    Settings    DecryptionKeyrings
+    CreateDecryptionKeyrings    CreateDecryptionKeyringsNameMaxSizeCreateDecryptionKeyringsNameMaxSizeCreateDecryptionKeyringsNameMaxSizeCreateDecryptionKeyring    ${path}keyrings//root//ca-cer.pem    ${path}keyrings//root//ca.key    23    id=certificateType_select0    id=keyringsadd_publicKeyAlgoSelet1    name
+    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span
+    DeleteKeyrings_del
+    
+DecryptionKeyringsNameCreateSpecialChar
+    [Tags]    Boundary    UI    Settings    DecryptionKeyrings
+    CreateDecryptionKeyrings    ВставкаСкриптов!@#$%^&(-+=‘；。，？    ${path}keyrings//root//ca-cer.pem    ${path}keyrings//root//ca.key    23    id=certificateType_select0    id=keyringsadd_publicKeyAlgoSelet1    name
+    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span
+    DeleteKeyrings_del
 
  DecryptionKeyringsCARootFileCAMiddleType
     [Tags]    Negtive    UI    Settings    DecryptionKeyrings

01-TestCase/tsg_ui/ui_settings/DecryptionProfileCase.robot

@@ -515,7 +515,18 @@ DecryptionProfileAllCloseTLSv1.3
     CreateDecryptionProfile   lyf-test-9    name    ${dict}    min1=TLSv1.3    max1=TLSv1.3
     click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr/td[2]/div/div/span
     Delete
+        
+DecryptionProfileTurnPage
+    [Tags]    Positive    UI    Settings    DecryptionProfile
+    OpenPages    sidebarProxy_Profiles    Three-levelMenu=profilesTabs_Profile_DecryptionProfile 
+    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[4]/div/button[2]   //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[4]/div/button[1]
+    ...     //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[4]/div/span[2]/div/input    2    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr[2]/td[1]/div/div
     
+DecryptionProfilePagingDisplay
+    [Tags]    Positive    UI    Settings    DecryptionProfile
+    OpenPages    sidebarProxy_Profiles    Three-levelMenu=profilesTabs_Profile_DecryptionProfile
+    PagingDisplay    50
+
 DecryptionProfileNameMinSize
     [Tags]    Boundary    UI    name    Settings    DecryptionProfile
     ${dict}    Create Dictionary    Common Name=1    Issuer=1    Self-signed=1    Expiry Date=1    EV Certificat=1
@@ -542,12 +553,6 @@ DecryptionProfileNameSpecialChar
     CreateDecryptionProfile   中文+absc+моряков+@#￥%……&*    name    ${dict}
     click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr/td[2]/div/div/span
     Delete
-    
-DecryptionProfileNamePagesTurnPage
-    [Tags]    Positive    UI    Settings    DecryptionProfile
-    OpenPages    sidebarProxy_Profiles    Three-levelMenu=profilesTabs_Profile_DecryptionProfile 
-    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[4]/div/button[2]   //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[4]/div/button[1]
-    ...     //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[4]/div/span[2]/div/input    2    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr[2]/td[1]/div/div
 
 DecryptionProfileDeleteReferencedData
     [Tags]    Negtive    UI    Settings    DecryptionProfile

01-TestCase/tsg_ui/ui_settings/HijackFilesCase.robot

@@ -95,6 +95,17 @@ HijackFilesDownloadFile
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/span
     DeletehijackDel
     
+HijackFilesPagesTurnPage
+    [Tags]    Positive    UI    Settings    HijackFile
+    OpenPages    sidebarProxy_Profiles    Three-levelMenu=profilesTabs_Profile_HijackFiles
+    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[2]   //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[1]
+    ...     //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/span[2]/div/input    2    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div
+    
+HijackFilesPagingDisplay
+    [Tags]    Positive    UI    Settings    HijackFile
+    OpenPages    sidebarProxy_Profiles    Three-levelMenu=profilesTabs_Profile_HijackFiles
+    PagingDisplay    50
+
 HijackFilesCreateNameMinSize
     [Tags]    Boundary    UI    Name    Settings    HijackFile
     CreateHijackFiles    1    ${path}hijack_files/Create-Hijack Files-test.apk    id=application/vnd.android.package-archive0    name
@@ -137,12 +148,6 @@ HijackFilesCreateDownloadNameMaxSize
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/span
     DeletehijackDel
     
-HijackFilesPagesTurnPage
-    [Tags]    Positive    UI    Settings    HijackFile
-    OpenPages    sidebarProxy_Profiles    Three-levelMenu=profilesTabs_Profile_HijackFiles
-    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[2]   //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[1]
-    ...     //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/span[2]/div/input    2    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div
-    
 HijackFilesUploadNullFile
      [Tags]    Negtive    html    Settings    HijackFile
      UploadFilesSize    HijackFiles    HijackFilesUploadNullFile    ${path}hijack_files/null.html    Please choose to upload files

01-TestCase/tsg_ui/ui_settings/IPLibrariesCase.robot

@@ -74,24 +74,6 @@ IPLibrariesSearchCity
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr
     DeleteIPLibraries
     
-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
-    CreateIpLibraries    Geo Name    Country    Africa    2147483647    548458    ${iplist}    j=2    Country=548458    Longitude=1    Latitude=2
-    DeleteIPLibraries
-    
-IPLibrariesCreateCountryandRegionAndCityMaxSize
-    [Tags]    Boundary    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    548459    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111    ${iplist}    j=2    Country=11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111    Longitude=1    Latitude=2
-    DeleteIPLibraries
-    
-IPLibrariesCreateLongitudeAndLatitudeMaxSize
-    [Tags]    Boundary    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    548460    548460    ${iplist}    j=2    Country=548460    Longitude=180    Latitude=90
-    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
@@ -164,6 +146,29 @@ IPLibrariesTurnPage
     TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/button[2]    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/button[1]
     ...    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/span[2]/div/input    2    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div
 
+IPLibrariesPagingDisplay
+    [Tags]    Positive    UI    Settings    IPLibraries
+    OpenPages    sidebarAdvanced    Advanced/ipLibrary
+    PagingDisplay    50
+
+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
+    CreateIpLibraries    Geo Name    Country    Africa    2147483647    548458    ${iplist}    j=2    Country=548458    Longitude=1    Latitude=2
+    DeleteIPLibraries
+    
+IPLibrariesCreateCountryandRegionAndCityMaxSize
+    [Tags]    Boundary    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    548459    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111    ${iplist}    j=2    Country=11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111    Longitude=1    Latitude=2
+    DeleteIPLibraries
+    
+IPLibrariesCreateLongitudeAndLatitudeMaxSize
+    [Tags]    Boundary    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    548460    548460    ${iplist}    j=2    Country=548460    Longitude=180    Latitude=90
+    DeleteIPLibraries
+
 IPLibrariesGeoNameIDRepeat
     [Tags]    Negtive    UI    Settings    IPLibraries
     ${iplist}    create list    10.1.1.1-20.1.1.1    20.1.1.1-30.1.1.1

01-TestCase/tsg_ui/ui_settings/InsertScriptCase.robot

@@ -60,6 +60,17 @@ InsertScriptDownloadFile
     DownLoadFile    ${path}insert_files\\Create-Insert Scripts-test.css    ${Downloadpath}Create-Insert Scripts-test.css
     Delete
     
+InsertScritsPagesTurnPage
+    [Tags]    Positive    UI    Settings    InsertScript
+    OpenPages    sidebarProxy_Profiles    Three-levelMenu=profilesTabs_Profile_Insert
+    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[2]   //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[1]
+    ...    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/span[2]/div/input    2    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr[1]/td[1]/div/div
+    
+InsertScritsPagingDisplay
+    [Tags]    Positive    UI    Settings    InsertScript
+    OpenPages    sidebarProxy_Profiles    Three-levelMenu=profilesTabs_Profile_Insert
+    PagingDisplay    50
+
 InsertScriptCreateSpecialFileName
     [Tags]    Boundary    UI    File    Settings    InsertScript
     CreateInsertScripts    CreateInsertScriptsSpecialFileName    ${path}insert_files\\ВставкаСкриптов!@#$%^&(-+=‘；。，？.css    css    name
@@ -78,12 +89,6 @@ InsertScriptsUpload20MFile
     click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
     Delete
     
-InsertScritsPagesTurnPage
-    [Tags]    Positive    UI    Settings    InsertScript
-    OpenPages    sidebarProxy_Profiles    Three-levelMenu=profilesTabs_Profile_Insert
-    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[2]   //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[1]
-    ...    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/span[2]/div/input    2    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[2]/div/div[3]/table/tbody/tr[1]/td[1]/div/div
-    
 InsertScriptsUploadNullFile
     [Tags]    Negtive    UI    File    Settings    InsertScript
     UploadFilesSize    InsertScripts    InsertScriptsUploadNullFile    ${path}insert_files\\null.css    Please choose to upload files

01-TestCase/tsg_ui/ui_settings/ResponsePagesCase.robot

@@ -36,9 +36,28 @@ ResponsePagesEditSearchName
     DownLoadFile    ${path}response_pages_files\\Create-ResponsePages-test-1.html    ${Downloadpath}Create-ResponsePages-test-1.html
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/span
     DeleteresinseDel
+    
+ResponsePagesDownloadFile
+    [Tags]    Positive    UI    Settings    ResponsePages
+    CreateResponsePages    Create-ResponsePagess-001    ${path}response_pages_files\\Create-ResponsePages-test.html    name
+    click    id=dowmloadi
+    DownLoadFile    ${path}response_pages_files\\Create-ResponsePages-test.html    ${Downloadpath}Create-ResponsePages-test.html
+    DeleteresinseDel
+    
+ResponsePagesTurnPage
+    [Tags]    Positive    UI    Settings    ResponsePages
+    OpenPages    sidebarProxy_Profiles    profilesTabs_Profile_ResponsePages
+    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[2]   //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[1]
+    ...    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/span[2]/div/input    2    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div
 
-ResponsePagesNameMinSize
+ResponsePagesPagingDisplay
-    [Tags]    Boundary    UI   Name    Settings    ResponsePage
+    [Tags]    Positive    UI    Settings    ResponsePages
+    OpenPages    sidebarProxy_Profiles    profilesTabs_Profile_ResponsePages
+    PagingDisplay    50
+    
+
+ResponsePagesCreateNameMinSize
+    [Tags]    Boundary    UI    name    Settings    ResponsePage
     CreateResponsePages    1    ${path}response_pages_files\\Create-Response_Pages-test-2.htm    name
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/span
     DeleteresinseDel
@@ -67,19 +86,6 @@ ResponsePagesSpecialFileName
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/span
     DeleteresinseDel
     
-ResponsePagesDownloadFile
-    [Tags]    Positive    UI    Settings    ResponsePages
-    CreateResponsePages    Create-ResponsePagess-001    ${path}response_pages_files\\Create-ResponsePages-test.html    name
-    click    id=dowmloadi
-    DownLoadFile    ${path}response_pages_files\\Create-ResponsePages-test.html    ${Downloadpath}Create-ResponsePages-test.html
-    DeleteresinseDel
-    
-ResponsePagesTurnPage
-    [Tags]    Positive    UI    Settings    ResponsePages
-    OpenPages    sidebarProxy_Profiles    profilesTabs_Profile_ResponsePages
-    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[2]   //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[1]
-    ...    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/span[2]/div/input    2    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div
-    
 ResponsePagesCreateNullNames
     [Tags]    Negtive    UI    Name    Settings    ResponsePages
     OpenPages    sidebarProxy_Profiles    profilesTabs_Profile_ResponsePages

01-TestCase/tsg_ui/ui_settings/SNATIPPoolsCase.robot

@@ -80,10 +80,10 @@ SNATIPPoolsTurnPage
     TurnPage    //*[@id="ly-table1-listcontent"]/div[2]/div/div/button[2]    //*[@id="ly-table1-listcontent"]/div[2]/div/div/button[1]    //*[@id="ly-table1-listcontent"]/div[2]/div/div/span[2]/div/input
     ...    2    //*[@id="wannat-table"]/div[3]/table/tbody/tr[1]/td[1]/div/div/span    1    //*[@id="ly-table1-listcontent"]/div[2]/div/div/ul/li[last()]
 
-SNATIPPools
+SNATIPPoolsPagingDisplay
     [Tags]    Positive    IP    Settings    SNATIPPools
     OpenPages    sidebarSetting_Wannat    ip  
-    PagingDisplay_One    50
+    PagingDisplay_Second    50
     
 CreateSNATIPPoolsNameMinSize
     [Tags]    Boundary    UI    name    Settings    SNATIPPools

01-TestCase/tsg_ui/ui_settings/SSLDecryptionExclusionCase.robot

@@ -17,7 +17,7 @@ SSLDecryptionExclusionCreateSuffixMatching
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span 
     Deletessl_del  
 
-SSLDecryptionExclusioEditSearchID
+SSLDecryptionExclusionEditSearchID
     [Tags]    Positive    UI    Settings    SSLDecryptionExclusion
     CreateSSLDecryptionExclusion    *myssl.com    myssl.com    myssl.com     name
     ${id}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div/p/span
@@ -25,13 +25,24 @@ SSLDecryptionExclusioEditSearchID
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span 
     Deletessl_del
 
-SSLDecryptionExclusioEditSearchName
+SSLDecryptionExclusionEditSearchName
     [Tags]    Positive    UI    Settings    SSLDecryptionExclusion
     CreateSSLDecryptionExclusion    *myssl.com    myssl.com    myssl.com     name
     EditSSLDecryptionExclusion    myssl.com    $www.jianshu.com    简xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div/p/spanxpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div/p/span书         www.jianshu.com    name
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span 
     Deletessl_del
     
+SSLDecryptionExclusionEditDefault
+    [Tags]    Positive    UI    Settings    SSLDecryptionExclusion
+    OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[3]    xpath
+    EditSSLDecryptionExclusion    1    *fe3.delivery.mp.microsoft.com    test11    *fe3.delivery.mp.microsoft.com    id
+    EditSSLDecryptionExclusion    1    *fe3.delivery.mp.microsoft.com    Mircosoft Store    *fe3.delivery.mp.microsoft.com    id
+    
+SSLDecryptionExclusionPagingDisplay
+    [Tags]    Positive    UI    Settings    SSLDecryptionExclusion
+    OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[3]    xpath
+    PagingDisplay    50
+    
 SSLDecryptionCreateFQDNMinSize
     [Tags]    Boundary    UI    Settings    SSLDecryptionExclusion
     CreateSSLDecryptionExclusion    *abc    abc    abc     name

01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot

@@ -126,6 +126,11 @@ SSLFingerprintShowNotPinning
     click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr
     DeleteSSLFingerprint
     Should Be Equal As Strings    ${text}    No Data
+    
+SSLFingerprintPagingDisplay
+    [Tags]    Positive    UI    Settings    SSLFingerprint   
+    OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[5]    Targeting=xpath
+    PagingDisplay    50
 
 SSLFingerprintCreateJa3NotCombined
     [Tags]    Boundary    UI    JA3Hash    Settings    SSLFingerprint

01-TestCase/tsg_ui/ui_settings/TrafficMirrorProfilesCase.robot

@@ -33,6 +33,17 @@ TrafficMirrorProfilesEditVlanSearchName
     click    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
     DeletetrafficMirrorDel
 
+TrafficMirrorProfilesPagesTurnPage
+    [Tags]    Positive    UI    Settings    TrafficMirrorProfile
+    OpenPages    sidebarProxy_Profiles    Three-levelMenu=profilesTabs_Profile_TrafficMirrorProfiles
+    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[2]   //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[1]
+    ...     //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/span[2]/div/input    2    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[2]/div/div[3]/table/tbody/tr[1]/td[1]/div/div
+
+TrafficMirrorProfilesPagingDisplay
+    [Tags]    Positive    UI    Settings    TrafficMirrorProfile
+    OpenPages    sidebarProxy_Profiles    Three-levelMenu=profilesTabs_Profile_TrafficMirrorProfiles
+    PagingDisplay    50
+
 TrafficMirrorProfilesCreateNameMinSize
     [Tags]    Boundary    UI    vlan    Settings    TrafficMirrorProfile
     CreateTrafficMirrorProfiles    1    xpath=/html/body/div/div[1]/div[1]/ul/li[1]    11    name
@@ -75,12 +86,6 @@ TrafficMirrorProfilesCreateMacMaxSize
     click    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
     DeletetrafficMirrorDel
     
-TrafficMirrorProfilesPagesTurnPage
-    [Tags]    Positive    UI    Settings    TrafficMirrorProfile
-    OpenPages    sidebarProxy_Profiles    Three-levelMenu=profilesTabs_Profile_TrafficMirrorProfiles
-    TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[2]   //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/button[1]
-    ...     //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[5]/div/span[2]/div/input    2    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[2]/div/div[3]/table/tbody/tr[1]/td[1]/div/div
-
 TrafficMirrorProfilesCreateErrorVlan_1
     [Tags]    Negtive    UI    vlan    Settings    TrafficMirrorProfile
     TrafficMirrorProfilesValidationError    TrafficMirrorProfilesCreateErrorVlan_1    xpath=/html/body/div/div[1]/div[1]/ul/li[1]    0    The value range of vlan is 1-4094

01-TestCase/tsg_ui/ui_settings/TrustedCertificateAuthoritiesCase.robot

@@ -69,12 +69,25 @@ TrustedCertificateAuthoritiesDownLoadCertificate
     DownLoadFile    ${path}keyrings//root//ca-cer.pem    ${DownLoadPath}ca-cer.pem
     DeleteAuthorities_del
     
+TrustedCertificateAuthoritiesEditDefaultCertificate
+    [Tags]    Positive    UI    Settings    TrustedCertificateAuthorities
+    OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[1]    xpath
+    Settings-Search    1    id
+    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]
+    sleep    1
+    SettingsElementAttributes    //*[@id="appEdit"]    el-button el-button--default el-button--small is-disabled    class   
+    
 TrustedCertificateAuthoritiesTurnPage
     [Tags]    Positive    UI    Settings    TrustedCertificateAuthorities
     OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[1]    xpath
     TurnPage    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/button[2]    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/button[1]
     ...    //*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[4]/div/span[2]/div/input    2    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span
 
+TrustedCertificateAuthoritiesPagingDisplay
+    [Tags]    Positive    UI    Settings    TrustedCertificateAuthorities
+    OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[1]    xpath
+    PagingDisplay    50
+
 TrustedCertificateAuthoritiesCreateNameMinSize
     [Tags]    Boundary    UI    name    Settings    TrustedCertificateAuthorities
     importTrustedCertificateAuthorities    test    ${path}keyrings//root//ca-cer.pem    name
@@ -115,6 +128,10 @@ TrustedCertificateAuthoritiesInportEntityCertificate
     [Tags]    Negtive    UI    Settings    TrustedCertificateAuthorities
     UploadFilesSize    TrustedCertificateAuthorities    InportEntityCertificate     ${path}keyrings//end-entity//caentity.chain.pem    End-entity certificate is not allowed to upload
     
+TrustedCertificateAuthoritiesExpiredCertificate
+    [Tags]    Negtive    UI    Settings    TrustedCertificateAuthorities
+    UploadFilesSize    TrustedCertificateAuthorities    ${TEST NAME}    ${path}keyrings//root//Expiredcertificate.pem    Certificate expired
+
 TrustedCertificateAuthoritiesInportEmptyFile
     [Tags]    Negtive    UI    Settings    TrustedCertificateAuthorities
     UploadFilesSize    TrustedCertificateAuthorities    InportNullFile     ${path}keyrings//root//null.pem    File content is empty

01-TestCase/tsg_ui/ui_settings/VPNAccountsCase.robot

@@ -15,7 +15,18 @@ VPNAccountsEditPassword
     CreateVPNAccounts    EditVPNAccountsName-01    111111    name
     EditVPNAccounts    EditVPNAccountsName-01    222222    name
     VPNAccountsDelete
- 
+       
+VPNAccountsTurnPages
+    [Tags]    Positive    UI    Settings    VPNAccounts
+    OpenPages    sidebarSetting_Wannat    account
+    TurnPage    //*[@id="ly-table1-listcontent"]/div[2]/div/div/button[2]    //*[@id="ly-table1-listcontent"]/div[2]/div/div/button[1]    //*[@id="ly-table1-listcontent"]/div[2]/div/div/span[2]/div/input    
+    ...    2    //*[@id="wannat-table"]/div[3]/table/tbody/tr[1]/td[1]/div/div/div[2]/span    1    //*[@id="ly-table1-listcontent"]/div[2]/div/div/ul/li[last()]
+
+VPNAccountsPagingDisplay
+    [Tags]    Positive    UI    Settings    VPNAccounts
+    OpenPages    sidebarSetting_Wannat    account
+    PagingDisplay_Second    50
+    
 VPNAccountsCreateNameMinSize
     [Tags]    Boundary    UI    name    Settings    VPNAccounts
     CreateVPNAccounts    1    111111    name
@@ -36,26 +47,6 @@ VPNAccountsCreatePasswordMaxSize
     CreateVPNAccounts    VPNAccountsCreateNameMaxSizeVPNAccountsCreateNameMaxSizeCreateVP    aaaaaaaa11111111    name
     VPNAccountsDelete
     
-VPNAccountsTurnPages
-    [Tags]    Positive    UI    Password    Settings    VPNAccounts
-    OpenPages    sidebarSetting_Wannat    account
-    click    xpath=//*[@id="ly-table1-listcontent"]/div[2]/div/div/button[2]
-    sleep    1
-    ${text1}    get text    xpath=//*[@id="wannat-table"]/div[3]/table/tbody/tr[1]/td[1]/div/div/div[2]/span
-    click    xpath=//*[@id="ly-table1-listcontent"]/div[2]/div/div/button[1]
-    sleep    1
-    ${text2}    get text    xpath=//*[@id="wannat-table"]/div[3]/table/tbody/tr[1]/td[1]/div/div/div[2]/span
-    Clear Element Text    xpath=//*[@id="ly-table1-listcontent"]/div[2]/div/div/span[2]/div/input
-    sleep    2
-    input text    xpath=//*[@id="ly-table1-listcontent"]/div[2]/div/div/span[2]/div/input   2
-    sleep    1
-    press keys    xpath=//*[@id="ly-table1-listcontent"]/div[2]/div/div/span[2]/div/input   ENTER
-    sleep    1
-    ${text3}    get text    xpath=//*[@id="wannat-table"]/div[3]/table/tbody/tr[1]/td[1]/div/div/div[2]/span
-    Should Not Be Equal    ${text1}    ${text2}
-    Should Not Be Equal    ${text3}    ${text2}
-    Should Not Be Equal    ${text3}    ${text2}
-    
 VPNAccountsCreateNameSpecialChar
     [Tags]    Negtive    UI    name    Settings    VPNAccounts
     OpenPages    sidebarSetting_Wannat    account

02-Keyword/tsg_ui/administration/Administration.robot

@@ -554,7 +554,7 @@ AdminTurnPage
     Should Not Be Equal    ${text3}    ${text4}
     Should Not Be Equal    ${text1}    ${text5}
     
-PagingDisplay
+AdministrationPagingDisplay
     [Arguments]    ${Number}
     [Documentation]    
     ...    ${Number}:  设置页面显示数据条数 （20、5、30、50、100）
@@ -582,7 +582,7 @@ PagingDisplay
     ${quzheng}    Evaluate    int(${qumo})
     ${b}    Set Variable    ${1}
     ${Page1}    Evaluate    ${quzheng}+${b}
-    ${Page}    Set Variable if    "${qumo}" != "0"    ${Page1}    ${qumo}
+    ${Page}    Set Variable if    "${quyu}" != "0"    ${Page1}    ${quzheng}
     sleep    1
     ${text}    Get text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div/div/ul/li[last()]
     Should Be Equal As Strings    ${text}    ${Page}
@@ -613,7 +613,7 @@ AuditLogs-PagingDisplay
     ${quzheng}    Evaluate    int(${qumo})
     ${b}    Set Variable    ${1}
     ${Page1}    Evaluate    ${quzheng}+${b}
-    ${Page}    Set Variable if    "${qumo}" != "0"    ${Page1}    ${qumo}
+    ${Page}    Set Variable if    "${quyu}" != "0"    ${Page1}    ${quzheng}
     sleep    1
     ${text}    Get text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[4]/div/ul/li[last()]
     Should Be Equal As Strings    ${text}    ${Page}

02-Keyword/tsg_ui/setting/Settings.robot

@@ -856,7 +856,7 @@ EditTrustedCertificateAuthorities
     Sleep    2
     Settings-Search    ${id-name}   ${search}
     sleep    1
-    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr    #点击搜索列表
+    click    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]    #点击搜索列表
     sleep    1
     click    id=appEdit    #点击Edit按钮
     sleep    1
@@ -947,7 +947,7 @@ EditSSLDecryptionExclusion
     input    id=sslAdd_itemDesc    ${value1}    #输入内容
     sleep    1
     click    id=ssl_ok    #点击OK缇交
-    Sleep    2
+    Wait Until Element Is Enabled    id=ssl_create    20
     run keyword if    "${search}"=="id"    run keywords    sleep    1
     ...    AND    Settings-Search    ${id-name}   ${search}
     ...    ELSE IF    "${search}"=="name"    run keywords    sleep    1
@@ -2292,7 +2292,7 @@ TurnPage
     press keys    xpath=${JumpInput}   ENTER
     sleep    2
     ${text4}    get text    xpath=${AssertXpath}
-    run keyword if    "${lastpage}" == "null"    run keyowrds    sleep    1
+    run keyword if    "${lastpage}" == "null"    run keywords    sleep    1
     ...    AND    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[last()]/div/ul/li[last()]
     ...    ELSE    click    xpath=${lastxpath}
     sleep    2 
@@ -2302,13 +2302,13 @@ TurnPage
     Should Not Be Equal    ${text3}    ${text4}
     Should Not Be Equal    ${text1}    ${text5}
     
-PagingDisplay_One
+PagingDisplay
     [Arguments]    ${Number}
     [Documentation]    
     ...    ${Number}:  设置页面显示数据条数 （20、5、30、50、100）
     ...    ${last} 次关键字 当最后一页定位和其他页面不同时，传入非null的值
     ...    ${lastxpath}  当最后一页定位和其他页面不同时，传入最后一页的xpath 定位
-    Mouse Over    xpath=//*[@id="ly-table1-listcontent"]/div[2]/div/span/div/i
+    Mouse Over    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[last()]/span/div/i
     sleep    1
     run keyword if    "${Number}"=="30"    run keywords    sleep    1
     ...    AND    Click element    xpath=//*[@id="page-size"]/div/label[2]
@@ -2321,8 +2321,8 @@ PagingDisplay_One
     sleep    1
     Click element    xpath=/html/body/div[last()]/div[1]/div[2]/button
     sleep    2
-    ${text}    Get text    xpath=//*[@id="ly-table1-listcontent"]/div[2]/div/div/span[1]
+    ${text}    Get text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[last()]/div/span[1]
-    sleep    1                   
+    sleep    1
     ${Quantity}    StringSegmentation    ${text}
     sleep    1
     ${quyu}    Evaluate    ${Quantity}%${Number}
@@ -2330,9 +2330,42 @@ PagingDisplay_One
     ${quzheng}    Evaluate    int(${qumo})
     ${b}    Set Variable    ${1}
     ${Page1}    Evaluate    ${quzheng}+${b}
-    ${Page}    Set Variable if    "${qumo}" != "0"    ${Page1}    ${qumo}
+    ${Page}    Set Variable if    "${quyu}" != "0"    ${Page1}    ${quzheng}
     sleep    1
-    ${text}    Get text    xpath=//*[@id="ly-table1-listcontent"]/div[2]/div/div/ul/li[last()]
+    ${text}    Get text    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div/div/div[last()]/div/ul/li[last()]                           
+    Should Be Equal As Strings    ${text}    ${Page}
+    
+PagingDisplay_Second
+    [Arguments]    ${Number}
+    [Documentation]    
+    ...    ${Number}:  设置页面显示数据条数 （20、5、30、50、100）
+    ...    ${last} 次关键字 当最后一页定位和其他页面不同时，传入非null的值
+    ...    ${lastxpath}  当最后一页定位和其他页面不同时，传入最后一页的xpath 定位
+    Mouse Over    xpath=//*[@id="ly-table1-listcontent"]/div[last()]/div/span/div/i
+    sleep    1
+    run keyword if    "${Number}"=="30"    run keywords    sleep    1
+    ...    AND    Click element    xpath=//*[@id="page-size"]/div/label[2]
+    ...    ELSE IF    "${Number}"=="50"    run keywords    sleep    1
+    ...    AND    Click element    xpath=//*[@id="page-size"]/div/label[3]
+    ...    ELSE IF    "${Number}"=="100"    run keywords    sleep    1
+    ...    AND    Click element    xpath=//*[@id="page-size"]/div/label[4]
+    ...    ELSE    Clear Element Text    xpath=/html/body/div[last()]/div[1]/div[2]/input
+    ...    AND    Input Text    xpath=/html/body/div[last()]/div[1]/div[2]/input    ${Number}
+    sleep    1
+    Click element    xpath=/html/body/div[last()]/div[1]/div[2]/button
+    sleep    2            
+    ${text}    Get text    xpath=//*[@id="ly-table1-listcontent"]/div[2]/div/div/span[1]
+    sleep    1
+    ${Quantity}    StringSegmentation    ${text}
+    sleep    1
+    ${quyu}    Evaluate    ${Quantity}%${Number}
+    ${qumo}    Evaluate    ${Quantity}/${Number}
+    ${quzheng}    Evaluate    int(${qumo})
+    ${b}    Set Variable    ${1}
+    ${Page1}    Evaluate    ${quzheng}+${b}
+    ${Page}    Set Variable if    "${quyu}" != "0"    ${Page1}    ${quzheng}
+    sleep    1
+    ${text}    Get text    xpath=//*[@id="ly-table1-listcontent"]/div[2]/div/div/ul/li[last()]                           
     Should Be Equal As Strings    ${text}    ${Page}
 
 ALL
@@ -2556,3 +2589,8 @@ SettingsAssertion
     ${text}    Get text    xpath=${assertxpath}
     Should Be Equal As Strings    ${text}    ${asserttext}
     
+SettingsElementAttributes
+    [Arguments]    ${assertxpath}    ${asserttext}    ${Element} 
+    ${text}    Get Element Attribute    xpath=${assertxpath}    ${Element} 
+    Should Be Equal As Strings    ${text}    ${asserttext}
+    

05-Other/keyrings/root/Expiredcertificate.pem

@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICdjCCAd+gAwIBAgIJAMvkFjvEOo+LMA0GCSqGSIb3DQEBCwUAMFQxCzAJBgNV
+BAYTAkNOMQswCQYDVQQIDAJCSjELMAkGA1UEBwwCQkoxCzAJBgNVBAoMAk5UMQsw
+CQYDVQQLDAJOVDERMA8GA1UEAwwIQ0EgVFJVU1QwHhcNMjAxMTE2MDYyNjU3WhcN
+MjAxMTE3MDYyNjU3WjBUMQswCQYDVQQGEwJDTjELMAkGA1UECAwCQkoxCzAJBgNV
+BAcMAkJKMQswCQYDVQQKDAJOVDELMAkGA1UECwwCTlQxETAPBgNVBAMMCENBIFRS
+VVNUMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDKD1sQvzjkhobx5LSI8r2
+d4k5H0D4MbdW0Vm8m7ConqL1QNEv8yDQ01BgqVhMv4dTsUtRTGQzE5WEZWrkeQ4g
+vyNecY60GJ5PaNyL3Azo1TZ6g1n6rsCddlKUnzEWgDy6YgSKNfbXUmWq+hjaaBO1
+KhSR/Sn6FJ9EPOhavRyEKQIDAQABo1AwTjAdBgNVHQ4EFgQUAxBm0kdln3d5SC6e
+RxZXc+gMSr4wHwYDVR0jBBgwFoAUAxBm0kdln3d5SC6eRxZXc+gMSr4wDAYDVR0T
+BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQAkmswZnY/gEYe2lI85OKgSMXf/rP1P
+NFfVvzittcdEUSIlUMouPMNHAlvp7M/623PhnFd/kQz7ztRgZ1qlvpUd3QZPNjGc
+o59gryyJPKLsaMRWwfd+LAyY1jiGOl9YFs0z1Dk+B32N55qM3323GT6qAW7Ni7Jc
+P7SqaMDdMwlKNg==
+-----END CERTIFICATE-----