Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java =================================================================== diff -u -r19477 -r19497 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java (.../Utils.java) (revision 19477) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java (.../Utils.java) (revision 19497) @@ -1157,7 +1157,7 @@ } /** - * 等待一段时间,直到页面的URL地址变为期望值 + * 等待一段时间,直到页面的URL地址变为期望值。如果没有跳转到期望值,则抛出运行时异常 * * @param newUrl * 期望的url @@ -1166,16 +1166,22 @@ */ public static void waitUntilUrlChange(final String newUrl, int seconds) { Wait wait = WaitFactory.createDefaultWait(); - wait.until(new Function() { + + boolean isURLOk = wait.until(new Function() { public Boolean apply(WebDriver d) { return d.getCurrentUrl().startsWith(newUrl); } }); + if (!isURLOk){ + String currentURL = Utils.driver.getCurrentUrl(); + throw new RuntimeException("URL地址没有跳转到期望地址,期望地址 = " + newUrl + + ",当前地址 = " + currentURL); + } } /** - * 等待一段时间,直到页面的URL地址包含了期望值 + * 等待一段时间,直到页面的URL地址包含了期望值。如果没有包含期望值,则抛出运行时异常 * * @param urlContaints * 期望的新URL中被包含的值 @@ -1185,13 +1191,19 @@ public static void waitUntilUrlContains(final String urlContaints, int seconds) { Wait wait = WaitFactory.createDefaultWait(); - wait.until(new Function() { + boolean isURLOk = wait.until(new Function() { public Boolean apply(WebDriver d) { return d.getCurrentUrl().toLowerCase() .contains(urlContaints.toLowerCase()); } }); + if (!isURLOk){ + String currentURL = Utils.driver.getCurrentUrl(); + throw new RuntimeException("URL地址包含期望值,期望包含值 = " + urlContaints + + ",当前地址 = " + currentURL); + } + } /**