阅卷核查部分用例优化

tests/test_cases/pytest.ini

@@ -22,4 +22,5 @@ markers= login
          yjhcRdss
          yjhcRdss1
          yjhc
+         yjhc1
          demo

tests/test_cases/test_yjhc.py

@@ -62,21 +62,21 @@ def test_jzfl(engine): # 卷宗分类
     engine.driver.xpath("//div[text()='文书区-起诉意见书' or text()='文书区-提请批准逮捕书']/..")[0].click()
 
     time.sleep(0.5)
-    li_list = engine.driver.xpath("//div[@id='26a4e69e-4473-4bf7-8328-a92d5682d21b']/ul/li")
+    li_list = engine.driver.xpath("//div[contains(@class,'ant-select-dropdown ant-select-dropdown--single ant-select-dropdown-placement-bottomLeft')]//ul/li")
     li_text_list = [li.text for li in li_list]
     assert li_text_list == ['文书区-起诉意见书','诉讼文书卷(一审公诉)','诉讼证据卷(一审公诉)']
     # 点击按类分
     engine.driver.xpath("//span[text()='按类分']/..")[0].click()
     time.sleep(0.5)
-    type_list = engine.driver.xpath("//div[@class='treeNode___1va-7']ul/li/ul/li")
+    type_list = engine.driver.xpath("//div[@class='treeNode___1va-7']/ul/li/ul/li")
     assert len(type_list) == 9
 
 
 
-@pytest.mark.yjhc
-@get_engine(__file__,url=URL1.format(**params1))
-def test_jzss(engine): # 卷宗搜索
-    pass # todo
+# @pytest.mark.yjhc
+# @get_engine(__file__,url=URL1.format(**params1))
+# def test_jzss(engine): # 卷宗搜索
+#     pass # todo
 
 
 
@@ -89,11 +89,13 @@ def test_xzfzjl(engine): # 新增犯罪经历
     engine.driver.xpath("//span[@class='title']//span[text()='起诉意见书']")[0].click()
     time.sleep(0.5)
     div_list = engine.driver.xpath("//div[@class='panel___1Zcx- arrayList___2Sw4G']")
+    engine.logger.info(f'len_div_list,{len(div_list)}')
     engine.driver.xpath("//div[text()='犯罪经历']/following-sibling::div[1]//a[text()=' 新增' or text()='新增']")[0].click()
-    time.sleep(0.1)
+    time.sleep(0.5)
     engine.driver.xpath("//span[text()='保 存']/..")[0].click()
     time.sleep(0.5)
     new_div_list = engine.driver.xpath("//div[@class='panel___1Zcx- arrayList___2Sw4G']")
+    engine.logger.info(f'len_new_div_list,{len(new_div_list)}')
     assert len(new_div_list)- len(div_list) == 1
 
 
@@ -106,13 +108,19 @@ def test_scfzjl(engine): # 删除犯罪经历
     engine.driver.xpath("//span[@class='title']//span[text()='起诉意见书']")[0].click()
     time.sleep(0.5)
     div_list = engine.driver.xpath("//div[@class='panel___1Zcx- arrayList___2Sw4G']")
+    time.sleep(0.5)
+    engine.logger.info(f'len_div_list,{len(div_list)}')
     engine.driver.xpath("//div[@class='panel___1Zcx- arrayList___2Sw4G']")[-1].click()
     time.sleep(0.5)
     engine.driver.xpath("//div[@class='panel___1Zcx- arrayList___2Sw4G']//div[@class='deleteTrigger___3-Md4']/button")[-1].click()
-    engine.driver.xpath("//span[text()='保 存']/..")[0].click()
     time.sleep(0.5)
     new_div_list = engine.driver.xpath("//div[@class='panel___1Zcx- arrayList___2Sw4G']")
+    time.sleep(0.5)
+    engine.driver.xpath("//span[text()='保 存']/..")[0].click()
+    time.sleep(0.5)
+    engine.logger.info(f'len_new_div_list,{len(new_div_list)}')
     assert len(div_list) - len(new_div_list) == 1
+    time.sleep(3)
 
 
 @pytest.mark.yjhcRdss
@@ -294,17 +302,16 @@ def test_sczl(engine):  # 事实关联摘录 删除摘录
     time.sleep(0.5)
     engine.driver.xpath("//span[@class='title']//span[text()='起诉意见书']")[0].click()
     time.sleep(0.5)
-    div_list = engine.driver.xpath("//div[text()='摘录']/../../div[@class='ant-collapse-content ant-collapse-content-active']/div")
+    div_list = engine.driver.xpath("//div[text()='摘录']/../..//div[@class='part___36A_X']")
 
     engine.driver.xpath("//div[@class='ant-row bottom___1ixzR']/button/span[text()='删 除']/..")[0].click()
     engine.driver.xpath("//span[text()='是']/..")[0].click()
     time.sleep(0.5)
