/hg/icedtea-web: Fix javascript url error in JSToJSet reproducer.

Mon Feb 9 22:03:17 UTC 2015

changeset 95c4a59a6b8d in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=95c4a59a6b8d
author: Jie Kang <jkang at redhat.com>
date: Mon Feb 09 16:44:15 2015 -0500

	Fix javascript url error in JSToJSet reproducer.

	2014-02-09  Jie Kang  <jkang at 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.


diffstat:

 ChangeLog                                                     |  10 ++++++++++
 tests/reproducers/simple/JSToJSet/resources/JSToJSet.html     |   7 ++++---
 tests/reproducers/simple/JSToJSet/resources/JSToJava_Set.js   |   8 ++++----
 tests/reproducers/simple/JSToJSet/testcases/JSToJSetTest.java |   1 -
 4 files changed, 18 insertions(+), 8 deletions(-)

diffs (78 lines):

diff -r dbe0614c2eca -r 95c4a59a6b8d ChangeLog

--- 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 at 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 at suse.com>
 
 	Removed bootstrap, made buildable with modular JDK
diff -r dbe0614c2eca -r 95c4a59a6b8d tests/reproducers/simple/JSToJSet/resources/JSToJSet.html
--- 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>
diff -r dbe0614c2eca -r 95c4a59a6b8d tests/reproducers/simple/JSToJSet/resources/JSToJava_Set.js
--- 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) {
diff -r dbe0614c2eca -r 95c4a59a6b8d tests/reproducers/simple/JSToJSet/testcases/JSToJSetTest.java
--- 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);
