Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java =================================================================== diff -u -r21391 -r21529 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java (.../Wash.java) (revision 21391) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java (.../Wash.java) (revision 21529) @@ -468,22 +468,33 @@ Utils.retryingFindAndClick(By.xpath("//span[contains(text(), '" + basketName + "')]")); // 删除篮筐 - Utils.retryingFindAndHover(By.cssSelector("div[name='divName_id']")); - Utils.retryingFindAndClick(By.cssSelector("div[name='divName_id']")); + /** + * 下面的代码写得不可靠,经常导致按住了删除图片,导致运行不正常,改为直接定位到img进行click + */ +// Utils.retryingFindAndHover(By.cssSelector("div[name='divName_id']")); +// Utils.retryingFindAndClick(By.cssSelector("div[name='divName_id']")); + + Utils.retryingFindAndClick(By + .cssSelector("img[src='" + Utils.settings.get("服务器地址").toString() + + "/images/web/stop.png" + "']")); + + String currentUrl = Utils.driver.getCurrentUrl(); + System.out.println("currentUrl = " + currentUrl); - if (currentUrl.indexOf("/images/web/stop.png") > 0) { - Utils.driver.get(Utils.settings.get("服务器地址").toString() - + "/homepage/portalPage.jsp"); - Utils.tryToCloseWarningWindow(); - Utils.retryingFindAndClick(By.id("washAndDisinfect")); - Utils.retryingFindAndSwitchToFrame(By.id("iframe_washAndDisinfect")); - Utils.retryingFindAndClick(By - .xpath("//button[contains(text(), '添加')]")); - String currentwindowhandle = Utils.driver.getWindowHandle(); - Utils.driver.switchTo().window(currentwindowhandle); - wash_washChangeBasket(); - } + +// if (currentUrl.indexOf("/images/web/stop.png") > 0) { +// Utils.driver.get(Utils.settings.get("服务器地址").toString() +// + "/homepage/portalPage.jsp"); +// Utils.tryToCloseWarningWindow(); +// Utils.retryingFindAndClick(By.id("washAndDisinfect")); +// Utils.retryingFindAndSwitchToFrame(By.id("iframe_washAndDisinfect")); +// Utils.retryingFindAndClick(By +// .xpath("//button[contains(text(), '添加')]")); +// String currentwindowhandle = Utils.driver.getWindowHandle(); +// Utils.driver.switchTo().window(currentwindowhandle); +// wash_washChangeBasket(); +// } // 重新扫描篮筐 JSWaiter.waitUntilJQueryReady(); if (Utils.isFind(Utils.retryingFind(By.id("inputText")))) {