From: <rb...@us...> - 2018-06-15 13:05:56
|
Revision: 15313 http://sourceforge.net/p/htmlunit/code/15313 Author: rbri Date: 2018-06-15 13:05:45 +0000 (Fri, 15 Jun 2018) Log Message: ----------- more ff60 expectations Modified Paths: -------------- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ConsoleTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/History2Test.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NamedNodeMapTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SetTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SymbolTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/URLSearchParamsTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window2Test.java Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ConsoleTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ConsoleTest.java 2018-06-15 12:18:21 UTC (rev 15312) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/ConsoleTest.java 2018-06-15 13:05:45 UTC (rev 15313) @@ -121,9 +121,8 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "exception", - CHROME = "success", - FF52 = "success") + @Alerts(DEFAULT = "success", + IE = "exception") public void fromWindow() throws Exception { final String html = "<html>\n" Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/History2Test.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/History2Test.java 2018-06-15 12:18:21 UTC (rev 15312) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/History2Test.java 2018-06-15 13:05:45 UTC (rev 15313) @@ -718,11 +718,9 @@ * @throws Exception if an error occurs */ @Test - @Alerts(DEFAULT = {"back", "forward", "go", "length", "pushState", "replaceState", "state"}, - FF52 = {"back", "forward", "go", "length", "pushState", "replaceState", + @Alerts(DEFAULT = {"back", "forward", "go", "length", "pushState", "replaceState", "scrollRestoration", "state"}, - CHROME = {"back", "forward", "go", "length", "pushState", "replaceState", - "scrollRestoration", "state"}) + IE = {"back", "forward", "go", "length", "pushState", "replaceState", "state"}) public void properties() throws Exception { final String html = "<html><head><script>\n" + " function test() {\n" @@ -779,7 +777,6 @@ */ @Test @Alerts(DEFAULT = {"auto", "manual", "auto", "auto", "auto", "auto"}, - FF60 = {"undefined", "manual", "auto", "MaNUaL", "unknown", "undefined"}, IE = {"undefined", "manual", "auto", "MaNUaL", "unknown", "undefined"}) public void scrollRestoration() throws Exception { final String html = "<html><head><script>\n" Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java 2018-06-15 12:18:21 UTC (rev 15312) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Location2Test.java 2018-06-15 13:05:45 UTC (rev 15313) @@ -125,9 +125,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(CHROME = {"", "about:blank", "blank", "", "about:", ""}, - FF60 = {"", "about:blank", "", "", "about:", ""}, - FF52 = {"", "about:blank", "blank", "", "about:", ""}, + @Alerts(DEFAULT = {"", "about:blank", "blank", "", "about:", ""}, IE = {"", "about:blank", "/blank", "", "about:", ""}) public void about_blank_attributes() throws Exception { final String html = "<html><head><title>First</title><script>\n" Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NamedNodeMapTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NamedNodeMapTest.java 2018-06-15 12:18:21 UTC (rev 15312) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NamedNodeMapTest.java 2018-06-15 13:05:45 UTC (rev 15313) @@ -14,7 +14,6 @@ */ package com.gargoylesoftware.htmlunit.javascript.host; -import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF60; import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE; import org.junit.Test; @@ -43,10 +42,9 @@ * @throws Exception if an error occurs */ @Test - @NotYetImplemented({FF60, IE}) @Alerts(DEFAULT = {"name=f", "id=f", "foo=bar", "baz=blah"}, - FF60 = {"baz=blah", "foo=bar", "id=f", "name=f"}, IE = {"name=f", "id=f", "baz=blah", "foo=bar"}) + @NotYetImplemented(IE) public void attributes() throws Exception { final String html = "<html>\n" Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SetTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SetTest.java 2018-06-15 12:18:21 UTC (rev 15312) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SetTest.java 2018-06-15 13:05:45 UTC (rev 15313) @@ -16,7 +16,6 @@ import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME; import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF; -import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF60; import org.junit.Test; import org.junit.runner.RunWith; @@ -362,9 +361,7 @@ */ @Test @Alerts(DEFAULT = "[object Set Iterator]", - FF60 = "[object Object]", IE = {}) - @NotYetImplemented(FF60) public void iteratorPrototype() throws Exception { final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_ Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SymbolTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SymbolTest.java 2018-06-15 12:18:21 UTC (rev 15312) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/SymbolTest.java 2018-06-15 13:05:45 UTC (rev 15313) @@ -56,7 +56,6 @@ */ @Test @Alerts(DEFAULT = {"symbol", "Symbol(Symbol.replace)", "true"}, - FF60 = {"undefined", "-", "true"}, IE = "not supported") public void replace() throws Exception { name("replace"); @@ -67,7 +66,6 @@ */ @Test @Alerts(DEFAULT = {"symbol", "Symbol(Symbol.search)", "true"}, - FF60 = {"undefined", "-", "true"}, IE = "not supported") public void search() throws Exception { name("search"); @@ -78,7 +76,6 @@ */ @Test @Alerts(DEFAULT = {"symbol", "Symbol(Symbol.split)", "true"}, - FF60 = {"undefined", "-", "true"}, IE = "not supported") public void split() throws Exception { name("split"); @@ -89,7 +86,6 @@ */ @Test @Alerts(DEFAULT = {"symbol", "Symbol(Symbol.hasInstance)", "true"}, - FF60 = {"undefined", "-", "true"}, IE = "not supported") public void hasInstance() throws Exception { name("hasInstance"); @@ -100,7 +96,6 @@ */ @Test @Alerts(DEFAULT = {"symbol", "Symbol(Symbol.isConcatSpreadable)", "true"}, - FF60 = {"undefined", "-", "true"}, IE = "not supported") public void isConcatSpreadable() throws Exception { name("isConcatSpreadable"); @@ -111,7 +106,6 @@ */ @Test @Alerts(DEFAULT = {"symbol", "Symbol(Symbol.unscopables)", "true"}, - FF60 = {"undefined", "-", "true"}, IE = "not supported") public void unscopables() throws Exception { name("unscopables"); @@ -142,7 +136,6 @@ */ @Test @Alerts(DEFAULT = {"symbol", "Symbol(Symbol.toStringTag)", "true"}, - FF60 = {"undefined", "-", "true"}, IE = "not supported") public void toStringTag() throws Exception { name("toStringTag"); @@ -172,7 +165,6 @@ */ @Test @Alerts(DEFAULT = {"Symbol()", "Symbol(foo)", "Symbol(Symbol.iterator)", "exception"}, - FF60 = {"Symbol()", "Symbol(foo)", "Symbol(Symbol.iterator)", "undefined"}, IE = "not supported") public void string() throws Exception { final String html = Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/URLSearchParamsTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/URLSearchParamsTest.java 2018-06-15 12:18:21 UTC (rev 15312) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/URLSearchParamsTest.java 2018-06-15 13:05:45 UTC (rev 15313) @@ -38,7 +38,6 @@ */ @Test @Alerts(DEFAULT = {"foo=1&bar=2", ""}, - FF60 = {"%3Ffoo=1&bar=2", ""}, IE = {}) @NotYetImplemented(FF60) public void ctor() throws Exception { Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window2Test.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window2Test.java 2018-06-15 12:18:21 UTC (rev 15312) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/Window2Test.java 2018-06-15 13:05:45 UTC (rev 15313) @@ -788,7 +788,8 @@ */ @Test @Alerts(DEFAULT = {"0,0", "100,200", "110,230", "0,0", "no scrollByLines()", "0,0", "no scrollByPages()"}, - FF = {"0,0", "100,200", "110,230", "0,0", "0,95", "0,0", "0,1238"}) + FF52 = {"0,0", "100,200", "110,230", "0,0", "0,95", "0,0", "0,1238"}, + FF60 = {"0,0", "100,200", "110,230", "0,0", "0,95", "0,0", "0,1254"}) @NotYetImplemented(FF) public void scrolling1() throws Exception { scrolling(true); @@ -877,8 +878,8 @@ */ @Test @Alerts(DEFAULT = {"undefined", "undefined"}, - FF60 = {"11", "91"}, - FF52 = {"11", "91"}) + FF52 = {"11", "91"}, + FF60 = {"11", "83"}) public void mozInnerScreen() throws Exception { final String html = "<html><body onload='test()'><script>\n" @@ -1141,10 +1142,15 @@ * @throws Exception if an error occurs */ @Test - @Alerts({ + @Alerts(DEFAULT = { "string string 7 number string", "string string 8 number object", "string string 9 number object", + "string string 1 number object"}, + FF = { + "string string 0 number string", + "string string 0 number object", + "string string 9 number object", "string string 1 number object"}) public void onErrorExceptionInstance() throws Exception { final String html @@ -1916,7 +1922,8 @@ */ @Test @Alerts(DEFAULT = "function", - CHROME = "undefined") + CHROME = "undefined", + FF60 = "undefined") public void showModalDialog() throws Exception { final String html = "<html><body><script>\n" |