Menu
▾
▴
[HtmlUnit] SVN: [15428] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit
|
From: <rb...@us...> - 2018-07-05 06:11:47
|
Revision: 15428
http://sourceforge.net/p/htmlunit/code/15428
Author: rbri
Date: 2018-07-05 06:11:38 +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/html/BaseFrameElement2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlButton2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlCheckBoxInput2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlElement2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlInlineFrame2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlLink2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPage3Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlRadioButtonInput2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSubmitInputTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/MalformedHtmlTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/PostponedActionTest.java
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/BaseFrameElement2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/BaseFrameElement2Test.java 2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/BaseFrameElement2Test.java 2018-07-05 06:11:38 UTC (rev 15428)
@@ -59,6 +59,6 @@
+ "</body></html>";
final WebDriver driver = loadPage2(html);
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlButton2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlButton2Test.java 2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlButton2Test.java 2018-07-05 06:11:38 UTC (rev 15428)
@@ -352,7 +352,7 @@
if (params.size() > 0) {
assertEquals(getExpectedAlerts()[2], params.get(0).getName() + "-" + params.get(0).getValue());
}
- assertEquals(getExpectedAlerts()[3], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[3]);
}
/**
@@ -702,7 +702,7 @@
final int expectedReqCount = Integer.parseInt(getExpectedAlerts()[0]);
assertEquals(expectedReqCount, getMockWebConnection().getRequestCount());
- assertEquals(getExpectedAlerts()[1], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[1]);
shutDownRealIE();
}
@@ -740,7 +740,7 @@
final int expectedReqCount = Integer.parseInt(getExpectedAlerts()[0]);
assertEquals(expectedReqCount, getMockWebConnection().getRequestCount());
- assertEquals(getExpectedAlerts()[1], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[1]);
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlCheckBoxInput2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlCheckBoxInput2Test.java 2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlCheckBoxInput2Test.java 2018-07-05 06:11:38 UTC (rev 15428)
@@ -534,7 +534,7 @@
final WebDriver driver = loadPage2(firstHtml);
driver.findElement(By.id("myCheckbox")).click();
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
@@ -558,7 +558,7 @@
final WebDriver driver = loadPage2(firstHtml);
driver.findElement(By.id("myCheckbox")).click();
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlElement2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlElement2Test.java 2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlElement2Test.java 2018-07-05 06:11:38 UTC (rev 15428)
@@ -235,8 +235,8 @@
+ "</form>\n"
+ "</body></html>";
- loadPage2(html);
- assertEquals(getExpectedAlerts()[0], getWebDriver().getTitle());
+ final WebDriver driver = loadPage2(html);
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
@@ -275,8 +275,8 @@
+ "</form>\n"
+ "</body></html>";
- loadPage2(html);
- assertEquals(getExpectedAlerts()[0], getWebDriver().getTitle());
+ final WebDriver driver = loadPage2(html);
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java 2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java 2018-07-05 06:11:38 UTC (rev 15428)
@@ -15,7 +15,6 @@
package com.gargoylesoftware.htmlunit.html;
import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME;
-import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF60;
import java.net.URL;
@@ -100,11 +99,9 @@
@Alerts(DEFAULT = "second [object HTMLFormElement] third [object HTMLFormElement] "
+ "parent [object HTMLFormElement]",
CHROME = "second undefined third [object HTMLFormElement] "
- + "parent [object HTMLFormElement]",
- FF60 = "second undefined third [object HTMLFormElement] "
- + "parent [object HTMLFormElement]")
+ + "parent [object HTMLFormElement]")
// real FF sometimes alerts 'third' before 'second'
- @NotYetImplemented({CHROME, FF60})
+ @NotYetImplemented(CHROME)
public void postponeLoading() throws Exception {
final String html = "<FRAMESET rows='50%,*' "
+ "onload=\"document.title += ' parent ' + window.parent.frames['third'].document.frm\">\n"
@@ -127,9 +124,9 @@
getMockWebConnection().setResponse(new URL(URL_FIRST, "second.html"), secondHtml);
getMockWebConnection().setResponse(new URL(URL_FIRST, "third.html"), thirdHtml);
- loadPage2(html);
+ final WebDriver driver = loadPage2(html);
assertEquals(3, getMockWebConnection().getRequestCount());
- assertEquals(getExpectedAlerts()[0], getWebDriver().getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
@@ -156,9 +153,9 @@
getMockWebConnection().setResponse(new URL(URL_FIRST, "second.html"), secondHtml);
getMockWebConnection().setResponse(new URL(URL_FIRST, "third.html"), thirdHtml);
- loadPage2(html);
+ final WebDriver driver = loadPage2(html);
assertEquals(3, getMockWebConnection().getRequestCount());
- assertEquals(getExpectedAlerts()[0], getWebDriver().getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
@@ -191,10 +188,9 @@
getMockWebConnection().setResponse(new URL(URL_FIRST, "third.html"), thirdHtml);
getMockWebConnection().setResponse(new URL(URL_FIRST, "fourth.html"), fourthHtml);
- loadPage2(html);
- Thread.sleep(400);
+ final WebDriver driver = loadPage2(html);
assertEquals(4, getMockWebConnection().getRequestCount());
- assertEquals(getExpectedAlerts()[0], getWebDriver().getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlInlineFrame2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlInlineFrame2Test.java 2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlInlineFrame2Test.java 2018-07-05 06:11:38 UTC (rev 15428)
@@ -144,7 +144,7 @@
final WebDriver driver = loadPage2(framesContent);
// top frame
- assertEquals("Top Page", driver.getTitle());
+ assertTitle(driver, "Top Page");
assertEquals("Body of top frame", driver.findElement(By.id("content")).getText());
// left frame
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlLink2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlLink2Test.java 2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlLink2Test.java 2018-07-05 06:11:38 UTC (rev 15428)
@@ -231,9 +231,7 @@
+ "</html>";
final WebDriver driver = loadPage2(html);
- Thread.sleep(200);
- final String text = driver.getTitle();
- assertEquals(String.join(";", getExpectedAlerts()), text);
+ assertTitle(driver, String.join(";", getExpectedAlerts()));
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPage3Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPage3Test.java 2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPage3Test.java 2018-07-05 06:11:38 UTC (rev 15428)
@@ -170,7 +170,7 @@
+ "</body></html>";
final WebDriver driver = loadPageWithAlerts2(html);
- assertEquals("foo", driver.getTitle());
+ assertTitle(driver, "foo");
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlRadioButtonInput2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlRadioButtonInput2Test.java 2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlRadioButtonInput2Test.java 2018-07-05 06:11:38 UTC (rev 15428)
@@ -617,7 +617,7 @@
final WebDriver driver = loadPage2(firstHtml);
driver.findElement(By.id("radio")).click();
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
@@ -642,7 +642,7 @@
final WebDriver driver = loadPage2(firstHtml);
driver.findElement(By.id("radio")).click();
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSubmitInputTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSubmitInputTest.java 2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSubmitInputTest.java 2018-07-05 06:11:38 UTC (rev 15428)
@@ -56,12 +56,12 @@
+ "<input type='submit' name='anotherButton' value='foo'/>\n"
+ "</form></body></html>";
- final WebDriver wd = loadPageWithAlerts2(html);
+ final WebDriver driver = loadPageWithAlerts2(html);
- final WebElement button = wd.findElement(By.name("button"));
+ final WebElement button = driver.findElement(By.name("button"));
button.click();
- assertEquals("foo", wd.getTitle());
+ assertTitle(driver, "foo");
assertEquals(Collections.singletonList(new NameValuePair("button", "foo")),
getMockWebConnection().getLastParameters());
@@ -102,12 +102,12 @@
getMockWebConnection().setResponse(new URL(URL_FIRST, "foo.html"), secondHtml);
- final WebDriver wd = loadPageWithAlerts2(html);
+ final WebDriver driver = loadPageWithAlerts2(html);
- final WebElement button = wd.findElement(By.id("button1"));
+ final WebElement button = driver.findElement(By.id("button1"));
button.click();
- assertEquals("Second", wd.getTitle());
+ assertTitle(driver, "Second");
}
/**
@@ -185,11 +185,11 @@
mockWebConnection.setResponse(new URL(URL_FIRST, "nextPage"),
"<html><head><title>next page</title></head></html>");
- final WebDriver wd = loadPageWithAlerts2(html);
- final WebElement input = wd.findElement(By.name("btn"));
+ final WebDriver driver = loadPageWithAlerts2(html);
+ final WebElement input = driver.findElement(By.name("btn"));
input.click();
- assertEquals("next page", wd.getTitle());
+ assertTitle(driver, "next page");
assertEquals(3, mockWebConnection.getRequestCount());
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/MalformedHtmlTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/MalformedHtmlTest.java 2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/MalformedHtmlTest.java 2018-07-05 06:11:38 UTC (rev 15428)
@@ -178,8 +178,8 @@
+ "</body>\n"
+ "</html>";
- final WebDriver webdriver = loadPageWithAlerts2(html);
- assertEquals("foo", webdriver.getTitle());
+ final WebDriver driver = loadPageWithAlerts2(html);
+ assertTitle(driver, "foo");
}
/**
@@ -290,7 +290,7 @@
+ "</script>\n"
+ "</body></html>";
final WebDriver driver = loadPage2(html);
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
driver.findElement(By.id("button")).click();
assertEquals(URL_FIRST + "?FromDate=inFirst", driver.getCurrentUrl());
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/PostponedActionTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/PostponedActionTest.java 2018-07-05 06:09:44 UTC (rev 15427)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/PostponedActionTest.java 2018-07-05 06:11:38 UTC (rev 15428)
@@ -70,7 +70,7 @@
conn.setResponse(new URL(URL_FIRST, "frame3.html"), thirdContent);
final WebDriver driver = loadPage2(html);
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
@@ -100,7 +100,7 @@
getMockWebConnection().setResponse(URL_SECOND, secondContent);
final WebDriver driver = loadPage2(firstContent);
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
@@ -138,7 +138,6 @@
conn.setResponse(new URL(URL_FIRST, "iframe.html"), secondContent);
final WebDriver driver = loadPage2(html);
- Thread.sleep(1000);
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
}
|
