Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java =================================================================== diff -u -r20970 -r21509 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java (.../Login.java) (revision 20970) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java (.../Login.java) (revision 21509) @@ -10,11 +10,12 @@ import org.openqa.selenium.Alert; import org.openqa.selenium.By; import org.openqa.selenium.NoAlertPresentException; +import org.openqa.selenium.WebElement; import org.openqa.selenium.os.WindowsUtils; import test.forgon.disinfectsystem.selenium.tools.JSWaiter; import test.forgon.disinfectsystem.selenium.tools.Utils; - +import static org.testng.Assert.assertNotNull; /** * Wait wait = WaitFactory.createDefaultWait(); * @@ -146,8 +147,12 @@ public void loginAction() { JSWaiter.waitUntilJQueryReady(); - if (Utils.isFind(Utils.retryingFind(By.id("j_username_display")))) { - Utils.retryingFind(By.id("j_username_display")).clear(); + WebElement usernameElement = Utils.retryingFind(By.id("j_username_display")); + + assertNotNull(usernameElement); + + if (Utils.isFind(usernameElement)) { + usernameElement.clear(); Utils.retryingFindAndClick(By.id("j_username_display")); Utils.retryingFindAndSendKeys(By.id("j_username_display"), Utils.settings.getJSONObject("一级供应室用户").get("工号")