提交objects关键字修改和case

01-TestCase/tsg_ui/ui_objects/Object-HTTPSignature-Case.robot

@@ -1,212 +1,260 @@
 *** Settings ***
 Force Tags        tsg-ui    objects    HTTPSignature
 Resource          ../../../03-Variable/bifangapivariable.txt
-Resource          ../../../02-Keyword/tsg_ui/objects/ObjectPages.robot
+Resource          ../../../02-Keyword/tsg_ui/objects/NewObjectPages.robot
 Library           OperatingSystem
-Resource          ../../../02-Keyword/tsg_ui/objects/Objects.robot
+Resource          ../../../02-Keyword/tsg_ui/objects/NewObject.robot
-
 *** Test Cases ***
-create-HTTPSignature-Request-User-Agent-prefix-001
+create-http-signature-001
-    #新建user-agent
+    #新建
-    CreatePage    ReqRes    create-HTTPSignature-Request-User-Agent-prefix-001    reqrestype=req    reqresheader=ua    keywordtext=Mozilla/5.0*
+    CreatePage    HTTPSignature    single    656e676c697368636f6e74656e74    reqrestype=res    reqresheader=sck    keywordtext=656e676c697368636f6e74656e74    hex=open
     #验证新建是否成功
-    ui-object-search-name    create-HTTPSignature-Request-User-Agent-prefix-001
+    ui-object-search-name    656e676c697368636f6e74656e74
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-HTTPSignature-Request-User-Agent-prefix-001
+    Should Be Equal As Strings    ${text}    656e676c697368636f6e74656e74
     #删除对象
     objects-delete
         
-create-HTTPSignature-Request-User-Agent-sub-002
+edit-http-signature-002
-    #新建user-agent
+    #新建
-    CreatePage    ReqRes    create-HTTPSignature-Request-User-Agent-sub-002    reqrestype=req    reqresheader=ua    keywordtext=Mozilla/5.
+    CreatePage    HTTPSignature    single    text*    reqrestype=res    reqresheader=ct    keywordtext=text*
     #验证新建是否成功
-    ui-object-search-name    create-HTTPSignature-Request-User-Agent-sub-002
+    ui-object-search-name    text*
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-HTTPSignature-Request-User-Agent-sub-002
+    Should Be Equal As Strings    ${text}    text*
+    object-edit-HTTPSignature    text*    req    ck    $mmmm
+    ui-object-search-name    text*
     #删除对象
     objects-delete
     
-create-HTTPSignature-Request-User-Agent-exactly-003
+create-http-signature-003
-    #新建user-agent
+    #新建
-    CreatePage    ReqRes    create-HTTPSignature-Request-User-Agent-exactly-003    reqrestype=req    reqresheader=ua    keywordtext=$Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.113 Safari/537.36
+    CreatePage    HTTPSignature    single    *скрипцияк    reqrestype=res    reqresheader=ct    keywordtext=*скрипцияк
     #验证新建是否成功
-    ui-object-search-name    create-HTTPSignature-Request-User-Agent-exactly-003
+    ui-object-search-name    *скрипцияк
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-HTTPSignature-Request-User-Agent-exactly-003
+    Should Be Equal As Strings    ${text}    *скрипцияк
     #删除对象
     objects-delete
     
-create-HTTPSignature-Request-User-Agent-suffix-004
+create-http-signature-004
-    #新建user-agent
+    #新建
-    CreatePage    ReqRes    create-HTTPSignature-Request-User-Agent-suffix-004    reqrestype=req    reqresheader=ua    keywordtext=*Safari/537.36
+    CreatePage    HTTPSignature    single    $支持中文    reqrestype=res    reqresheader=ct    keywordtext=$支持中文
     #验证新建是否成功
-    ui-object-search-name    create-HTTPSignature-Request-User-Agent-suffix-004
+    ui-object-search-name    $支持中文
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-HTTPSignature-Request-User-Agent-suffix-004
+    Should Be Equal As Strings    ${text}    $支持中文
     #删除对象
     objects-delete
     
-create-HTTPSignature-Request-Cookie-prefix-005
+create-http-signature-005
-    #新建cookie
+    #新建
-    CreatePage    ReqRes    create-HTTPSignature-Request-Cookie-prefix-005    reqrestype=req    reqresheader=ck    keywordtext=cookie*
+    CreatePage    HTTPSignature    single    1234@#%    reqrestype=res    reqresheader=ct    keywordtext=1234@#%
     #验证新建是否成功
-    ui-object-search-name    create-HTTPSignature-Request-Cookie-prefix-005
+    ui-object-search-name    1234@#%
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-HTTPSignature-Request-Cookie-prefix-005
+    Should Be Equal As Strings    ${text}    1234@#%
     #删除对象
     objects-delete
     
-create-HTTPSignature-Request-Cookie-sub-006
+create-http-signature-006
-    #新建cookie
+    #新建
-    CreatePage    ReqRes    create-HTTPSignature-Request-Cookie-sub-006    reqrestype=req    reqresheader=ck    keywordtext=cookie
+    CreatePage    HTTPSignature    single    text*    reqrestype=res    reqresheader=ct    keywordtext=text*
     #验证新建是否成功
-    ui-object-search-name    create-HTTPSignature-Request-Cookie-sub-006
+    ui-object-search-name    text*
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-HTTPSignature-Request-Cookie-sub-006
+    Should Be Equal As Strings    ${text}    text*
     #删除对象
     objects-delete
     
-create-HTTPSignature-Request-Cookie-exactly-007
+create-http-signature-007
-    #新建cookie
+    #新建
-    CreatePage    ReqRes    create-HTTPSignature-Request-Cookie-exactly-007    reqrestype=req    reqresheader=ck    keywordtext=$cookie
+    CreatePage    HTTPSignature    single    *скрипцияк    reqrestype=res    reqresheader=sck    keywordtext=*скрипцияк
     #验证新建是否成功
-    ui-object-search-name    create-HTTPSignature-Request-Cookie-exactly-007
+    ui-object-search-name    *скрипцияк
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-HTTPSignature-Request-Cookie-exactly-007
+    Should Be Equal As Strings    ${text}    *скрипцияк
     #删除对象
     objects-delete
     
-create-HTTPSignature-Request-Cookie-suffix-008
+create-http-signature-008
-    #新建cookie
+    #新建
-    CreatePage    ReqRes    create-HTTPSignature-Request-Cookie-suffix-008    reqrestype=req    reqresheader=ck    keywordtext=*cookie
+    CreatePage    HTTPSignature    single    $支持中文    reqrestype=res    reqresheader=sck    keywordtext=$支持中文
     #验证新建是否成功
-    ui-object-search-name    create-HTTPSignature-Request-Cookie-suffix-008
+    ui-object-search-name    $支持中文
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-HTTPSignature-Request-Cookie-suffix-008
+    Should Be Equal As Strings    ${text}    $支持中文
     #删除对象
     objects-delete
     
-create-HTTPSignature-Response-Set-Cookie-prefix-009
+create-http-signature-009
-    #新建set-cookie
+    #新建
-    CreatePage    ReqRes    create-HTTPSignature-Response-Set-Cookie-prefix-009    reqrestype=res    reqresheader=sck    keywordtext=set-cookie*
+    CreatePage    HTTPSignature    single    1234@#%    reqrestype=res    reqresheader=sck    keywordtext=1234@#%
     #验证新建是否成功
-    ui-object-search-name    create-HTTPSignature-Response-Set-Cookie-prefix-009
+    ui-object-search-name    1234@#%
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-HTTPSignature-Response-Set-Cookie-prefix-009
+    Should Be Equal As Strings    ${text}    1234@#%
     #删除对象
     objects-delete
     
-create-HTTPSignature-Response-Set-Cookie-sub-010
+create-http-signature-010
-    #新建set-cookie
+    #新建
-    CreatePage    ReqRes    create-HTTPSignature-Response-Set-Cookie-sub-010    reqrestype=res    reqresheader=sck    keywordtext=set-cookie
+    CreatePage    HTTPSignature    single    mmmm*    reqrestype=res    reqresheader=sck    keywordtext=mmmm*
     #验证新建是否成功
-    ui-object-search-name    create-HTTPSignature-Response-Set-Cookie-sub-010
+    ui-object-search-name    mmmm*
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-HTTPSignature-Response-Set-Cookie-sub-010
+    Should Be Equal As Strings    ${text}    mmmm*
     #删除对象
     objects-delete
     
-create-HTTPSignature-Response-Set-Cookie-exactly-011
+create-http-signature-011
-    #新建set-cookie
+    #新建
-    CreatePage    ReqRes    create-HTTPSignature-Response-Set-Cookie-exactly-011    reqrestype=res    reqresheader=sck    keywordtext=$set-cookie
+    CreatePage    HTTPSignature    single    *скрипцияк    reqrestype=req    reqresheader=ck    keywordtext=*скрипцияк
     #验证新建是否成功
-    ui-object-search-name    create-HTTPSignature-Response-Set-Cookie-exactly-011
+    ui-object-search-name    *скрипцияк
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-HTTPSignature-Response-Set-Cookie-exactly-011
+    Should Be Equal As Strings    ${text}    *скрипцияк
     #删除对象
     objects-delete
     
-create-HTTPSignature-Response-Set-Cookie-suffix-012
+create-http-signature-012
-    #新建set-cookie
+    #新建
-    CreatePage    ReqRes    create-HTTPSignature-Response-Set-Cookie-suffix-012    reqrestype=res    reqresheader=sck    keywordtext=*set-cookie
+    CreatePage    HTTPSignature    single    $支持中文    reqrestype=req    reqresheader=ck    keywordtext=$支持中文
     #验证新建是否成功
-    ui-object-search-name    create-HTTPSignature-Response-Set-Cookie-suffix-012
+    ui-object-search-name    $支持中文
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-HTTPSignature-Response-Set-Cookie-suffix-012
+    Should Be Equal As Strings    ${text}    $支持中文
     #删除对象
     objects-delete
     
