From: <asa...@us...> - 2017-05-02 09:10:12
|
Revision: 14313 http://sourceforge.net/p/htmlunit/code/14313 Author: asashour Date: 2017-05-02 09:10:09 +0000 (Tue, 02 May 2017) Log Message: ----------- Fix Error.stack Modified Paths: -------------- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/HtmlUnitContextFactory.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeErrorTest.java Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2017-05-01 16:52:04 UTC (rev 14312) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2017-05-02 09:10:09 UTC (rev 14313) @@ -829,6 +829,10 @@ IE}) JS_ENUM_NUMBERS_FIRST, + /** Javascript {@code Error.stack}. */ + @BrowserFeature({CHROME, FF}) + JS_ERROR_STACK, + /** Javascript {@code Error.stackTraceLimit}. */ @BrowserFeature({CHROME, IE}) JS_ERROR_STACK_TRACE_LIMIT, Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/HtmlUnitContextFactory.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/HtmlUnitContextFactory.java 2017-05-01 16:52:04 UTC (rev 14312) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/HtmlUnitContextFactory.java 2017-05-02 09:10:09 UTC (rev 14313) @@ -16,6 +16,7 @@ import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_ARGUMENTS_READ_ONLY_ACCESSED_FROM_FUNCTION; import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_ENUM_NUMBERS_FIRST; +import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_ERROR_STACK; import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_FUNCTION_DECLARED_FORWARD_IN_BLOCK; import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_GET_PROTOTYPE_OF_STRING; import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_IGNORES_LAST_LINE_CONTAINING_UNCOMMENTED; @@ -315,7 +316,7 @@ case Context.FEATURE_HTMLUNIT_EVAL_LOCAL_SCOPE: return false; case Context.FEATURE_HTMLUNIT_ERROR_STACK: - return true; + return browserVersion_.hasFeature(JS_ERROR_STACK); case Context.FEATURE_HTMLUNIT_CONSTRUCTOR: return true; case Context.FEATURE_HTMLUNIT_FUNCTION_OBJECT_METHOD: Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeErrorTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeErrorTest.java 2017-05-01 16:52:04 UTC (rev 14312) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/NativeErrorTest.java 2017-05-02 09:10:09 UTC (rev 14313) @@ -14,9 +14,6 @@ */ package com.gargoylesoftware.htmlunit.javascript; -import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.CHROME; -import static com.gargoylesoftware.htmlunit.BrowserRunner.TestedBrowser.FF; - import org.junit.Test; import org.junit.runner.RunWith; @@ -68,7 +65,6 @@ */ @Test @Alerts({"string", "true"}) - @NotYetImplemented public void stackNewError() throws Exception { final String html = "<html><head><script>\n" @@ -97,7 +93,6 @@ @Test @Alerts(DEFAULT = {"string", "true"}, IE = {"undefined"}) - @NotYetImplemented({FF, CHROME}) public void stackNewErrorWithoutThrow() throws Exception { final String html = "<html><head><script>\n" @@ -123,7 +118,6 @@ @Test @Alerts(DEFAULT = "true", IE = "false") - @NotYetImplemented({FF, CHROME}) public void stackInNewError() throws Exception { final String html = "<html><head><script>\n" |