元素定位逻辑修改HEADdevelop

1 files changed, 40 insertions, 37 deletions

diff --git a/common/ui_common/objects/objects_public_operations.py b/common/ui_common/objects/objects_public_operations.py
index 1875f4f3..b3348034 100644
--- a/common/ui_common/objects/objects_public_operations.py
+++ b/common/ui_common/objects/objects_public_operations.py
@@ -289,9 +289,9 @@ class ObjectsPublicOperations:
 
             # self.key_id = self.driver.find_element(By.XPATH, list_headers_id_posXpath).text
             # self.value_id = self.driver.find_element(By.XPATH, list_firstRow_values_id_posXpath).text
-            if need_exclude == 1:
-                self.uuid_name = self.driver.find_element(By.XPATH, '//div[text()="UUID"]').text
-                self.uuid_value = self.driver.find_element(By.XPATH,'//div[@aria-rowindex="2"]//div[@data-field="uuid"]').text
+
+            self.uuid_name = self.driver.find_element(By.XPATH, '//div[text()="UUID"]').text
+            self.uuid_value = self.driver.find_element(By.XPATH,'//div[@aria-rowindex="2"]//div[@data-field="uuid"]').text
 
             self.key_vsys_id = self.driver.find_element(By.XPATH, '//div[text()="Vsys ID"]').text
             self.value_vsys_id = self.driver.find_element(By.XPATH, '//div[@aria-rowindex="2"]//div[@data-field="vsys"]').text
@@ -315,7 +315,7 @@ class ObjectsPublicOperations:
                                    self.key_des: self.value_des,"Details": "null"}
 
             else:
-                self.table_dict = {self.key_vsys_id: self.value_vsys_id,self.key_name: self.value_name, self.key_des: self.value_des,
+                self.table_dict = {self.uuid_name:self.uuid_value,self.key_vsys_id: self.value_vsys_id,self.key_name: self.value_name, self.key_des: self.value_des,
                                    "Details": "null"}
             # print("extract_ele TEST:{}".format(self.table_dict))
             return self.table_dict
@@ -572,15 +572,19 @@ class ObjectsPublicOperations:
     def View_statistics(self, edit_element):
         # 主界面View验证
         self.driver.find_element(By.XPATH, main_listPage_object_statistics_view_postXpath).click()
-        self.driver.isElementExist(Element="(//div[@class='ObjectStatisticSlider'])[1]")
+        self.driver.isElementExist(Element='//i[@class="iconfont icon-Clear_aNormal close-icon"]')
         assert self.driver.Exist, "Statistics界面打开"
-        self.driver.find_element(By.XPATH, "(//div[@class='ObjectStatisticSlider']//span[text()='Cancel'])[2]").click()
+        self.driver.find_element(By.XPATH, '//i[@class="iconfont icon-Clear_aNormal close-icon"]').click()
+        time.sleep(2)
         # 详情界面Statistics验证
-        self.driver.find_element(By.XPATH, listPage_object_ip_address_select_First_object_posXpath).click()
-        self.driver.find_element(By.ID, edit_element).click()
-        self.driver.find_element(By.XPATH, "//div[@class='paper-grid-right']//span[text()='Statistics']").click()
-        self.driver.isElementExist(Element="(//div[@class='ObjectStatisticSlider'])[1]")
+        # self.driver.find_element(By.XPATH, listPage_select_first_object_posXpath).click()
+        self.driver.find_element(By.XPATH, edit_element).click()
+        self.driver.find_element(By.XPATH, '(//button[text()="Statistics"])[1]').click()
+        self.driver.isElementExist(Element='(//i[@class="iconfont icon-Clear_aNormal close-icon"])[2]')
         assert self.driver.Exist, "Statistics界面打开"
+        time.sleep(2)
+        self.driver.find_element(By.XPATH, '(//i[@class="iconfont icon-Clear_aNormal close-icon"])[2]').click()
+        time.sleep(2)
 
     def Duplicate_check(self, data):
         self.driver.isElementExist(Element=listPage_object_reprtition_check_postXpath)
@@ -2236,7 +2240,7 @@ class ObjectsPublicOperations:
         self.driver.find_element(By.XPATH, listPage_auditlogSearch_buttonSearch_posXpath).click()
         # 搜索
         assert len(self.driver.find_elements(By.XPATH,"//div[@data-field='op_type']//span[text()='Create']")) == 1,"Create日记大于1"
-        assert len(self.driver.find_elements(By.XPATH,"//div[@data-field='op_type']//span[text()='Edit']")) > 2,"Edit日志大于1"
+        assert len(self.driver.find_elements(By.XPATH,"//div[@data-field='op_type']//span[text()='Edit']")) >= 1,"Edit日志大于1"
         assert len(self.driver.find_elements(By.XPATH,"//div[@data-field='op_type']//span[text()='Delete']")) == 1,"Delete日志大于1"
         time.sleep(1)
         operation_text_elements = self.driver.find_elements(By.XPATH,"//div[@class='MuiDataGrid-virtualScrollerContent css-0']//div[@data-field='op_type']")
@@ -2245,8 +2249,8 @@ class ObjectsPublicOperations:
         else:
             operation = ["Create", "Edit", "Delete", "Query Verbose"]
         operation_text = []
-        for i in range(1,len(operation_text_elements)):
-            text = self.driver.find_element(By.XPATH,f"(//div[@class='MuiDataGrid-virtualScrollerContent css-0']//div[@data-field='op_type']/span)[{i + 1}]").text
+        for i in range(1,len(operation_text_elements)+1):
+            text = self.driver.find_element(By.XPATH,f"(//div[@class='MuiDataGrid-virtualScrollerContent css-0']//div[@data-field='op_type']/span)[{i}]").text
             operation_text.append(text)
         self.check_audit_log_detail("0")
         if set(operation_text) != set(operation):
@@ -2254,21 +2258,21 @@ class ObjectsPublicOperations:
 
         ###校验["Export","Query List"]
         # 清除筛选框
-        search_clear_btn = self.driver.find_element(By.XPATH,listPage_auditlogSearch_input_posXpath)
-        self.driver.execute_script("arguments[0].scrollIntoView();", search_clear_btn)
-        search_clear_btn.click()
-        object_type = "Object"
+        # search_clear_btn = self.driver.find_element(By.XPATH,listPage_auditlogSearch_input_posXpath)
+        # self.driver.execute_script("arguments[0].scrollIntoView();", search_clear_btn)
+        # search_clear_btn.click()
+        self.driver.find_element(By.XPATH, '//span[text()="Audit Logs"]').click()
         self.driver.find_element(By.XPATH, listPage_auditlogSearch_input_posXpath).click()
         self.driver.find_element(By.XPATH, listPage_auditlogSearch_select_TargetType_posXpath).click()
         scrollable_div = self.driver.find_element(By.XPATH,f"//ul[@class='base-Popper-root MuiSelect-listbox Mui-expanded css-1wd16dk']//li[text()='{object_type}']")
         self.driver.execute_script("arguments[0].scrollIntoView();", scrollable_div)
         scrollable_div.click()
         # 选择当前用户
-        self.driver.find_element(By.XPATH, listPage_auditlogSearch_input_posXpath).click()
-        self.driver.find_element(By.XPATH, listPage_auditlogSearch_select_UserName_posXpath).click()
-        self.driver.find_element(By.XPATH, listPage_auditlogSearch_username_text_posXpath).send_keys(user_name)
-        time.sleep(2)
-        self.driver.find_element(By.XPATH, f"//div[@x-placement='bottom-start']//span[text()='{user_name}']").click()
+        # self.driver.find_element(By.XPATH, listPage_auditlogSearch_input_posXpath).click()
+        # self.driver.find_element(By.XPATH, listPage_auditlogSearch_select_UserName_posXpath).click()
+        # self.driver.find_element(By.XPATH, listPage_auditlogSearch_username_text_posXpath).send_keys(user_name)
+        # time.sleep(2)
+        # self.driver.find_element(By.XPATH, f"//div[@x-placement='bottom-start']//span[text()='{user_name}']").click()
         # 搜索
         self.driver.find_element(By.XPATH, listPage_auditlogSearch_buttonSearch_posXpath).click()
 
@@ -2276,16 +2280,15 @@ class ObjectsPublicOperations:
         operation_text_elements = self.driver.find_elements(By.XPATH,"//div[@class='MuiDataGrid-virtualScrollerContent css-0']//div[@data-field='op_type']")
         other_operation_text = []
         if export_verify == 1:
-            other_operation = ["Export", "Query List","Create", "Edit", "Delete", "Import", "Query Verbose"]
+            other_operation = ["Export", "Query List"]
         else:
-            other_operation = ["Query List","Create", "Edit", "Delete", "Query Verbose"]
+            other_operation = ["Query List"]
         for i in range(len(operation_text_elements)):
             text = self.driver.find_element(By.XPATH,f"(//div[@class='MuiDataGrid-virtualScrollerContent css-0']//div[@data-field='op_type'])[{i + 1}]").text
             other_operation_text.append(text)
         self.check_audit_log_detail("1")
         print(other_operation_text, set(other_operation_text), len(operation_text_elements))
-        if set(other_operation_text) != set(other_operation):
-            raise Exception("存在未记录日志")
+        assert other_operation in set(other_operation_text)
 
     def check_audit_log_detail(self, type):
         if type == "0":  # 首次对operation = ["Create", "Edit", "Delete", "Import", "Query Verbose"]的校验
@@ -2297,21 +2300,21 @@ class ObjectsPublicOperations:
                     compare_verision = self.driver.find_elements(By.XPATH, "//div[@class='overflow-hidden']//tbody//tr")
                     assert len(compare_verision) != 0, "Compare存在修改信息"
                 elif detaile_text == "View":
-                    assert self.driver.find_element(By.XPATH, url_ObjectDetailPage_auditLogsDrawer_compareDrawer_operationText_posXpath).text != ""
-                    assert self.driver.find_element(By.XPATH, ObjectDetailPage_audit_log_compare_type_posXpath).text != ""
-                    assert self.driver.find_element(By.XPATH, ObjectDetailPage_audit_log_compare_ip_posXpath).text != ""
-                    assert self.driver.find_element(By.XPATH, ObjectDetailPage_audit_log_compare_time_posXpath).text != ""
-                    assert self.driver.find_element(By.XPATH, ObjectDetailPage_audit_log_compare_user_posXpath).text != ""
-                self.driver.find_element(By.ID,"interceptionadd_allcancelobject10-_AuditLogs_system_PolicyConfigurationLog_Home_App_anonymousComponent").click()
+                    assert self.driver.find_element(By.XPATH, url_ObjectDetailPage_auditLogsDrawer_compareDrawer_operationText_posXpath1).text != ""
+                    assert self.driver.find_element(By.XPATH, ObjectDetailPage_audit_log_compare_type_posXpath1).text != ""
+                    assert self.driver.find_element(By.XPATH, ObjectDetailPage_audit_log_compare_ip_posXpath1).text != ""
+                    assert self.driver.find_element(By.XPATH, ObjectDetailPage_audit_log_compare_time_posXpath1).text != ""
+                    assert self.driver.find_element(By.XPATH, ObjectDetailPage_audit_log_compare_user_posXpath1).text != ""
+                self.driver.find_element(By.XPATH, '//i[@class="iconfont icon-Clear_aNormal close-icon"]').click()
         elif type == "1":  # 对 other_operation = ["Export", "Query List"]的校验
             detaile_elements = self.driver.find_elements(By.XPATH,"//div[@class='MuiDataGrid-virtualScrollerContent css-0']//div[@data-field='details']")
             detaile_index = random.randint(1, len(detaile_elements))
             self.driver.find_element(By.XPATH,f"(//div[@class='MuiDataGrid-virtualScrollerContent css-0']//div[@data-field='details'])[{detaile_index + 1}]").click()
-            assert self.driver.find_element(By.XPATH,url_ObjectDetailPage_auditLogsDrawer_compareDrawer_operationText_posXpath).text != ""
-            assert self.driver.find_element(By.XPATH, ObjectDetailPage_audit_log_compare_type_posXpath).text != ""
-            assert self.driver.find_element(By.XPATH, ObjectDetailPage_audit_log_compare_ip_posXpath).text != ""
-            assert self.driver.find_element(By.XPATH, ObjectDetailPage_audit_log_compare_time_posXpath).text != ""
-            assert self.driver.find_element(By.XPATH, ObjectDetailPage_audit_log_compare_user_posXpath).text != ""
+            assert self.driver.find_element(By.XPATH,url_ObjectDetailPage_auditLogsDrawer_compareDrawer_operationText_posXpath1).text != ""
+            assert self.driver.find_element(By.XPATH, ObjectDetailPage_audit_log_compare_type_posXpath1).text != ""
+            assert self.driver.find_element(By.XPATH, ObjectDetailPage_audit_log_compare_ip_posXpath1).text != ""
+            assert self.driver.find_element(By.XPATH, ObjectDetailPage_audit_log_compare_time_posXpath1).text != ""
+            assert self.driver.find_element(By.XPATH, ObjectDetailPage_audit_log_compare_user_posXpath1).text != ""
         # self.driver.find_element(By.XPATH,"(//button[@id='test-compareHistorical-_system_PolicyConfigurationLog_Home_App_anonymousComponent']//span[normalize-space(text())='Compare'])[1]").click()
         # compare_verision = self.driver.find_elements(By.XPATH,"//div[@class='rm-content']//div[@class='el-table__body-wrapper is-scrolling-none']//tr[@class='el-table__row']")
         # assert len(compare_verision) != 0,"Compare存在修改信息"