对Settings和Administration关键字及用例进行调整

This commit is contained in:
byb11
2021-03-12 10:31:15 +08:00
parent 8af6c69a1c
commit cc0443cf44
5 changed files with 19 additions and 13 deletions

View File

@@ -64,7 +64,7 @@ AuditLogsTrafficMirrorProfile
EditTrafficMirrorProfiles ${id} EditAuditLogsTrafficMirrorProfile xpath=/html/body/div/div[1]/div[1]/ul/li[1] 11 id EditTrafficMirrorProfiles ${id} EditAuditLogsTrafficMirrorProfile xpath=/html/body/div/div[1]/div[1]/ul/li[1] 11 id
click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[1]/div/div[2]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/span
DeletetrafficMirrorDel DeletetrafficMirrorDel
Wait Until Element Is Enabled xpath=/html/body/div[last()]/p ${sleep_Wait} sleep ${sleep}
AdminOpenPages sidebarsystem_PolicyConfigurationLog sidebarsystem_PolicyConfigurationLog AdminOpenPages sidebarsystem_PolicyConfigurationLog sidebarsystem_PolicyConfigurationLog
AuditLogsSearch ${id} Traffic Mirror Profile AuditLogsSearch ${id} Traffic Mirror Profile
Wait Until Element Is Enabled xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div ${sleep_Wait} Wait Until Element Is Enabled xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div ${sleep_Wait}
@@ -206,9 +206,11 @@ AuditLogsCachedIntermediateCertificates
AuditLogsSSLFingerprint AuditLogsSSLFingerprint
[Tags] Positive UI SSL Fingerprint Administration AuditLogs [Tags] Positive UI SSL Fingerprint Administration AuditLogs
CreateSSLFingerprint cccccc4db3e351bbd8d38b64c41ffddd Yes JA3Hash Description=AuditLogsSSLFingerprint ${a} evaluate random.randint(1000,9999) random
${b} evaluate random.randint(1000,9999) random
CreateSSLFingerprint cccccc4db3e351bbd8d38b${a}1ffddd Yes JA3Hash Description=AuditLogsSSLFingerprint
${id1} Get Text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div/div/span ${id1} Get Text xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/div/div/span
EditSSLFingerprint ${id1} a75de4ddd3e351bbd8d3ffffffffffff No id Description=EditAuditLogsSSLFingerprint EditSSLFingerprint ${id1} a75de4ddd3e351b${b}3ffffffffffff No id Description=EditAuditLogsSSLFingerprint
click element xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr click element xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr
DeleteSSLFingerprint DeleteSSLFingerprint
Wait Until Element Is Enabled xpath=/html/body/div[last()]/p ${sleep_Wait} Wait Until Element Is Enabled xpath=/html/body/div[last()]/p ${sleep_Wait}

View File

@@ -274,8 +274,8 @@ RolesCreateNameMaxSize
${b} evaluate random.randint(1000,9999) random ${b} evaluate random.randint(1000,9999) random
CreateRoles RolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNam${b} 自动化测试 ${list} CreateRoles RolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNam${b} 自动化测试 ${list}
Wait Until Element Is Enabled id=profilesTabs_Profile_Insert ${sleep_Wait} Wait Until Element Is Enabled id=profilesTabs_Profile_Insert ${sleep_Wait}
RoleSearch RolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMax RoleSearch RolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNam${b}
Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/span/span RolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMax Assertion //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr/td[1]/div/div/span/span RolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNameMaxSizeRolesCreateNam${b}
RolesDelete RolesDelete
RolesCreateNameSpecialChar RolesCreateNameSpecialChar

View File

@@ -61,7 +61,7 @@ UsersEdit
UserCreatePage UsersEdit ${a} 111111 log 30 log superuser UserCreatePage UsersEdit ${a} 111111 log 30 log superuser
UserSearchName UsersEdit Name UserSearchName UsersEdit Name
UserEdit 1111 close UserEdit 1111 close
Wait Until Element Is Enabled id=userEdit ${sleep_Wait} Wait Until Element Is Enabled id=userAdd ${sleep_Wait}
UserSearchName ${a} UserName UserSearchName ${a} UserName
${text} Get Element Attribute xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[10]/div/div/span/div class ${text} Get Element Attribute xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[10]/div/div/span/div class
Should Be Equal As Strings ${text} el-switch Should Be Equal As Strings ${text} el-switch

View File

