Menu
▾
▴
[HtmlUnit] SVN: [15434] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ javascript/host
|
From: <rb...@us...> - 2018-07-05 06:27:15
|
Revision: 15434
http://sourceforge.net/p/htmlunit/code/15434
Author: rbri
Date: 2018-07-05 06:27:06 +0000 (Thu, 05 Jul 2018)
Log Message:
-----------
try to make our test suite more robust (when running in real browsers)
Modified Paths:
--------------
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocumentWrite2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameElement2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptionElement2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/worker/WorkerTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestCORSTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement2Test.java 2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAnchorElement2Test.java 2018-07-05 06:27:06 UTC (rev 15434)
@@ -200,7 +200,7 @@
final WebDriver driver = loadPage2(html);
driver.findElement(By.id("button1")).click();
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElementTest.java 2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElementTest.java 2018-07-05 06:27:06 UTC (rev 15434)
@@ -402,6 +402,6 @@
actions.moveToElement(driver.findElement(By.id("disabledBtn")));
actions.perform();
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocumentWrite2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocumentWrite2Test.java 2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocumentWrite2Test.java 2018-07-05 06:27:06 UTC (rev 15434)
@@ -244,7 +244,7 @@
try {
final WebDriver driver = loadPageWithAlerts2(html);
- assertEquals("#1", driver.getTitle());
+ assertTitle(driver, "#1");
}
finally {
shutDownRealIE();
@@ -315,7 +315,7 @@
try {
final WebDriver driver = loadPage2(html);
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
finally {
shutDownRealIE();
@@ -344,7 +344,7 @@
try {
final WebDriver driver = loadPage2(html);
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
finally {
shutDownAll();
@@ -389,7 +389,7 @@
getMockWebConnection().setDefaultResponse(script, JAVASCRIPT_MIME_TYPE);
final WebDriver driver = loadPage2(html);
- assertEquals("First", driver.getTitle());
+ assertTitle(driver, "First");
assertEquals("hello", driver.findElement(By.id("div1")).getText());
}
@@ -410,7 +410,7 @@
+ "</script></div></body></html>";
final WebDriver driver = loadPageWithAlerts2(html);
- assertEquals("done", driver.getTitle());
+ assertTitle(driver, "done");
assertEquals("in inline script", driver.findElement(By.id("it")).getText());
}
@@ -432,7 +432,7 @@
getMockWebConnection().setDefaultResponse(js, JAVASCRIPT_MIME_TYPE);
final WebDriver driver = loadPage2(html);
- assertEquals("done", driver.getTitle());
+ assertTitle(driver, "done");
assertEquals("here", driver.findElement(By.id("it")).getText());
assertEquals("here", driver.findElement(By.tagName("body")).getText());
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement2Test.java 2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement2Test.java 2018-07-05 06:27:06 UTC (rev 15434)
@@ -1458,15 +1458,15 @@
try {
final WebDriver driver = loadPage2(firstHtml);
- assertEquals("First:" + getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, "First:" + getExpectedAlerts()[0]);
driver.findElement(By.id("button1")).click();
driver.switchTo().window("second");
- assertEquals("Second:" + getExpectedAlerts()[1], driver.getTitle());
+ assertTitle(driver, "Second:" + getExpectedAlerts()[1]);
driver.findElement(By.id("button2")).click();
- assertEquals("Second:" + getExpectedAlerts()[2], driver.getTitle());
+ assertTitle(driver, "Second:" + getExpectedAlerts()[2]);
}
finally {
shutDownRealIE();
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java 2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java 2018-07-05 06:27:06 UTC (rev 15434)
@@ -115,8 +115,8 @@
+ "</body>\n"
+ "</html>";
- final WebDriver webDriver = loadPageWithAlerts2(html);
- assertEquals("test", webDriver.getTitle());
+ final WebDriver driver = loadPageWithAlerts2(html);
+ assertTitle(driver, "test");
}
/**
@@ -270,8 +270,8 @@
+ "</body>\n"
+ "</html>";
- final WebDriver webDriver = loadPageWithAlerts2(html);
- assertEquals("test", webDriver.getTitle());
+ final WebDriver driver = loadPageWithAlerts2(html);
+ assertTitle(driver, "test");
}
/**
@@ -349,8 +349,8 @@
+ "</body>\n"
+ "</html>";
- final WebDriver webDriver = loadPageWithAlerts2(html);
- assertEquals("test", webDriver.getTitle());
+ final WebDriver driver = loadPageWithAlerts2(html);
+ assertTitle(driver, "test");
}
/**
@@ -387,13 +387,13 @@
final String[] alerts = getExpectedAlerts();
int i = 0;
- final WebDriver webDriver = loadPage2(html);
+ final WebDriver driver = loadPage2(html);
- webDriver.findElement(By.id("login")).click();
- assertEquals(alerts[i++], webDriver.getTitle());
+ driver.findElement(By.id("login")).click();
+ assertTitle(driver, alerts[i++]);
- webDriver.findElement(By.id("password")).click();
- assertEquals(alerts[i++], webDriver.getTitle());
+ driver.findElement(By.id("password")).click();
+ assertTitle(driver, alerts[i++]);
}
/**
@@ -427,10 +427,10 @@
+ " </form>\n"
+ "</body></html>";
- final WebDriver webDriver = loadPageWithAlerts2(html);
+ final WebDriver driver = loadPageWithAlerts2(html);
- webDriver.findElement(By.id("login")).click();
- assertEquals("", webDriver.getTitle());
+ driver.findElement(By.id("login")).click();
+ assertTitle(driver, "");
}
/**
@@ -462,10 +462,10 @@
+ " </form>\n"
+ "</body></html>";
- final WebDriver webDriver = loadPageWithAlerts2(html);
+ final WebDriver driver = loadPageWithAlerts2(html);
- webDriver.findElement(By.id("login")).click();
- assertEquals("", webDriver.getTitle());
+ driver.findElement(By.id("login")).click();
+ assertTitle(driver, "");
}
/**
@@ -497,10 +497,10 @@
+ " </form>\n"
+ "</body></html>";
- final WebDriver webDriver = loadPageWithAlerts2(html);
+ final WebDriver driver = loadPageWithAlerts2(html);
- webDriver.findElement(By.id("login")).click();
- assertEquals("", webDriver.getTitle());
+ driver.findElement(By.id("login")).click();
+ assertTitle(driver, "");
}
/**
@@ -533,13 +533,13 @@
final String[] alerts = getExpectedAlerts();
int i = 0;
- final WebDriver webDriver = loadPage2(html);
+ final WebDriver driver = loadPage2(html);
- webDriver.findElement(By.id("login")).click();
- assertEquals(alerts[i++], webDriver.getTitle());
+ driver.findElement(By.id("login")).click();
+ assertTitle(driver, alerts[i++]);
- webDriver.findElement(By.id("password")).click();
- assertEquals(alerts[i++], webDriver.getTitle());
+ driver.findElement(By.id("password")).click();
+ assertTitle(driver, alerts[i++]);
}
/**
@@ -605,8 +605,8 @@
+ " <div id='div1' align='left'></div>\n"
+ "</body>\n"
+ "</html>";
- final WebDriver webDriver = loadPageWithAlerts2(html);
- assertEquals("test", webDriver.getTitle());
+ final WebDriver driver = loadPageWithAlerts2(html);
+ assertTitle(driver, "test");
}
/**
@@ -2759,8 +2759,8 @@
+ "} catch(e) { alert('exception'); }\n"
+ "</script></body></html>";
- final WebDriver webDriver = loadPageWithAlerts2(html);
- assertEquals("page 1", webDriver.getTitle());
+ final WebDriver driver = loadPageWithAlerts2(html);
+ assertTitle(driver, "page 1");
}
/**
@@ -3014,8 +3014,8 @@
+ "<script>\n"
+ " document.body.innerHTML = unescape(document.body.innerHTML);\n"
+ "</script></body></html>";
- final WebDriver webDriver = loadPageWithAlerts2(html);
- assertEquals("Recursion", webDriver.getTitle());
+ final WebDriver driver = loadPageWithAlerts2(html);
+ assertTitle(driver, "Recursion");
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElementTest.java 2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFormElementTest.java 2018-07-05 06:27:06 UTC (rev 15434)
@@ -1067,7 +1067,7 @@
// ok
}
driver.switchTo().window("foo1");
- assertEquals("Name: foo1", driver.getTitle());
+ assertTitle(driver, "Name: foo1");
}
/**
@@ -1228,7 +1228,7 @@
// NB: comparing the sequence order here is not 100% safe with a real browser
assertEquals(expectedRequests, getMockWebConnection().getRequestedUrls(URL_FIRST));
- assertEquals("Page 4", driver.getTitle());
+ assertTitle(driver, "Page 4");
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameElement2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameElement2Test.java 2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLFrameElement2Test.java 2018-07-05 06:27:06 UTC (rev 15434)
@@ -196,7 +196,7 @@
expandExpectedAlertsVariables(URL_FIRST);
verifyAlerts(driver, getExpectedAlerts());
- assertEquals("first", driver.getTitle());
+ assertTitle(driver, "first");
}
/**
@@ -393,9 +393,9 @@
getMockWebConnection().setResponse(new URL(URL_FIRST, "head.html"), top);
getMockWebConnection().setResponse(new URL(URL_FIRST, "bottom.html"), bottom);
- loadPage2(html);
+ final WebDriver driver = loadPage2(html);
assertEquals(3, getMockWebConnection().getRequestCount());
- assertEquals(getExpectedAlerts()[0], getWebDriver().getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
@@ -421,9 +421,9 @@
getMockWebConnection().setResponse(new URL(URL_FIRST, "left.html"), left);
getMockWebConnection().setResponse(new URL(URL_FIRST, "right.html"), right);
- loadPage2(html);
+ final WebDriver driver = loadPage2(html);
assertEquals(3, getMockWebConnection().getRequestCount());
- assertEquals(getExpectedAlerts()[0], getWebDriver().getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
@@ -479,7 +479,7 @@
final WebDriver driver = loadPage2(html);
// top frame
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
// header frame
driver.switchTo().frame("header");
@@ -561,7 +561,7 @@
final WebDriver driver = loadPage2(html);
// top frame
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
// header frame
driver.switchTo().frame("header");
@@ -640,7 +640,7 @@
final WebDriver driver = loadPage2(html);
// top frame
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
// header frame
driver.switchTo().frame("header");
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElementTest.java 2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElementTest.java 2018-07-05 06:27:06 UTC (rev 15434)
@@ -1022,7 +1022,7 @@
final WebDriver driver = loadPage2(html);
driver.findElement(By.name("field1")).sendKeys("bla");
driver.findElement(By.tagName("img")).click();
- assertEquals("page 2", driver.getTitle());
+ assertTitle(driver, "page 2");
}
/**
@@ -1968,7 +1968,7 @@
actions.moveToElement(driver.findElement(By.id("tester")));
actions.perform();
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptionElement2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptionElement2Test.java 2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptionElement2Test.java 2018-07-05 06:27:06 UTC (rev 15434)
@@ -1427,7 +1427,7 @@
actions.moveToElement(driver.findElement(By.id("option1")));
actions.perform();
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
@@ -1481,6 +1481,6 @@
actions.moveToElement(driver.findElement(By.id("option1")));
actions.perform();
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElementTest.java 2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLScriptElementTest.java 2018-07-05 06:27:06 UTC (rev 15434)
@@ -334,7 +334,7 @@
getMockWebConnection().setResponse(URL_SECOND, js);
final WebDriver driver = loadPage2(html);
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
@@ -567,7 +567,7 @@
getMockWebConnection().setResponse(URL_SECOND, js);
final WebDriver driver = loadPage2(html);
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
@@ -1019,7 +1019,7 @@
getMockWebConnection().setResponse(new URL(URL_FIRST, "js3.js"), "document.title += ' 3';");
final WebDriver driver = loadPage2(html);
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
@@ -1043,7 +1043,7 @@
getMockWebConnection().setResponse(new URL(URL_FIRST, "js2.js"), "document.title += ' 2';");
final WebDriver driver = loadPage2(html);
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
@@ -1066,7 +1066,7 @@
getMockWebConnection().setResponse(new URL(URL_FIRST, "js2.js"), "document.title += ' 2';");
final WebDriver driver = loadPage2(html);
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
@@ -1091,7 +1091,7 @@
getMockWebConnection().setResponse(new URL(URL_FIRST, "js.js"), "document.title += ' 3';");
final WebDriver driver = loadPage2(html);
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
@@ -1118,7 +1118,7 @@
getMockWebConnection().setResponse(new URL(URL_FIRST, "js.js"), "document.title += ' from script';");
final WebDriver driver = loadPage2(html);
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElementTest.java 2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElementTest.java 2018-07-05 06:27:06 UTC (rev 15434)
@@ -2387,7 +2387,7 @@
actions.moveToElement(driver.findElement(By.id("select1")));
actions.perform();
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
@@ -2420,7 +2420,7 @@
actions.moveToElement(driver.findElement(By.id("select1")));
actions.perform();
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElementTest.java 2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElementTest.java 2018-07-05 06:27:06 UTC (rev 15434)
@@ -781,6 +781,6 @@
actions.moveToElement(driver.findElement(By.id("tester")));
actions.perform();
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/worker/WorkerTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/worker/WorkerTest.java 2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/worker/WorkerTest.java 2018-07-05 06:27:06 UTC (rev 15434)
@@ -118,8 +118,7 @@
getMockWebConnection().setResponse(new URL(URL_FIRST, "scriptToImport2.js"), scriptToImportJs2);
final WebDriver driver = loadPage2(html);
- Thread.sleep(200);
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
@@ -145,8 +144,7 @@
getMockWebConnection().setResponse(new URL(URL_FIRST, "worker.js"), workerJs);
final WebDriver driver = loadPage2(html);
- Thread.sleep(200);
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestCORSTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestCORSTest.java 2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestCORSTest.java 2018-07-05 06:27:06 UTC (rev 15434)
@@ -834,8 +834,7 @@
startWebServer2(".", null, servlets2);
final WebDriver driver = loadPage2(html, new URL(URL_FIRST, "/withCredentials1"));
- Thread.sleep(DEFAULT_WAIT_TIME);
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java 2018-07-05 06:25:25 UTC (rev 15433)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java 2018-07-05 06:27:06 UTC (rev 15434)
@@ -646,9 +646,9 @@
+ "<body onload='test()'></body></html>";
getMockWebConnection().setDefaultResponse("");
- final WebDriver webdriver = loadPageWithAlerts2(html);
- assertEquals(URL_FIRST.toString(), webdriver.getCurrentUrl());
- assertEquals("foo", webdriver.getTitle());
+ final WebDriver driver = loadPageWithAlerts2(html);
+ assertEquals(URL_FIRST.toString(), driver.getCurrentUrl());
+ assertTitle(driver, "foo");
}
/**
|