-create-HTTPSignature-Response-Content-Type-prefix-0013
+create-http-signature-013
-    #新建content-type
+    #新建
-    CreatePage    ReqRes    create-HTTPSignature-Response-Content-Type-prefix-0013    reqrestype=res    reqresheader=ct    keywordtext=Content-Type*
+    CreatePage    HTTPSignature    single    1234@#%    reqrestype=req    reqresheader=ck    keywordtext=1234@#%
     #验证新建是否成功
-    ui-object-search-name    create-HTTPSignature-Response-Content-Type-prefix-0013
+    ui-object-search-name    1234@#%
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-HTTPSignature-Response-Content-Type-prefix-0013
+    Should Be Equal As Strings    ${text}    1234@#%
     #删除对象
     objects-delete
     
-create-HTTPSignature-Response-Content-Type-sub-0014
+create-http-signature-014
-    #新建content-type
+    #新建
-    CreatePage    ReqRes    create-HTTPSignature-Response-Content-Type-sub-0014    reqrestype=res    reqresheader=ct    keywordtext=Content-Type
+    CreatePage    HTTPSignature    single    mmmm*    reqrestype=req    reqresheader=ck    keywordtext=mmmm*
     #验证新建是否成功
-    ui-object-search-name    create-HTTPSignature-Response-Content-Type-sub-0014
+    ui-object-search-name    mmmm*
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-HTTPSignature-Response-Content-Type-sub-0014
+    Should Be Equal As Strings    ${text}    mmmm*
     #删除对象
     objects-delete
     
-create-HTTPSignature-Response-Content-Type-exactly-0015
+create-http-signature-015
-    #新建content-type
+    #新建
-    CreatePage    ReqRes    create-HTTPSignature-Response-Content-Type-exactly-0015    reqrestype=res    reqresheader=ct    keywordtext=$Content-Type
+    CreatePage    HTTPSignature    single    *скрипцияк    reqrestype=req    reqresheader=ua    keywordtext=*скрипцияк
     #验证新建是否成功
-    ui-object-search-name    create-HTTPSignature-Response-Content-Type-exactly-0015
+    ui-object-search-name    *скрипцияк
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-HTTPSignature-Response-Content-Type-exactly-0015
+    Should Be Equal As Strings    ${text}    *скрипцияк
     #删除对象
     objects-delete
     
-create-HTTPSignature-Response-Content-Type-suffix-0016
+create-http-signature-016
-    #新建content-type
+    #新建
-    CreatePage    ReqRes    create-HTTPSignature-Response-Content-Type-suffix-0016    reqrestype=res    reqresheader=ct    keywordtext=*Content-Type
+    CreatePage    HTTPSignature    single    $支持中文    reqrestype=req    reqresheader=ua    keywordtext=$支持中文
     #验证新建是否成功
-    ui-object-search-name    create-HTTPSignature-Response-Content-Type-suffix-0016
+    ui-object-search-name    $支持中文
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-HTTPSignature-Response-Content-Type-suffix-0016
+    Should Be Equal As Strings    ${text}    $支持中文
     #删除对象
     objects-delete
     
-edit-HTTPSignature-017
+create-http-signature-017
-    #新建user-agent
+    #新建
-    CreatePage    ReqRes    create-HTTPSignature-Request-User-Agent-prefix-001    reqrestype=req    reqresheader=ua    keywordtext=Mozilla/5.0*
+    CreatePage    HTTPSignature    single    1234@#%    reqrestype=req    reqresheader=ua    keywordtext=1234@#%
     #验证新建是否成功
-    ui-object-search-name    create-HTTPSignature-Request-User-Agent-prefix-001
+    ui-object-search-name    1234@#%
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-HTTPSignature-Request-User-Agent-prefix-001
+    Should Be Equal As Strings    ${text}    1234@#%
-    #修改对象
-    object-edit-HTTPSignature    edit-HTTPSignature-017    res    sck    8f6c 6362 31 36 8fdb 5236    hex=open
-    #查询修改对象
-    ui-object-search-name    edit-HTTPSignature-017
     #删除对象
     objects-delete
     
-create-HTTPSignature-open-16-hex-0018
+create-http-signature-018
-    #新建content-type
+    #新建
-    CreatePage    ReqRes    create-HTTPSignature-open-16-hex-0018    reqrestype=res    reqresheader=ct    keywordtext=*63 6f 6e 74 65 6e 74    hex=open
+    CreatePage    HTTPSignature    single    mmmm*    reqrestype=req    reqresheader=ua    keywordtext=mmmm*
     #验证新建是否成功
-    ui-object-search-name    create-HTTPSignature-open-16-hex-0018
+    ui-object-search-name    mmmm*
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-HTTPSignature-open-16-hex-0018
+    Should Be Equal As Strings    ${text}    mmmm*
     #删除对象
     objects-delete
     
-create-HTTPSignature-group-019
+create-http-signature-019
-    #新建HTTPSignature
+    #新建Account
-    CreatePage    ReqRes    create-HTTPSignature-Request-User-Agent-prefix-001    reqrestype=req    reqresheader=ua    keywordtext=Mozilla/5.0*
+    CreatePage    HTTPSignature    single    w    reqrestype=req    reqresheader=ua    keywordtext=www.*
-    #新建HTTPSignature
-    CreatePage    ReqRes    create-HTTPSignature-Request-User-Agent-sub-002    reqrestype=req    reqresheader=ua    keywordtext=Mozilla/5.
-    #新建HTTPSignature-group
-    ${objects_name}    Create List    create-HTTPSignature-Request-User-Agent-prefix-001    create-HTTPSignature-Request-User-Agent-sub-002
-    CreatePage    ReqRes    create-HTTPSignature-group-019    group=ReqResGroup    object_name=${objects_name}
     #验证新建是否成功
-    ui-object-search-name    create-HTTPSignature-group-019
+    ui-object-search-name    w
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-HTTPSignature-group-019
+    Should Be Equal As Strings    ${text}    w
     #删除对象
     objects-delete
-    #删除对象
-    ui-object-search-name    create-HTTPSignature-Request-User-Agent-prefix-001
-    objects-delete
-    ui-object-search-name    create-HTTPSignature-Request-User-Agent-sub-002
-    objects-delete
 
+create-http-signature-020
+    #新建Account
+    CreatePage    HTTPSignature    single    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111    reqrestype=req    reqresheader=ua    keywordtext=www.*
+    #验证新建是否成功
+    ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    #删除对象
+    objects-delete
+    
+create-http-signature-021
+    #新建
+    CreatePage    HTTPSignature    single    中@enция    keywordtext=中@enция
+    ${objects_name}    Create List     中@enция
+    CreatePage    HTTPSignature    group    group中@enция    object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    中@enция
+    objects-delete  
+ 
+create-http-signature-022
+    #新建
+    CreatePage    HTTPSignature    single    w    keywordtext=中@enция
+    ${objects_name}    Create List    w
+    CreatePage    HTTPSignature    group    group中@enция    object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    w
+    objects-delete
+
+create-http-signature-023
+    #新建
+    CreatePage    HTTPSignature    single    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111    keywordtext=中@enция
+    ${objects_name}    Create List    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    CreatePage    HTTPSignature    group    group中@enция    object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    objects-delete  
+    
+create-http-signature-024
+    #新建
+    CreatePage    HTTPSignature    single    w    keywordtext=中@enция
+    CreatePage    HTTPSignature    single    中@enция    keywordtext=中@enция
+    ${objects_name}    Create List    w    中@enция
+    CreatePage    HTTPSignature    group    group中@enция    object_name=${objects_name} 
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    中@enция
+    objects-delete
+    ui-object-search-name    w
+    objects-delete 
+    
+create-http-signature-025
+    Pages
+    SelectObj    HTTPSignature   
+    Ui-Pages    5       

01-TestCase/tsg_ui/ui_objects/Object_Account_Case.robot

@@ -1,81 +1,132 @@
 *** Settings ***
 Force Tags        tsg-ui    objects    account
 Resource          ../../../03-Variable/bifangapivariable.txt
-Resource          ../../../02-Keyword/tsg_ui/objects/ObjectPages.robot
+Resource          ../../../02-Keyword/tsg_ui/objects/NewObjectPages.robot
 Library           OperatingSystem
-Resource          ../../../02-Keyword/tsg_ui/objects/Objects.robot
+Resource          ../../../02-Keyword/tsg_ui/objects/NewObject.robot
 
 *** Test Cases ***
-create-account-prefix-001
+edit-account-001
     #新建Account
-    CreatePage    Account    create-account-prefix-001    keywordtext=www.*
+    CreatePage    Account    single    0000    keywordtext=0000
     #验证新建是否成功
-    ui-object-search-name    create-account-prefix-001
+    ui-object-search-name    0000
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-account-prefix-001
+    Should Be Equal As Strings    ${text}    0000
+    #修改Account
+    object-edit-account    0000    $0000  
+    ui-object-search-name    0000
     #删除对象
     objects-delete
 
-create-account-sub-002
+create-account-002
     #新建Account
-    CreatePage    Account    create-account-sub-002    keywordtext=1234
+    CreatePage    Account    single    *скрипцияк    keywordtext=*скрипцияк
     #验证新建是否成功
-    ui-object-search-name    create-account-sub-002
+    ui-object-search-name    *скрипцияк
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    log    ${text}
+    Should Be Equal As Strings    ${text}    *скрипцияк
     #删除对象
     objects-delete
 
-create-account-exactly-003
+create-account-003
     #新建Account
-    CreatePage    Account    create-account-exactly-003    keywordtext=$1234567
+    CreatePage    Account    single    $支持中文    keywordtext=$支持中文
     #验证新建是否成功
-    ui-object-search-name    create-account-exactly-003
+    ui-object-search-name    $支持中文
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    log    ${text}
+    Should Be Equal As Strings    ${text}    $支持中文
     #删除对象
     objects-delete
 
-create-account-suffix-004
+create-account-004
     #新建Account
