Menu
▾
▴
[HtmlUnit] SVN: [15432] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/ javascript/host
|
From: <rb...@us...> - 2018-07-05 06:24:52
|
Revision: 15432
http://sourceforge.net/p/htmlunit/code/15432
Author: rbri
Date: 2018-07-05 06:24:47 +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/dom/CharacterDataTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/MutationObserverTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/BeforeUnloadEventTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/Event2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MouseEventTest.java
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/CharacterDataTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/CharacterDataTest.java 2018-07-05 06:23:56 UTC (rev 15431)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/CharacterDataTest.java 2018-07-05 06:24:47 UTC (rev 15432)
@@ -52,7 +52,7 @@
+ "<div id='div1'>Some Text</div></body></html>";
final WebDriver driver = loadPageWithAlerts2(html);
- assertEquals("First", driver.getTitle());
+ assertTitle(driver, "First");
}
/**
@@ -75,7 +75,7 @@
+ "<div id='div1'>Some Text</div></body></html>";
final WebDriver driver = loadPageWithAlerts2(html);
- assertEquals("First", driver.getTitle());
+ assertTitle(driver, "First");
}
/**
@@ -98,7 +98,7 @@
+ "<div id='div1'>Some Text</div></body></html>";
final WebDriver driver = loadPageWithAlerts2(html);
- assertEquals("First", driver.getTitle());
+ assertTitle(driver, "First");
}
/**
@@ -120,7 +120,7 @@
+ "<div id='div1'>Some Text</div></body></html>";
final WebDriver driver = loadPageWithAlerts2(html);
- assertEquals("First", driver.getTitle());
+ assertTitle(driver, "First");
}
/**
@@ -165,7 +165,7 @@
+ "<div id='div1'>Some Not So New Text</div></body></html>";
final WebDriver driver = loadPageWithAlerts2(html);
- assertEquals("First", driver.getTitle());
+ assertTitle(driver, "First");
}
/**
@@ -206,7 +206,7 @@
+ "<div id='div1'>-</div></body></html>";
final WebDriver driver = loadPageWithAlerts2(html);
- assertEquals("First", driver.getTitle());
+ assertTitle(driver, "First");
}
/**
@@ -245,7 +245,7 @@
+ "<div id='div1'>abcde</div></body></html>";
final WebDriver driver = loadPageWithAlerts2(html);
- assertEquals("First", driver.getTitle());
+ assertTitle(driver, "First");
}
/**
@@ -279,7 +279,7 @@
+ "<div id='div1'>Some Not So New Text</div></body></html>";
final WebDriver driver = loadPageWithAlerts2(html);
- assertEquals("First", driver.getTitle());
+ assertTitle(driver, "First");
}
/**
@@ -301,7 +301,7 @@
+ "<div id='div1'>Some Text</div></body></html>";
final WebDriver driver = loadPageWithAlerts2(html);
- assertEquals("First", driver.getTitle());
+ assertTitle(driver, "First");
}
/**
@@ -323,7 +323,7 @@
+ "<div id='div1'>Some Old Text</div></body></html>";
final WebDriver driver = loadPageWithAlerts2(html);
- assertEquals("First", driver.getTitle());
+ assertTitle(driver, "First");
}
/**
@@ -345,7 +345,7 @@
+ "<div id='div1'>Some New Text</div></body></html>";
final WebDriver driver = loadPageWithAlerts2(html);
- assertEquals("First", driver.getTitle());
+ assertTitle(driver, "First");
}
/**
@@ -369,6 +369,6 @@
+ "<div id='div1'>Some Text</div></body></html>";
final WebDriver driver = loadPageWithAlerts2(html);
- assertEquals("First", driver.getTitle());
+ assertTitle(driver, "First");
}
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTest.java 2018-07-05 06:23:56 UTC (rev 15431)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTest.java 2018-07-05 06:24:47 UTC (rev 15432)
@@ -148,10 +148,10 @@
expandExpectedAlertsVariables(URL_FIRST);
final WebDriver driver = loadPage2(firstHtml);
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
driver.findElement(By.id("testJavascript")).click();
- assertEquals(getExpectedAlerts()[1], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[1]);
}
/**
@@ -1642,7 +1642,7 @@
+ "</body></html>";
final WebDriver driver = loadPageWithAlerts2(html);
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
@@ -1679,7 +1679,7 @@
+ "</body></html>";
final WebDriver driver = loadPageWithAlerts2(html);
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
@@ -1697,7 +1697,7 @@
+ "</body></html>";
final WebDriver driver = loadPageWithAlerts2(html);
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/MutationObserverTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/MutationObserverTest.java 2018-07-05 06:23:56 UTC (rev 15431)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/MutationObserverTest.java 2018-07-05 06:24:47 UTC (rev 15432)
@@ -423,7 +423,6 @@
+ "</body></html>";
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/event/BeforeUnloadEventTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/BeforeUnloadEventTest.java 2018-07-05 06:23:56 UTC (rev 15431)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/BeforeUnloadEventTest.java 2018-07-05 06:24:47 UTC (rev 15432)
@@ -82,7 +82,7 @@
+ "</body></html>";
final WebDriver driver = loadPage2(html);
- assertEquals(String.join(" ", getExpectedAlerts()), driver.getTitle());
+ assertTitle(driver, String.join(" ", getExpectedAlerts()));
}
/**
@@ -106,7 +106,7 @@
+ "</body></html>";
final WebDriver driver = loadPage2(html);
- assertEquals(String.join(" ", getExpectedAlerts()), driver.getTitle());
+ assertTitle(driver, String.join(" ", getExpectedAlerts()));
}
/**
@@ -131,7 +131,7 @@
+ "</body></html>";
final WebDriver driver = loadPage2(html);
- assertEquals(String.join(" ", getExpectedAlerts()), driver.getTitle());
+ assertTitle(driver, String.join(" ", getExpectedAlerts()));
}
/**
@@ -156,7 +156,7 @@
+ "</body></html>";
final WebDriver driver = loadPage2(html);
- assertEquals(String.join(" ", getExpectedAlerts()), driver.getTitle());
+ assertTitle(driver, String.join(" ", getExpectedAlerts()));
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/Event2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/Event2Test.java 2018-07-05 06:23:56 UTC (rev 15431)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/Event2Test.java 2018-07-05 06:24:47 UTC (rev 15432)
@@ -289,7 +289,7 @@
final WebDriver driver = loadPage2(html);
driver.findElement(By.id("clickMe")).click();
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
@@ -412,7 +412,7 @@
final WebDriver driver = loadPage2(html);
driver.findElement(By.id("typeHere")).sendKeys("a");
- assertEquals(getExpectedAlerts()[0], driver.getTitle());
+ assertTitle(driver, getExpectedAlerts()[0]);
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java 2018-07-05 06:23:56 UTC (rev 15431)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MessageEventTest.java 2018-07-05 06:24:47 UTC (rev 15432)
@@ -71,7 +71,7 @@
+ "</body></html>";
final WebDriver driver = loadPage2(html);
- assertEquals(String.join(" ", getExpectedAlerts()), driver.getTitle());
+ assertTitle(driver, String.join(" ", getExpectedAlerts()));
}
/**
@@ -100,7 +100,7 @@
+ "</body></html>";
final WebDriver driver = loadPage2(html);
- assertEquals(String.join(" ", getExpectedAlerts()), driver.getTitle());
+ assertTitle(driver, String.join(" ", getExpectedAlerts()));
}
/**
@@ -155,7 +155,7 @@
+ "</script></body></html>";
final WebDriver driver = loadPage2(html);
- assertEquals(String.join(" ", getExpectedAlerts()), driver.getTitle());
+ assertTitle(driver, String.join(" ", getExpectedAlerts()));
}
/**
@@ -186,6 +186,6 @@
+ "</script></body></html>";
final WebDriver driver = loadPage2(html);
- assertEquals(String.join(" ", getExpectedAlerts()), driver.getTitle());
+ assertTitle(driver, String.join(" ", getExpectedAlerts()));
}
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MouseEventTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MouseEventTest.java 2018-07-05 06:23:56 UTC (rev 15431)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/event/MouseEventTest.java 2018-07-05 06:24:47 UTC (rev 15432)
@@ -229,7 +229,7 @@
setExpectedAlerts();
final WebDriver driver = loadPageWithAlerts2(html);
- assertEquals("Mouse Event coordinates", driver.getTitle());
+ assertTitle(driver, "Mouse Event coordinates");
final WebElement textarea = driver.findElement(By.id("myTextarea"));
assertEquals("", textarea.getText());
|
