Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestPack.java =================================================================== diff -u -r37288 -r37294 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestPack.java (.../TestPack.java) (revision 37288) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestPack.java (.../TestPack.java) (revision 37294) @@ -368,29 +368,31 @@ } @Story("测试检查人,灭菌人,包装人的使用配置项显示") - @Ignore + //@Ignore @Test public void test_showInspectorField_showSterileField_showWrapperField_display()throws InterruptedException { - Utils.setConfigJs("showInspectorField", true); + Utils.setConfigJs("showInspectorField", true);//新增配置项 Utils.setConfigJs("showSterileField", true); Utils.setConfigJs("showWrapperField", true); String inspector = ""; String wrapper = ""; String sterileUser = ""; JSONObject operator = nomalPackingJsonObj.getJSONObject("operator");//操作人 - String taskGroup = nomalPackingJsonObj.getString("task_group");//装配 + String taskGroup = nomalPackingJsonObj.getString("task_group");//装配组 loginProxy.go_login_by_btn(operator.getString("username"), operator.getString("password")); personalDesktopProxy.go_pack(taskGroup); - inspector = packProxy.inspectorstyle(inspector);//获取状态是否为none,不是的场合即为显示 - Assert.assertFalse(inspector.contains("none")); + inspector = packProxy.inspectorstyle(inspector);//获取状态是否有table-layout,是的场合即为显示 + Assert.assertTrue(inspector.contains("table-layout")); sterileUser = packProxy.sterileUserstyle(sterileUser); - Assert.assertFalse(sterileUser.contains("none")); + Assert.assertTrue(sterileUser.contains("table-layout")); wrapper = packProxy.wrapperstyle(wrapper); - Assert.assertFalse(wrapper.contains("none")); - Utils.deleteConfigJs("showInspectorField"); + Assert.assertTrue(wrapper.contains("table-layout")); + Thread.sleep(2000); + + Utils.deleteConfigJs("showInspectorField");//删除配置项 Utils.deleteConfigJs("showSterileField"); Utils.deleteConfigJs("showWrapperField"); }