Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java =================================================================== diff -u -r26696 -r26700 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 26696) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 26700) @@ -435,10 +435,9 @@ Utils.retryingFindAndClick(By.xpath("//a[contains(text(),'保存')]")); //点击确认提示框 - Wait wait = WaitFactory.createDefaultWait(); - wait.until(ExpectedConditions.alertIsPresent()); - Alert alertBox = Utils.driver.switchTo().alert(); - alertBox.accept(); +// Wait wait = WaitFactory.createDefaultWait(); +// wait.until(ExpectedConditions.alertIsPresent()); + Utils.driver.switchTo().alert().accept(); String recyclingFormWindowhandle = Utils.driver.getWindowHandle(); Utils.driver.switchTo().window(recyclingFormWindowhandle); @@ -574,13 +573,13 @@ element = Utils.retryingFindForthCellOfTable(By .id("awaitForRecycleTable")); //待回收记录 - WebElement await = Utils.driver.findElement(By.xpath("//*[@id='awaitForRecycleTable']//tr[1]/td[2]")); + WebElement await = Utils.retryingFind(By.xpath("//*[@id='awaitForRecycleTable']//tr[1]/td[2]")); String applyTime1 = await.getText(); String style1 = await.getAttribute("style"); //已回收记录 - WebElement record = Utils.driver.findElement(By.xpath("//*[@id='recyclingRecordTable']//tr[1]/td[6]")); + WebElement record = Utils.retryingFind(By.xpath("//*[@id='recyclingRecordTable']//tr[1]/td[6]")); String applyTime2 = record.getText(); - String style2 = record.getAttribute("background-color: yellow;"); + String style2 = record.getAttribute("style"); //通过申请时间断言这两条记录为同一申请单 assertTrue("待回收列表第一条申请单不是部分回收申请单!","background-color: yellow;".equals(style1)); assertTrue("回收记录列表第一条申请单不是部分回收申请单!","background-color: yellow;".equals(style2));