Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestUseRecord.java =================================================================== diff -u -r33939 -r33945 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestUseRecord.java (.../TestUseRecord.java) (revision 33939) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestUseRecord.java (.../TestUseRecord.java) (revision 33945) @@ -35,12 +35,16 @@ private UseRecordProxy useRecordProxy = new UseRecordProxy(); private PersonalDesktopProxy personalDesktopProxy = new PersonalDesktopProxy(); private static JSONObject addUseRecordJsonObj;//新增使用记录测试用例参数 + private static JSONObject reviewAndGenerateAppJsonObj;//审核并生成申请单测试用例参数 + private static JSONObject reviewAndGenerateAppInUseRecordFormJsonObj;//打开使用记录审核并生成申请单测试用例参数 @BeforeClass public static void setUp_class(){ Utils.init(); addUseRecordJsonObj = Utils.testcaseData.getJSONObject("test_add_use_record"); + reviewAndGenerateAppJsonObj = Utils.testcaseData.getJSONObject("test_review_and_generate_application"); + reviewAndGenerateAppInUseRecordFormJsonObj = Utils.testcaseData.getJSONObject("test_review_and_generate_appliction_in_userecord_form"); } @Story("测试新增使用记录") @@ -77,6 +81,38 @@ Assert.assertTrue(result.contains(expect)); } + @Story("测试审核并生成申请单") + @Test + public void test_review_and_generate_application(){ + JSONObject operator = reviewAndGenerateAppJsonObj.getJSONObject("operator");//操作人 + String patientName = reviewAndGenerateAppJsonObj.getString("patientName");//病人姓名 + String expect = reviewAndGenerateAppJsonObj.getString("expect");//预期结果 + + //登录 + loginProxy.go_login_by_btn(operator.getString("username"), operator.getString("password")); + + //根据病人姓名选择一条使用记录审核并生成申请单 + personalDesktopProxy.go_use_record(); + String result = useRecordProxy.review_and_generate_appliction(patientName); + Assert.assertTrue(result.contains(expect)); + } + + @Story("测试打开一条使用记录审核并生成申请单") + @Test + public void test_review_and_generate_appliction_in_userecord_form(){ + JSONObject operator = reviewAndGenerateAppInUseRecordFormJsonObj.getJSONObject("operator");//操作人 + String patientName = reviewAndGenerateAppInUseRecordFormJsonObj.getString("patientName");//病人姓名 + String expect = reviewAndGenerateAppInUseRecordFormJsonObj.getString("expect");//预期结果 + + //登录 + loginProxy.go_login_by_btn(operator.getString("username"), operator.getString("password")); + + //根据病人姓名点开一条使用记录审核并生成申请单 + personalDesktopProxy.go_use_record(); + String result = useRecordProxy.review_and_generate_appliction_in_userecord_form(patientName); + Assert.assertTrue(result.contains(expect)); + } + @After public void tearDown() throws FileNotFoundException, WebDriverException, InterruptedException{ //用例跑完后,添加截图到测试报告 Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/sign/SignProxy.java =================================================================== diff -u -r33939 -r33945 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/sign/SignProxy.java (.../SignProxy.java) (revision 33939) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/sign/SignProxy.java (.../SignProxy.java) (revision 33945) @@ -1,5 +1,6 @@ package test.forgon.disinfectsystem.selenium3.page.sign; +import io.qameta.allure.Step; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -12,6 +13,11 @@ //引入签收页面操作层 private SignHandle signHandle = new SignHandle(); + /** + * 签收物品 + * @param tousseBarcodes + */ + @Step("签收物品") public void sign_tousses(JSONArray tousseBarcodes){ //循环扫描物品 for(int i=0;i