-    CreatePage    Account    create-account-suffix-004    keywordtext=*1234567
+    CreatePage    Account    single    1234@#%    keywordtext=1234@#%
     #验证新建是否成功
-    ui-object-search-name    create-account-suffix-004
+    ui-object-search-name    1234@#%
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    log    ${text}
+    Should Be Equal As Strings    ${text}    1234@#%
     #删除对象
     objects-delete
 
-edit-account-005
+create-account-005
     #新建Account
-    CreatePage    Account    create-account-suffix-004    keywordtext=*1234567
+    CreatePage    Account    single    www.*    keywordtext=www.*
     #验证新建是否成功
-    ui-object-search-name    create-account-suffix-004
+    ui-object-search-name    www.*
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    log    ${text}
+    Should Be Equal As Strings    ${text}    www.*
-    #修改对象
-    object-edit-account    deit-account-005    $www.baidu.com
-    #查询修改对象
-    ui-object-search-name    deit-account-005
     #删除对象
     objects-delete
     
-Create-account-group-006
+create-account-006
-    #新建category
+    #新建Account
-    CreatePage    Account    create-account-sub-002    keywordtext=1234
+    CreatePage    Account    single    w    keywordtext=www.*
-    #新建category
-    CreatePage    Account    create-account-suffix-004    keywordtext=*1234567
-    #新建category
-    ${objects_name}    Create List    create-account-sub-002    create-account-suffix-004
-    CreatePage    Account    Create-account-group-006    group=AccountGroup    object_name=${objects_name}
     #验证新建是否成功
-    ui-object-search-name    Create-account-group-006
+    ui-object-search-name    w
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    Create-account-group-006
+    Should Be Equal As Strings    ${text}    w
     #删除对象
     objects-delete
+
+create-account-007
+    #新建Account
+    CreatePage    Account    single    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111    keywordtext=www.*
+    #验证新建是否成功
+    ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
     #删除对象
-    ui-object-search-name    create-account-sub-002
     objects-delete
-    ui-object-search-name    create-account-suffix-004
+    
+create-account-008
+    #新建Account
+    CreatePage    Account    single    中@enция    keywordtext=中@enция
+    ${objects_name}    Create List     中@enция
+    CreatePage    Account    group    group中@enция    object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
     objects-delete
+    ui-object-search-name    中@enция
+    objects-delete
+ 
+create-account-009
+    #新建Account
+    CreatePage    Account    single    w    keywordtext=中@enция
+    ${objects_name}    Create List    w
+    CreatePage    Account    group    group中@enция    object_name=${objects_name} 
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    w
+    objects-delete
+
+create-account-010
+    #新建Account
+    CreatePage    Account    single    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111    keywordtext=中@enция
+    ${objects_name}    Create List    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    CreatePage    Account    group    group中@enция    object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    objects-delete
+    
+create-account-011
+    #新建Account
+    CreatePage    Account    single    w    keywordtext=中@enция
+    CreatePage    Account    single    中@enция    keywordtext=中@enция
+    ${objects_name}    Create List    w    中@enция
+    CreatePage    Account    group    group中@enция    object_name=${objects_name} 
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    中@enция
+    objects-delete
+    ui-object-search-name    w
+    objects-delete
+
+create-account-012
+    Pages
+    SelectObj    Account    
+    Ui-Pages    5

01-TestCase/tsg_ui/ui_objects/Object_Category_Case.robot

@@ -1,62 +1,132 @@
 *** Settings ***
 Force Tags        tsg-ui    objects    category
 Resource          ../../../03-Variable/bifangapivariable.txt
-Resource          ../../../02-Keyword/tsg_ui/objects/ObjectPages.robot
+Resource          ../../../02-Keyword/tsg_ui/objects/NewObjectPages.robot
 Library           OperatingSystem
-Resource          ../../../02-Keyword/tsg_ui/objects/Objects.robot
+Resource          ../../../02-Keyword/tsg_ui/objects/NewObject.robot
 
 *** Test Cases ***
-create-category-exactly-001
+edit-category-001
-    #新建Category
+    #新建
-    CreatePage    Category    create-category-exactly-001    keywordtext=$www.baidu.com
+    CreatePage    Category    single    *.com    keywordtext=*.com
     #验证新建是否成功
-    ui-object-search-name    create-category-exactly-001
+    ui-object-search-name    *.com
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-category-exactly-001
+    Should Be Equal As Strings    ${text}    *.com
+    #修改
+    object-edit-fqdn   *.com    $ww.jianshu.com  
+    ui-object-search-name    *.com
     #删除对象
     objects-delete
 
-create-category-suffix-002
+create-category-002
-    #新建Category
+    #新建
-    CreatePage    Category    create-category-suffix-002    keywordtext=*baidu.com
+    CreatePage    Category    single    *.com    keywordtext=*.com
     #验证新建是否成功
-    ui-object-search-name    create-category-suffix-002
+    ui-object-search-name    *.com
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-category-suffix-002
+    Should Be Equal As Strings    ${text}    *.com
     #删除对象
     objects-delete
 
-edit-category-003
+create-category-003
-    #新建Category
+    #新建
-    CreatePage    Category    create-category-suffix-002    keywordtext=*baidu.com
+    CreatePage    Category    single    $www.baidu.com    keywordtext=$www.baidu.com
     #验证新建是否成功
-    ui-object-search-name    create-category-suffix-002
+    ui-object-search-name    $www.baidu.com
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-category-suffix-002
+    Should Be Equal As Strings    ${text}    $www.baidu.com
-    #修改对象
-    object-edit-fqdn    deit-category-003    $open.node.com
-    #查询修改对象
-    ui-object-search-name    deit-category-003
     #删除对象
     objects-delete
 
-Create-category-group-004
+create-category-004
-    #新建category
+    #新建
-    CreatePage    Category    create-category-exactly-001    keywordtext=$www.baidu.com
+    CreatePage    Category    single    *скрипцияк.    keywordtext=*www.vision.net
-    #新建category
-    CreatePage    Category    create-category-suffix-002    keywordtext=*baidu.com
-    #新建category
-    ${objects_name}    Create List    create-category-exactly-001    create-category-suffix-002
-    CreatePage    category    Create-category-group-004    group=CategoryGroup    object_name=${objects_name}
     #验证新建是否成功
-    ui-object-search-name    Create-category-group-004
+    ui-object-search-name    *скрипцияк.
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    Create-category-group-004
+    Should Be Equal As Strings    ${text}    *скрипцияк.
     #删除对象
     objects-delete
-    #删除对象
-    ui-object-search-name    create-category-exactly-001
-    objects-delete
-    ui-object-search-name    create-category-exactly-001
-    objects-delete
     
+create-category-005
+    #新建
+    CreatePage    Category    single    $支持中文.    keywordtext=$www.vision.com
+    #验证新建是否成功
+    ui-object-search-name    $支持中文.
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    $支持中文.
+    #删除对象
+    objects-delete
+    
+create-category-006
+    #新建
+    CreatePage    Category    single    w    keywordtext=*6n.com
+    #验证新建是否成功
+    ui-object-search-name    w
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    w
+    #删除对象
+    objects-delete
+
+create-category-007
+    #新建
+    CreatePage    Category    single    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111    keywordtext=*.com
+    #验证新建是否成功
+    ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    #删除对象
+    objects-delete
+    
+create-category-008
+    #新建
+    CreatePage    Category    single    中@enция    keywordtext=*node.com
+    ${objects_name}    Create List     中@enция
+    CreatePage    Category    group    group中@enция    object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    中@enция
+    objects-delete  
+ 
+create-category-009
+    #新建
+    CreatePage    Category    single    w    keywordtext=*node.com
+    ${objects_name}    Create List    w
+    CreatePage    Category    group    group中@enция    object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    w
+    objects-delete
+
+create-category-010
+    #新建
+    CreatePage    Category    single    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111    keywordtext=*.com
+    ${objects_name}    Create List    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    CreatePage    Category    group    group中@enция    object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    objects-delete   
+    
+create-category-011
+    #新建
+    CreatePage    Category    single    w    keywordtext=*node.com
+    CreatePage    Category    single    中@enция    keywordtext=*www.node.com
+    ${objects_name}    Create List    w    中@enция
+    CreatePage    Category    group    group中@enция    object_name=${objects_name} 
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    中@enция
+    objects-delete
+    ui-object-search-name    w
+    objects-delete   
+    
+create-category-012
+    Pages
+    SelectObj    Category   
+    Ui-Pages    5   

01-TestCase/tsg_ui/ui_objects/Object_Fqdn_Case.robot

@@ -1,73 +1,132 @@
 *** Settings ***
 Force Tags        tsg-ui    objects    fqdn
 Resource          ../../../03-Variable/bifangapivariable.txt
-Resource          ../../../02-Keyword/tsg_ui/objects/ObjectPages.robot
+Resource          ../../../02-Keyword/tsg_ui/objects/NewObjectPages.robot
 Library           OperatingSystem
-Resource          ../../../02-Keyword/tsg_ui/objects/Objects.robot
+Resource          ../../../02-Keyword/tsg_ui/objects/NewObject.robot
 
 *** Test Cases ***
-create-fqdn-exactly-001
+edit-fqdn-001
-    #新建fqdn,exactly
+    #新建
-    CreatePage    Fqdn    create-fqdn-exactly-001    keywordtext=$open.node.com
+    CreatePage    FQDN    single    *.com    keywordtext=*.com
     #验证新建是否成功
-    ui-object-search-name    create-fqdn-exactly-001
+    ui-object-search-name    *.com
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-fqdn-exactly-001
+    Should Be Equal As Strings    ${text}    *.com
+    #修改
+    object-edit-fqdn    *.com    $www.baidu.com  
+    ui-object-search-name    *.com
     #删除对象
     objects-delete    
 
-create-fqdn-suffix-002
+create-fqdn-002
-    #新建fqdn,exactly
+    #新建
-    CreatePage    Fqdn    create-fqdn-suffix-002    keywordtext=*open.node.com
+    CreatePage    FQDN    single    *.com    keywordtext=*.com
     #验证新建是否成功