@@ -486,7 +486,7 @@ EditMyAccount
... ELSE log 不修改密码提醒按钮 ... ELSE log 不修改密码提醒按钮
sleep ${sleep_min} sleep ${sleep_min}
click element id=userOk click element id=userOk
sleep ${sleep_min} sleep ${sleep}
LoginRestrictionsObtainSQLIP LoginRestrictionsObtainSQLIP

View File

@@ -914,7 +914,7 @@ EditDecryptionKeyrings
click ${type1} #选择加密解密类型 click ${type1} #选择加密解密类型
sleep ${sleep_min} sleep ${sleep_min}
click id=keyringsadd_sub #点击OK缇交 click id=keyringsadd_sub #点击OK缇交
sleep ${sleep} Wait Until Element Is Enabled id=app_create ${sleep_Wait}
run keyword if "${search}"=="id" run keywords sleep ${sleep_min} run keyword if "${search}"=="id" run keywords sleep ${sleep_min}
... AND Settings-Search ${id-name} ${search} ... AND Settings-Search ${id-name} ${search}
... ELSE IF "${search}"=="name" run keywords sleep ${sleep_min} ... ELSE IF "${search}"=="name" run keywords sleep ${sleep_min}
@@ -1852,7 +1852,9 @@ SystemUsagePolicyVerification
click id=Advanced/storageQuota click id=Advanced/storageQuota
sleep ${sleep_min} sleep ${sleep_min}
${text2}= SystemUsageText ${type} ${text2}= SystemUsageText ${type}
sleep ${sleep_min}
${text3}= SystemUsagePolicySQLVerification ${type} ${DisabledOREnabled} ${text3}= SystemUsagePolicySQLVerification ${type} ${DisabledOREnabled}
sleep ${sleep_min}
Should Be Equal As Strings ${text1} ${text2} Should Be Equal As Strings ${text1} ${text2}
Should Be Equal As Strings ${text2} ${text3} Should Be Equal As Strings ${text2} ${text3}
@@ -1887,7 +1889,8 @@ SystemUsageChart
sleep ${sleep_min} sleep ${sleep_min}
${ChartValueXpath}= SystemUsageGetText ${type} ${ChartValueXpath}= SystemUsageGetText ${type}
Mouse Over xpath=${ChartSuspension} Mouse Over xpath=${ChartSuspension}
Wait Until Element Is Enabled xpath=/html/body/div[last()]/div[1]/div/div/div[2]/table/tbody/tr[1]/td[2]/div/span 10 sleep ${sleep}
# Wait Until Element Is Enabled xpath=/html/body/div[last()]/div[1]/div/div/div[2]/table/tbody/tr[1]/td[2]/div/span 10
${text1} get text xpath=${ChartValueXpath} #获取图表上的值 ${text1} get text xpath=${ChartValueXpath} #获取图表上的值
[Return] ${text1} [Return] ${text1}
@@ -1908,7 +1911,8 @@ SystemUsageText
sleep ${sleep_min} sleep ${sleep_min}
${TextValueXpath}= SystemUsageGetText ${type} ${TextValueXpath}= SystemUsageGetText ${type}
Mouse Over xpath=${TextSuspension} Mouse Over xpath=${TextSuspension}
Wait Until Element Is Enabled xpath=/html/body/div[last()]/div[1]/div/div/div[2]/table/tbody/tr[1]/td[2]/div/span 10 sleep ${sleep}
# Wait Until Element Is Enabled xpath=/html/body/div[last()]/div[1]/div/div/div[2]/table/tbody/tr[1]/td[2]/div/span 10
${text2} get text xpath=${TextValueXpath} ${text2} get text xpath=${TextValueXpath}
[Return] ${text2} [Return] ${text2}
@@ -2496,9 +2500,9 @@ UploadFilesSize
... AND click id=hijackAddContentType #点击+ 打开侧滑窗口 ... AND click id=hijackAddContentType #点击+ 打开侧滑窗口
... AND sleep ${sleep_min} ... AND sleep ${sleep_min}
... AND click id=text/html0 ... AND click id=text/html0
... AND sleep ${sleep_min} ... AND sleep ${sleep}
... AND click id=hijackAddOk1 ... AND click id=hijackAddOk1
... AND sleep ${sleep_min} ... AND sleep ${sleep}
run keyword if "${Page}"=="SSLFingerprint" run keywords sleep ${sleep_min} run keyword if "${Page}"=="SSLFingerprint" run keywords sleep ${sleep_min}
... AND click id=children6 #点击一级目录Settings ... AND click id=children6 #点击一级目录Settings
... AND sleep ${sleep_min} ... AND sleep ${sleep_min}