Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java =================================================================== diff -u -r26553 -r26560 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 26553) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 26560) @@ -516,6 +516,7 @@ @Test public void recyle_return() { try { + String recyleWin = Utils.driver.getWindowHandle(); //点击待回收表格第一行第一列 Utils.retryingFindAndClick(By.xpath("//*[@id='awaitForRecycleTable']//tr[1]/td[1]")); waitUrlChange(); @@ -543,10 +544,10 @@ 8); /*** 供应室回收终止 ***/ recyle_terminate(); + Utils.driver.switchTo().window(recyleWin); JSWaiter.waitUntilJQueryReady(); Utils.driver.get(Utils.settings.get("服务器地址").toString()); logger.info("供应室回收终止完成"); - after(); } catch (Exception e) { e.printStackTrace(); fail(e.getMessage());