-    ui-object-search-name    create-fqdn-suffix-002
+    ui-object-search-name    *.com
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-fqdn-suffix-002
+    Should Be Equal As Strings    ${text}    *.com
     #删除对象
     objects-delete
     
-create-fqdn-suffix-003
+create-fqdn-003
-    #新建fqdn,exactly
+    #新建
-    CreatePage    Fqdn    create-fqdn-suffix-003    keywordtext=*123-456_abc
+    CreatePage    FQDN    single    *.123-456_abc    keywordtext=*.123-456_abc
     #验证新建是否成功
-    ui-object-search-name    create-fqdn-suffix-003
+    ui-object-search-name    *.123-456_abc
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-fqdn-suffix-003
+    Should Be Equal As Strings    ${text}    *.123-456_abc
     #删除对象
     objects-delete
     
-deit-fqdn-004
+create-fqdn-004
-    #新建fqdn,exactly
+    #新建
-    CreatePage    Fqdn    create-fqdn-suffix-002    keywordtext=*open.node.com
+    CreatePage    FQDN    single    $www.baidu.com    keywordtext=$www.baidu.com
     #验证新建是否成功
-    ui-object-search-name    create-fqdn-suffix-002
+    ui-object-search-name    $www.baidu.com
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-fqdn-suffix-002
+    Should Be Equal As Strings    ${text}    $www.baidu.com
-    #修改对象
-    object-edit-fqdn    deit-fqdn-004    $open.node.com
-    #查询修改对象
-    ui-object-search-name    deit-fqdn-004
     #删除对象
     objects-delete
 
-Create-fqdn-group-005
+create-fqdn-005
-    #新建fqdn,exactly
+    #新建
-    CreatePage    Fqdn    create-fqdn-suffix-002    keywordtext=*open.node.com
+    CreatePage    FQDN    single    $支持中文    keywordtext=$www.baidu.com
-    #新建fqdn,exactly
-    CreatePage    Fqdn    create-fqdn-suffix-003    keywordtext=*123-456_abc
-    #新建fqdn
-    ${objects_name}    Create List    create-fqdn-suffix-002    create-fqdn-suffix-003
-    CreatePage    Fqdn    create-fqdn-group-005    group=FqdnGroup    object_name=${objects_name}
     #验证新建是否成功
-    ui-object-search-name    create-fqdn-group-005
+    ui-object-search-name    $支持中文
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-fqdn-group-005
+    Should Be Equal As Strings    ${text}    $支持中文
     #删除对象
     objects-delete
+
+create-fqdn-006
+    #新建
+    CreatePage    FQDN    single    w    keywordtext=*www.baidu.com
+    #验证新建是否成功
+    ui-object-search-name    w
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    w
     #删除对象
-    ui-object-search-name    create-fqdn-suffix-002
-    objects-delete
-    ui-object-search-name    create-fqdn-suffix-003
     objects-delete
 
+create-fqdn-007
+    #新建
+    CreatePage    FQDN    single    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111    keywordtext=*www.node.cn
+    #验证新建是否成功
+    ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    #删除对象
+    objects-delete
     
+create-fqdn-008
+    #新建
+    CreatePage    FQDN    single    中@enция    keywordtext=*node.cn
+    ${objects_name}    Create List     中@enция
+    CreatePage    FQDN    group    group中@enция    object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    中@enция
+    objects-delete  
+ 
+create-fqdn-009
+    #新建
+    CreatePage    FQDN    single    w    keywordtext=*.com
+    ${objects_name}    Create List    w
+    CreatePage    FQDN    group   group中@enция    object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    w
+    objects-delete
+
+create-fqdn-010
+    #新建
+    CreatePage    FQDN    single    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111    keywordtext=*.com
+    ${objects_name}    Create List    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    CreatePage    FQDN    group   group中@enция    object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    objects-delete   
+    
+create-fqdn-011
+    #新建
+    CreatePage    FQDN    single    w    keywordtext=$www.baidu.com
+    CreatePage    FQDN    single    中@enция    keywordtext=*.com
+    ${objects_name}    Create List    w    中@enция
+    CreatePage    FQDN    group    group中@enция    object_name=${objects_name} 
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    中@enция
+    objects-delete
+    ui-object-search-name    w
+    objects-delete 
+    
+create-fqdn-012
+    Pages
+    SelectObj    FQDN   
+    Ui-Pages    5      

01-TestCase/tsg_ui/ui_objects/Object_Ip_Case.robot

@@ -1,199 +1,260 @@
 *** Settings ***
 Force Tags        tsg-ui    objects    ip
 Resource          ../../../03-Variable/bifangapivariable.txt
-Resource          ../../../02-Keyword/tsg_ui/objects/ObjectPages.robot
+Resource          ../../../02-Keyword/tsg_ui/objects/NewObjectPages.robot
 Library           OperatingSystem
-Resource          ../../../02-Keyword/tsg_ui/objects/Objects.robot
+Resource          ../../../02-Keyword/tsg_ui/objects/NewObject.robot
 
 *** Test Cases ***
-create-ipv4-range-001
+create-address-ipv4-001
-    #新建ip，range
+    #新建ipv4，range,name输入最小值(1位)
-    CreatePage    Ip    create-ipv4-range-001    ipads=ipv4    ipclient=range    ipclienttext1=192.168.1.1    ipclienttext2=192.168.1.1
+    CreatePage    IP    single    1    ip_type=Ip    ipclienttext1=192.168.100.1-192.168.200.1    post=0
-    ...    post=0/0    ip_type=Ip
     #验证新建是否成功
-    ui-object-search-name    create-ipv4-range-001
+    ui-object-search-name    1
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-ipv4-range-001
+    Should Be Equal As Strings    ${text}    1
+    #删除对象
+    objects-delete
+create-address-ipv4-002
+    #新建ipv4
+    CreatePage    IP    single    create-address-ipv4-002    ip_type=Ip    ipclienttext1=192.168.100.1    post=1
+    #验证新建是否成功
+    ui-object-search-name    create-address-ipv4-002
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    create-address-ipv4-002
+    #删除对象
+    objects-delete
+create-address-ipv4-003
+    #新建ipv4,CIDR最小值，post最小值
+    CreatePage    IP    single    create-address-ipv4-003    ip_type=Ip    ipclienttext1=192.168.100.1/0    post=0
+    #验证新建是否成功
+    ui-object-search-name    create-address-ipv4-003
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    create-address-ipv4-003
+    #删除对象
+    objects-delete
+create-address-ipv4-004
+    #新建ipv4,CIDR最大值，post最大值
+    CreatePage    IP    single    create-address-ipv4-004    ip_type=Ip    ipclienttext1=192.168.100.1/32    post=65535
+    #验证新建是否成功
+    ui-object-search-name    create-address-ipv4-004
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    create-address-ipv4-004
+    #删除对象
+    objects-delete
+create-address-ipv6-005
+    #新建ipv6，range，name输入最大值(128位)
+    CreatePage    IP    single    create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres    ip_type=Ip    ipclienttext1=AAAA::AAAA-FFFF::FFFF    post=65535
+    #验证新建是否成功
+    ui-object-search-name    create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres
+    #删除对象
+    objects-delete
+create-address-ipv6-006
+    #新建ipv6，name输入最大值(128位)
+    CreatePage    IP    single    create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres    ip_type=Ip    ipclienttext1=AAAA::AAAA   post=65535
+    #验证新建是否成功
+    ui-object-search-name    create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres
+    #删除对象
+    objects-delete
+create-address-ipv6-007
+    #新建ipv6，CIRD最小值，和post最小值，name输入最大值(128位)
+    CreatePage    IP    single    create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres    ip_type=Ip    ipclienttext1=AAAA::AAAA/0   post=0
+    #验证新建是否成功
+    ui-object-search-name    create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres
     #删除对象
     objects-delete
     
-create-ipv4-cidr-002
+create-address-ipv6-008
-    #新建ip，cidr
+    #新建ipv6，CIRD最大值，和post最大值，name输入最大值(128位)
-    CreatePage    Ip    create-ipv4-cidr-002    ipads=ipv4    ipclient=cidr    ipclienttext1=192.168.1.1    ipclienttext2=24
+    CreatePage    IP    single    create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres    ip_type=Ip    ipclienttext1=AAAA::AAAA/128   post=65535
-    ...    post=65535/65535    ip_type=Ip
     #验证新建是否成功
-    ui-object-search-name    create-ipv4-cidr-002
+    ui-object-search-name    create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-ipv4-cidr-002
+    Should Be Equal As Strings    ${text}    create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres
     #删除对象
     objects-delete
     
-create-ipv4-masks-003
+create-address-geography-country-009
-    #新建ip，masks
+    #新建ip归属地，国家
-    CreatePage    Ip    create-ipv4-masks-003    ipads=ipv4    ipclient=masks    ipclienttext1=192.168.1.1    ipclienttext2=255.255.255.0
+    ${Country}    Create List    China    Hong Kong
-    ...    post=1/1    ip_type=Ip
+    CreatePage    IP    single    create-address-geography-country-008    ip_type=Geography    Country=${Country}
     #验证新建是否成功
-    ui-object-search-name    create-ipv4-masks-003
+    ui-object-search-name    create-address-geography-country-008
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-ipv4-masks-003
+    Should Be Equal As Strings    ${text}    create-address-geography-country-008
     #删除对象
     objects-delete
     
-create-ipv6-range-004
+create-address-geography-city-010
-    #新建ip，range
+    #新建ip归属地，城市
-    CreatePage    Ip    create-ipv6-range-004    ipads=ipv6    ipclient=range    ipclienttext1=0:0:0:0:0:0:0:0    ipclienttext2=FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF
+    ${City}    Create List    Beijing
-    ...    post=65535/65535    ip_type=Ip
+    CreatePage    IP    single    create-address-geography-city-010    ip_type=Geography    City=${City}
     #验证新建是否成功
