Index: ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java =================================================================== diff -u -r17701 -r17708 --- ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java (.../Utils.java) (revision 17701) +++ ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java (.../Utils.java) (revision 17708) @@ -72,8 +72,8 @@ /** 打开浏览器 */ public static void webDriverInit() { - System.setProperty("webdriver.ie.driver", - "C:\\IEDriverServer_Win32_3.3.0\\IEDriverServer.exe"); +// System.setProperty("webdriver.ie.driver", +// "C:\\IEDriverServer_Win32_3.3.0\\IEDriverServer.exe"); // 解决ie兼容模式设置导致无法启动问题 DesiredCapabilities ieCapabilities = DesiredCapabilities .internetExplorer(); @@ -87,9 +87,9 @@ // driver = new InternetExplorerDriver(ieCapabilities); try { - driver = new RemoteWebDriver(new URL( - "http://192.168.2.18:4444/wd/hub"), ieCapabilities); -// driver = new InternetExplorerDriver(ieCapabilities); +// driver = new RemoteWebDriver(new URL( +// "http://192.168.2.18:4444/wd/hub"), ieCapabilities); + driver = new InternetExplorerDriver(ieCapabilities); } catch (Exception e) { e.printStackTrace(); @@ -185,7 +185,7 @@ } }); // driver.findElement(by); -// Thread.sleep(1000); + Thread.sleep(1000); break; } catch (Exception e) { } @@ -457,7 +457,9 @@ Utils.retryingFindAndClick(By.id("recyclingRecordTouchScreen")); Utils.waitForWindowToOpen(2, 5000); // 遍历所有窗口,切换至新窗口(回收清点窗口) + Set handles = Utils.driver.getWindowHandles(); + System.out.println("准备进行窗口切换,窗口数量:" + handles.size()); for (String windowHandle : handles) { if (!windowHandle.equalsIgnoreCase(mainWindow)) { Utils.driver.switchTo().window(windowHandle); Index: ssts-selenium-test/src/test/java/test_4_1/Login.java =================================================================== diff -u -r17700 -r17708 --- ssts-selenium-test/src/test/java/test_4_1/Login.java (.../Login.java) (revision 17700) +++ ssts-selenium-test/src/test/java/test_4_1/Login.java (.../Login.java) (revision 17708) @@ -85,10 +85,7 @@ Utils.settings.getJSONObject("一级供应室用户").getString("密码")); Utils.retryingFindAndClick(By.id("btn1")); - System.out.println("Page title is: " + Utils.driver.getTitle()); - Utils.tryToCloseWarningWindow(); - assertEquals(Utils.settings.get("服务器地址") - + "/homepage/portalPage.jsp", Utils.driver.getCurrentUrl()); + isLoginSuccess(); } catch (Exception e) { e.printStackTrace(); AssertJUnit.fail(e.getMessage()); @@ -110,19 +107,32 @@ Utils.settings.getJSONObject("一级供应室用户").get("密码") .toString()); Utils.retryingFindAndClick(By.id("btn1")); - - System.out.println("Page title is: " + Utils.driver.getTitle()); - - Utils.tryToCloseWarningWindow(); - assertEquals(Utils.settings.get("服务器地址") - + "/homepage/portalPage.jsp", Utils.driver.getCurrentUrl()); + + isLoginSuccess(); + } catch (Exception e) { e.printStackTrace(); AssertJUnit.fail(e.getMessage()); } } /** + * 判断登录是否成功 + */ + private void isLoginSuccess() { + + Utils.waitUntilUrlChange(Utils.settings.get("服务器地址") + + "/homepage/portalPage.jsp", 5); + + System.out.println("Page title is: " + Utils.driver.getTitle()); + + Utils.tryToCloseWarningWindow(); + + assertEquals(Utils.settings.get("服务器地址") + + "/homepage/portalPage.jsp", Utils.driver.getCurrentUrl()); + } + + /** * 供应室用户登陆触摸屏清洗 * */ @Test Index: ssts-selenium-test/src/test/java/test_4_1/Apply.java =================================================================== diff -u -r17700 -r17708 --- ssts-selenium-test/src/test/java/test_4_1/Apply.java (.../Apply.java) (revision 17700) +++ ssts-selenium-test/src/test/java/test_4_1/Apply.java (.../Apply.java) (revision 17708) @@ -590,9 +590,12 @@ String name = Utils.settings.getJSONObject("一级供应室外来器械").getString( "名称"); - Utils.retryingFindAndClick( - By.cssSelector("input[name='foreignTousseName1']")) - .sendKeys(name); + WebElement element = Utils.retryingFindAndClick( + By.cssSelector("input[name='foreignTousseName1']")); + + Thread.sleep(1000); + element.sendKeys(name); + Utils.retryingFindAndClick(By .xpath("//div/ul/li[contains(text(), '" + name + "')]"));