维护UISettings模块用例develop

1 files changed, 14 insertions, 15 deletions

diff --git a/02-Keyword/tsg_ui/setting/Settings.robot b/02-Keyword/tsg_ui/setting/Settings.robot
index 63dfa34..5662fe5 100644
--- a/02-Keyword/tsg_ui/setting/Settings.robot
+++ b/02-Keyword/tsg_ui/setting/Settings.robot
@@ -316,7 +316,7 @@ CreateHijackFiles
     click    ${type}    #选择文件类型
     sleep    ${sleep}
     click    id=hijackAddOk1    #点击OK
-    Wait Until Element Is Enabled    id=hijackAdd    ${sleep_Wait}
+    Wait Until Element Is Enabled    id=VSidebar1_Home1_App0_anonymousComponent-1_Proxy_Profiles/Profile_HijackFiles    ${sleep_Wait}
     Settings-Search    ${name}    ${search}    #搜索框的关键字
     ${text1}    Get Text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/span    #获取点击后页面文本信息
     Should Be Equal As Strings    ${text1}    ${name}    #断言
@@ -342,7 +342,7 @@ CreateInsertScripts
     ...    AND    click    //span[.="${jstype}"]
     sleep    ${sleep_min}
     click    id=insertAddOk1    #点击OK
-    Wait Until Element Is Enabled    id=insertAdd    ${sleep_Wait}
+    Wait Until Element Is Enabled    id=VSidebar1_Home1_App0_anonymousComponent-1_Proxy_Profiles/Profile_Insert    ${sleep_Wait}
     Settings-Search    ${name}    ${search}    #搜索框的关键字
     log    psssssssssssssssssssssssssss
     Sleep    ${sleep_min}
@@ -363,7 +363,7 @@ TrafficMirrorProfilesValidationError
     Sleep    ${sleep_min}
     input    id=trafficmirror_addrArray0    ${shuru}
     sleep    ${sleep}
-    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[2]/button[1]    #点击OK
+    click    id=trafficMirrorProfile_ok    #点击OK
     sleep    ${sleep}
     ${text1}    Get Text    xpath=/html/body/div[last()]/p    #获取点击后页面提示信息
     Should Be Equal As Strings    ${text1}    ${PromptInformation}    #断言
@@ -543,7 +543,7 @@ EditTrafficMirrorProfiles
     OpenPages    VSidebar1_Home1_App0_anonymousComponent-1_Proxy_Profiles/Profile_TrafficMirrorProfiles
     Settings-Search    ${id-name}    ${search}    #搜索框的关键字
     sleep    ${sleep_min}
-    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[2]/div[1]/div/div[2]/div/div[3]/table/tbody/tr[1]    #点击搜素到的列表
+    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div/div[2]/div/div[3]/table/tbody/tr[1]    #点击搜素到的列表
     sleep    ${sleep_min}
     click    id=trafficMirrorEdit    #点击Edit
     sleep    ${sleep_min}
@@ -585,7 +585,7 @@ importTrustedCertificateAuthorities
     Choose File    xpath=//*[@id="upload_dome"]/div/input    ${file}    #上传文件
     sleep    ${sleep}
     click    id=authoritiesAdd_sub    #点击OK缇交
-    Wait Until Element Is Enabled    id=app_create    ${sleep_Wait}
+    Wait Until Element Is Enabled    id=VSidebar1_Home1_App0_anonymousComponent-1_Proxy_CertificateManagement/Certificate_Authorities    ${sleep_Wait}
     Settings-Search    ${name}   ${search}
     sleep    ${sleep}
     ${text1}    Get Text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[2]/div/div/div/p/span    #获取点击后页面文本信息
@@ -657,7 +657,7 @@ CreateDecryptionKeyrings
     sleep    ${sleep_min}
     ${root}    Set Variable    ${shift}
     run keyword if    "${root}"=="open"    run keywords    sleep    ${sleep_min}
-    ...    AND    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[2]/div[2]/form/div[9]/div/div/span
+    ...    AND    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[2]/div[2]/form/div[9]/div/div/span
     ...    ELSE IF    "${root}"=="close"    log    "go on"
     Run Keyword If    '${PrivateKeyType}'=='HSM'    run keywords    sleep    ${sleep_min}
     ...    AND    click    id=privateHSM
@@ -672,7 +672,7 @@ CreateDecryptionKeyrings
     Should Be Equal As Strings    ${text1}    ${name}    #断言
     
 DecryptionKeyringsErrorVerification
