Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/sterile/SterilePage.java =================================================================== diff -u -r34288 -r34315 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/sterile/SterilePage.java (.../SterilePage.java) (revision 34288) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/sterile/SterilePage.java (.../SterilePage.java) (revision 34315) @@ -35,6 +35,10 @@ private By interruptionConfirmCompleteBtn = By.xpath("//button[text()='完成灭菌']");//重新灭菌-完成灭菌按钮 private By reSterilizationBtn = By.xpath("//button[text()='重新灭菌']");//灭菌失败-重新灭菌按钮 + + private By biologicaMonitoringResults = By.cssSelector("input#biologyResult+img"); //生物监测结果 + private By modifyBtn = By.id("modifyBtn"); //修改按钮 + private By monitorBtn = By.id("monitorBtn"); //修改后-保存按钮 /** * 获取添加按钮 @@ -240,6 +244,40 @@ } /** + * 获取生物监测结果 + * @return + */ + public WebElement get_biological_monitoring_results(){ + return get_element_until_clickable(this.biologicaMonitoringResults); + } + + /** + * 获取生物监测结果选项 + * @param sterilizerName + * @return + */ + public WebElement get_biological_monitoring_results_option(String biologicalResult){ + By biologicalMonitoringResultsOption = By.xpath("//div[contains(text(),'"+biologicalResult+"')]");//灭菌炉程序选项 + return get_element_until_clickable(biologicalMonitoringResultsOption); + } + + /** + * 获取修改按钮 + * @return + */ + public WebElement get_modify_btn(){ + return get_element_until_clickable(this.modifyBtn); + } + + /** + * 获取修改后-保存按钮 + * @return + */ + public WebElement get_monitor_btn(){ + return get_element_until_clickable(this.monitorBtn); + } + + /** * 获取提示信息框 * @return */ Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/sterile/SterileHandle.java =================================================================== diff -u -r34288 -r34315 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/sterile/SterileHandle.java (.../SterileHandle.java) (revision 34288) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/sterile/SterileHandle.java (.../SterileHandle.java) (revision 34315) @@ -193,7 +193,36 @@ } + /** + * 点击修改按钮 + */ + public void click_modify_btn(){ + sterilePage.get_modify_btn().click(); + } + + /** + * 点击修改后-保存按钮 + */ + public void click_monitor_btn(){ + sterilePage.get_monitor_btn().click(); + } + + /** + * 点击生物监测结果 + */ + public void click_biological_monitoring_results(){ + sterilePage.get_biological_monitoring_results().click(); + } + + /** + * 点击生物监测结果选项 + * @param biologicalResult + */ + public void click_biological_monitoring_results_option(String biologicalResult){ + sterilePage.get_biological_monitoring_results_option(biologicalResult).click(); + } + /** * 获取提示信息 * @return */ Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestSterilize.java =================================================================== diff -u -r34288 -r34315 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestSterilize.java (.../TestSterilize.java) (revision 34288) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestSterilize.java (.../TestSterilize.java) (revision 34315) @@ -155,6 +155,28 @@ Assert.assertTrue(result.contains(expect1)); } + @Story("灭菌完成后修改生物监测结果") + @Test + public void test_sterilize_by_scan_barcodes_result(){ + JSONObject operator = normalSterilizeJsonObj.getJSONObject("operator");//操作人 + String sterilizationGroup = normalSterilizeJsonObj.getString("sterilization_group");//灭菌炉分组 + String sterilizerBarcode = normalSterilizeJsonObj.getJSONObject("sterilizer").getString("barcode");//灭菌炉条码 + String sterilizationProgramBarcode = normalSterilizeJsonObj.getJSONObject("sterilization_program").getString("barcode");//灭菌程序条码 + String sterilizationPurpose = normalSterilizeJsonObj.getString("sterilization_purpose");//灭菌目的 + JSONArray barcodes = normalSterilizeJsonObj.getJSONArray("barcodes_5");//待灭菌物品条码 + String biologicalResult = normalSterilizeJsonObj.getString("biological_result");//生物监测结果 + String expect = normalSterilizeJsonObj.getString("expect");//预期结果 + + //登录 + loginProxy.go_login_by_btn(operator.getString("username"), operator.getString("password")); + + //灭菌 + personalDesktopProxy.go_sterilization(sterilizationGroup); + String result = sterileProxy.sterilize_by_scan_barcodes_result(sterilizerBarcode, sterilizationProgramBarcode, sterilizationPurpose, barcodes,biologicalResult); + logger.debug("提示框:"+result); + Assert.assertTrue(result.contains(expect)); + } + @After public void tearDown() throws FileNotFoundException, WebDriverException, InterruptedException{ //用例跑完后,添加截图到测试报告 Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json =================================================================== diff -u -r34310 -r34315 --- ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json (.../testcase_data.json) (revision 34310) +++ ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json (.../testcase_data.json) (revision 34315) @@ -1075,10 +1075,16 @@ {"barcode":"010013071"}, {"barcode":"010013076"} ], + "barcodes_5":[ + {"barcode":"010013067"}, + {"barcode":"010013072"}, + {"barcode":"010013077"} + ], "responsibleperson":{ "username":"cssduser2", "barcode":"0100001002" }, + "biological_result":"合格", "expect":"完成灭菌", "expect1":"保存成功" }, Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/sterile/SterileProxy.java =================================================================== diff -u -r34288 -r34315 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/sterile/SterileProxy.java (.../SterileProxy.java) (revision 34288) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/sterile/SterileProxy.java (.../SterileProxy.java) (revision 34315) @@ -272,6 +272,36 @@ } /** + * 灭菌完成后修改生物监测结果 + * @param sterilizerBarcode + * @param sterilizationProgram + * @param sterilizationPurpose + * @param operator + * @param barcodes + * @return + */ + @Step("灭菌完成后修改生物监测结果") + public String sterilize_by_scan_barcodes_result(String sterilizerBarcode,String sterilizationProgram,String sterilizationPurpose, JSONArray barcodes,String biologicalResult){ + try { + + //调用“通过扫描来添加一条灭菌记录并完成灭菌”方法 + sterilize_by_scan_barcodes(sterilizerBarcode, sterilizationProgram, sterilizationPurpose, barcodes); + + //灭菌完成后修改监测结果 + sterileHandle.switch_to_sterilization_frame(); + sterileHandle.first_select(); + sterileHandle.click_modify_btn(); + Utils.driver.switchTo().defaultContent(); + sterileHandle.click_biological_monitoring_results(); + sterileHandle.click_biological_monitoring_results_option(biologicalResult); + sterileHandle.click_monitor_btn(); + } catch (Exception e) { + e.printStackTrace(); + } + return sterileHandle.get_ext_tip_msg(); + } + + /** * 添加一条空的灭菌记录并完成灭菌 * @param sterilizerBarcode * @param sterilizationProgram