Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java =================================================================== diff -u -r18662 -r18725 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 18662) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 18725) @@ -9,21 +9,28 @@ import org.testng.AssertJUnit; import org.testng.annotations.Test; -import test.forgon.disinfectsystem.selenium.Disinfection; +import test.forgon.disinfectsystem.selenium.factory.WaitFactory; import test.forgon.disinfectsystem.selenium.sterilization.helper.SterilizationHelper; import test.forgon.disinfectsystem.selenium.tools.Utils; import org.apache.commons.lang3.StringUtils; import org.openqa.selenium.By; import org.openqa.selenium.Keys; +import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; +import org.openqa.selenium.support.ui.ExpectedConditions; +import org.openqa.selenium.support.ui.Wait; public class SterilizationTest { @Test public static void sterilizationSeriesOperationsOfFristSupplyRoom() { try { +// Utils.init(); +// Login login = new Login(); +// login.login_oneSupplyRoom(); + Wait wait = WaitFactory.createDefaultWait(); Utils.driver.switchTo().defaultContent(); Utils.retryingFindAndDoAction( By.xpath("//span[contains(text(), '个人桌面')]"), @@ -92,6 +99,9 @@ // 灭菌中断 Utils.retryingFindAndDoAction(By.id("iframe_sterilizationRecord"), Utils.ACTION_SWITCH_TO_FRAME); + //等待表单提交成功 + wait.until(ExpectedConditions.attributeToBe(Utils.driver.findElement(By + .id("formSubmitResult")), "value", "1")); Utils.retryingFindAndDoAction( By.id(sterilizerName + "-" + SterilizationHelper.炉次_1号高温蒸汽灭菌炉), Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js =================================================================== diff -u -r18491 -r18725 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 18491) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 18725) @@ -810,7 +810,7 @@ handler : function() { grid.getStore().reload(); } - },{id:'completeSterilizationRecordForm1Submit',xtype:'hidden',value:'0'}]; + },{id:'formSubmitResult',xtype:'hidden',value:'0'}]; }else{ tbar = [{ text : '删除', Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordCompleteForm.js =================================================================== diff -u -r17932 -r18725 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordCompleteForm.js (.../sterilizationRecordCompleteForm.js) (revision 17932) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordCompleteForm.js (.../sterilizationRecordCompleteForm.js) (revision 18725) @@ -323,11 +323,9 @@ var result = Ext.decode(response.responseText); showResult(result.message); grid.dwrReload(); - Ext.getCmp('completeSterilizationRecordForm1Submit').setValue('1'); //灭菌确认或者灭菌卸载的完成后把“completeSterilizationRecordForm1Submit”隐藏域设值为1 }, failure : function(response, options) { var result = Ext.decode(response.responseText); - Ext.getCmp('completeSterilizationRecordForm1Submit').setValue('-1'); if(result && result.message){ showResult(result.message); } Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r18557 -r18725 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 18557) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 18725) @@ -3204,6 +3204,7 @@ top.Ext.getCmp("sterilizationGoods").setValue(result); var barcodePostionInfo = getBarcodePositionData(); top.Ext.getCmp("barcodePositionInfo").setValue(barcodePostionInfo); + Ext.getCmp("formSubmitResult").setValue(0); formObj.form .submit( { url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!savesterilizationRecord.do', @@ -3219,6 +3220,8 @@ } grid.dwrReload(); sterilizationRecordWin.close(); + //表单提交完给隐藏域formSubmitResult设置为1,自动化测试会用到 + Ext.getCmp("formSubmitResult").setValue(1); }, failure : function(form, action) { var result = Ext.decode(action.response.responseText);