-    [Arguments]    ${name}    ${file}    ${file1}    ${type}    ${type1}    ${Positioning}    ${Assertion}
+    [Arguments]    ${name}    ${file}    ${file1}    ${type}    ${type1}    ${Assertion}
     [Documentation]    用于验证导入证书和类型不匹配的错误验证
     ...    必填参数：
     ...    ${name}:新建页面name输入框里的内容
@@ -680,7 +680,6 @@ DecryptionKeyringsErrorVerification
     ...    ${file1}:上传文件所在本地的路径
     ...    ${type}:上传证书类型的元素
     ...    ${type1}:上传证书加密解密算法的元素
-    ...    ${Positioning}:获取文本的xpath定位
     ...    ${Assertion}：断言信息
     sleep    ${sleep}
     click    id=VSidebar1_Home1_App0_anonymousComponent-1_Profiles    #点击一级目录Settings
@@ -1968,7 +1967,7 @@ EditPacketCapture
     input    id=PacketCaptureadd_name    ${name}
     sleep    ${sleep_min}
     run keyword if    "${AddressType}"=="IPV6"    run keywords    sleep    ${sleep_min}
-    ...    AND    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[1]/div/div[2]/form/div[2]/div/div/div/span/span/i
+    ...    AND    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[1]/div/div[2]/form/div[2]/div/div/div[1]/span/span/i
     ...    AND    sleep    ${sleep_min}
     ...    AND    click    id=select_addrtype1
     ...    AND    sleep    ${sleep_min}
@@ -1990,7 +1989,7 @@ EditPacketCapture
     ...    AND    input    id=PacketCaptureadd_serPort    ${ServerPort}
     ...    AND    sleep    ${sleep_min}
     ...    ELSE    log    ServerPort不输入
-    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[1]/div/div[2]/form/div[7]/div/div/div/span/span/i
+    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div[1]/div/div[2]/form/div[7]/div/div/div[1]/span/span/i
     sleep    ${sleep_min}
     run keyword if    "${Protocol}"=="TCP"    run keywords    sleep    ${sleep_min}
     ...    AND    click    id=select_Protocol0
@@ -2176,7 +2175,7 @@ TurnPage
     sleep    ${sleep}
     ${text4}    get text    xpath=${AssertXpath}
     run keyword if    "${lastpage}" == "null"    run keywords    sleep    ${sleep_min}
-    ...    AND    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[2]/div/div/div[last()]/div/ul/li[last()]
+    ...    AND    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div/div/div/ul/li[last()]
     ...    ELSE    click    xpath=${lastxpath}
     sleep    ${sleep} 
     ${text5}    get text    xpath=${AssertXpath}
@@ -2373,9 +2372,9 @@ UploadFilesSize
     run keyword if    "${Page}"=="SSLFingerprint"    run keywords    sleep    ${sleep_min}
     ...    AND    OpenPages    VSidebar1_Home1_App0_anonymousComponent-1_Proxy_CertificateManagement/SSL_Fingerprint
     ...    AND    sleep    ${sleep_min}
-    ...    AND    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[2]/div[1]/div/div[1]/span[2]/button
+    ...    AND    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div/div[1]/span[2]/button
     ...    AND    sleep    ${sleep_min}
-    ...    AND    Choose File    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[2]/div[4]/div/div/div[2]/div/div[1]/input    ${file}
+    ...    AND    Choose File    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[4]/div/div/div[2]/div/div[1]/input    ${file}
     ...    AND    sleep    ${sleep}
     ...    AND    click    id=Import_ua_Ok
     ...    AND    sleep    ${sleep}
@@ -2423,7 +2422,7 @@ DeleteReferencedData
     ...    AND    sleep    ${sleep_min}
     ...    AND    DeleteresinseDel
     run keyword if    "${Page}"=="InsertScript"    run keywords    sleep    ${sleep_min}
-    ...    AND    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[2]/div/div/div[2]/div/div[3]/table/tbody/tr
+    ...    AND    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div/div[2]/div/div[3]/table/tbody/tr[1]
     ...    AND    sleep    ${sleep_min}
     ...    AND    Delete
     run keyword if    "${Page}"=="HijackFile"    run keywords    sleep    ${sleep_min}
@@ -2435,7 +2434,7 @@ DeleteReferencedData
     ...    AND    sleep    ${sleep_min}
     ...    AND    DeletetrafficMirrorDel 
     run keyword if    "${Page}"=="DecryptionProfile"    run keywords    sleep    ${sleep_min}
-    ...    AND    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[2]/div/div/div[2]/div/div[3]/table/tbody/tr/td[2]/div/div/span
+    ...    AND    click    xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div/div[2]/div/div[3]/table/tbody/tr
     ...    AND    sleep    ${sleep_min}
     ...    AND    Delete 
     ${text}    get text    xpath=/html/body/div[last()]/p