Menu
▾
▴
[HtmlUnit] SVN: [15352] trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit
|
From: <rb...@us...> - 2018-06-18 15:43:16
|
Revision: 15352
http://sourceforge.net/p/htmlunit/code/15352
Author: rbri
Date: 2018-06-18 15:43:09 +0000 (Mon, 18 Jun 2018)
Log Message:
-----------
more ff60 expectations
Modified Paths:
--------------
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementChildNodesTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlDateInputTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlIsIndex2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPage3Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/CanvasRenderingContext2DTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/SelectionTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest2Test.java
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementChildNodesTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementChildNodesTest.java 2018-06-17 14:16:42 UTC (rev 15351)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/general/ElementChildNodesTest.java 2018-06-18 15:43:09 UTC (rev 15352)
@@ -413,7 +413,8 @@
* @throws Exception if the test fails
*/
@Test
- @Alerts({"3", "2", "2", "3", "2", "2"})
+ @Alerts(DEFAULT = {"3", "2", "2", "3", "2", "2"},
+ FF60 = {"1", "0", "1", "1", "0", "1"})
public void dialog() throws Exception {
loadPageWithAlerts2(test("dialog"));
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlDateInputTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlDateInputTest.java 2018-06-17 14:16:42 UTC (rev 15351)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlDateInputTest.java 2018-06-18 15:43:09 UTC (rev 15352)
@@ -34,7 +34,8 @@
*/
@Test
@Alerts(DEFAULT = {"text-datetime", "text-Date"},
- CHROME = {"text-datetime", "date-Date"})
+ CHROME = {"text-datetime", "date-Date"},
+ FF60 = {"text-datetime", "date-Date"})
public void type() throws Exception {
final String html =
"<html>\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlIsIndex2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlIsIndex2Test.java 2018-06-17 14:16:42 UTC (rev 15351)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlIsIndex2Test.java 2018-06-18 15:43:09 UTC (rev 15352)
@@ -44,7 +44,8 @@
*/
@Test
@Alerts(DEFAULT = "null",
- CHROME = "[object HTMLUnknownElement]")
+ CHROME = "[object HTMLUnknownElement]",
+ FF60 = "[object HTMLUnknownElement]")
@NotYetImplemented({IE, FF})
public void simpleScriptable() throws Exception {
final String html = "<html><head>\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPage3Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPage3Test.java 2018-06-17 14:16:42 UTC (rev 15351)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPage3Test.java 2018-06-18 15:43:09 UTC (rev 15352)
@@ -465,6 +465,7 @@
*/
@Test
@Alerts(DEFAULT = "Something",
+ FF60 = "error",
IE = "error")
@NotYetImplemented(IE)
public void shouldBeAbleToFindElementByXPathInXmlDocument() throws Exception {
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/CanvasRenderingContext2DTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/CanvasRenderingContext2DTest.java 2018-06-17 14:16:42 UTC (rev 15351)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/CanvasRenderingContext2DTest.java 2018-06-18 15:43:09 UTC (rev 15352)
@@ -81,12 +81,10 @@
* @throws Exception if an error occurs
*/
@Test
- @Alerts(DEFAULT = {"addHitRegion", "drawCustomFocusRing", "drawSystemFocusRing", "ellipse",
- "removeHitRegion", "scrollPathIntoView", "35 methods"},
- CHROME = {"addHitRegion", "drawCustomFocusRing", "drawSystemFocusRing", "removeHitRegion",
+ @Alerts(DEFAULT = {"addHitRegion", "drawCustomFocusRing", "drawSystemFocusRing", "removeHitRegion",
"scrollPathIntoView", "36 methods"},
- FF52 = {"addHitRegion", "drawCustomFocusRing", "drawSystemFocusRing", "removeHitRegion",
- "scrollPathIntoView", "36 methods"})
+ IE = {"addHitRegion", "drawCustomFocusRing", "drawSystemFocusRing", "ellipse",
+ "removeHitRegion", "scrollPathIntoView", "35 methods"})
public void methods() throws Exception {
final String[] methods = {"addHitRegion", "arc", "arcTo", "beginPath", "bezierCurveTo", "clearRect", "clip",
"closePath", "createImageData", "createLinearGradient", "createPattern", "createRadialGradient",
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/SelectionTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/SelectionTest.java 2018-06-17 14:16:42 UTC (rev 15351)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/SelectionTest.java 2018-06-18 15:43:09 UTC (rev 15352)
@@ -88,7 +88,10 @@
"2:s2/0/s2/1/false/undefined/1/xyz/xyz"},
CHROME = {
"1:null/0/null/0/true/None/0/",
- "2:s2/0/s2/1/false/Range/1/xyz/xyz"})
+ "2:s2/0/s2/1/false/Range/1/xyz/xyz"},
+ FF60 = {
+ "1:null/0/null/0/true/None/0/",
+ "2:s2/0/s2/1/false/Range/1/xyz/xyz"})
public void selectAllChildren() throws Exception {
final String jsSnippet = ""
+ " alertSelection(selection);\n"
@@ -108,10 +111,15 @@
"3:s2/0/s3/2/false/undefined/1/xyzfoo---/xyzfoo---",
"4:s2/0/s3/3/false/undefined/1/xyzfoo---foo/xyzfoo---foo"},
CHROME = {
- "1:s2/0/s2/1/false/Range/1/xyz/xyz",
- "2:s2/0/s3/1/false/Range/1/xyzfoo/xyzfoo",
- "3:s2/0/s3/2/false/Range/1/xyzfoo---/xyzfoo---",
- "4:s2/0/s3/3/false/Range/1/xyzfoo---foo/xyzfoo---foo"},
+ "1:s2/0/s2/1/false/Range/1/xyz/xyz",
+ "2:s2/0/s3/1/false/Range/1/xyzfoo/xyzfoo",
+ "3:s2/0/s3/2/false/Range/1/xyzfoo---/xyzfoo---",
+ "4:s2/0/s3/3/false/Range/1/xyzfoo---foo/xyzfoo---foo"},
+ FF60 = {
+ "1:s2/0/s2/1/false/Range/1/xyz/xyz",
+ "2:s2/0/s3/1/false/Range/1/xyzfoo/xyzfoo",
+ "3:s2/0/s3/2/false/Range/1/xyzfoo---/xyzfoo---",
+ "4:s2/0/s3/3/false/Range/1/xyzfoo---foo/xyzfoo---foo"},
IE = {"1:s2/0/s2/1/false/undefined/1/xyz/xyz",
"selection.extend not available"})
public void extend() throws Exception {
@@ -139,7 +147,10 @@
"2:s2/0/s2/0/true/undefined/1//"},
CHROME = {
"1:s2/0/s2/1/false/Range/1/xyz/xyz",
- "2:s2/0/s2/0/true/Caret/1//"})
+ "2:s2/0/s2/0/true/Caret/1//"},
+ FF60 = {
+ "1:s2/0/s2/1/false/Range/1/xyz/xyz",
+ "2:s2/0/s2/0/true/Caret/1//"})
public void collapseToStart() throws Exception {
final String jsSnippet = ""
+ " selection.selectAllChildren(s2);\n"
@@ -159,7 +170,10 @@
"2:s2/1/s2/1/true/undefined/1//"},
CHROME = {
"1:s2/0/s2/1/false/Range/1/xyz/xyz",
- "2:s2/1/s2/1/true/Caret/1//"})
+ "2:s2/1/s2/1/true/Caret/1//"},
+ FF60 = {
+ "1:s2/0/s2/1/false/Range/1/xyz/xyz",
+ "2:s2/1/s2/1/true/Caret/1//"})
public void collapseToEnd() throws Exception {
final String jsSnippet = ""
+ " selection.selectAllChildren(s2);\n"
@@ -180,10 +194,15 @@
"3:s2/1/s3/1/false/undefined/1/foo/foo",
"4:null/0/null/0/true/undefined/0/"},
CHROME = {
- "1:null/0/null/0/true/None/0/",
- "2:null/0/null/0/true/None/0/",
- "3:s2/1/s3/1/false/Range/1/foo/foo",
- "4:null/0/null/0/true/None/0/"})
+ "1:null/0/null/0/true/None/0/",
+ "2:null/0/null/0/true/None/0/",
+ "3:s2/1/s3/1/false/Range/1/foo/foo",
+ "4:null/0/null/0/true/None/0/"},
+ FF60 = {
+ "1:null/0/null/0/true/None/0/",
+ "2:null/0/null/0/true/None/0/",
+ "3:s2/1/s3/1/false/Range/1//foo",
+ "4:null/0/null/0/true/None/0/"})
public void range() throws Exception {
final String jsSnippet = ""
+ " alertSelection(selection);\n"
@@ -212,6 +231,10 @@
CHROME = {
"1:[object Text]/1/[object Text]/2/false/Range/1/yzfo/yzfo",
"2:null/0/null/0/true/None/0/",
+ "false", "true"},
+ FF60 = {
+ "1:[object Text]/1/[object Text]/2/false/Range/1/yzfo/yzfo",
+ "2:null/0/null/0/true/None/0/",
"false", "true"})
public void aLittleBitOfEverything_removeRange() throws Exception {
final String jsSnippet = ""
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest2Test.java 2018-06-17 14:16:42 UTC (rev 15351)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest2Test.java 2018-06-18 15:43:09 UTC (rev 15352)
@@ -958,7 +958,12 @@
"date XYZ GMT\r\n"
+ "server: Jetty(XXX)\r\n"
+ "transfer-encoding: chunked\r\n"
- + "content-type: text/xml;charset=iso-8859-1\r\n"})
+ + "content-type: text/xml;charset=iso-8859-1\r\n"},
+ FF60 = {"", "",
+ "Content-Type: text/xml;charset=iso-8859-1\n"
+ + "Date XYZ GMT\n"
+ + "Server: Jetty(XXX)\n"
+ + "Transfer-Encoding: chunked\n"})
@NotYetImplemented(CHROME)
public void getAllResponseHeaders() throws Exception {
final String html =
|
