Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java =================================================================== diff -u -r19259 -r19357 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 19259) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 19357) @@ -6,11 +6,11 @@ import static org.testng.AssertJUnit.assertTrue; import java.util.List; -import java.util.Set; import java.util.function.Function; import net.sf.json.JSONObject; +import org.apache.log4j.Logger; import org.openqa.selenium.Alert; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; @@ -24,7 +24,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.log4j.Logger; import test.forgon.disinfectsystem.selenium.factory.WaitFactory; import test.forgon.disinfectsystem.selenium.tools.JSWaiter; @@ -131,7 +130,6 @@ } Utils.retryingFindAndClick(By.cssSelector("input[value='保存并新建']")); - // Utils.doWait(1000); } catch (Exception e) { e.printStackTrace(); AssertJUnit.fail(e.getMessage()); @@ -191,7 +189,6 @@ addButton.click(); } Utils.retryingFindAndClick(By.id("saveBtn")); - // Utils.doWait(1000); } catch (Exception e) { e.printStackTrace(); AssertJUnit.fail(e.getMessage()); @@ -204,7 +201,6 @@ @Test public void recyle_oneSupplyRoomSignboard() { try { - // Utils.doWait(1500); String barcode = Utils.settings.getJSONObject("临床科室").getString( "条码"); @@ -249,24 +245,20 @@ addButton.click(); } - // Utils.doWait(500); Utils.retryingFindAndSendKeys(By.id("tousseItemTable"), Utils.settings.getJSONObject("一级供应室清洗篮筐1").getString("条码") + "\n"); dialogWindowClose(); // 扫描标识牌条码回收入筐 - // Utils.doWait(500); Utils.retryingFindAndSendKeys( By.id("tousseItemTable"), Utils.settings.getJSONObject("一级供应室器械包1").getString( "标识牌条码1") + "\n"); - // Utils.doWait(500); Utils.retryingFindAndClick(By.id("saveBtn")); - // Utils.doWait(2500); } catch (Exception e) { e.printStackTrace(); AssertJUnit.fail(e.getMessage()); @@ -312,7 +304,6 @@ } Utils.retryingFindAndClick(By.id("saveBtn")); - // Utils.doWait(1000); } catch (Exception e) { e.printStackTrace(); AssertJUnit.fail(e.getMessage()); @@ -589,9 +580,7 @@ .getString("条码") + "\n"); dialogWindowClose(); Utils.retryingFindAndClick(By.cssSelector(".btn-a")); - // Utils.doWait(800); Utils.retryingFindAndClick(By.id("saveBtn")); - // Utils.doWait(2000); } catch (Exception e) { e.printStackTrace(); AssertJUnit.fail(e.getMessage()); @@ -606,8 +595,6 @@ try { // Utils.retryingFindAndClick(By.id("addRecycleRecordBtn")); waitUrlChange(); - // TODO：以下的等待2秒，要评估是否可以去掉 - // Utils.doWait(2000); WebElement recycleForm = this.scanRecycleUserBarcode(); // 扫描科室条码 @@ -631,7 +618,6 @@ String recyclingFormWindowhandle = Utils.driver.getWindowHandle(); Utils.driver.switchTo().window(recyclingFormWindowhandle); - // Utils.doWait(1000); Utils.retryingFindAndSendKeys(By.id("tousseItemTable"), Utils.settings.getJSONObject("一级供应室清洗篮筐1").getString("条码") @@ -683,14 +669,12 @@ // 增加材料丢失 Utils.retryingFindAndClick(By.id("recyclingErrorButton0")); Utils.retryingFindAndSwitchToFrame(By.tagName("iframe")); - // Utils.doWait(500); Utils.retryingFindAndClick(By.id("recyclingErrorTable")); // 点击第1行的+号按钮 Utils.retryingFindAndClick(By.id("addButton0")); Utils.retryingFindAndClick(By.id("errorSubmitButton")); Utils.driver.switchTo().defaultContent(); Utils.retryingFindAndClick(By.id("saveBtn")); - // Utils.doWait(1000); } catch (Exception e) { e.printStackTrace(); AssertJUnit.fail(e.getMessage()); @@ -768,7 +752,7 @@ Utils.retryingFindAndSwitchToFrame(By.tagName("iframe")); a = (int) (Math.random() * 8 + 1) + ""; - Thread.sleep(500); +// Thread.sleep(500); Utils.retryingFindAndClick(By.id("button" + a)); Utils.retryingFindAndClick(By.id("button6")); @@ -795,7 +779,6 @@ } Utils.retryingFindAndClick(By.id("saveBtn")); - // Utils.doWait(1000); } catch (Exception e) { System.out.println("异常信息："); e.printStackTrace(); @@ -835,7 +818,7 @@ Utils.retryingFindAndSwitchToFrame(By.tagName("iframe")); String a = (int) (Math.random() * 8 + 1) + ""; - Thread.sleep(500); +// Thread.sleep(500); Utils.retryingFindAndClick(By.id("button" + a)); Utils.retryingFindAndClick(By.id("button5")); Utils.retryingFindAndClick(By.id("okButton")); @@ -859,7 +842,6 @@ } Utils.retryingFindAndClick(By.id("saveBtn")); - // Utils.doWait(1000); } catch (Exception e) { e.printStackTrace(); AssertJUnit.fail(e.getMessage()); @@ -992,7 +974,6 @@ waitUrlChange(); Utils.retryingFindAndClick(By.id("confirmBtnTd")); - // Utils.doWait(1000); } } catch (Exception e) { e.printStackTrace(); @@ -1052,7 +1033,7 @@ } Utils.retryingFindAndClick(By.className("btn-e")); - Utils.waitForWindowAmountEquals(1, 5000); + Utils.waitForWindowAmountEquals(1, 20000); // 从自定义入筐的窗口切换回主窗口 for (String winHandle : Utils.driver.getWindowHandles()) { @@ -1076,7 +1057,6 @@ JSWaiter.waitUntilJQueryReady(); // Utils.jsClick(Utils.findByAwait(By.id("saveBtn"))); Utils.retryingFindAndClick(By.id("saveBtn")); - // Utils.doWait(2000); } catch (Exception e) { e.printStackTrace(); AssertJUnit.fail(e.getMessage()); @@ -1127,12 +1107,10 @@ JSONObject jsonObject = Utils.settings.getJSONObject(user); WebElement webElement = Utils.retryingFindAndSendKeys(by, jsonObject.getString("条码") + "\n"); - // Utils.doWait(500); Wait wait = WaitFactory.createDefaultWait(); // 断言回收人或者清洗人的姓名填写成功 wait.until(ExpectedConditions.attributeContains(by, "value", jsonObject.getString("姓名"))); - // Utils.doWait(500); return webElement; } @@ -1146,12 +1124,10 @@ if(Utils.isFind(Utils.findByAwait(By.id("recyclingUser")))){ table = this.scanBarcode(By.id("recyclingUser"), "回收人"); this.logger.info("扫描回收人条码成功");} - // Utils.doWait(500); // 扫描清点人条码 if(Utils.isFind(Utils.findByAwait(By.id("operator")))){ table = this.scanBarcode(By.id("operator"), "清点人"); this.logger.info("扫描清点人条码成功");} - // Utils.doWait(500); } catch (Exception e) { e.printStackTrace(); AssertJUnit.fail(e.getMessage()); @@ -1191,7 +1167,6 @@ * Utils.driver.switchTo().window(recyclingFormWindowhandle); name = * Utils.settings.getJSONObject("清点人").getString("条码"); * - * // Thread.sleep(1000); // * Utils.retryingFind(By.cssSelector("input[value='清点人员']")) // .click(); // * 扫描清点人条码 *