Index: ssts-selenium-test/src/test/java/test_4_1/sterilization/service/impl/GdsySterilization.java =================================================================== diff -u -r17932 -r17933 --- ssts-selenium-test/src/test/java/test_4_1/sterilization/service/impl/GdsySterilization.java (.../GdsySterilization.java) (revision 17932) +++ ssts-selenium-test/src/test/java/test_4_1/sterilization/service/impl/GdsySterilization.java (.../GdsySterilization.java) (revision 17933) @@ -9,9 +9,6 @@ import org.openqa.selenium.interactions.Actions; import org.testng.AssertJUnit; -import com.forgon.tools.string.StringTools; -import com.forgon.tools.util.ForgonDateUtils; - import test_4_1.sterilization.helper.SterilizationHelper; import test_4_1.sterilization.service.Sterilization; import test_4_1.tools.Utils; @@ -48,7 +45,7 @@ Utils.retryingFindAndDoAction(By.id("sterilizationPurpose"), Utils.ACTION_SENDKEYS, Keys.DOWN); Utils.retryingFindAndDoAction(By.xpath("//div[contains(text(), '器械包灭菌')]"), Utils.ACTION_CLICK); String tempBarcode = ""; - if (StringTools.isNotBlank(barcodes)) { + if (barcodes != null && !barcodes.equals("")) { String[] barcodesArr = barcodes.split(";"); tempBarcode = barcodesArr[0]; for (String barcode : barcodesArr) { @@ -126,8 +123,8 @@ javaScript += "Ext.getCmp('chemistryResult').setValue('不合格');"; javaScript += "Ext.getCmp('biologyResult').setValue('合格');"; Utils.runJavaScript(javaScript); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, ForgonDateUtils.safelyFormatDate(new Date(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, ForgonDateUtils.safelyFormatDate(new Date(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); Utils.retryingFindAndDoAction(By.id("monitorUserBarcode"), Utils.ACTION_SENDKEYS, cssduser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorCheckerBarcode"), Utils.ACTION_SENDKEYS, cssduser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorBtn"), Utils.ACTION_CLICK); @@ -163,7 +160,7 @@ Utils.retryingFindAndDoAction(By.id("sterilizationPurpose"), Utils.ACTION_SENDKEYS, Keys.DOWN); Utils.retryingFindAndDoAction(By.xpath("//div[contains(text(), '器械包灭菌')]"), Utils.ACTION_CLICK); String tempBarcode = ""; - if (StringTools.isNotBlank(barcodes)) { + if (barcodes != null && !barcodes.equals("")) { String[] barcodesArr = barcodes.split(";"); tempBarcode = barcodesArr[0]; for (String barcode : barcodesArr) { @@ -239,8 +236,8 @@ javaScript += "Ext.getCmp('chemistryResult').setValue('不合格');"; javaScript += "Ext.getCmp('biologyResult').setValue('合格');"; Utils.runJavaScript(javaScript); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, ForgonDateUtils.safelyFormatDate(new Date(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, ForgonDateUtils.safelyFormatDate(new Date(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); Utils.retryingFindAndDoAction(By.id("monitorUserBarcode"), Utils.ACTION_SENDKEYS, oruser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorCheckerBarcode"), Utils.ACTION_SENDKEYS, oruser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorBtn"), Utils.ACTION_CLICK); Index: ssts-selenium-test/src/test/java/test_4_1/sterilization/service/impl/ZsyySterilization.java =================================================================== diff -u -r17932 -r17933 --- ssts-selenium-test/src/test/java/test_4_1/sterilization/service/impl/ZsyySterilization.java (.../ZsyySterilization.java) (revision 17932) +++ ssts-selenium-test/src/test/java/test_4_1/sterilization/service/impl/ZsyySterilization.java (.../ZsyySterilization.java) (revision 17933) @@ -16,9 +16,6 @@ import org.openqa.selenium.support.ui.Wait; import org.testng.AssertJUnit; -import com.forgon.tools.string.StringTools; -import com.forgon.tools.util.ForgonDateUtils; - import test_4_1.sterilization.helper.SterilizationHelper; import test_4_1.sterilization.service.Sterilization; import test_4_1.tools.Utils; @@ -75,7 +72,7 @@ Utils.retryingFindAndDoAction(By.id("sterilizationPurpose"), Utils.ACTION_SENDKEYS, Keys.DOWN); Utils.retryingFindAndDoAction(By.xpath("//div[contains(text(), '器械包灭菌')]"), Utils.ACTION_CLICK); String tempBarcode = ""; - if (StringTools.isNotBlank(barcodes)) { + if (barcodes != null && !barcodes.equals("")) { String[] barcodesArr = barcodes.split(";"); tempBarcode = barcodesArr[0]; for (String barcode : barcodesArr) { @@ -178,8 +175,8 @@ Utils.waitPageLoaded(biologyResult + "return biologyResult ? false : true"); Utils.runJavaScript(biologyResult + "biologyResult.setValue('不合格');"); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, ForgonDateUtils.safelyFormatDate(new Date(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, ForgonDateUtils.safelyFormatDate(new Date(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); Utils.retryingFindAndDoAction(By.id("monitorUserBarcode"), Utils.ACTION_SENDKEYS, cssduser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorCheckerBarcode"), Utils.ACTION_SENDKEYS, cssduser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorBtn"), Utils.ACTION_CLICK); @@ -215,7 +212,7 @@ Utils.retryingFindAndDoAction(By.id("sterilizationPurpose"), Utils.ACTION_SENDKEYS, Keys.DOWN); Utils.retryingFindAndDoAction(By.xpath("//div[contains(text(), '器械包灭菌')]"), Utils.ACTION_CLICK); String tempBarcode = ""; - if (StringTools.isNotBlank(barcodes)) { + if (barcodes != null && !barcodes.equals("")) { String[] barcodesArr = barcodes.split(";"); tempBarcode = barcodesArr[0]; for (String barcode : barcodesArr) { @@ -317,8 +314,8 @@ Utils.waitPageLoaded(biologyResult + "return biologyResult ? false : true"); Utils.runJavaScript(biologyResult + "biologyResult.setValue('不合格');"); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, ForgonDateUtils.safelyFormatDate(new Date(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, ForgonDateUtils.safelyFormatDate(new Date(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); Utils.retryingFindAndDoAction(By.id("monitorUserBarcode"), Utils.ACTION_SENDKEYS, oruser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorCheckerBarcode"), Utils.ACTION_SENDKEYS, oruser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorBtn"), Utils.ACTION_CLICK); Index: ssts-selenium-test/src/test/java/test_4_1/sterilization/service/impl/Zd5ySterilization.java =================================================================== diff -u -r17932 -r17933 --- ssts-selenium-test/src/test/java/test_4_1/sterilization/service/impl/Zd5ySterilization.java (.../Zd5ySterilization.java) (revision 17932) +++ ssts-selenium-test/src/test/java/test_4_1/sterilization/service/impl/Zd5ySterilization.java (.../Zd5ySterilization.java) (revision 17933) @@ -16,9 +16,6 @@ import org.openqa.selenium.support.ui.Wait; import org.testng.AssertJUnit; -import com.forgon.tools.string.StringTools; -import com.forgon.tools.util.ForgonDateUtils; - import test_4_1.sterilization.helper.SterilizationHelper; import test_4_1.sterilization.service.Sterilization; import test_4_1.tools.Utils; @@ -75,7 +72,7 @@ Utils.retryingFindAndDoAction(By.id("sterilizationPurpose"), Utils.ACTION_SENDKEYS, Keys.DOWN); Utils.retryingFindAndDoAction(By.xpath("//div[contains(text(), '器械包灭菌')]"), Utils.ACTION_CLICK); String tempBarcode = ""; - if (StringTools.isNotBlank(barcodes)) { + if (barcodes != null && !barcodes.equals("")) { String[] barcodesArr = barcodes.split(";"); tempBarcode = barcodesArr[0]; for (String barcode : barcodesArr) { @@ -178,8 +175,8 @@ Utils.waitPageLoaded(biologyResult + "return biologyResult ? false : true"); Utils.runJavaScript(biologyResult + "biologyResult.setValue('不合格');"); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, ForgonDateUtils.safelyFormatDate(new Date(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, ForgonDateUtils.safelyFormatDate(new Date(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); Utils.retryingFindAndDoAction(By.id("monitorUserBarcode"), Utils.ACTION_SENDKEYS, cssduser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorCheckerBarcode"), Utils.ACTION_SENDKEYS, cssduser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorBtn"), Utils.ACTION_CLICK); @@ -215,7 +212,7 @@ Utils.retryingFindAndDoAction(By.id("sterilizationPurpose"), Utils.ACTION_SENDKEYS, Keys.DOWN); Utils.retryingFindAndDoAction(By.xpath("//div[contains(text(), '器械包灭菌')]"), Utils.ACTION_CLICK); String tempBarcode = ""; - if (StringTools.isNotBlank(barcodes)) { + if (barcodes != null && !barcodes.equals("")) { String[] barcodesArr = barcodes.split(";"); tempBarcode = barcodesArr[0]; for (String barcode : barcodesArr) { @@ -317,8 +314,8 @@ Utils.waitPageLoaded(biologyResult + "return biologyResult ? false : true"); Utils.runJavaScript(biologyResult + "biologyResult.setValue('不合格');"); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, ForgonDateUtils.safelyFormatDate(new Date(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); - Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, ForgonDateUtils.safelyFormatDate(new Date(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, "")); + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringStartDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); + Utils.retryingFindAndDoAction(By.id("biologicalMonitoringEndDate"), Utils.ACTION_SENDKEYS, "2017-04-28 13:14"); Utils.retryingFindAndDoAction(By.id("monitorUserBarcode"), Utils.ACTION_SENDKEYS, oruser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorCheckerBarcode"), Utils.ACTION_SENDKEYS, oruser1Barcode + "\n"); Utils.retryingFindAndDoAction(By.id("monitorBtn"), Utils.ACTION_CLICK);