Mercurial > hg > release > icedtea-web-1.6
changeset 1150:95c4a59a6b8d
Fix javascript url error in JSToJSet reproducer.
2014-02-09 Jie Kang <jkang@redhat.com>
Fix javascript url error in JSToJSet reproducer.
* tests/reproducers/simple/JSToJSet/resources/JSToJSet.html: added quotes
around scriptable paramter.
* tests/reproducers/simple/JSToJSet/resources/JSToJava_Set.js: decode url
before using it
* tests/reproducers/simple/JSToJSet/testcases/JSToJSetTest.java:
KnownToFail annotations removed from tests that now pass correctly.
| author | Jie Kang <jkang@redhat.com> |
|---|---|
| date | Mon, 09 Feb 2015 16:44:15 -0500 |
| parents | dbe0614c2eca |
| children | 6d7f7e0e3829 |
| files | ChangeLog tests/reproducers/simple/JSToJSet/resources/JSToJSet.html tests/reproducers/simple/JSToJSet/resources/JSToJava_Set.js tests/reproducers/simple/JSToJSet/testcases/JSToJSetTest.java |
| diffstat | 4 files changed, 18 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Feb 09 16:38:45 2015 -0500 +++ b/ChangeLog Mon Feb 09 16:44:15 2015 -0500 @@ -1,3 +1,13 @@ +2014-02-09 Jie Kang <jkang@redhat.com> + + Fix javascript url error in JSToJSet reproducer. + * tests/reproducers/simple/JSToJSet/resources/JSToJSet.html: added quotes + around scriptable paramter. + * tests/reproducers/simple/JSToJSet/resources/JSToJava_Set.js: decode url + before using it + * tests/reproducers/simple/JSToJSet/testcases/JSToJSetTest.java: + KnownToFail annotations removed from tests that now pass correctly. + 2015-02-06 Fridrich Strba <fridrich.strba@suse.com> Removed bootstrap, made buildable with modular JDK
--- a/tests/reproducers/simple/JSToJSet/resources/JSToJSet.html Mon Feb 09 16:38:45 2015 -0500 +++ b/tests/reproducers/simple/JSToJSet/resources/JSToJSet.html Mon Feb 09 16:44:15 2015 -0500 @@ -8,9 +8,10 @@ <body> <h2>The JSToJSet html page</h2> - <applet code="JSToJSet" width="1000" height="100" id="applet" - MAYSCRIPT - jnlp_href="jstoj-set.jnlp"> + <applet id="applet" code="JSToJSet" + jnlp_href="jstoj-set.jnlp" + width="1000" height="100" MAYSCRIPT + scriptable="true"> </applet> <div id="messageDiv"></div>
--- a/tests/reproducers/simple/JSToJSet/resources/JSToJava_Set.js Mon Feb 09 16:38:45 2015 -0500 +++ b/tests/reproducers/simple/JSToJSet/resources/JSToJava_Set.js Mon Feb 09 16:44:15 2015 -0500 @@ -5,7 +5,8 @@ } function attemptSetTests() { - var urlArgs = document.URL.split("?"); + var decodedUrl = decodeURI(document.URL); + var urlArgs = decodedUrl.split("?"); var testParams = urlArgs[1].split(";"); var field = testParams[0]; var value = testParams[1]; @@ -26,7 +27,6 @@ if (field === "_JSObject") { value = new JSCar(100, "red"); } - } else if (value.indexOf('[') != -1) { var elem = value.substring(1); @@ -34,9 +34,9 @@ value[0] = elem; } - eval('applet.' + field + '= value'); + eval('applet.' + field + ' = value'); - // modifiing _intArray[0] into _intArray + // modifying _intArray[0] into _intArray // _DoubleArray[0] into _DoubleArray var nameEnd = field.indexOf('['); if (nameEnd != -1) {
--- a/tests/reproducers/simple/JSToJSet/testcases/JSToJSetTest.java Mon Feb 09 16:38:45 2015 -0500 +++ b/tests/reproducers/simple/JSToJSet/testcases/JSToJSetTest.java Mon Feb 09 16:44:15 2015 -0500 @@ -176,7 +176,6 @@ @Test @TestInBrowsers(testIn = { Browsers.all }) @NeedsDisplay - @KnownToFail @Bug(id = { "PR1298" }) public void AppletJSToJSet_intArrayElement_Test() throws Exception { jsToJavaSetSpecialTest("_intArray[0]", "1", TestType.ARRAY_ELEMENT);