From: <rb...@us...> - 2018-06-15 12:18:26
|
Revision: 15312 http://sourceforge.net/p/htmlunit/code/15312 Author: rbri Date: 2018-06-15 12:18:21 +0000 (Fri, 15 Jun 2018) Log Message: ----------- more ff60 expectations Modified Paths: -------------- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/IteratorTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine2Test.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeFunctionTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeStringTest.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable2Test.java Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/IteratorTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/IteratorTest.java 2018-06-15 12:04:36 UTC (rev 15311) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/IteratorTest.java 2018-06-15 12:18:21 UTC (rev 15312) @@ -34,7 +34,7 @@ */ @Test @Alerts(DEFAULT = "Iterator not available", - FF = {"first,1", "second,2"}) + FF52 = {"first,1", "second,2"}) public void simple() throws Exception { final String html = "<html>\n" @@ -61,7 +61,7 @@ */ @Test @Alerts(DEFAULT = "Iterator not available", - FF = "[object StopIteration]") + FF52 = "[object StopIteration]") public void stopIteration() throws Exception { final String html = "<html>\n" Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine2Test.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine2Test.java 2018-06-15 12:04:36 UTC (rev 15311) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/JavaScriptEngine2Test.java 2018-06-15 12:18:21 UTC (rev 15312) @@ -122,8 +122,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"in goo", "in hoo", "in foo"}, - FF60 = {"in goo", "in hoo", "foo error"}) + @Alerts({"in goo", "in hoo", "in foo"}) public void functionDeclaredForwardInBlock() throws Exception { final String html = "<html><head></head><body>\n" + "<script>\n" @@ -149,10 +148,8 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = {"function foo() {}", "function foo() {}"}, - CHROME = {"undefined", "function foo() {}"}, - FF52 = {"undefined", "function foo() {}"}, - FF60 = {"undefined", "foo error"}) + @Alerts(DEFAULT = {"undefined", "function foo() {}"}, + IE = {"function foo() {}", "function foo() {}"}) @NotYetImplemented({IE, CHROME, FF52}) public void variableNotDefined() throws Exception { final String html = "<html><head></head><body>\n" Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeFunctionTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeFunctionTest.java 2018-06-15 12:04:36 UTC (rev 15311) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeFunctionTest.java 2018-06-15 12:18:21 UTC (rev 15312) @@ -114,7 +114,8 @@ */ @Test @Alerts(DEFAULT = "function anonymous() {\n var x = 1;\n}", - CHROME = "function anonymous(\n) {\n var x = 1;\n}") + CHROME = "function anonymous(\n) {\n var x = 1;\n}", + FF60 = "function anonymous(\n) {\n var x = 1;\n}") public void newFunctionToString() throws Exception { final String html = "<html><head><title>foo</title><script>\n" Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeStringTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeStringTest.java 2018-06-15 12:04:36 UTC (rev 15311) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeStringTest.java 2018-06-15 12:18:21 UTC (rev 15312) @@ -80,8 +80,7 @@ */ @Test @Alerts(DEFAULT = {"contains: undefined", "toSource: undefined", "trim: function"}, - FF52 = {"contains: undefined", "toSource: function", "trim: function"}, - FF60 = {"contains: function", "toSource: function", "trim: function"}) + FF = {"contains: undefined", "toSource: function", "trim: function"}) public void methods_differences() throws Exception { final String[] methods = {"contains", "toSource", "trim" }; final String html = NativeDateTest.createHTMLTestMethods("'hello'", methods); @@ -157,9 +156,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(DEFAULT = "contains not supported", - FF60 = {"true", "false", "true", "true", "true", "false", "true", "true", "true", "false", - "true", "true", "false", "false"}) + @Alerts("contains not supported") public void contains() throws Exception { final String html = "<!DOCTYPE html>\n" Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable2Test.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable2Test.java 2018-06-15 12:04:36 UTC (rev 15311) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable2Test.java 2018-06-15 12:18:21 UTC (rev 15312) @@ -42,6 +42,7 @@ * @author Sudhan Moghe * @author <a href="mailto:mi...@10...">Mike Dirolf</a> * @author Frank Danek + * @author Ronald Brill */ @RunWith(BrowserRunner.class) public class SimpleScriptable2Test extends WebDriverTestCase { @@ -322,7 +323,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(FF = {"function", "true", "function length() {\n [native code]\n}", "0", "0"}, + @Alerts(DEFAULT = {"function", "true", "function get length() {\n [native code]\n}", "0", "0"}, CHROME = {"undefined", "false", "undefined", "exception"}, IE = {"function", "true", "\nfunction length() {\n [native code]\n}\n", "0", "0"}) @NotYetImplemented(CHROME) |