-    ui-object-search-name    create-ipv6-range-004
+    ui-object-search-name    create-address-geography-city-010
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-ipv6-range-004
+    Should Be Equal As Strings    ${text}    create-address-geography-city-010
     #删除对象
     objects-delete
     
-create-ipv6-cidr-005
+create-address-geography-countryandcity-011
-    #新建ip，cidr
+    #新建ip归属地，国家和城市
-    CreatePage    Ip    create-ipv6-cidr-005    ipads=ipv6    ipclient=cidr    ipclienttext1=0:0:0:0:0:0:0:0    ipclienttext2=64
-    ...    post=1/1    ip_type=Ip
-    #验证新建是否成功
-    ui-object-search-name    create-ipv6-cidr-005
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-ipv6-cidr-005
-    #删除对象
-    objects-delete
-
-create-ipv6-masks-006
-    #新建ip，masks
-    CreatePage    Ip    create-ipv6-masks-006    ipads=ipv6    ipclient=masks    ipclienttext1=0:0:0:0:0:0:0:0    ipclienttext2=0:0:0:0:0:0:0:0
-    ...    post=65535/65535    ip_type=Ip
-    #验证新建是否成功
-    ui-object-search-name    create-ipv6-masks-006
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-ipv6-masks-006
-    #删除对象
-    objects-delete
-
-edit-ip-007
-    #新建ip，masks
-    CreatePage    Ip    create-ipv6-masks-007    ipads=ipv6    ipclient=masks    ipclienttext1=0:0:0:0:0:0:0:0    ipclienttext2=0:0:0:0:0:0:0:0    ip_type=Ip    post=65535/65535
-    #验证新建是否成功
-    ui-object-search-name    create-ipv6-masks-007
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-ipv6-masks-007
-    #修改对象
-    object-edit-ip    edit-ip-007    ipv4    range    192.168.100.1    192.168.100.1    post=0/0
-    #查询修改对象
-    ui-object-search-name    edit-ip-007
-    #删除对象
-    objects-delete
-
-create-ipv6-range-008
-    #新建ip，range
-    CreatePage    Ip    create-ipv6-range-008    ipads=ipv6    ipclient=range    ipclienttext1=::    ipclienttext2=::1
-    ...    post=0/0    ip_type=Ip
-    #验证新建是否成功
-    ui-object-search-name    create-ipv6-range-008
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-ipv6-range-008
-    #删除对象
-    objects-delete
-
-create-ipv4-range-009
-    #新建ip，range
-    CreatePage    Ip    create-ipv4-range-009    ipads=ipv4    ipclient=range    ipclienttext1=0.0.0.0    ipclienttext2=255.255.255.255
-    ...    post=65535/65535    ip_type=Ip
-    #验证新建是否成功
-    ui-object-search-name    create-ipv4-range-009
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-ipv4-range-009
-    #删除对象
-    objects-delete
-
-create-ipv4-cidr-010
-    #新建ip，cidr
-    CreatePage    Ip    create-ipv4-cidr-010    ipads=ipv4    ipclient=cidr    ipclienttext1=0.0.0.0    ipclienttext2=0
-    ...    post=0/0    ip_type=Ip
-    #验证新建是否成功
-    ui-object-search-name    create-ipv4-cidr-010
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-ipv4-cidr-010
-    #删除对象
-    objects-delete
-
-create-ipv4-cidr-011
-    #新建ip，cidr
-    CreatePage    Ip    create-ipv4-cidr-011    ipads=ipv4    ipclient=cidr    ipclienttext1=255.255.255.255    ipclienttext2=32
-    ...    post=65535/65535    ip_type=Ip
-    #验证新建是否成功
-    ui-object-search-name    create-ipv4-cidr-011
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-ipv4-cidr-011
-    #删除对象
-    objects-delete
-
-create-ipv6-range-012
-    #新建ip，range
-    CreatePage    Ip    create-ipv6-range-012    ipads=ipv6    ipclient=range    ipclienttext1=::    ipclienttext2=FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF
-    ...    post=0/0    ip_type=Ip
-    #验证新建是否成功
-    ui-object-search-name    create-ipv6-range-012
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-ipv6-range-012
-    #删除对象
-    objects-delete
-
-create-ipv6-cidr-013
-    #新建ip，range
-    CreatePage    Ip    create-ipv6-cidr-013    ipads=ipv6    ipclient=cidr    ipclienttext1=::    ipclienttext2=0
-    ...    post=0/0    ip_type=Ip
-    #验证新建是否成功
-    ui-object-search-name    create-ipv6-cidr-013
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-ipv6-cidr-013
-    #删除对象
-    objects-delete
-
-create-ipv6-cidr-014
-    #新建ip，range
-    CreatePage    Ip    create-ipv6-cidr-014    ipads=ipv6    ipclient=cidr    ipclienttext1=FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF    ipclienttext2=128
-    ...    post=65535/65535    ip_type=Ip
-    #验证新建是否成功
-    ui-object-search-name    create-ipv6-cidr-014
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-ipv6-cidr-014
-    #删除对象
-    objects-delete
-    
-create-ip-group-015
-    #新建ip，${objects_name}的赋值可以先新建ip，用刚新建ip的name赋值
-    ${objects_name}    Create List    lyf-50.59    lyf-50.43
-    CreatePage    Ip    create-ip-group-015    group=AddressGroup    ip_type=Ip    object_name=${objects_name}
-    #验证新建是否成功
-    ui-object-search-name    create-ip-group-015
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-ip-group-015
-    #删除对象
-    objects-delete
-    
-create-geography-group-016
-    #新建ip，${objects_name}的赋值可以先新建geography，用刚新建geography的name赋值
-    ${objects_name}    Create List    yyq-Hong Kong    yyq-US
-    CreatePage    Ip    create-geography-group-016    group=AddressGroup    ip_type=Geography    object_name=${objects_name}
-    #验证新建是否成功
-    ui-object-search-name    create-geography-group-016
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-geography-group-016
-    #删除对象
-    objects-delete
-    
-create-geography-017
-    #把要添加的国家和城市定义一个列表
     ${Country}    Create List    China    Hong Kong
     ${City}    Create List    Beijing
-    #新建归属地
+    CreatePage    IP    single    create-address-geography-countryandcity-011    ip_type=Geography    Country=${Country}    City=${City}
-    CreatePage    Ip    create-geography-017    ip_type=Geography    Country=${Country}    City=${City}
     #验证新建是否成功
-    ui-object-search-name    create-geography-017
+    ui-object-search-name    create-address-geography-countryandcity-011
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-geography-017
+    Should Be Equal As Strings    ${text}    create-address-geography-countryandcity-011
+    #删除对象
+    objects-delete
+    
+create-addressgroup-ip-012
+    #新建ipv4
+    CreatePage    IP    single    create-address-ipv4-002    ip_type=Ip    ipclienttext1=192.168.100.1    post=1
+    #新建addressgroup，sub_objects添加一个ip对象
+    ${objects_name}    Create List    create-address-ipv4-002
+    CreatePage    IP    group    create-addressgroup-ip-012    ip_type=Ip     object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    create-addressgroup-ip-012
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    create-addressgroup-ip-012
+    #删除对象
+    objects-delete
+    ui-object-search-name    create-address-ipv4-002
+    objects-delete
+    
+create-addressgroup-ip-013
+    #新建ipv4
+    CreatePage    IP    single    create-address-ipv4-002    ip_type=Ip    ipclienttext1=192.168.100.1    post=1
+    #新建ipv6，name输入最大值(128位)
+    CreatePage    IP    single    create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres    ip_type=Ip    ipclienttext1=AAAA::AAAA   post=65535
+    #新建addressgroup，sub_objects添加多个ip对象
+    ${objects_name}    Create List    create-address-ipv4-002    create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres
+    CreatePage    IP    group    create-addressgroup-ip-013    ip_type=Ip     object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    create-addressgroup-ip-013
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    create-addressgroup-ip-013
+    #删除对象
+    objects-delete
+    ui-object-search-name    create-address-ipv4-002
+    objects-delete
+    ui-object-search-name    create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres
+    objects-delete
+    
+create-addressgroup-ip-014
+    #新建ipv4
+    CreatePage    IP    single    create-address-ipv4-002    ip_type=Ip    ipclienttext1=192.168.100.1    post=1
+    #新建addressgroup，sub_objects添加一个ip对象，name输入最小字符
+    ${objects_name}    Create List    create-address-ipv4-002
+    CreatePage    IP    group    L    ip_type=Ip     object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    L
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    L
+    #删除对象
+    objects-delete
+    ui-object-search-name    create-address-ipv4-002
+    objects-delete
+    
+create-addressgroup-ip-015
+    #新建ipv4
+    CreatePage    IP    single    create-address-ipv4-002    ip_type=Ip    ipclienttext1=192.168.100.1    post=1
+    #新建addressgroup，sub_objects添加一个ip对象，name输入最大字符
+    ${objects_name}    Create List    create-address-ipv4-002
+    CreatePage    IP    group    create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres    ip_type=Ip     object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-address-ipv6-001create-addres
+    #删除对象
+    objects-delete
+    ui-object-search-name    create-address-ipv4-002
+    objects-delete
+    
+create-addressgroup-ip-016
+    #新建ipv4
+    CreatePage    IP    single    create-address-ipv4-002    ip_type=Ip    ipclienttext1=192.168.100.1    post=1
+    #新建addressgroup，sub_objects添加一个ip对象，name输入中英俄特殊字符数字
+    ${objects_name}    Create List    create-address-ipv4-002
+    CreatePage    IP    group    中abcДдБб!@#123    ip_type=Ip     object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    中abcДдБб!@#123
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    中abcДдБб!@#123
+    #删除对象
+    objects-delete
+    ui-object-search-name    create-address-ipv4-002
+    objects-delete
+    
+create-addressgroup-geography-017
+    #新建ip归属地，国家
+    ${Country}    Create List    China    Hong Kong
+    CreatePage    IP    single    create-address-geography-country-008    ip_type=Geography    Country=${Country}
+    #新建addressgroup，sub_objects添加一个ip归属地对象，name输入中英俄特殊字符数字
+    ${objects_name}    Create List    create-address-geography-country-008
+    CreatePage    IP    group    中abcДдБб!@#123    ip_type=Geography     object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    中abcДдБб!@#123
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    中abcДдБб!@#123
+    #删除对象
+    objects-delete
+    ui-object-search-name    create-address-geography-country-008
+    objects-delete
+    
+create-addressgroup-geography-018
+    #新建ip归属地，国家
+    ${Country}    Create List    China    Hong Kong
+    CreatePage    IP    single    create-address-geography-country-008    ip_type=Geography    Country=${Country}
+    #新建ip归属地，国家和城市
+    ${Country}    Create List    China    Hong Kong
+    ${City}    Create List    Beijing
+    CreatePage    IP    single    create-address-geography-countryandcity-011    ip_type=Geography    Country=${Country}    City=${City}
+    #新建addressgroup，sub_objects添加多个ip归属地对象，name输入中英俄特殊字符数字
+    ${objects_name}    Create List    create-address-geography-country-008    create-address-geography-countryandcity-011
+    CreatePage    IP    group    中abcДдБб!@#123    ip_type=Geography     object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    中abcДдБб!@#123
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    中abcДдБб!@#123
+    #删除对象
+    objects-delete
+    ui-object-search-name    create-address-geography-country-008
+    objects-delete
+    ui-object-search-name    create-address-geography-countryandcity-011
+    objects-delete
+edit-address-ipv4-019
+    #新建ipv4,CIDR最大值，post最大值
+    CreatePage    IP    single    create-address-ipv4-004    ip_type=Ip    ipclienttext1=192.168.100.1/32    post=65535
+    #验证新建是否成功
+    ui-object-search-name    create-address-ipv4-004
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    create-address-ipv4-004
+    #修改对象
+    object-edit-ip   Edit      192.168.100.100      post=0/100
+    #验证修改
+    ui-object-search-name    Edit
+    #删除对象
+    objects-delete
+edit-address-geography-countryandcity-020
+    #新建ip归属地，国家和城市
+    ${Country}    Create List    China    Hong Kong
+    ${City}    Create List    Beijing
+    CreatePage    IP    single    create-address-geography-countryandcity-011    ip_type=Geography    Country=${Country}    City=${City}
+    #验证新建是否成功
+    ui-object-search-name    create-address-geography-countryandcity-011
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    create-address-geography-countryandcity-011
+    #修改对象
+    object-edit-Geography    edit-address-geography-countryandcity-020
+    #验证修改
+    ui-object-search-name    edit-address-geography-countryandcity-020
     #删除对象
     objects-delete

