From: <rb...@us...> - 2018-06-15 15:24:46
|
Revision: 15317 http://sourceforge.net/p/htmlunit/code/15317 Author: rbri Date: 2018-06-15 15:24:20 +0000 (Fri, 15 Jun 2018) Log Message: ----------- more ff60 expectations Modified Paths: -------------- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAppletElementTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAudioElementTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElementTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocumentTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement2Test.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElementTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLabelElementTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMenuElementTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMeterElementTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptionsCollectionTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElementTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLStyleElementTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElementTest.java Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAppletElementTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAppletElementTest.java 2018-06-15 13:19:13 UTC (rev 15316) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAppletElementTest.java 2018-06-15 15:24:20 UTC (rev 15317) @@ -40,6 +40,8 @@ @Alerts(DEFAULT = {"left", "right", "bottom", "middle", "top", "wrong", ""}, IE = {"left", "right", "bottom", "middle", "top", "", ""}, CHROME = {"undefined", "undefined", "undefined", "undefined", + "undefined", "undefined", "undefined"}, + FF60 = {"undefined", "undefined", "undefined", "undefined", "undefined", "undefined", "undefined"}) @NotYetImplemented(IE) public void getAlign() throws Exception { @@ -103,7 +105,8 @@ @Test @Alerts(IE = {"[object HTMLAppletElement]", "[object HTMLAppletElement]"}, CHROME = {"[object HTMLUnknownElement]", "exception"}, - FF = {"[object HTMLAppletElement]", "function HTMLAppletElement() {\n [native code]\n}"}) + FF60 = {"[object HTMLUnknownElement]", "exception"}, + FF52 = {"[object HTMLAppletElement]", "function HTMLAppletElement() {\n [native code]\n}"}) public void type() throws Exception { final String html = "" + "<html><head><title>foo</title>\n" Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAudioElementTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAudioElementTest.java 2018-06-15 13:19:13 UTC (rev 15316) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLAudioElementTest.java 2018-06-15 15:24:20 UTC (rev 15317) @@ -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.FF52; import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE; import org.junit.Test; @@ -328,8 +327,8 @@ @Test @Alerts(DEFAULT = "", CHROME = "probably", - FF52 = "maybe") - @NotYetImplemented({CHROME, FF52}) + FF = "maybe") + @NotYetImplemented({CHROME, FF}) public void canPlayType_AudioFlac() throws Exception { canPlayType("audio/flac"); } @@ -339,8 +338,8 @@ */ @Test @Alerts(DEFAULT = "", - FF52 = "maybe") - @NotYetImplemented(FF52) + FF = "maybe") + @NotYetImplemented(FF) public void canPlayType_AudioXFlac() throws Exception { canPlayType("audio/x-flac"); } Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElementTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElementTest.java 2018-06-15 13:19:13 UTC (rev 15316) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLButtonElementTest.java 2018-06-15 15:24:20 UTC (rev 15317) @@ -253,7 +253,8 @@ */ @Test @Alerts(DEFAULT = {"undefined", "undefined", "undefined", "undefined", "undefined", "undefined"}, - CHROME = {"0", "2", "1", "2", "1", "1"}) + CHROME = {"0", "2", "1", "2", "1", "1"}, + FF60 = {"0", "2", "1", "2", "1", "1"}) public void labels() throws Exception { final String html = "<html><head>\n" Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocumentTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocumentTest.java 2018-06-15 13:19:13 UTC (rev 15316) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocumentTest.java 2018-06-15 15:24:20 UTC (rev 15317) @@ -392,7 +392,8 @@ * @throws Exception if the test fails */ @Test - @Alerts({"[object HTMLCollection]", "0"}) + @Alerts(DEFAULT = {"[object HTMLCollection]", "0"}, + FF60 = {"[object NodeList]", "0"}) public void applets() throws Exception { final String html = "<html>\n" + "<head>\n" @@ -867,7 +868,8 @@ * @throws Exception if the test fails */ @Test - @Alerts({"2", "0"}) + @Alerts(DEFAULT = {"2", "0"}, + FF60 = {"0", "0"}) public void getElementsByName_emptyName() throws Exception { final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_ + "<html><head><title>foo</title><script>\n" Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement2Test.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement2Test.java 2018-06-15 13:19:13 UTC (rev 15316) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElement2Test.java 2018-06-15 15:24:20 UTC (rev 15317) @@ -825,9 +825,8 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"something", "null"}, - CHROME = {"something", "0"}, - FF = {"something", "0"}) + @Alerts(DEFAULT = {"something", "0"}, + IE = {"something", "null"}) public void innerText_null() throws Exception { final String html = "<html><head>\n" + "<script>\n" Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java 2018-06-15 13:19:13 UTC (rev 15316) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java 2018-06-15 15:24:20 UTC (rev 15317) @@ -4146,8 +4146,7 @@ */ @Test @Alerts(DEFAULT = {"outside", "1", "middle", "2", "3", "4", - "before-begin after-begin inside before-end after-end"}, - FF60 = "insertAdjacentElement not available") + "before-begin after-begin inside before-end after-end"}) public void insertAdjacentElement() throws Exception { insertAdjacentElement("beforeend", "afterend", "beforebegin", "afterbegin"); insertAdjacentElement("beforeEnd", "afterEnd", "beforeBegin", "afterBegin"); @@ -4199,8 +4198,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "executed", - FF60 = "insertAdjacentElement not available") + @Alerts("executed") public void insertAdjacentElementExecuteJavaScript() throws Exception { final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_ + "<html><head><title>foo</title><script>\n" @@ -4225,8 +4223,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "executed", - FF60 = "insertAdjacentElement not available") + @Alerts("executed") public void insertAdjacentElementExecuteNestedJavaScript() throws Exception { final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_ + "<html><head><title>foo</title><script>\n" @@ -4253,8 +4250,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "declared", - FF60 = "insertAdjacentElement not available") + @Alerts("declared") public void insertAdjacentElementDeclareJavaScript() throws Exception { final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_ + "<html><head><title>foo</title><script>\n" @@ -4279,9 +4275,8 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"outside", "middle", - "before-begin after-begin inside before-end after-end"}, - FF60 = "insertAdjacentText not available") + @Alerts({"outside", "middle", + "before-begin after-begin inside before-end after-end"}) public void insertAdjacentText() throws Exception { insertAdjacentText("beforeend", "afterend", "beforebegin", "afterbegin"); insertAdjacentText("beforeEnd", "afterEnd", "beforeBegin", "afterBegin"); Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElementTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElementTest.java 2018-06-15 13:19:13 UTC (rev 15316) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElementTest.java 2018-06-15 15:24:20 UTC (rev 15317) @@ -81,11 +81,11 @@ /** * @throws Exception if the test fails */ - @Alerts(DEFAULT = {"error fileupload1", "abc", "abc", "abc", "", "abc", "foo", "", "abc", "abc", + @Alerts(FF52 = {"error fileupload1", "abc", "abc", "abc", "", "abc", "", "", "abc", "abc", "abc", "abc", "abc", "abc", "abc", "abc", "#000000", "abc", "abc", "abc", "abc", "abc", "abc", "", "50", "abc", "abc", "abc", "abc"}, - FF52 = {"error fileupload1", "abc", "abc", "abc", "", "abc", "", "", "abc", "abc", - "abc", "abc", "abc", "abc", "abc", "abc", "#000000", "abc", "abc", "abc", "abc", "abc", + FF60 = {"error fileupload1", "abc", "abc", "abc", "", "abc", "", "", "abc", "abc", + "abc", "abc", "abc", "abc", "abc", "abc", "#000000", "", "abc", "abc", "", "abc", "abc", "", "50", "abc", "abc", "abc", "abc"}, CHROME = {"error fileupload1", "abc", "abc", "abc", "", "abc", "", "", "abc", "abc", "abc", "abc", "abc", "abc", "abc", "abc", "#000000", "", "abc", "", "", "", @@ -101,15 +101,9 @@ /** * @throws Exception if the test fails */ - @Alerts(DEFAULT = {"", "", "", "", "", "foo", "", "", "", + @Alerts(DEFAULT = {"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "#000000", "", "", "", "", "", "", "", "50", "", "", "", ""}, - FF52 = {"", "", "", "", "", "", "", "", "", - "", "", "", "", "", "", "#000000", "", "", "", "", "", - "", "", "50", "", "", "", ""}, - CHROME = {"", "", "", "", "", "", "", "", "", - "", "", "", "", "", "", "#000000", "", "", "", "", "", - "", "", "50", "", "", "", ""}, IE = {"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "50", "", "", "", ""}) @@ -121,11 +115,11 @@ /** * @throws Exception if the test fails */ - @Alerts(DEFAULT = {"error fileupload1", " ", " ", " ", "", " ", "foo", "", " ", " ", + @Alerts(FF52 = {"error fileupload1", " ", " ", " ", "", " ", "", "", " ", " ", " ", " ", " ", " ", " ", " ", "#000000", " ", " ", " ", " ", " ", " ", "", "50", " ", "", " ", ""}, - FF52 = {"error fileupload1", " ", " ", " ", "", " ", "", "", " ", " ", - " ", " ", " ", " ", " ", " ", "#000000", " ", " ", " ", " ", " ", + FF60 = {"error fileupload1", " ", " ", " ", "", " ", "", "", " ", " ", + " ", " ", " ", " ", " ", " ", "#000000", "", " ", " ", "", " ", " ", "", "50", " ", "", " ", ""}, CHROME = {"error fileupload1", " ", " ", " ", "", " ", "", "", " ", " ", " ", " ", " ", " ", " ", " ", "#000000", "", " ", "", "", "", @@ -141,11 +135,11 @@ /** * @throws Exception if the test fails */ - @Alerts(DEFAULT = {"error fileupload1", "12", "12", "12", "", "12", "foo", "", "12", "12", + @Alerts(FF52 = {"error fileupload1", "12", "12", "12", "", "12", "", "", "12", "12", "12", "12", "12", "12", "12", "12", "#000000", "12", "12", "12", "12", "12", "12", "12", "12", "12", "12", "12", "12"}, - FF52 = {"error fileupload1", "12", "12", "12", "", "12", "", "", "12", "12", - "12", "12", "12", "12", "12", "12", "#000000", "12", "12", "12", "12", "12", + FF60 = {"error fileupload1", "12", "12", "12", "", "12", "", "", "12", "12", + "12", "12", "12", "12", "12", "12", "#000000", "", "12", "12", "", "12", "12", "12", "12", "12", "12", "12", "12"}, CHROME = {"error fileupload1", "12", "12", "12", "", "12", "", "", "12", "12", "12", "12", "12", "12", "12", "12", "#000000", "", "12", "", "", "", @@ -161,15 +155,9 @@ /** * @throws Exception if the test fails */ - @Alerts(DEFAULT = {"", "null", "", "", "", "foo", "", "", "", + @Alerts(DEFAULT = {"", "null", "", "", "", "", "", "", "", "", "null", "", "null", "", "", "#000000", "", "", "", "", "", "", "", "50", "", "", "", ""}, - FF52 = {"", "null", "", "", "", "", "", "", "", - "", "null", "", "null", "", "", "#000000", "", "", "", "", "", - "", "", "50", "", "", "", ""}, - CHROME = {"", "null", "", "", "", "", "", "", "", - "", "null", "", "null", "", "", "#000000", "", "", "", "", "", - "", "", "50", "", "", "", ""}, IE = {"", "null", "", "", "", "", "", "", "", "", "null", "", "null", "", "null", "", "", "", "", "", "", "", "", "50", "", "", "", ""}) @@ -291,11 +279,16 @@ "submit", "submit", "text", "textarea", "color", "date", "text", "datetime-local", "time", "week", "month", "number", "range", "search", "email", "tel", "url"}, - FF = {"button", "button", "checkbox", "file", "hidden", "select-one", "select-multiple", + FF52 = {"button", "button", "checkbox", "file", "hidden", "select-one", "select-multiple", "password", "radio", "reset", "reset", "submit", "submit", "text", "textarea", "color", "text", "text", "text", "text", "text", "text", "number", "range", "search", "email", "tel", "url"}, + FF60 = {"button", "button", "checkbox", "file", "hidden", "select-one", "select-multiple", + "password", "radio", "reset", "reset", + "submit", "submit", "text", "textarea", "color", "date", "text", + "text", "time", "text", "text", "number", "range", + "search", "email", "tel", "url"}, IE = {"button", "button", "checkbox", "file", "hidden", "select-one", "select-multiple", "password", "radio", "reset", "reset", "submit", "submit", "text", "textarea", "text", "text", "text", @@ -377,12 +370,15 @@ /** * @throws Exception if the test fails */ - @Alerts(FF = {"abc", "abc", "abc", "", "abc", "foo", "", "abc", "abc", + @Alerts(FF52 = {"abc", "abc", "abc", "", "abc", "foo", "", "abc", "abc", "abc", "abc", "abc", "abc", "abc", "foo", "#000000", "abc", "abc", "abc", "abc", "abc", "abc", "", "50", "abc", "abc", "abc", "abc"}, + FF60 = {"abc", "abc", "abc", "", "abc", "foo", "", "abc", "abc", + "abc", "abc", "abc", "abc", "abc", "foo", "#000000", "", "abc", + "abc", "", "abc", "abc", "", "50", "abc", "abc", "abc", "abc"}, CHROME = {"abc", "abc", "abc", "", "abc", "foo", "", "abc", "abc", - "abc", "abc", "abc", "abc", "abc", "foo", "#000000", "", "abc", - "", "", "", "", "", "50", "abc", "abc", "abc", "abc"}, + "abc", "abc", "abc", "abc", "abc", "foo", "#000000", "", "abc", + "", "", "", "", "", "50", "abc", "abc", "abc", "abc"}, IE = {"abc", "abc", "abc", "", "abc", "foo", "", "abc", "abc", "abc", "abc", "abc", "abc", "abc", "foo", "abc", "abc", "abc", "abc", "abc", "abc", "abc", "", "50", "abc", "abc", "abc", "abc"}) @@ -1064,10 +1060,9 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"undefined", "undefined", "undefined", "30", "30", "30", + @Alerts(IE = {"undefined", "undefined", "undefined", "30", "30", "30", "undefined", "40", "string", "number"}, - FF52 = {"undefined", "30", "undefined", "30", "30", "30", "40", "50", "string", "number"}, - CHROME = {"undefined", "30", "undefined", "30", "30", "30", "40", "50", "string", "number"}) + DEFAULT = {"undefined", "30", "undefined", "30", "30", "30", "40", "50", "string", "number"}) public void minLength() throws Exception { final String html = "<html><head><title>First</title><script>\n" @@ -1691,7 +1686,8 @@ */ @Test @Alerts(DEFAULT = {"undefined", "undefined", "undefined", "undefined", "undefined", "undefined"}, - CHROME = {"0", "2", "1", "2", "1", "1"}) + CHROME = {"0", "2", "1", "2", "1", "1"}, + FF60 = {"0", "2", "1", "2", "1", "1"}) public void labels() throws Exception { final String html = "<html><head>\n" Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLabelElementTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLabelElementTest.java 2018-06-15 13:19:13 UTC (rev 15316) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLLabelElementTest.java 2018-06-15 15:24:20 UTC (rev 15317) @@ -156,9 +156,8 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "[object HTMLFormElement]", - CHROME = "null", - FF52 = "null") + @Alerts(DEFAULT = "null", + IE = "[object HTMLFormElement]") public void form() throws Exception { final String html = "<html>\n" Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMenuElementTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMenuElementTest.java 2018-06-15 13:19:13 UTC (rev 15316) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMenuElementTest.java 2018-06-15 15:24:20 UTC (rev 15317) @@ -114,6 +114,9 @@ CHROME = {"undefined", "undefined", "undefined", "undefined", "undefined", "null", "", "blah", "context", "ToolBar", "list", "context", "toolbar", "ConText", "", "unknown"}, + FF60 = {"", "", "blah", "context", "ToolBar", "null", "", "blah", + "context", "ToolBar", "list", "context", "toolbar", "ConText", + "", "unknown"}, IE = {"", "", "", "", "", "null", "", "blah", "context", "ToolBar", "ex", "", "ex", "", "ex", "", "ex", "", "", "ex", ""}) public void type() throws Exception { Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMeterElementTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMeterElementTest.java 2018-06-15 13:19:13 UTC (rev 15316) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLMeterElementTest.java 2018-06-15 15:24:20 UTC (rev 15317) @@ -74,7 +74,8 @@ */ @Test @Alerts(DEFAULT = {"undefined", "undefined", "undefined", "undefined", "undefined", "undefined"}, - CHROME = {"0", "2", "1", "2", "1", "1"}) + CHROME = {"0", "2", "1", "2", "1", "1"}, + FF60 = {"0", "2", "1", "2", "1", "1"}) public void labels() throws Exception { final String html = "<html><head>\n" Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptionsCollectionTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptionsCollectionTest.java 2018-06-15 13:19:13 UTC (rev 15316) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLOptionsCollectionTest.java 2018-06-15 15:24:20 UTC (rev 15317) @@ -961,6 +961,7 @@ */ @Test @Alerts(DEFAULT = {"0", "1", "One", "3", "One", "Two", "Three"}, + FF60 = {"exception", "exception", "exception"}, IE = {"exception", "exception", "exception"}) public void setLengthMinusOne() throws Exception { setLength("-1"); Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElementTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElementTest.java 2018-06-15 13:19:13 UTC (rev 15316) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElementTest.java 2018-06-15 15:24:20 UTC (rev 15317) @@ -14,7 +14,7 @@ */ package com.gargoylesoftware.htmlunit.javascript.host.html; -import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF; +import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF52; import java.util.List; @@ -2128,8 +2128,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"two", ""}, - FF60 = {"two", "two"}) + @Alerts(DEFAULT = {"two", ""}) public void value() throws Exception { final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_ @@ -2185,8 +2184,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"two", ""}, - FF60 = {"two", "two"}) + @Alerts(DEFAULT = {"two", ""}) public void valueByValueCase() throws Exception { final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_ @@ -2272,8 +2270,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"two", ""}, - FF60 = {"two", "two"}) + @Alerts(DEFAULT = {"two", ""}) public void valueNull() throws Exception { final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_ @@ -2301,8 +2298,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"two", "", ""}, - FF60 = {"two", "two", "two"}) + @Alerts(DEFAULT = {"two", "", ""}) public void valueOther() throws Exception { final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_ @@ -2432,7 +2428,8 @@ */ @Test @Alerts(DEFAULT = {"undefined", "undefined", "undefined", "undefined", "undefined", "undefined"}, - CHROME = {"0", "2", "1", "2", "1", "1"}) + CHROME = {"0", "2", "1", "2", "1", "1"}, + FF60 = {"0", "2", "1", "2", "1", "1"}) public void labels() throws Exception { final String html = "<html><head>\n" @@ -2639,7 +2636,7 @@ */ @Test // https://github.com/mozilla/geckodriver/issues/584 - @BuggyWebDriver(FF) + @BuggyWebDriver(FF52) public void optionClickActions() throws Exception { final String html = "<html><body>\n" Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLStyleElementTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLStyleElementTest.java 2018-06-15 13:19:13 UTC (rev 15316) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLStyleElementTest.java 2018-06-15 15:24:20 UTC (rev 15317) @@ -208,7 +208,7 @@ */ @Test @Alerts(DEFAULT = {"undefined", "undefined"}, - FF = {"false", "true"}) + FF52 = {"false", "true"}) public void scoped() throws Exception { final String html = "<html><head>\n" @@ -236,7 +236,7 @@ */ @Test @Alerts(DEFAULT = {"undefined", "true", "false"}, - FF = {"false", "true", "false"}) + FF52 = {"false", "true", "false"}) public void scoped_setter() throws Exception { final String html = "<html><head>\n" Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElementTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElementTest.java 2018-06-15 13:19:13 UTC (rev 15316) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLTextAreaElementTest.java 2018-06-15 15:24:20 UTC (rev 15317) @@ -163,6 +163,7 @@ @Test @Alerts(DEFAULT = {"0,0", "11,11", "0,11", "0,11", "7,7"}, CHROME = {"0,0", "11,11", "11,11", "11,11", "7,7"}, + FF60 = {"0,0", "11,11", "11,11", "11,11", "7,7"}, IE = {"0,0", "0,0", "0,0", "0,11", "0,0"}) public void selection_outOfBounds() throws Exception { selection(-3, 15); @@ -368,7 +369,6 @@ */ @Test @Alerts(DEFAULT = {"20", "5", "8", "4", "20", "20", "20", "3"}, - FF60 = {"20", "5", "8", "4", "error", "4", "error", "4", "20", "3"}, IE = {"20", "5", "8", "4", "error", "4", "error", "4", "error", "4", "3"}) public void cols() throws Exception { final String html @@ -419,7 +419,6 @@ */ @Test @Alerts(DEFAULT = {"2", "5", "8", "4", "2", "2", "2", "3"}, - FF60 = {"2", "5", "8", "4", "error", "4", "error", "4", "2", "3"}, IE = {"2", "5", "8", "4", "error", "4", "error", "4", "error", "4", "3"}) public void rows() throws Exception { final String html |