From: <rb...@us...> - 2018-06-20 06:02:28
|
Revision: 15361 http://sourceforge.net/p/htmlunit/code/15361 Author: rbri Date: 2018-06-20 06:02:23 +0000 (Wed, 20 Jun 2018) Log Message: ----------- more ff60 expectations Modified Paths: -------------- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImage2Test.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSelect2Test.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java 2018-06-19 06:21:08 UTC (rev 15360) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFrame2Test.java 2018-06-20 06:02:23 UTC (rev 15361) @@ -99,7 +99,9 @@ @Alerts(DEFAULT = "second [object HTMLFormElement] third [object HTMLFormElement] " + "parent [object HTMLFormElement]", CHROME = "second undefined third [object HTMLFormElement] " - + "parent [object HTMLFormElement]") + + "parent [object HTMLFormElement]", + FF60 = "second undefined third [object HTMLFormElement] " + + "parent [object HTMLFormElement]") // real FF sometimes alerts 'third' before 'second' @NotYetImplemented(CHROME) public void postponeLoading() throws Exception { Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImage2Test.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImage2Test.java 2018-06-19 06:21:08 UTC (rev 15360) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImage2Test.java 2018-06-20 06:02:23 UTC (rev 15361) @@ -150,9 +150,8 @@ * @throws Exception if an error occurs */ @Test - @Alerts(DEFAULT = "true", - CHROME = "false", - FF52 = "false") + @Alerts(DEFAULT = "false", + IE = "true") public void isDisplayedEmptySource() throws Exception { isDisplayed("src=''"); } Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSelect2Test.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSelect2Test.java 2018-06-19 06:21:08 UTC (rev 15360) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSelect2Test.java 2018-06-20 06:02:23 UTC (rev 15361) @@ -14,7 +14,7 @@ */ package com.gargoylesoftware.htmlunit.html; -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 java.util.List; @@ -44,7 +44,7 @@ * @exception Exception If the test fails */ @Test - @BuggyWebDriver({FF, IE}) + @BuggyWebDriver({FF52, IE}) public void select() throws Exception { final String html = "<html><head><title>foo</title></head><body>\n" + "<form id='form1'><select name='select1' multiple>\n" @@ -113,7 +113,7 @@ * @exception Exception If the test fails */ @Test - @BuggyWebDriver({FF, IE}) + @BuggyWebDriver({FF52, IE}) public void controlClick() throws Exception { final String html = "<html><head><title>foo</title></head><body>\n" + "<form id='form1'><select name='select1' multiple>\n" Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java 2018-06-19 06:21:08 UTC (rev 15360) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequestTest.java 2018-06-20 06:02:23 UTC (rev 15361) @@ -687,8 +687,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"true", "exception"}, - FF60 = {"true", "overwritten"}) + @Alerts({"true", "exception"}) public void overrideMimeTypeAfterSend() throws Exception { final String html = "<html><head>\n" + "<script>\n" @@ -1397,9 +1396,8 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"someLoad [object ProgressEvent]", "load", "true"}, - CHROME = {"someLoad [object ProgressEvent]", "load", "false"}, - FF52 = {"someLoad [object ProgressEvent]", "load", "false"}) + @Alerts(DEFAULT = {"someLoad [object ProgressEvent]", "load", "false"}, + IE = {"someLoad [object ProgressEvent]", "load", "true"}) public void addEventListener() throws Exception { final String html = "<html>\n" @@ -1434,9 +1432,8 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"someLoad [object ProgressEvent]", "load", "true", "11", "11"}, - CHROME = {"someLoad [object ProgressEvent]", "load", "false", "11", "0"}, - FF52 = {"someLoad [object ProgressEvent]", "load", "false", "11", "0"}) + @Alerts(DEFAULT = {"someLoad [object ProgressEvent]", "load", "false", "11", "0"}, + IE = {"someLoad [object ProgressEvent]", "load", "true", "11", "11"}) public void addEventListenerDetails() throws Exception { final String html = "<html>\n" @@ -1473,9 +1470,8 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "null", - CHROME = "function", - FF52 = "function") + @Alerts(DEFAULT = "function", + IE = "null") @NotYetImplemented public void addEventListenerCaller() throws Exception { final String html = @@ -1579,11 +1575,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"[object Object]", "undefined", "undefined", - "function onreadystatechange() {\n [native code]\n}", - "function onreadystatechange() {\n [native code]\n}", - "true", "true"}, - FF52 = {"[object Object]", "undefined", "undefined", + @Alerts(FF = {"[object Object]", "undefined", "undefined", "function get onreadystatechange() {\n [native code]\n}", "function set onreadystatechange() {\n [native code]\n}", "true", "true"}, @@ -1626,12 +1618,12 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"[object Object]", "undefined", "undefined", + @Alerts(FF52 = {"[object Object]", "undefined", "undefined", "function () { return !0 }", - "function onreadystatechange() {\n [native code]\n}", + "function set onreadystatechange() {\n [native code]\n}", "true", "true"}, - FF52 = {"[object Object]", "undefined", "undefined", - "function () { return !0 }", + FF60 = {"[object Object]", "undefined", "undefined", + "function() { return !0 }", "function set onreadystatechange() {\n [native code]\n}", "true", "true"}, CHROME = {"[object Object]", "undefined", "undefined", |