From: <rb...@us...> - 2018-06-15 13:06:47
|
Revision: 15314 http://sourceforge.net/p/htmlunit/code/15314 Author: rbri Date: 2018-06-15 13:06:43 +0000 (Fri, 15 Jun 2018) Log Message: ----------- more ff60 expectations Modified Paths: -------------- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMImplementationTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMTokenListTest.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/EventNodeTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeListTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeTest.java Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMImplementationTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMImplementationTest.java 2018-06-15 13:05:45 UTC (rev 15313) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMImplementationTest.java 2018-06-15 13:06:43 UTC (rev 15314) @@ -270,13 +270,10 @@ @Test @Alerts(DEFAULT = {"http://www.w3.org/TR/SVG11/feature#BasicStructure 1.0: true", "http://www.w3.org/TR/SVG11/feature#BasicStructure 1.1: true", - "http://www.w3.org/TR/SVG11/feature#BasicStructure 1.2: false"}, - CHROME = {"http://www.w3.org/TR/SVG11/feature#BasicStructure 1.0: true", - "http://www.w3.org/TR/SVG11/feature#BasicStructure 1.1: true", "http://www.w3.org/TR/SVG11/feature#BasicStructure 1.2: true"}, - FF = {"http://www.w3.org/TR/SVG11/feature#BasicStructure 1.0: true", + IE = {"http://www.w3.org/TR/SVG11/feature#BasicStructure 1.0: true", "http://www.w3.org/TR/SVG11/feature#BasicStructure 1.1: true", - "http://www.w3.org/TR/SVG11/feature#BasicStructure 1.2: true"}) + "http://www.w3.org/TR/SVG11/feature#BasicStructure 1.2: false"}) public void hasFeature_SVG_BasicStructure() throws Exception { hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "['1.0', '1.1', '1.2']"); } @@ -287,13 +284,10 @@ @Test @Alerts(DEFAULT = {"http://www.w3.org/TR/SVG11/feature#Shape 1.0: true", "http://www.w3.org/TR/SVG11/feature#Shape 1.1: true", - "http://www.w3.org/TR/SVG11/feature#Shape 1.2: false"}, - CHROME = {"http://www.w3.org/TR/SVG11/feature#Shape 1.0: true", - "http://www.w3.org/TR/SVG11/feature#Shape 1.1: true", "http://www.w3.org/TR/SVG11/feature#Shape 1.2: true"}, - FF = {"http://www.w3.org/TR/SVG11/feature#Shape 1.0: true", + IE = {"http://www.w3.org/TR/SVG11/feature#Shape 1.0: true", "http://www.w3.org/TR/SVG11/feature#Shape 1.1: true", - "http://www.w3.org/TR/SVG11/feature#Shape 1.2: true"}) + "http://www.w3.org/TR/SVG11/feature#Shape 1.2: false"}) public void hasFeature_SVG_Shape() throws Exception { hasFeature("http://www.w3.org/TR/SVG11/feature#Shape", "['1.0', '1.1', '1.2']"); } Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMTokenListTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMTokenListTest.java 2018-06-15 13:05:45 UTC (rev 15313) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DOMTokenListTest.java 2018-06-15 13:06:43 UTC (rev 15314) @@ -127,6 +127,7 @@ @Test @Alerts(DEFAULT = {"3", "0", "3", "8"}, CHROME = {"3", "0", "2", "8"}, + FF60 = {"3", "0", "2", "8"}, IE = {"3", "0", "3", "7"}) public void length() throws Exception { final String html @@ -251,9 +252,8 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"a b", "2", "exception"}, - CHROME = {"a b", "2", "false"}, - FF52 = {"a b", "2", "false"}) + @Alerts(DEFAULT = {"a b", "2", "false"}, + IE = {"a b", "2", "exception"}) public void containsEmpty() throws Exception { contains("a b", ""); } @@ -262,9 +262,8 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"a b", "2", "exception"}, - CHROME = {"a b", "2", "false"}, - FF52 = {"a b", "2", "false"}) + @Alerts(DEFAULT = {"a b", "2", "false"}, + IE = {"a b", "2", "exception"}) public void containsBlank() throws Exception { contains("a b", " "); } @@ -273,9 +272,8 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"a b", "2", "exception"}, - CHROME = {"a b", "2", "false"}, - FF52 = {"a b", "2", "false"}) + @Alerts(DEFAULT = {"a b", "2", "false"}, + IE = {"a b", "2", "exception"}) public void containsTab() throws Exception { contains("a b", "\t"); } @@ -284,9 +282,8 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"a b", "2", "exception"}, - CHROME = {"a b", "2", "false"}, - FF52 = {"a b", "2", "false"}) + @Alerts(DEFAULT = {"a b", "2", "false"}, + IE = {"a b", "2", "exception"}) public void containsCr() throws Exception { contains("a b", "\\r"); } @@ -295,9 +292,8 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"a b", "2", "exception"}, - CHROME = {"a b", "2", "false"}, - FF52 = {"a b", "2", "false"}) + @Alerts(DEFAULT = {"a b", "2", "false"}, + IE = {"a b", "2", "exception"}) public void containsNl() throws Exception { contains("a b", "\\n"); } @@ -493,7 +489,7 @@ */ @Test @Alerts(DEFAULT = {" \t \n ", "0", "1", "a"}, - FF = {" \t \n ", "0", "1", " \t \n a"}) + FF52 = {" \t \n ", "0", "1", " \t \n a"}) public void addToWhitespace() throws Exception { add(" \t \r ", "a"); } @@ -503,7 +499,7 @@ */ @Test @Alerts(DEFAULT = {"a ", "1", "2", "a b"}, - FF = {"a ", "1", "2", "a b"}) + FF52 = {"a ", "1", "2", "a b"}) public void addToWhitespaceAtEnd() throws Exception { add("a ", "b"); } @@ -540,7 +536,8 @@ */ @Test @Alerts(DEFAULT = {"a b a", "3", "exception", "3", "a b a"}, - CHROME = {"a b a", "2", "exception", "2", "a b a"}) + CHROME = {"a b a", "2", "exception", "2", "a b a"}, + FF60 = {"a b a", "2", "exception", "2", "a b a"}) public void addElementWithBlank() throws Exception { add("a b a", "a b"); } @@ -550,7 +547,8 @@ */ @Test @Alerts(DEFAULT = {"a b a\tb", "4", "exception", "4", "a b a\tb"}, - CHROME = {"a b a\tb", "2", "exception", "2", "a b a\tb"}) + CHROME = {"a b a\tb", "2", "exception", "2", "a b a\tb"}, + FF60 = {"a b a\tb", "2", "exception", "2", "a b a\tb"}) public void addElementWithTab() throws Exception { add("a b a\tb", "a\tb"); } @@ -560,7 +558,8 @@ */ @Test @Alerts(DEFAULT = {"a \t c \n d e", "4", "4", "a \t c \n d e"}, - CHROME = {"a \t c \n d e", "4", "4", "a c d e"}) + CHROME = {"a \t c \n d e", "4", "4", "a c d e"}, + FF60 = {"a \t c \n d e", "4", "4", "a c d e"}) public void addToWhitespaceExisting() throws Exception { add("a \t c \n d e", "c"); } @@ -687,9 +686,8 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {" \t \n ", "0", "0", " \t \n "}, - CHROME = {" \t \n ", "0", "0", ""}, - FF52 = {" \t \n ", "0", "0", ""}) + @Alerts(DEFAULT = {" \t \n ", "0", "0", ""}, + IE = {" \t \n ", "0", "0", " \t \n "}) public void removeFromWhitespace() throws Exception { remove(" \t \r ", "a"); } @@ -708,7 +706,8 @@ */ @Test @Alerts(DEFAULT = {"a b a", "3", "1", "b"}, - CHROME = {"a b a", "2", "1", "b"}) + CHROME = {"a b a", "2", "1", "b"}, + FF60 = {"a b a", "2", "1", "b"}) public void removeDuplicated() throws Exception { remove("a b a", "a"); } @@ -718,7 +717,8 @@ */ @Test @Alerts(DEFAULT = {"a b a", "3", "exception", "3", "a b a"}, - CHROME = {"a b a", "2", "exception", "2", "a b a"}) + CHROME = {"a b a", "2", "exception", "2", "a b a"}, + FF60 = {"a b a", "2", "exception", "2", "a b a"}) public void removeElementWithBlank() throws Exception { remove("a b a", "a b"); } @@ -728,7 +728,8 @@ */ @Test @Alerts(DEFAULT = {"a b a\tb", "4", "exception", "4", "a b a\tb"}, - CHROME = {"a b a\tb", "2", "exception", "2", "a b a\tb"}) + CHROME = {"a b a\tb", "2", "exception", "2", "a b a\tb"}, + FF60 = {"a b a\tb", "2", "exception", "2", "a b a\tb"}) public void removeElementWithTab() throws Exception { remove("a b a\tb", "a\tb"); } @@ -746,8 +747,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"a \t c \n d e", "4", "3", "a d e"}, - FF60 = {"a \t c \n d e", "4", "3", "a d e"}) + @Alerts({"a \t c \n d e", "4", "3", "a d e"}) public void removeWhitespace() throws Exception { remove("a \t c \n d e", "c"); } 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-06-15 13:05:45 UTC (rev 15313) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/DocumentTest.java 2018-06-15 13:06:43 UTC (rev 15314) @@ -253,7 +253,8 @@ */ @Test @Alerts(DEFAULT = {"0", "3", "3", "true"}, - CHROME = {"0", "0", "0", "true"}) + CHROME = {"0", "0", "0", "true"}, + FF60 = {"0", "0", "0", "true"}) public void applets() throws Exception { final String html = "<html>\n" @@ -2773,8 +2774,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"null", "null"}, - FF60 = {"undefined", "undefined"}) + @Alerts({"null", "null"}) public void rootElement() throws Exception { final String html = "<html>\n" + "<head>\n" Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/EventNodeTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/EventNodeTest.java 2018-06-15 13:05:45 UTC (rev 15313) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/EventNodeTest.java 2018-06-15 13:06:43 UTC (rev 15314) @@ -132,6 +132,7 @@ @Test @Alerts(DEFAULT = "mousedown label,focus text,mouseup label,click label,click text,", CHROME = "mousedown label,mouseup label,click label,focus text,click text,", + FF60 = "mousedown label,mouseup label,click label,focus text,click text,", IE = "mousedown label,mouseup label,click label,click text,focus text,") @NotYetImplemented({FF, IE}) public void clickEventsLabel() throws Exception { Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeListTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeListTest.java 2018-06-15 13:05:45 UTC (rev 15313) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeListTest.java 2018-06-15 13:06:43 UTC (rev 15314) @@ -26,6 +26,7 @@ * Tests for {@link NodeList}. * * @author Ahmed Ashour + * @author Ronald Brill */ @RunWith(BrowserRunner.class) public class NodeListTest extends WebDriverTestCase { @@ -72,7 +73,6 @@ */ @Test @Alerts(DEFAULT = "0,1,2,3,4,5,entries,forEach,item,keys,length,values", - FF60 = "0,1,2,3,4,5,item,length", IE = "0,1,2,3,4,5,item,length", EDGE = "0,1,2,3,4,5,item,length") public void iterator() throws Exception { @@ -107,7 +107,6 @@ "[object HTMLScriptElement] 3 [object NodeList] undefined", "[object HTMLBodyElement] 4 [object NodeList] undefined", "[object HTMLDivElement] 5 [object NodeList] undefined"}, - FF60 = "no forEach", IE = "no forEach", EDGE = "no forEach") public void forEach() throws Exception { @@ -137,7 +136,6 @@ */ @Test @Alerts(DEFAULT = {"done", "value", "object", "0", "[object HTMLHtmlElement]"}, - FF60 = "not defined", IE = "not defined", EDGE = "not defined") public void entries() throws Exception { Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeTest.java 2018-06-15 13:05:45 UTC (rev 15313) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/dom/NodeTest.java 2018-06-15 13:06:43 UTC (rev 15314) @@ -354,8 +354,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"true", "false"}, - FF60 = {"isSameNode not supported"}) + @Alerts({"true", "false"}) public void isSameNode() throws Exception { final String html = "<html><head><title>foo</title><script>\n" + " function test() {\n" |