01-TestCase/tsg_ui/ui_objects/Object_Keywords_Case.robot

@@ -1,92 +1,141 @@
 *** Settings ***
 Force Tags        tsg-ui    objects    keywords
 Resource          ../../../03-Variable/bifangapivariable.txt
-Resource          ../../../02-Keyword/tsg_ui/objects/ObjectPages.robot
+Resource          ../../../02-Keyword/tsg_ui/objects/NewObjectPages.robot
 Library           OperatingSystem
-Resource          ../../../02-Keyword/tsg_ui/objects/Objects.robot
+Resource          ../../../02-Keyword/tsg_ui/objects/NewObject.robot
 
 *** Test Cases ***
-create-keywords-prefix-001
+edit-keywords-001
-    #新建keywords
+    #新建
-    CreatePage    Key    create-keywords-prefix-001    keywordtext=www.*
+    CreatePage    Key    single    *pppp    keywordtext=*pppp
     #验证新建是否成功
-    ui-object-search-name    create-keywords-prefix-001
+    ui-object-search-name    *pppp
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-keywords-prefix-001
+    Should Be Equal As Strings    ${text}    *pppp
+    object-edit-keywords   *pppp    656e676c6973    hex=open  
+    ui-object-search-name    *pppp
     #删除对象
     objects-delete
 
-create-keywords-sub-002
+create-keywords-002
-    #新建keywords
+    #新建
-    CreatePage    Key    create-keywords-sub-002    keywordtext=1234@#%
+    CreatePage    Key    single    656e676c6973    keywordtext=656e676c6973    hex=open
     #验证新建是否成功
-    ui-object-search-name    create-keywords-sub-002
+    ui-object-search-name    656e676c6973
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-keywords-sub-002
+    Should Be Equal As Strings    ${text}    656e676c6973
     #删除对象
     objects-delete
 
-create-keywords-exactly-003
+create-keywords-003
-    #新建keywords
+    #新建
-    CreatePage    Key    create-keywords-exactly-003    keywordtext=$支持中文
+    CreatePage    Key    single    *скрипцияк    keywordtext=*скрипцияк
     #验证新建是否成功
-    ui-object-search-name    create-keywords-exactly-003
+    ui-object-search-name    *скрипцияк
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-keywords-exactly-003
+    Should Be Equal As Strings    ${text}    *скрипцияк
     #删除对象
     objects-delete
 
-create-keywords-suffix-004
+create-keywords-004
-    #新建keywords
+    #新建
-    CreatePage    Key    create-keywords-suffix-004    keywordtext=*скрипцияк.
+    CreatePage    Key    single    $支持中文    keywordtext=$支持中文
     #验证新建是否成功
-    ui-object-search-name    create-keywords-suffix-004
+    ui-object-search-name    $支持中文
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-keywords-suffix-004
+    Should Be Equal As Strings    ${text}    $支持中文
     #删除对象
     objects-delete
     
-edit-keywords-005
+create-keywords-005
-    #新建keywords
+    #新建
-    CreatePage    Key    create-keywords-suffix-005    keywordtext=*123456
+    CreatePage    Key    single    1234@#%    keywordtext=1234@#%
     #验证新建是否成功
-    ui-object-search-name    create-keywords-suffix-005
+    ui-object-search-name    1234@#%
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-keywords-suffix-005
+    Should Be Equal As Strings    ${text}    1234@#%
-    #修改对象
-    object-edit-keywords    edit-keywords-005    $www.baidu.com
-    #查询修改对象
-    ui-object-search-name    edit-keywords-005
     #删除对象
     objects-delete
 
-create-keywords-open-16hex-006
+create-keywords-006
-    #新建keywords
+    #新建
-    CreatePage    Key    create-keywords-open-16hex-006    keywordtext=*123456    hex=open
+    CreatePage    Key    single    www.*    keywordtext=www.*
     #验证新建是否成功
-    ui-object-search-name    create-keywords-open-16hex-006
+    ui-object-search-name    www.*
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/span/span[2]/span
-    log    ${text}
-    #删除对象
-    objects-delete
-    
-Create-keywords-group-007
-    #新建keywords
-    CreatePage    Key    create-keywords-prefix-001    keywordtext=www.*
-    #新建keywords
-    CreatePage    Key    create-keywords-sub-002    keywordtext=1234@#%
-    #新建keywords
-    ${objects_name}    Create List    create-keywords-prefix-001    create-keywords-sub-002
-    CreatePage    Key    Create-keywords-group-007    group=KeyGroup    object_name=${objects_name}
-    #验证新建是否成功
-    ui-object-search-name    Create-keywords-group-007
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    Create-keywords-group-007
+    Should Be Equal As Strings    ${text}    www.*
     #删除对象
     objects-delete
-    #删除对象
-    ui-object-search-name    create-keywords-prefix-001
-    objects-delete
-    ui-object-search-name    create-keywords-sub-002
-    objects-delete
 
+create-keywords-007
+    #新建Account
+    CreatePage    Key    single    w    keywordtext=www.*
+    #验证新建是否成功
+    ui-object-search-name    w
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    w
+    #删除对象
+    objects-delete
+
+create-keywords-008
+    #新建Account
+    CreatePage    Key    single    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111    keywordtext=www.*
+    #验证新建是否成功
+    ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    #删除对象
+    objects-delete
+    
+create-keywords-009
+    #新建
+    CreatePage    Key    single    中@enция    keywordtext=中@enция
+    ${objects_name}    Create List     中@enция
+    CreatePage    Key    group    group中@enция    object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    中@enция
+    objects-delete  
+ 
+create-keywords-010
+    #新建
+    CreatePage    Key    single    w    keywordtext=中@enция
+    ${objects_name}    Create List    w
+    CreatePage    Key    group    group中@enция    object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    w
+    objects-delete
+
+create-keywords-011
+    #新建
+    CreatePage    Key    single    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111    keywordtext=中@enция
+    ${objects_name}    Create List    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    CreatePage    Key    group    group中@enция    object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    objects-delete 
+    
+create-keywords-012
+    #新建
+    CreatePage    Key    single    w    keywordtext=中@enция
+    CreatePage    Key    single    中@enция    keywordtext=中@enция
+    ${objects_name}    Create List    w    中@enция
+    CreatePage    Key    group    group中@enция    object_name=${objects_name} 
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    中@enция
+    objects-delete
+    ui-object-search-name    w
+    objects-delete  
+    
+create-keywords-013
+    Pages
+    SelectObj    Key   
+    Ui-Pages    5     

01-TestCase/tsg_ui/ui_objects/Object_Subscriber_Id_Case.robot

@@ -1,62 +1,122 @@
 *** Settings ***
 Force Tags        tsg-ui    object    sub-id
 Resource          ../../../03-Variable/bifangapivariable.txt
-Resource          ../../../02-Keyword/tsg_ui/objects/ObjectPages.robot
+Resource          ../../../02-Keyword/tsg_ui/objects/NewObjectPages.robot
 Library           OperatingSystem
-Resource          ../../../02-Keyword/tsg_ui/objects/Objects.robot
+Resource          ../../../02-Keyword/tsg_ui/objects/NewObject.robot
 
 *** Test Cases ***
-create-Subscriber-ID-001
+edit-subscriber-id-001
-    #新建sub-id
+    #新建
-    CreatePage    Sub    create-sub-id-001    keywordtext=$test37
+    CreatePage    SubscriberID    single    $test37    keywordtext=$test37
     #验证新建是否成功
