From: <rb...@us...> - 2018-06-17 09:17:42
|
Revision: 15345 http://sourceforge.net/p/htmlunit/code/15345 Author: rbri Date: 2018-06-17 09:17:38 +0000 (Sun, 17 Jun 2018) Log Message: ----------- ff60 support (wip) Modified Paths: -------------- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/CanvasRenderingContext2DTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.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/HTMLSelectElementTest.java 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 09:03:07 UTC (rev 15344) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/canvas/CanvasRenderingContext2DTest.java 2018-06-17 09:17:38 UTC (rev 15345) @@ -193,7 +193,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"rendering...", "...done"}) + @Alerts({"rendering...", "...done"}) public void drawImage_noImage() throws Exception { final String html = "<html><body>\n" + "<img id='myImage'>\n" @@ -216,7 +216,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"rendering...", "...done"}) + @Alerts({"rendering...", "...done"}) public void drawImage_invalidImage() throws Exception { try (InputStream is = getClass().getResourceAsStream("invalid.png")) { final byte[] directBytes = IOUtils.toByteArray(is); Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java 2018-06-17 09:03:07 UTC (rev 15344) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java 2018-06-17 09:17:38 UTC (rev 15345) @@ -844,10 +844,10 @@ * @throws Exception if an error occurs */ @Test - @Alerts(IE = {"inline", "inline", "none", "block", "inline-block", "inline", - "inline", "inline", "inline", "inline", "inline", "inline", "inline"}, - DEFAULT = {"inline", "inline", "none", "block", "inline-block", "inline", - "inline", "inline", "inline", "inline", "inline", "block", "inline"}) + @Alerts(DEFAULT = {"inline", "inline", "none", "block", "inline-block", "inline", + "inline", "inline", "inline", "inline", "inline", "block", "inline"}, + IE = {"inline", "inline", "none", "block", "inline-block", "inline", + "inline", "inline", "inline", "inline", "inline", "inline", "inline"}) public void defaultDisplayValues_S() throws Exception { final String html = "<!DOCTYPE HTML>\n<html><body>\n" + " <p>\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-17 09:03:07 UTC (rev 15344) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLElementTest.java 2018-06-17 09:17:38 UTC (rev 15345) @@ -4145,7 +4145,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"outside", "1", "middle", "2", "3", "4", + @Alerts({"outside", "1", "middle", "2", "3", "4", "before-begin after-begin inside before-end after-end"}) public void insertAdjacentElement() throws Exception { insertAdjacentElement("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-17 09:03:07 UTC (rev 15344) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLInputElementTest.java 2018-06-17 09:17:38 UTC (rev 15345) @@ -1060,9 +1060,9 @@ * @throws Exception if the test fails */ @Test - @Alerts(IE = {"undefined", "undefined", "undefined", "30", "30", "30", - "undefined", "40", "string", "number"}, - DEFAULT = {"undefined", "30", "undefined", "30", "30", "30", "40", "50", "string", "number"}) + @Alerts(DEFAULT = {"undefined", "30", "undefined", "30", "30", "30", "40", "50", "string", "number"}, + IE = {"undefined", "undefined", "undefined", "30", "30", "30", + "undefined", "40", "string", "number"}) public void minLength() throws Exception { final String html = "<html><head><title>First</title><script>\n" 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-17 09:03:07 UTC (rev 15344) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSelectElementTest.java 2018-06-17 09:17:38 UTC (rev 15345) @@ -2128,7 +2128,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"two", ""}) + @Alerts({"two", ""}) public void value() throws Exception { final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_ @@ -2184,7 +2184,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"two", ""}) + @Alerts({"two", ""}) public void valueByValueCase() throws Exception { final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_ @@ -2270,7 +2270,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"two", ""}) + @Alerts({"two", ""}) public void valueNull() throws Exception { final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_ @@ -2298,7 +2298,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"two", "", ""}) + @Alerts({"two", "", ""}) public void valueOther() throws Exception { final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_ |