+    new_div_list = engine.driver.xpath("//div[text()='摘录']/../..//div[@class='part___36A_X']")
+
     engine.driver.xpath("//span[text()='保 存']/..")[0].click()
-    time.sleep(0.5)
-    new_div_list = engine.driver.xpath("//div[text()='摘录']/../../div[@class='ant-collapse-content ant-collapse-content-active']/div")
-    message = engine.driver.xpath("//div[@class='ant-message']//span[contains(text(),'保存成功')]")
 
-    assert len(div_list)-len(new_div_list) == 1 and len(message) == 1
+    assert len(div_list)-len(new_div_list) == 1
 
 
 @pytest.mark.yjhcRdss
@@ -319,14 +326,13 @@ def test_xzxyrjbxx(engine):  # 新增嫌疑人基本信息
     time.sleep(1)
     xyr_list = engine.driver.xpath("//div[text()='嫌疑人基本信息']/../..//div[contains(@class,'item___2HoCU')]")
     engine.driver.xpath("//div[text()='嫌疑人基本信息']/../..//div[@class='plus___1ckgY']/a")[0].click()
-
-    new_xyr_list = engine.driver.xpath("//div[text()='嫌疑人基本信息']/../..//div[contains(@class,'item___2HoCU')]")
-    engine.driver.xpath("//span[text()='保 存']/..")[0].click()
     time.sleep(0.5)
-    message = engine.driver.xpath("//div[@class='ant-message']//span[contains(text(),'保存成功')]")
-
-    assert len(new_xyr_list)-len(xyr_list) == 1  and len(message) == 1
+    new_xyr_list = engine.driver.xpath("//div[text()='嫌疑人基本信息']/../..//div[contains(@class,'item___2HoCU')]")
+    # engine.driver.xpath("//span[text()='保 存']/..")[0].click()
+    # time.sleep(0.5)
+    # message = engine.driver.xpath("//div[@class='ant-message']//span[contains(text(),'保存成功')]")
 
+    assert len(new_xyr_list)-len(xyr_list) == 1
 
 
 @pytest.mark.yjhcRdss
@@ -345,7 +351,7 @@ def test_scxyrjbxx(engine):  # 删除嫌疑人基本信息
     engine.driver.xpath("//div[text()='嫌疑人基本信息']/../..//div[contains(@class,'item___2HoCU')]/a[@class='delete___3-b3m']")[-1].click()
     engine.driver.xpath("//span[text()='是']/..")[0].click()
     time.sleep(1.5)
-    # engine.driver.xpath("//span[text()='保 存']/..")[0].click()
+    engine.driver.xpath("//span[text()='保 存']/..")[0].click()
     # time.sleep(0.5)
     # message = engine.driver.xpath("//div[@class='ant-message']//span[contains(text(),'保存成功')]")
 
@@ -372,7 +378,7 @@ def test_xgxyrxm(engine):  # 修改嫌疑人姓名
     # engine.driver.xpath("//input[@id='起诉意见书_犯罪嫌疑人_0_犯罪嫌疑人姓名']")[-1].clear()
     js = '''document.querySelector("#起诉意见书_犯罪嫌疑人_0_犯罪嫌疑人姓名").value = "";'''
     engine.driver.execute_script(js)
-    engine.driver.xpath("//input[@id='起诉意见书_犯罪嫌疑人_0_犯罪嫌疑人姓名']")[-1].send_keys(xyr_name)
+    engine.driver.xpath("//input[@id='起诉意见书_犯罪嫌疑人_0_犯罪嫌疑人姓名']")[0].send_keys(xyr_name)
     engine.driver.xpath("//span[text()='保 存']/..")[0].click()
     time.sleep(0.5)
     message = engine.driver.xpath("//div[@class='ant-message']//span[contains(text(),'保存成功')]")
@@ -403,7 +409,7 @@ def test_xgxyrqtxx(engine):  # 修改嫌疑人qtxx
     engine.driver.xpath("//span[text()='保 存']/..")[0].click()
     time.sleep(0.5)
     message = engine.driver.xpath("//div[@class='ant-message']//span[contains(text(),'保存成功')]")
-    test_birth = engine.driver.xpath("//input[@title='出生日期']/following-sibling::div[1]//input")[-1].text
+    test_birth = engine.driver.xpath("//div[@title='出生日期']/following-sibling::div[1]//input")[-1].text
     assert len(message) == 1 and test_birth == xyr_birth