-    ui-object-search-name    create-sub-id-001
+    ui-object-search-name    $test37
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-sub-id-001
+    Should Be Equal As Strings    ${text}    $test37
+    #修改
+    object-edit-Subscriber-ID    $test37    $test35  
+    ui-object-search-name    $test37
     #删除对象
     objects-delete
         
-create-Subscriber-ID-002
+create-subscriber-id-002
-    #新建sub-id
+    #新建
-    CreatePage    Sub    create-sub-id-002    keywordtext=$abc_%$#@123中文_скрипцияк.
+    CreatePage    SubscriberID    single    $abc_@%-+123中ДдБб    keywordtext=$abc_@%-+123中ДдБб
     #验证新建是否成功
-    ui-object-search-name    create-sub-id-002
+    ui-object-search-name    $abc_@%-+123中ДдБб
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-sub-id-002
+    Should Be Equal As Strings    ${text}    $abc_@%-+123中ДдБб
     #删除对象
     objects-delete
     
-edit-Subscriber-ID-003
+create-subscriber-id-003
-    #新建sub-id
+    #新建
-    CreatePage    Sub    create-sub-id-001    keywordtext=$test37
+    CreatePage    SubscriberID    single    $test37    keywordtext=$test37
     #验证新建是否成功
-    ui-object-search-name    create-sub-id-001
+    ui-object-search-name    $test37
-    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/span/span[2]/span
-    log    ${text}
-    #修改对象
-    object-edit-Subscriber-ID    deit-sub-id-003    $test20
-    #查询修改对象
-    ui-object-search-name    deit-sub-id-003
-    #删除对象
-    objects-delete
-    
-create-Subscriber-ID-group-004
-    #新建sub-id
-    CreatePage    Sub    create-sub-id-002    keywordtext=$abc_%$#@123中文_скрипцияк.
-    #新建sub-id
-    CreatePage    Sub    create-sub-id-001    keywordtext=$test37
-    #新建sub-id-group
-    ${objects_name}    Create List    create-sub-id-002    create-sub-id-001
-    CreatePage    Sub    create-Subscriber-ID-group-004    group=SubGroup    object_name=${objects_name}
-    #验证新建是否成功
-    ui-object-search-name    create-Subscriber-ID-group-004
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-Subscriber-ID-group-004
+    Should Be Equal As Strings    ${text}    $test37
     #删除对象
     objects-delete
-    #删除对象
-    ui-object-search-name    create-sub-id-002
-    objects-delete
-    ui-object-search-name    create-sub-id-001
-    objects-delete
 
+create-subscriber-id-004
+    #新建
+    CreatePage    SubscriberID    single    $支持中文    keywordtext=$www.result.cn
+    #验证新建是否成功
+    ui-object-search-name    $支持中文
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    $支持中文
+    #删除对象
+    objects-delete
+    
+create-subscriber-id-005
+    #新建Account
+    CreatePage    SubscriberID    single    w    keywordtext=$www.node.com
+    #验证新建是否成功
+    ui-object-search-name    w
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    w
+    #删除对象
+    objects-delete
+
+create-subscriber-id-006
+    #新建Account
+    CreatePage    SubscriberID    single    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111    keywordtext=$www.node.com
+    #验证新建是否成功
+    ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    #删除对象
+    objects-delete
+    
+create-subscriber-id-007
+    #新建
+    CreatePage    SubscriberID    single    中@enция    keywordtext=$www.node.com
+    ${objects_name}    Create List     中@enция
+    CreatePage    SubscriberID    group    group中@enция    object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    中@enция
+    objects-delete  
+ 
+create-subscriber-id-008
+    #新建
+    CreatePage    SubscriberID    single    w    keywordtext=$www.node.com
+    ${objects_name}    Create List    w
+    CreatePage    SubscriberID    group    group中@enция    object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    w
+    objects-delete
+
+create-subscriber-id-009
+    #新建
+    CreatePage    SubscriberID    single    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111    keywordtext=$www.node.com
+    ${objects_name}    Create List    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    CreatePage    SubscriberID    group    group中@enция    object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    objects-delete 
+    
+create-subscriber-id-010
+    #新建
+    CreatePage    SubscriberID    single    w    keywordtext=$www.node.com
+    CreatePage    SubscriberID    single    中@enция    keywordtext=$www.result.cn
+    ${objects_name}    Create List    w    中@enция
+    CreatePage    SubscriberID    group    group中@enция    object_name=${objects_name} 
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    中@enция
+    objects-delete
+    ui-object-search-name    w
+    objects-delete 
+    
+create-subscriber-id-011
+    Pages
+    SelectObj    SubscriberID   
+    Ui-Pages    5     

01-TestCase/tsg_ui/ui_objects/Object_Url_Case.robot

@@ -1,82 +1,131 @@
 *** Settings ***
 Force Tags        tsg-ui    objects    url
 Resource          ../../../03-Variable/bifangapivariable.txt
-Resource          ../../../02-Keyword/tsg_ui/objects/ObjectPages.robot
+Resource          ../../../02-Keyword/tsg_ui/objects/NewObjectPages.robot
 Library           OperatingSystem
-Resource          ../../../02-Keyword/tsg_ui/objects/Objects.robot
+Resource          ../../../02-Keyword/tsg_ui/objects/NewObject.robot
 
 *** Test Cases ***
-create-url-prefix-001
+edit-url-001
-    #新建URL
+    #新建
-    CreatePage    Url    create-url-prefix-001    keywordtext=www.*
+    CreatePage    URL    single    *.com    keywordtext=*.com
     #验证新建是否成功
-    ui-object-search-name    create-url-prefix-001
+    ui-object-search-name    *.com
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-url-prefix-001
+    Should Be Equal As Strings    ${text}    *.com
+    object-edit-url   *.com    www.*  
+    ui-object-search-name    *.com
     #删除对象
     objects-delete
 
-create-url-sub-002
+create-url-002
-    #新建sub-id
+    #新建
-    CreatePage    Url    create-url-sub-002    keywordtext=1234@#%
+    CreatePage    URL    single    *скрипцияк    keywordtext=*скрипцияк
     #验证新建是否成功
-    ui-object-search-name    create-url-sub-002
+    ui-object-search-name    *скрипцияк
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-url-sub-002
+    Should Be Equal As Strings    ${text}    *скрипцияк
     #删除对象
     objects-delete
 
-create-url-exactly-003
+create-url-003
-    #新建sub-id
+    #新建
-    CreatePage    Url    create-url-exactly-003    keywordtext=$支持中文
+    CreatePage    URL    single    $支持中文    keywordtext=$支持中文
     #验证新建是否成功
-    ui-object-search-name    create-url-exactly-003
+    ui-object-search-name    $支持中文
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-url-exactly-003
+    Should Be Equal As Strings    ${text}    $支持中文
     #删除对象
     objects-delete
 
-create-url-suffix-004
+create-url-004
-    #新建sub-id
+    #新建
-    CreatePage    Url    create-url-suffix-004    keywordtext=*скрипцияк.
+    CreatePage    URL    single    1234@#%    keywordtext=1234@#%
     #验证新建是否成功
-    ui-object-search-name    create-url-suffix-004
+    ui-object-search-name    1234@#%
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-url-suffix-004
+    Should Be Equal As Strings    ${text}    1234@#%
     #删除对象
     objects-delete
 
-edit-url-005
+create-url-005
-    #新建sub-id
+    #新建
-    CreatePage    Url    create-url-suffix-005    keywordtext=*.com
+    CreatePage    URL    single    www.*    keywordtext=www.*
     #验证新建是否成功
-    ui-object-search-name    create-url-suffix-005
+    ui-object-search-name    www.*
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-url-suffix-005
+    Should Be Equal As Strings    ${text}    www.*
-    #修改对象
-    object-edit-url    deit-url-005    $www.baidu.com
-    #查询修改对象
-    ui-object-search-name    deit-url-005
     #删除对象
     objects-delete
     
-create-url-group-006
+create-url-006
-    #新建url
+    #新建Account
-    CreatePage    Url    create-url-sub-002    keywordtext=1234@#%
+    CreatePage    URL    single    w    keywordtext=www.*
-    #新建url
-    CreatePage    Url    create-url-exactly-003    keywordtext=$支持中文
-    #新建url-group
-    ${objects_name}    Create List    create-url-sub-002    create-url-exactly-003
-    CreatePage    Sub    create-url-group-006    group=UrlGroup    object_name=${objects_name}
     #验证新建是否成功
-    ui-object-search-name    create-url-group-006
+    ui-object-search-name    w
     ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
-    Should Be Equal As Strings    ${text}    create-url-group-006
+    Should Be Equal As Strings    ${text}    w
     #删除对象
     objects-delete
-    #删除对象
-    ui-object-search-name    create-url-sub-002
-    objects-delete
-    ui-object-search-name    create-url-exactly-003
-    objects-delete
 
+create-url-007
+    #新建Account
+    CreatePage    URL    single    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111    keywordtext=www.*
+    #验证新建是否成功
+    ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    ${text}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/span
+    Should Be Equal As Strings    ${text}    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    #删除对象
+    objects-delete
+    
+create-url-008
+    #新建
+    CreatePage    URL    single    中@enция    keywordtext=中@enция
+    ${objects_name}    Create List     中@enция
+    CreatePage    URL    group    group中@enция    object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    中@enция
+    objects-delete  
+ 
+create-url-009
+    #新建
+    CreatePage    URL    single    w    keywordtext=中@enция
+    ${objects_name}    Create List    w
+    CreatePage    URL    group    group中@enция    object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    w
+    objects-delete
+
+create-url-010
+    #新建
+    CreatePage    URL    single    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111    keywordtext=中@enция
+    ${objects_name}    Create List    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    CreatePage    URL    group    group中@enция    object_name=${objects_name}
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
+    objects-delete  
+    
+create-url-011
+    #新建
+    CreatePage    URL    single    w    keywordtext=中@enция
+    CreatePage    URL    single    中@enция    keywordtext=中@enция
+    ${objects_name}    Create List    w    中@enция
+    CreatePage    URL    group    group中@enция    object_name=${objects_name} 
+    #验证新建是否成功
+    ui-object-search-name    group中@enция
+    objects-delete
+    ui-object-search-name    中@enция
+    objects-delete
+    ui-object-search-name    w
+    objects-delete 
+    
+create-url-012
+    Pages
+    SelectObj    URL   
+    Ui-Pages    5    

