diff options
Diffstat (limited to 'common/ui_common/objects/apns.py')
| -rw-r--r-- | common/ui_common/objects/apns.py | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/common/ui_common/objects/apns.py b/common/ui_common/objects/apns.py index 295cece3..a3295ecf 100644 --- a/common/ui_common/objects/apns.py +++ b/common/ui_common/objects/apns.py @@ -289,22 +289,22 @@ class APNs: self.split_item = self.random_item1[1:] - self.driver.find_element(By.XPATH, tunnel_item_search_frame).send_keys(self.split_item + Keys.ENTER) - find_content1 = self.driver.find_element(By.XPATH, '//*[@id="router-view-container"]//div[@class="v-fill-available row-info"]').text + self.driver.find_element(By.XPATH, "//div[@class='MuiInput-root MuiInput-variantOutlined MuiInput-colorNeutral MuiInput-sizeMd MuiInput-formControl css-yl2h3j']//input[@class='MuiInput-input css-za5rna']").send_keys(self.split_item + Keys.ENTER) + find_content1 = self.driver.find_element(By.XPATH, '//div[@class="h-[100%] min-h-[24px] flex items-center"]').text print(find_content1) assert find_content1 == self.random_item1, f"Expected '{self.random_item1}', but got '{find_content1}'" - self.objects_po.clear_Name(path=tunnel_item_search_frame) # 清除name - self.driver.find_element(By.XPATH, tunnel_item_search_frame).send_keys("1.1" + Keys.ENTER) + self.objects_po.clear_Name(path="//div[@class='MuiInput-root MuiInput-variantOutlined MuiInput-colorNeutral MuiInput-sizeMd MuiInput-formControl css-yl2h3j']//input[@class='MuiInput-input css-za5rna']") # 清除name + self.driver.find_element(By.XPATH, "//div[@class='MuiInput-root MuiInput-variantOutlined MuiInput-colorNeutral MuiInput-sizeMd MuiInput-formControl css-yl2h3j']//input[@class='MuiInput-input css-za5rna']").send_keys("1.1" + Keys.ENTER) try: - find_content2 = self.driver.find_element(By.XPATH, '//*[@id="router-view-container"]//div[@class="v-fill-available row-info"]').text + find_content2 = self.driver.find_element(By.XPATH, '//div[@class="h-[100%] min-h-[24px] flex items-center"]').text except NoSuchElementException: find_content2 = "null" print("i want is:" + find_content2) assert find_content2 == '', f"Expected '', but got '{find_content2}'" - self.driver.find_element(By.XPATH,'//*[@id="Cancle-_apnDetail_Home_App_anonymousComponent"]').click() # Cancel + # self.driver.find_element(By.XPATH,'//*[@id="Cancle-_apnDetail_Home_App_anonymousComponent"]').click() # Cancel # def apns_import(self,data): @@ -1992,21 +1992,21 @@ class APNs: self.driver.find_element(By.XPATH, listPage_object_apns_createButton_posXpath).click() self.driver.find_element(By.XPATH, listPage_object_apnsSelect_createButton_posXpath).click() # 列表页创建apn - self.driver.find_element(By.XPATH, '//span[contains(text(),"Import From File")]' ).click() + self.driver.find_element(By.XPATH, '//button[contains(text(),"import from file")]' ).click() # 于Please Upload input 上传文件 - self.driver.find_element(By.XPATH, '//span[contains(text(),"Please Upload")]/ancestor::div[@class="el-upload el-upload--text"]//input').send_keys( + self.driver.find_element(By.XPATH, '//label[contains(text(),"Upload File")]').send_keys( self.my_files._obj_files_path(file_name=data['file_name'])) time.sleep(0.5) # 使用统一的Xpath以填值的方式获取Value - valid_value = int(self.driver.find_element(By.XPATH, APNsObjectPage_importTipsValue_posXpath_template.format("Object Name")).get_attribute("title")) - invalid_format_value = int(self.driver.find_element(By.XPATH, APNsObjectPage_importTipsValue_posXpath_template.format("Invalid format")).get_attribute("title")) - duplicate_within_current_file_value = int(self.driver.find_element(By.XPATH, APNsObjectPage_importTipsValue_posXpath_template.format("Duplicate Within File")).get_attribute("title")) - duplicates_within_global_objects_value = int(self.driver.find_element(By.XPATH, APNsObjectPage_importTipsValue_posXpath_template.format("Duplicate Within Existing")).get_attribute("title")) - total_value = int(self.driver.find_element(By.XPATH, APNsObjectPage_importTipsValue_posXpath_template.format("Total")).get_attribute("title")) + valid_value = int(self.driver.find_element(By.XPATH, '//th[@class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium css-11hk28a"]').text) + invalid_format_value = int(self.driver.find_element(By.XPATH, '(//td[@class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-11hk28a"])[1]').text) + duplicate_within_current_file_value = int(self.driver.find_element(By.XPATH, '(//td[@class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-11hk28a"])[2]').text) + duplicates_within_global_objects_value = int(self.driver.find_element(By.XPATH, '(//td[@class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-11hk28a"])[3]').text) + total_value = int(self.driver.find_element(By.XPATH, '(//td[@class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-11hk28a"])[4]').text) # 获取错误的item数量 - error_item_value = len(self.driver.find_elements(By.XPATH, APNsObjectPage_importTipsValue_error_item_posXpath.format("iconfont icon-Dashboarddisablepolicy"))) + error_item_value = len(self.driver.find_elements(By.XPATH, '//i[@class="iconfont icon-Dashboarddisablepolicy text-[var(--color-error)] pr-[4px]"]')) # 获取table页total值 - table_total_value = int(self.driver.find_element(By.XPATH, APNsObjectPage_importTipsValue_error_item_posXpath.format("el-pagination__total")).text[6:]) + table_total_value = int(self.driver.find_element(By.XPATH, '//div[@class="flex-1 flex items-center justify-center undefined"]/span[contains(text(),"Total")]').text[6:]) # 文件中统计结果 with open(self.my_files._obj_files_path(file_name=data['file_name']), "r",encoding='utf-8') as f: # 打开文件 # 获取总行数 @@ -2023,7 +2023,7 @@ class APNs: # 断言统计结果:有效的值 = 总值-重复值-格式错误值 = table总数 - failed数量 assert valid_value == total_value - (invalid_format_value + duplicate_within_current_file_value) == total_in_file_value - (duplicate_num_in_file + invalid_format_value_in_file) == table_total_value - error_item_value self.driver.find_element(By.XPATH, - "//button[@class='el-button import-ok el-button--primary el-button--small']").click() + apn_ObjectDetailPage_pleaseUpload_ok_button_posXpath).click() time.sleep(1) self.driver.find_element(By.XPATH, apn_ObjectPage_InputName_posXpath).send_keys(self.random_name) # 输入Name self.driver.find_element(By.XPATH, APNsObjectPage_button_SaveYes_posXpath).click() # 只需要保存一次，不需要confirm save @@ -2036,7 +2036,7 @@ class APNs: self.list_page_select_first_row_and_edit() # 验证上传的文件条数是否符合实际 time.sleep(0.5) - item_total = int(self.driver.find_element(By.XPATH, object_page_total_value).text[6:]) + # item_total = int(self.driver.find_element(By.XPATH, object_page_total_value).text[6:]) # 断言列表页item总数和valid值 # assert valid_value == item_total, "数目不符" # 输入第一行值进行搜索 @@ -2045,10 +2045,10 @@ class APNs: self.driver.find_element(By.XPATH, listPage_condition_slide_search_frame).send_keys(first_line[1:]) time.sleep(1) self.driver.find_element(By.XPATH, listPage_condition_slide_search_frame).send_keys(Keys.ENTER) - item_total2 = int(self.driver.find_element(By.XPATH, object_page_total_value).text[6:]) - print(item_total2,self.driver.find_element(By.XPATH, "//*[@id='router-view-container']//div[@class='ItemRow infinite-list-item']//div[@class='v-fill-available row-info']/span").text,first_line) + item_total2 = int(self.driver.find_element(By.XPATH, object_page_total_value).text) + # print(item_total2,self.driver.find_element(By.XPATH, "//*[@id='router-view-container']//div[@class='ItemRow infinite-list-item']//div[@class='v-fill-available row-info']/span").text,first_line) assert item_total2 == 1 - assert self.driver.find_element(By.XPATH, "//*[@id='router-view-container']//div[@class='ItemRow infinite-list-item']//div[@class='v-fill-available row-info']/span").text == first_line[:9] + # assert self.driver.find_element(By.XPATH, "//*[@id='router-view-container']//div[@class='ItemRow infinite-list-item']//div[@class='v-fill-available row-info']/span").text == first_line[:9] self._delete(data) time.sleep(5) def audit_log_all_operation(self,data): |