Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java =================================================================== diff -u -r20998 -r21381 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java (.../Delivery.java) (revision 20998) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java (.../Delivery.java) (revision 21381) @@ -22,14 +22,16 @@ public class Delivery { @BeforeMethod public void init() { - Utils.init(); + //调试时需要打开 +// Utils.init(); Login login = new Login(); login.login_oneSupplyRoom(); Utils.retryingFindAndClick(By.id("invoicePlan")); Utils.retryingFindAndSwitchToFrame(By.id("iframe_invoicePlan")); String name = Utils.settings.getJSONObject("临床科室").getString("名称"); - + Utils.retryingFindAndHover(By + .xpath("//a[contains(text(), '" + name + "')]")); // 视图中的记录,执行selenium的js点击无效,必须调用selenium的API Utils.retryingFindAndClickBySeleniumAPI(By .xpath("//a[contains(text(), '" + name + "')]")); @@ -54,6 +56,8 @@ Utils.retryingFindAndClick(By.id("invoicePlan")); Utils.retryingFindAndSwitchToFrame(By.id("iframe_invoicePlan")); String name = Utils.settings.getJSONObject("临床科室").getString("名称"); + Utils.retryingFindAndHover(By + .xpath("//a[contains(text(), '" + name + "')]")); Utils.retryingFindAndClickBySeleniumAPI(By .xpath("//a[contains(text(), '" + name + "')]")); Utils.driver.switchTo().defaultContent(); @@ -357,6 +361,8 @@ Utils.retryingFindAndSwitchToFrame(By.id("iframe_invoicePlan")); String name = Utils.settings.getJSONObject("临床科室").getString("名称"); + Utils.retryingFindAndHover(By + .xpath("//a[contains(text(), '" + name + "')]")); Utils.retryingFindAndClickBySeleniumAPI(By .xpath("//a[contains(text(), '" + name + "')]")); Utils.driver.switchTo().defaultContent(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java =================================================================== diff -u -r21336 -r21381 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 21336) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java (.../SterilizationTest.java) (revision 21381) @@ -343,7 +343,8 @@ System.out.print("没有待灭菌的物品"); } JSWaiter.waitUntilJQueryReady(); - Utils.driver.quit(); + Login login=new Login(); + login.login_Out(); } catch (Exception e) { e.printStackTrace(); AssertJUnit.fail(e.getMessage()); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java =================================================================== diff -u -r21372 -r21381 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 21372) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 21381) @@ -212,6 +212,8 @@ Utils.retryingFindAndClick(By.id("invoicePlan")); Utils.retryingFindAndSwitchToFrame(By.id("iframe_invoicePlan")); String name = Utils.settings.getJSONObject("临床科室").getString("名称"); + Utils.retryingFindAndHover(By + .xpath("//a[contains(text(), '" + name + "')]")); Utils.retryingFindAndClickBySeleniumAPI(By .xpath("//a[contains(text(), '" + name + "')]")); Utils.driver.switchTo().defaultContent(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Apply.java =================================================================== diff -u -r20663 -r21381 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Apply.java (.../Apply.java) (revision 20663) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Apply.java (.../Apply.java) (revision 21381) @@ -890,23 +890,23 @@ .cssSelector("input[value='归还物品']")); String currentwindowhandle = Utils.driver.getWindowHandle(); Utils.driver.switchTo().window(currentwindowhandle); - - Utils.retryingFindAndClick(By - .xpath("//button[contains(text(), '保存')]")); + if (Utils.isFind(Utils.retryingFind(By + .xpath("//button[contains(text(), '保存')]")))) { + Utils.retryingFindAndClick(By + .xpath("//button[contains(text(), '保存')]")); + } // 定位到弹出对话框的按钮 Wait wait = WaitFactory.createDefaultWait(); - WebElement yesbutton = wait - .until(new Function() { - public WebElement apply(WebDriver driver) { + wait.until(new Function() { + public WebElement apply(WebDriver driver) { + JSWaiter.waitUntilJQueryReady(); + return Utils.retryingFind(By + .xpath("//button[contains(text(), '是')]")); - JSWaiter.waitUntilJQueryReady(); - - return driver.findElement(By - .xpath("//button[contains(text(), '是')]")); - - } - }); - Utils.clickWebElement(ActionExecuteMethod.ByTagType, yesbutton); + } + }); + Utils.retryingFindAndClick(By + .xpath("//button[contains(text(), '是')]")); } JSWaiter.waitUntilJQueryReady(); } catch (Exception e) {