01-TestCase/tsg_ui/ui_settings/Insert_Scripts_Case.robot

@@ -18,16 +18,16 @@ Create_Insert_Scripts-003
     Create-Insert Scripts    1    ${path}insert_files\\Create-Insert Scripts-test.css    xpath=/html/body/div/div[1]/div[1]/ul/li[1]
 
 Create_Insert_Scripts-004
-    [Tags]    css    name传入超过128字符
+    [Tags]    css    name传入超过64字符
-    Create-Insert Scripts    ${path}insert_files\\Create-Insert Scripts-test.css${path}insert_files\\Create-Insert Scripts-test.css${path}insert_files\\Create-Insert Scripts-test.css    ${path}insert_files\\Create-Insert Scripts-test.css    xpath=/html/body/div/div[1]/div[1]/ul/li[1]
+    Create-Insert Scripts    Create-Insert Scripts-test.cssCreate-Insert Scripts-test.cssCrea    ${path}insert_files\\Create-Insert Scripts-test.css    xpath=/html/body/div/div[1]/div[1]/ul/li[1]
 
 Create_Insert_Scripts-005
     [Tags]    js    name最小值
     Create-Insert Scripts    1    ${path}insert_files\\Create-Insert_Scripts-test.js    xpath=/html/body/div/div[1]/div[1]/ul/li[2]
 
 Create_Insert_Scripts-006
-    [Tags]    js    name传入超过128字符
+    [Tags]    js    name传入超过64字符
-    Create-Insert Scripts    ${path}insert_files\\Create-Insert Scripts-test.css${path}insert_files\\Create-Insert Scripts-test.css${path}insert_files\\Create-Insert Scripts-test.css    ${path}insert_files\\Create-Insert_Scripts-test.js    xpath=/html/body/div/div[1]/div[1]/ul/li[2]
+    Create-Insert Scripts    Create-Insert Scripts-test.cssCreate-Insert Scripts-test.cssCrea    ${path}insert_files\\Create-Insert_Scripts-test.js    xpath=/html/body/div/div[1]/div[1]/ul/li[2]
 
 Edit_Insert_Scripts-007
     [Tags]    css    edit

01-TestCase/tsg_ui/ui_settings/Response_Pages_Case.robot

@@ -18,8 +18,8 @@ Create_Response_pages-003
     Create-Response Pages    1    ${path}response_pages_files\\Create-Response_Pages-test-2.htm
 
 Create_Response_pages-004
-    [Tags]    name超过128字符
+    [Tags]    name超过64字符
-    Create-Response Pages    ${path}response_pages_files\\Create-Response Pages-test2.htm${path}response_pages_files\\Create-Response Pages-test2.htm${path}response_pages_files\\Create-Response Pages-test2.htm    ${path}response_pages_files\\Create-Response_Pages-test-2.htm
+    Create-Response Pages    Create-Insert Scripts-test.cssCreate-Insert Scripts-test.cssCrea    ${path}response_pages_files\\Create-Response_Pages-test-2.htm
 
 Create_Response_pages-005
     [Tags]    中英俄特殊字符

01-TestCase/tsg_ui/ui_settings/Trusted_Certificate_Authorities_Case.robot

@@ -12,7 +12,7 @@ Create_Trusted_Certificate_Authorities-002
     import-Trusted Certificate Authorities    test    ${path}keyrings//root//tango-ca-root-01-cer.pem
 
 Create_Trusted_Certificate_Authorities-003
-    import-Trusted Certificate Authorities    ${path}keyrings//root//tango-ca-root-01-cer.pem${path}keyrings//root//tango-ca-root-01-cer.pem${path}keyrings//root//tango-ca-root-01-cer.pem    ${path}keyrings//root//tango-ca-root-01-cer.pem
+    import-Trusted Certificate Authorities    Create-Insert Scripts-test.cssCreate-Insert Scripts-test.cssCreaCreate-Insert Scripts-test.cssCreate-Insert Scripts-test.cssCrea    ${path}keyrings//root//tango-ca-root-01-cer.pem
 
 Edit_Trusted_Certificate_Authorities-004
     import-Trusted Certificate Authorities    lyf-RF-test-001    ${path}keyrings//root//tango-ca-root-01-cer.pem

02-Keyword/tsg_ui/Menu.robot

@@ -4,9 +4,9 @@ Library           Selenium2Library
 *** Keywords ***
 Menu
     [Arguments]    ${menuOne}    ${menuTwo}
-    Wait Until Element Is Enabled    id=routerEvent0
+    Wait Until Element Is Enabled    id=children0    10
     #    一级菜单
-    ${dict}    create dictionary    dashboard=routerEvent0    policy&objects=children1    log=children2    report=children3    device=children4    settings=children5    administartion=children6
+    ${dict}    create dictionary    dashboard=children0    policy&objects=children1    log=children2    report=children3    device=children4    settings=children5    administartion=children6
     #    二级菜单
     ${policy&objects}    create dictionary    Security Policy=sidebarObjects_ProxyInterception    Proxy Policy=sidebarObjects_ProxyManipulation    Objects=sidebarObjects_Objects    Schedules=sidebarObjects_Schedule    Tags=sidebarObjects_Tags
     ${log}    create dictionary    Security Event Logs=sidebarLog_SecurityEventLogs    Proxy Event Logs=sidebarLog_ProxyEventLogs    Session Records=sidebarLog_SesssionRecords    Radius Logs=sidebarLog_RadiusLogs

02-Keyword/tsg_ui/objects/NewObject.robot

@@ -720,4 +720,20 @@ Create-AddressGroup-Geography
     ...    AND    sleep    1
     run keyword if    "${group}"=="AddressGroup" and "${ip_type}"=="Ip"    run keywords    sleep    1
     ...    AND    Create-Sub-Objects   ${object_name}
+Pages
+     [Arguments]
+     Menu    policy&objects    Objects
+     sleep    3
      
+Ui-Pages
+     [Arguments]    ${pages} 
+     #click element    xpath=//*[@id="app"]/div/div[3]/div/div/div[10]/div/ul/li[1]
+     #sleep    2               
+     #click element    xpath=//*[@id="app"]/div/div[3]/div/div/div[10]/div/button[2]
+     #sleep    2             
+     Clear Element Text    xpath=//*[@id="app"]/div/div[3]/div/div/div[10]/div/span[2]/div/input
+     sleep    2
+     input text    xpath=//*[@id="app"]/div/div[3]/div/div/div[10]/div/span[2]/div/input   ${pages} 
+     sleep    2
+     press keys    xpath=//*[@id="app"]/div/div[3]/div/div/div[10]/div/span[2]/div/input    ENTER
+     sleep    2

02-Keyword/tsg_ui/objects/NewObjectPages.robot

@@ -8,7 +8,7 @@ Library           Collections
 #新建object
 CreatePage
 
-    [Arguments]    ${buildType}     ${name}      ${groupaddType}=null       ${objectform}=null   ${ip_type}=null          ${ipclienttext1}=null
+    [Arguments]    ${objectform}    ${buildType}     ${name}      ${groupaddType}=null    ${ip_type}=null          ${ipclienttext1}=null
     ...    ${keywordtext}=null    ${hex}=close    ${reqrestype}=null    ${reqresheader}=null    ${post}=null    ${Country}=null    ${City}=null    ${groupadd}=null    ${object_name}=null
     Menu    policy&objects    Objects
     sleep    3

02-Keyword/tsg_ui/setting/Settings.robot

@@ -45,7 +45,7 @@ Create-Hijack Files
     click    ${type}    #选择文件类型
     sleep    2
     click    id=hijackAddOk1    #点击OK
-    Wait Until Element Is Visible    id=one-input
+    Wait Until Element Is Visible    id=one-input    20
     input    id=one-input    ${name}    #搜索输入框输入name
     Sleep    1
     click    id=select_new_search_btn    #点击搜索按钮
@@ -145,7 +145,7 @@ Edit-Insert Scripts
     sleep    1
     click    ${type}    #选择文件类型
     sleep    1
-    click    xpath=//*[@id="policy_Manipulation_create8"]/div[2]/form/div[8]/div/div/button[1]    #点击ok提交
+    click    id=insertAddOk1    #点击ok提交
 
 Create-Response Pages
     [Arguments]    ${name}    ${file}
@@ -202,7 +202,7 @@ Edit-Response Pages
     sleep    1
     Choose File    xpath=//*[@id="policy_Manipulation_create6"]/div[2]/form/div[5]/div/div/div/input    ${file}
     sleep    1
-    click    xpath=//*[@id="policy_Manipulation_create6"]/div[2]/form/div[7]/div/div/button[1]
+    click    id=responseAddOk1
 
 Edit-Hijack Files
     [Arguments]    ${id-name}    ${name}    ${name1}    ${file}    ${type}    ${shift}=1
@@ -247,9 +247,9 @@ Edit-Hijack Files
     sleep    3
     click    ${type}    #选择类型
     sleep    1
-    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[2]/div[2]/div/div[2]/button    #关闭侧滑框
+    click    xpath=//*[@id="app"]/div/div[3]/div/div/div[2]/div[3]/div/p/i    #关闭侧滑框
     sleep    1
-    click    id=hijackAddOk    #点击ok提交
+    click    id=hijackAddOk1    #点击ok提交
 
 Edit-Traffic Mirror Profiles
     [Arguments]    ${id-name}    ${name}    ${name1}    ${type}    ${shuju}