Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json =================================================================== diff -u -r34444 -r34445 --- ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json (.../testcase_data.json) (revision 34444) +++ ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json (.../testcase_data.json) (revision 34445) @@ -1387,8 +1387,6 @@ "failed_result":"登记 质量监测-监测范围:材料 的记录,失败" }, "expect":{ - "success":"success", - "failed":"failed", "delete":"成功删除1条", "save":"保存成功" } Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/qualitymonitoring/QualityMonitoringProxy.java =================================================================== diff -u -r34438 -r34445 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/qualitymonitoring/QualityMonitoringProxy.java (.../QualityMonitoringProxy.java) (revision 34438) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/qualitymonitoring/QualityMonitoringProxy.java (.../QualityMonitoringProxy.java) (revision 34445) @@ -56,7 +56,7 @@ } catch (Exception e) { e.printStackTrace(); } - return "success"; + return Utils.get_ext_tip_msg(); } } Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestQualityMonitoring.java =================================================================== diff -u -r34444 -r34445 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestQualityMonitoring.java (.../TestQualityMonitoring.java) (revision 34444) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestQualityMonitoring.java (.../TestQualityMonitoring.java) (revision 34445) @@ -60,7 +60,7 @@ String materialName=qualityMonitoringJsonObj.getJSONObject("material").getString("material_name");//抽检器械名称 String materialAmount=qualityMonitoringJsonObj.getJSONObject("material").getString("material_amount");//抽检器械数量 String failedResult=qualityMonitoringJsonObj.getJSONObject("material").getString("failed_result");//失败原因 - String success = qualityMonitoringJsonObj.getJSONObject("expect").getString("success");//预期结果 + String save = qualityMonitoringJsonObj.getJSONObject("expect").getString("save");//预期结果 //登录 logger.debug("登录"); @@ -73,7 +73,7 @@ logger.debug("添加一条质量监测记录"); String result= qualityMonitoringProxy.QualityMonitoring_material(responsibleperson,remark,materialName,materialAmount,failedResult); logger.debug(result); - Assert.assertTrue(result.contains(success)); + Assert.assertTrue(result.contains(save)); }