Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java =================================================================== diff -u -r20809 -r20819 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 20809) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 20819) @@ -1273,34 +1273,38 @@ @AfterMethod public void after() { - JSWaiter.waitUntilJQueryReady(); - Utils.driver.quit(); - if (Utils.driver.getWindowHandles().isEmpty()) { - System.out.println("Session ID is null"); - } else { - Set allWindowsId = Utils.driver.getWindowHandles(); - for (String windowID : allWindowsId) { - if (windowID != null) { - if (Utils.driver.switchTo().window(windowID).getTitle() - .contains("消毒") - || Utils.driver.switchTo().window(windowID) - .getTitle().contains("WebDriver")) { - Utils.driver.switchTo().window(windowID); - System.out.println(windowID); - JSWaiter.waitUntilJQueryReady(); - Utils.driver.quit(); - WindowsUtils.killByName("conhost.exe"); - WindowsUtils.killByName("IEDriverServer.exe *32"); - WindowsUtils.killByName("iexplore.exe"); - // TODO:暂时用下面语句杀掉IE进程,解决IE8,win7运行后装配界面没有关闭的问题 - WindowsUtils.killByName("iexplore.exe *32"); - assemble.isAlertPresent(); - continue; + try { + JSWaiter.waitUntilJQueryReady(); + Utils.driver.quit(); + if (Utils.driver.getWindowHandles().isEmpty()) { + System.out.println("Session ID is null"); + } else { + Set allWindowsId = Utils.driver.getWindowHandles(); + for (String windowID : allWindowsId) { + if (windowID != null) { + if (Utils.driver.switchTo().window(windowID).getTitle() + .contains("消毒") + || Utils.driver.switchTo().window(windowID) + .getTitle().contains("WebDriver")) { + Utils.driver.switchTo().window(windowID); + System.out.println(windowID); + JSWaiter.waitUntilJQueryReady(); + Utils.driver.quit(); + WindowsUtils.killByName("conhost.exe"); + WindowsUtils.killByName("IEDriverServer.exe *32"); + WindowsUtils.killByName("iexplore.exe"); + // TODO:暂时用下面语句杀掉IE进程,解决IE8,win7运行后装配界面没有关闭的问题 + WindowsUtils.killByName("iexplore.exe *32"); + assemble.isAlertPresent(); + continue; + } + } else { + break; } - } else { - break; } } + } catch (Exception e) { + e.printStackTrace(); } }