From: <asa...@us...> - 2013-09-26 21:55:03
|
Revision: 8518 http://sourceforge.net/p/htmlunit/code/8518 Author: asashour Date: 2013-09-26 21:54:54 +0000 (Thu, 26 Sep 2013) Log Message: ----------- JavaScript: window.localStorage and .sessionStorage are supported in Chrome. Issue 1539 Modified Paths: -------------- trunk/htmlunit/src/changes/changes.xml trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Storage.java trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/StorageTest.java Modified: trunk/htmlunit/src/changes/changes.xml =================================================================== --- trunk/htmlunit/src/changes/changes.xml 2013-09-26 21:36:13 UTC (rev 8517) +++ trunk/htmlunit/src/changes/changes.xml 2013-09-26 21:54:54 UTC (rev 8518) @@ -8,6 +8,9 @@ <body> <release version="2.13" date="???" description="Bugfixes"> + <action type="add" dev="asashour" issue="1539"> + JavaScript: window.localStorage and .sessionStorage are supported in Chrome. + </action> <action type="add" dev="asashour" issue="1545"> JavaScript: node and window.addEventListener() and .removeEventListener() are supported in Chrome. </action> Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2013-09-26 21:36:13 UTC (rev 8517) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2013-09-26 21:54:54 UTC (rev 8518) @@ -1269,7 +1269,7 @@ SET_READONLY_PROPERTIES, /** Indicates [object StorageObsolete] instead of [object Storage]. */ - @BrowserFeature({ @WebBrowser(value = FF, maxVersion = 10), @WebBrowser(CHROME) }) + @BrowserFeature({ @WebBrowser(value = FF, maxVersion = 10) }) STORAGE_OBSOLETE, /** Indicates that string.trim() is supported. */ Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Storage.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Storage.java 2013-09-26 21:36:13 UTC (rev 8517) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Storage.java 2013-09-26 21:54:54 UTC (rev 8518) @@ -15,6 +15,7 @@ package com.gargoylesoftware.htmlunit.javascript.host; import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.STORAGE_OBSOLETE; +import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.CHROME; import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.FF; import static com.gargoylesoftware.htmlunit.javascript.configuration.BrowserName.IE; @@ -149,7 +150,7 @@ /** * Clears all items. */ - @JsxFunction({ @WebBrowser(value = IE, minVersion = 8), @WebBrowser(FF) }) + @JsxFunction({ @WebBrowser(value = IE, minVersion = 8), @WebBrowser(FF), @WebBrowser(CHROME) }) public void clear() { getMap().clear(); } Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2013-09-26 21:36:13 UTC (rev 8517) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Window.java 2013-09-26 21:54:54 UTC (rev 8518) @@ -539,7 +539,7 @@ * Returns the localStorage property. * @return the localStorage property */ - @JsxGetter({ @WebBrowser(value = IE, minVersion = 8), @WebBrowser(FF) }) + @JsxGetter({ @WebBrowser(value = IE, minVersion = 8), @WebBrowser(FF), @WebBrowser(CHROME) }) public Storage getLocalStorage() { return getStorage(Type.LOCAL_STORAGE); } @@ -548,7 +548,7 @@ * Returns the sessionStorage property. * @return the sessionStorage property */ - @JsxGetter({ @WebBrowser(value = IE, minVersion = 8), @WebBrowser(FF) }) + @JsxGetter({ @WebBrowser(value = IE, minVersion = 8), @WebBrowser(FF), @WebBrowser(CHROME) }) public Storage getSessionStorage() { return getStorage(Type.SESSION_STORAGE); } Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/StorageTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/StorageTest.java 2013-09-26 21:36:13 UTC (rev 8517) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/StorageTest.java 2013-09-26 21:54:54 UTC (rev 8518) @@ -44,7 +44,8 @@ @Test @Alerts(IE = { "undefined", "undefined", "undefined" }, IE8 = { "undefined", "[object]", "[object]" }, FF = { "[object StorageList]", "[object Storage]", "[object Storage]" }, - FF17 = { "undefined", "[object Storage]", "[object Storage]" }) + FF17 = { "undefined", "[object Storage]", "[object Storage]" }, + CHROME = { "undefined", "[object Storage]", "[object Storage]" }) @NotYetImplemented(FF3_6) public void storage() throws Exception { final String html @@ -77,8 +78,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(IE8 = { "string", "1" }, - FF = { "string", "1" }) + @Alerts({ "string", "1" }) public void localStorage() throws Exception { final String firstHtml = "<html><head></head><body>\n" @@ -111,8 +111,7 @@ * @throws Exception if the test fails */ @Test - @Alerts(IE8 = { "0", "2", "there", "world", "1", "0" }, - FF = { "0", "2", "there", "world", "1", "0" }) + @Alerts({ "0", "2", "there", "world", "1", "0" }) public void sessionStorage() throws Exception { final String html = "<html><head></head><body>\n" |