From: <rb...@us...> - 2018-06-17 13:16:49
|
Revision: 15349 http://sourceforge.net/p/htmlunit/code/15349 Author: rbri Date: 2018-06-17 13:16:42 +0000 (Sun, 17 Jun 2018) Log Message: ----------- more ff60 expectations Modified Paths: -------------- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementClientWidthTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetWidthTest.java Added Paths: ----------- trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetHeightTest.properties.FF60.txt Removed Paths: ------------- trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetHeightTest.properties.FF45.txt Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementClientWidthTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementClientWidthTest.java 2018-06-17 12:59:25 UTC (rev 15348) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementClientWidthTest.java 2018-06-17 13:16:42 UTC (rev 15349) @@ -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 static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE; import org.junit.Test; @@ -187,9 +186,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "0", - FF60 = "240") - @NotYetImplemented(FF60) + @Alerts("0") public void applet() throws Exception { loadPageWithAlerts2(test("applet")); } @@ -367,7 +364,8 @@ */ @Test @Alerts(DEFAULT = "12", - FF = "18", + FF52 = "18", + FF60 = "16", IE = "20") @NotYetImplemented public void button() throws Exception { @@ -457,9 +455,8 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "0", - CHROME = "-16", - FF52 = "-16") + @Alerts(DEFAULT = "-16", + IE = "0") public void details() throws Exception { loadPageWithAlerts2(test("details")); } @@ -848,7 +845,7 @@ */ @Test @Alerts(DEFAULT = "0", - FF = "141", + FF52 = "141", IE = "143") @NotYetImplemented public void isindex() throws Exception { @@ -1441,9 +1438,8 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "0", - CHROME = "-16", - FF52 = "-16") + @Alerts(DEFAULT = "-16", + IE = "0") public void summary() throws Exception { loadPageWithAlerts2(test("summary")); } @@ -1721,7 +1717,8 @@ */ @Test @Alerts(DEFAULT = "12", - FF = "18", + FF52 = "18", + FF60 = "16", IE = "20") @NotYetImplemented public void inputButton() throws Exception { @@ -1746,7 +1743,8 @@ */ @Test @Alerts(CHROME = "253", - FF = "237", + FF52 = "237", + FF60 = "235", IE = "262") @NotYetImplemented public void inputFile() throws Exception { @@ -1796,7 +1794,8 @@ */ @Test @Alerts(CHROME = "92", - FF = "50", + FF52 = "50", + FF60 = "48", IE = "100") @NotYetImplemented public void inputReset() throws Exception { @@ -1824,7 +1823,8 @@ */ @Test @Alerts(CHROME = "58", - FF = "96", + FF52 = "96", + FF60 = "94", IE = "114") @NotYetImplemented public void inputSubmit() throws Exception { Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetWidthTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetWidthTest.java 2018-06-17 12:59:25 UTC (rev 15348) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetWidthTest.java 2018-06-17 13:16:42 UTC (rev 15349) @@ -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 static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.IE; import org.junit.Test; @@ -187,9 +186,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "0", - FF60 = "240") - @NotYetImplemented(FF60) + @Alerts("0") public void applet() throws Exception { loadPageWithAlerts2(test("applet")); } @@ -366,9 +363,9 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "16", - FF = "24", - IE = "22") + @Alerts(DEFAULT = "22", + CHROME = "16", + FF52 = "24") @NotYetImplemented public void button() throws Exception { loadPageWithAlerts2(test("button")); @@ -457,9 +454,8 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "0", - CHROME = "-16", - FF52 = "-16") + @Alerts(DEFAULT = "-16", + IE = "0") public void details() throws Exception { loadPageWithAlerts2(test("details")); } @@ -847,7 +843,7 @@ */ @Test @Alerts(DEFAULT = "0", - FF = "143", + FF52 = "143", IE = "145") @NotYetImplemented public void isindex() throws Exception { @@ -1442,9 +1438,8 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "0", - CHROME = "-16", - FF52 = "-16") + @Alerts(DEFAULT = "-16", + IE = "0") public void summary() throws Exception { loadPageWithAlerts2(test("summary")); } @@ -1718,9 +1713,9 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "16", - FF = "24", - IE = "22") + @Alerts(DEFAULT = "22", + CHROME = "16", + FF52 = "24") @NotYetImplemented public void inputButton() throws Exception { loadPageWithAlerts2(testInput("button")); @@ -1744,7 +1739,8 @@ */ @Test @Alerts(DEFAULT = "253", - FF = "237", + FF52 = "237", + FF60 = "235", IE = "262") @NotYetImplemented public void inputFile() throws Exception { @@ -1794,7 +1790,8 @@ */ @Test @Alerts(DEFAULT = "96", - FF = "56", + FF52 = "56", + FF60 = "54", IE = "102") @NotYetImplemented public void inputReset() throws Exception { @@ -1822,7 +1819,8 @@ */ @Test @Alerts(DEFAULT = "62", - FF = "102", + FF52 = "102", + FF60 = "100", IE = "116") @NotYetImplemented public void inputSubmit() throws Exception { Deleted: trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetHeightTest.properties.FF45.txt =================================================================== --- trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetHeightTest.properties.FF45.txt 2018-06-17 12:59:25 UTC (rev 15348) +++ trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetHeightTest.properties.FF45.txt 2018-06-17 13:16:42 UTC (rev 15349) @@ -1 +0,0 @@ -0, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 30, 31, 32, 33, 34, 35, 36, 37, 38, 40, 41, 42, 43, 44, 45, 46, 47, 48, 50, 51, 52, 53, 53, 55, 57, 58, 59, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 72, 73, 74, 75, 76, 77, 78, 79, 80, 82, 84, 85, 86, 87, 88, 89, 90, 91, 93, 94, 95, 96, 96, 98, 99, 100, 101, 103, 104, 105, 106, 106, 108, 109, 111, 112, 113, 115, 116, 117, 118, 119, 120, 121, 122, 123, 125, 126, 127, 128, 129, 130, 131, 132, 133, 135, 136, 138, 139, 139, 141, 142, 143, 144, 146, 147, 148, 149 \ No newline at end of file Added: trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetHeightTest.properties.FF60.txt =================================================================== --- trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetHeightTest.properties.FF60.txt (rev 0) +++ trunk/htmlunit/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/css/property/ElementOffsetHeightTest.properties.FF60.txt 2018-06-17 13:16:42 UTC (rev 15349) @@ -0,0 +1 @@ +0, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 30, 31, 32, 33, 34, 35, 36, 37, 38, 40, 41, 42, 43, 44, 45, 46, 47, 48, 50, 51, 52, 53, 53, 55, 57, 58, 59, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 72, 73, 74, 75, 76, 77, 78, 79, 80, 82, 84, 85, 86, 87, 88, 89, 90, 91, 93, 94, 95, 96, 96, 98, 99, 100, 101, 103, 104, 105, 106, 106, 108, 109, 111, 112, 113, 115, 116, 117, 118, 119, 120, 121, 122, 123, 125, 126, 127, 128, 129, 130, 131, 132, 133, 135, 136, 138, 139, 139, 141, 142, 143, 144, 146, 147, 148, 149 \ No newline at end of file |