/hg/icedtea-web: Refactor JS LiveConnect tests to avoid race con...
aazores at icedtea.classpath.org
aazores at icedtea.classpath.org
Thu Jun 19 18:36:00 UTC 2014
changeset e261b17f4afd in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=e261b17f4afd
author: Jie Kang <jkang at redhat.com>
date: Thu Jun 19 14:35:13 2014 -0400
Refactor JS LiveConnect tests to avoid race conditions
Passing and KnownToFail also updated
2014-06-19 Jie Kang <jkang at redhat.com>
Refactored Live-Connect (java-js) test cases to fix race condition between
JS and J-applet. Checked each test and marked tests known to fail
correctly. Removed and replaced deprecated code usage.
* tests/reproducers/simple/JSObjectFromEval/resources/JSObjectFromEval.html
* tests/reproducers/simple/JSObjectFromEval/resources/JSObjectFromEval.js
* tests/reproducers/simple/JSObjectWithoutToString/resources/JSObjectWithoutToString.html
* tests/reproducers/simple/JSObjectWithoutToString/resources/JSObjectWithoutToString.js
* tests/reproducers/simple/JSToJFuncParam/resources/JSToJFuncParam.html
* tests/reproducers/simple/JSToJFuncParam/resources/JSToJava_FuncParam.js
* tests/reproducers/simple/JSToJFuncParam/srcs/JSToJFuncParam.java
* tests/reproducers/simple/JSToJFuncParam/testcases/JSToJFuncParamTest.java
* tests/reproducers/simple/JSToJFuncResol/resources/JSToJFuncResol.html
* tests/reproducers/simple/JSToJFuncResol/resources/JSToJava_FuncResol.js
* tests/reproducers/simple/JSToJFuncResol/srcs/JSToJFuncResol.java
* tests/reproducers/simple/JSToJFuncResol/testcases/JSToJFuncResolTest.java
* tests/reproducers/simple/JSToJFuncReturn/resources/JSToJFuncReturn.html
* tests/reproducers/simple/JSToJFuncReturn/resources/JSToJava_FuncReturn.js
* tests/reproducers/simple/JSToJFuncReturn/srcs/JSToJFuncReturn.java
* tests/reproducers/simple/JSToJFuncReturn/testcases/JSToJFuncReturnTest.java
* tests/reproducers/simple/JSToJGet/resources/JSToJGet.html
* tests/reproducers/simple/JSToJGet/resources/JSToJ_auxiliary.js
* tests/reproducers/simple/JSToJGet/resources/JSToJava_Get.js
* tests/reproducers/simple/JSToJGet/srcs/JSToJGet.java
* tests/reproducers/simple/JSToJGet/testcases/JSToJGetTest.java
* tests/reproducers/simple/JSToJSet/resources/JSToJSet.html
* tests/reproducers/simple/JSToJSet/resources/JSToJava_Set.js
* tests/reproducers/simple/JSToJSet/srcs/JSToJSet.java
* tests/reproducers/simple/JSToJSet/testcases/JSToJSetTest.java
* tests/reproducers/simple/JSToJTypeConv/resources/JSToJTypeConv.html
* tests/reproducers/simple/JSToJTypeConv/resources/JSToJava_TypeConv.js
* tests/reproducers/simple/JToJSString/resources/JToJSString.html
* tests/reproducers/simple/JToJSString/resources/JToJSString.js
* tests/reproducers/simple/JToJSString/resources/JToJSStringJnlpApplet.html
* tests/reproducers/simple/JToJSString/resources/JSTest.js
* tests/reproducers/simple/JavascriptFuncParam/resources/JavascriptFuncParam.html
* tests/reproducers/simple/JavascriptFuncParam/srcs/JavascriptFuncParam.java
* tests/reproducers/simple/JavascriptFuncParam/testcases/JavascriptFuncParamTest.java
* tests/reproducers/simple/JavascriptFuncReturn/resources/JavascriptFuncReturn.html
* tests/reproducers/simple/JavascriptFuncReturn/srcs/JavascriptFuncReturn.java
* tests/reproducers/simple/JavascriptGet/resources/JavascriptGet.html
* tests/reproducers/simple/JavascriptGet/resources/Javascript_Get.js
* tests/reproducers/simple/JavascriptGet/srcs/JavascriptGet.java
* tests/reproducers/simple/JavascriptSet/resources/JavascriptSet.html
* tests/reproducers/simple/JavascriptSet/resources/Javascript_Set.js
* tests/reproducers/simple/JavascriptSet/srcs/JavascriptSet.java
* tests/reproducers/simple/JavascriptSet/testcases/JavascriptSetTest.java
* tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.html
* tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.js
* tests/reproducers/simple/JavascriptFuncReturn/resources/Javascript_FuncReturn.js
diffstat:
ChangeLog | 52 +
tests/reproducers/simple/JSObjectFromEval/resources/JSObjectFromEval.html | 25 +-
tests/reproducers/simple/JSObjectFromEval/resources/JSObjectFromEval.js | 37 +-
tests/reproducers/simple/JSObjectWithoutToString/resources/JSObjectWithoutToString.html | 32 +-
tests/reproducers/simple/JSObjectWithoutToString/resources/JSObjectWithoutToString.js | 6 +-
tests/reproducers/simple/JSToJFuncParam/resources/JSToJFuncParam.html | 30 +-
tests/reproducers/simple/JSToJFuncParam/resources/JSToJava_FuncParam.js | 13 +-
tests/reproducers/simple/JSToJFuncParam/srcs/JSToJFuncParam.java | 54 +-
tests/reproducers/simple/JSToJFuncParam/testcases/JSToJFuncParamTest.java | 32 +-
tests/reproducers/simple/JSToJFuncResol/resources/JSToJFuncResol.html | 32 +-
tests/reproducers/simple/JSToJFuncResol/resources/JSToJava_FuncResol.js | 6 +-
tests/reproducers/simple/JSToJFuncResol/srcs/JSToJFuncResol.java | 175 ++-
tests/reproducers/simple/JSToJFuncResol/testcases/JSToJFuncResolTest.java | 13 +-
tests/reproducers/simple/JSToJFuncReturn/resources/JSToJFuncReturn.html | 29 +-
tests/reproducers/simple/JSToJFuncReturn/resources/JSToJava_FuncReturn.js | 15 +-
tests/reproducers/simple/JSToJFuncReturn/srcs/JSToJFuncReturn.java | 26 +-
tests/reproducers/simple/JSToJFuncReturn/testcases/JSToJFuncReturnTest.java | 11 +-
tests/reproducers/simple/JSToJGet/resources/JSToJGet.html | 112 +--
tests/reproducers/simple/JSToJGet/resources/JSToJ_auxiliary.js | 6 +-
tests/reproducers/simple/JSToJGet/resources/JSToJava_Get.js | 422 +++++----
tests/reproducers/simple/JSToJGet/srcs/JSToJGet.java | 12 +-
tests/reproducers/simple/JSToJGet/testcases/JSToJGetTest.java | 28 +-
tests/reproducers/simple/JSToJSet/resources/JSToJSet.html | 28 +-
tests/reproducers/simple/JSToJSet/resources/JSToJava_Set.js | 38 +-
tests/reproducers/simple/JSToJSet/srcs/JSToJSet.java | 15 +-
tests/reproducers/simple/JSToJSet/testcases/JSToJSetTest.java | 60 +-
tests/reproducers/simple/JSToJTypeConv/resources/JSToJTypeConv.html | 12 +-
tests/reproducers/simple/JSToJTypeConv/resources/JSToJava_TypeConv.js | 4 +-
tests/reproducers/simple/JToJSString/resources/JSTest.js | 7 +
tests/reproducers/simple/JToJSString/resources/JToJSString.html | 7 +-
tests/reproducers/simple/JToJSString/resources/JToJSString.js | 36 +-
tests/reproducers/simple/JToJSString/resources/JToJSStringJnlpApplet.html | 7 +-
tests/reproducers/simple/JToJSString/srcs/JToJSString.java | 9 +-
tests/reproducers/simple/JavascriptFuncParam/resources/JavascriptFuncParam.html | 46 +-
tests/reproducers/simple/JavascriptFuncParam/resources/JavascriptFuncParam.js | 24 +
tests/reproducers/simple/JavascriptFuncParam/srcs/JavascriptFuncParam.java | 109 +-
tests/reproducers/simple/JavascriptFuncParam/testcases/JavascriptFuncParamTest.java | 1 -
tests/reproducers/simple/JavascriptFuncReturn/resources/JavascriptFuncReturn.html | 16 +-
tests/reproducers/simple/JavascriptFuncReturn/resources/JavascriptFuncReturn.jnlp | 22 +
tests/reproducers/simple/JavascriptFuncReturn/resources/JavascriptFuncReturn.js | 16 +
tests/reproducers/simple/JavascriptFuncReturn/srcs/JavascriptFuncReturn.java | 5 +
tests/reproducers/simple/JavascriptGet/resources/JavascriptGet.html | 29 +-
tests/reproducers/simple/JavascriptGet/resources/Javascript_Get.js | 13 +-
tests/reproducers/simple/JavascriptGet/srcs/JavascriptGet.java | 55 +-
tests/reproducers/simple/JavascriptSet/resources/JavascriptSet.html | 33 +-
tests/reproducers/simple/JavascriptSet/resources/Javascript_Set.js | 33 +-
tests/reproducers/simple/JavascriptSet/srcs/JavascriptSet.java | 64 +-
tests/reproducers/simple/JavascriptSet/testcases/JavascriptSetTest.java | 63 +-
tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.html | 18 +-
tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.js | 3 +-
50 files changed, 1021 insertions(+), 920 deletions(-)
diffs (truncated from 3535 to 500 lines):
diff -r cba0b900aa2b -r e261b17f4afd ChangeLog
--- a/ChangeLog Thu Jun 19 16:30:22 2014 +0200
+++ b/ChangeLog Thu Jun 19 14:35:13 2014 -0400
@@ -1,3 +1,55 @@
+2014-06-19 Jie Kang <jkang at redhat.com>
+
+ Refactored Live-Connect (java-js) test cases to fix race condition between
+ JS and J-applet. Checked each test and marked tests known to fail
+ correctly. Removed and replaced deprecated code usage.
+ * tests/reproducers/simple/JSObjectFromEval/resources/JSObjectFromEval.html
+ * tests/reproducers/simple/JSObjectFromEval/resources/JSObjectFromEval.js
+ * tests/reproducers/simple/JSObjectWithoutToString/resources/JSObjectWithoutToString.html
+ * tests/reproducers/simple/JSObjectWithoutToString/resources/JSObjectWithoutToString.js
+ * tests/reproducers/simple/JSToJFuncParam/resources/JSToJFuncParam.html
+ * tests/reproducers/simple/JSToJFuncParam/resources/JSToJava_FuncParam.js
+ * tests/reproducers/simple/JSToJFuncParam/srcs/JSToJFuncParam.java
+ * tests/reproducers/simple/JSToJFuncParam/testcases/JSToJFuncParamTest.java
+ * tests/reproducers/simple/JSToJFuncResol/resources/JSToJFuncResol.html
+ * tests/reproducers/simple/JSToJFuncResol/resources/JSToJava_FuncResol.js
+ * tests/reproducers/simple/JSToJFuncResol/srcs/JSToJFuncResol.java
+ * tests/reproducers/simple/JSToJFuncResol/testcases/JSToJFuncResolTest.java
+ * tests/reproducers/simple/JSToJFuncReturn/resources/JSToJFuncReturn.html
+ * tests/reproducers/simple/JSToJFuncReturn/resources/JSToJava_FuncReturn.js
+ * tests/reproducers/simple/JSToJFuncReturn/srcs/JSToJFuncReturn.java
+ * tests/reproducers/simple/JSToJFuncReturn/testcases/JSToJFuncReturnTest.java
+ * tests/reproducers/simple/JSToJGet/resources/JSToJGet.html
+ * tests/reproducers/simple/JSToJGet/resources/JSToJ_auxiliary.js
+ * tests/reproducers/simple/JSToJGet/resources/JSToJava_Get.js
+ * tests/reproducers/simple/JSToJGet/srcs/JSToJGet.java
+ * tests/reproducers/simple/JSToJGet/testcases/JSToJGetTest.java
+ * tests/reproducers/simple/JSToJSet/resources/JSToJSet.html
+ * tests/reproducers/simple/JSToJSet/resources/JSToJava_Set.js
+ * tests/reproducers/simple/JSToJSet/srcs/JSToJSet.java
+ * tests/reproducers/simple/JSToJSet/testcases/JSToJSetTest.java
+ * tests/reproducers/simple/JSToJTypeConv/resources/JSToJTypeConv.html
+ * tests/reproducers/simple/JSToJTypeConv/resources/JSToJava_TypeConv.js
+ * tests/reproducers/simple/JToJSString/resources/JToJSString.html
+ * tests/reproducers/simple/JToJSString/resources/JToJSString.js
+ * tests/reproducers/simple/JToJSString/resources/JToJSStringJnlpApplet.html
+ * tests/reproducers/simple/JToJSString/resources/JSTest.js
+ * tests/reproducers/simple/JavascriptFuncParam/resources/JavascriptFuncParam.html
+ * tests/reproducers/simple/JavascriptFuncParam/srcs/JavascriptFuncParam.java
+ * tests/reproducers/simple/JavascriptFuncParam/testcases/JavascriptFuncParamTest.java
+ * tests/reproducers/simple/JavascriptFuncReturn/resources/JavascriptFuncReturn.html
+ * tests/reproducers/simple/JavascriptFuncReturn/srcs/JavascriptFuncReturn.java
+ * tests/reproducers/simple/JavascriptGet/resources/JavascriptGet.html
+ * tests/reproducers/simple/JavascriptGet/resources/Javascript_Get.js
+ * tests/reproducers/simple/JavascriptGet/srcs/JavascriptGet.java
+ * tests/reproducers/simple/JavascriptSet/resources/JavascriptSet.html
+ * tests/reproducers/simple/JavascriptSet/resources/Javascript_Set.js
+ * tests/reproducers/simple/JavascriptSet/srcs/JavascriptSet.java
+ * tests/reproducers/simple/JavascriptSet/testcases/JavascriptSetTest.java
+ * tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.html
+ * tests/reproducers/simple/JavascriptURLProtocol/resources/JavascriptProtocol.js
+ * tests/reproducers/simple/JavascriptFuncReturn/resources/Javascript_FuncReturn.js
+
2014-06-19 Jiri Vanek <jvanek at redhat.com>
* NEWS: mentioned All JDKs ability, DE localization, JDK6 incompatibility
diff -r cba0b900aa2b -r e261b17f4afd tests/reproducers/simple/JSObjectFromEval/resources/JSObjectFromEval.html
--- a/tests/reproducers/simple/JSObjectFromEval/resources/JSObjectFromEval.html Thu Jun 19 16:30:22 2014 +0200
+++ b/tests/reproducers/simple/JSObjectFromEval/resources/JSObjectFromEval.html Thu Jun 19 14:35:13 2014 -0400
@@ -36,19 +36,12 @@
-->
<html>
- <head></head>
- <body>
- <applet
- id = "applet"
- code = "JSObjectFromEval.class"
- archive = "JSObjectFromEval.jar">
- </applet>
- <script type = "text/javascript"
- src = "JSObjectFromEval.js">
- </script>
-
- <script type = "text/javascript">
- testJSObjectFromEval();
- </script>
- </body>
-</html>
\ No newline at end of file
+<head>
+<script type="text/javascript" src="JSTest.js"></script>
+</head>
+<body>
+ <applet id="applet" code="JSObjectFromEval"
+ archive="JSObjectFromEval.jar"> </applet>
+ <script type="text/javascript" src="JSObjectFromEval.js"></script>
+</body>
+</html>
diff -r cba0b900aa2b -r e261b17f4afd tests/reproducers/simple/JSObjectFromEval/resources/JSObjectFromEval.js
--- a/tests/reproducers/simple/JSObjectFromEval/resources/JSObjectFromEval.js Thu Jun 19 16:30:22 2014 +0200
+++ b/tests/reproducers/simple/JSObjectFromEval/resources/JSObjectFromEval.js Thu Jun 19 14:35:13 2014 -0400
@@ -1,22 +1,23 @@
-function testJSObjectFromEval() {
- var applet = document.getElementById("applet");
- var obj;
-
- applet.output("*** Test JSObject from JS ***");
+function attemptJSObjectFromEvalTest() {
+ var obj;
- applet.output("JS create");
- obj = new Object();
- applet.output("Java set");
- applet.setJSMember(obj, "test", 0);
- applet.output("obj.test = " + obj.test);
+ applet.output("*** Test JSObject from JS ***");
- applet.output("*** Test JSObject from Java ***");
+ applet.output("JS create");
+ obj = new Object();
+ applet.output("Java set");
+ applet.setJSMember(obj, "test", 0);
+ applet.output("obj.test = " + obj.test);
- applet.output("Java create");
- obj = applet.newJSObject();
- applet.output("Java set");
- applet.setJSMember(obj, "test", 0);
- applet.output("obj.test = " + obj.test);
+ applet.output("*** Test JSObject from Java ***");
- applet.output("*** APPLET FINISHED ***"); //We're done here
-}
\ No newline at end of file
+ applet.output("Java create");
+ obj = applet.newJSObject();
+ applet.output("Java set");
+ applet.setJSMember(obj, "test", 0);
+ applet.output("obj.test = " + obj.test);
+
+ applet.output("*** APPLET FINISHED ***"); // We're done here
+}
+
+doTest(attemptJSObjectFromEvalTest, applet);
\ No newline at end of file
diff -r cba0b900aa2b -r e261b17f4afd tests/reproducers/simple/JSObjectWithoutToString/resources/JSObjectWithoutToString.html
--- a/tests/reproducers/simple/JSObjectWithoutToString/resources/JSObjectWithoutToString.html Thu Jun 19 16:30:22 2014 +0200
+++ b/tests/reproducers/simple/JSObjectWithoutToString/resources/JSObjectWithoutToString.html Thu Jun 19 14:35:13 2014 -0400
@@ -1,25 +1,23 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html lang="en-US">
- <head>
- <title>JavaScript to Java LiveConnect - Function return values from applet</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<head>
+<title>JavaScript to Java LiveConnect - Function return values
+ from applet</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<script type="text/javascript" src="JSTest.js"></script>
+</head>
+<body>
- <script language="JavaScript" src="JSObjectWithoutToString.js"></script>
+ <h2>The JSObjectWithoutToString html page</h2>
- </head>
- <body>
-
- <h2> The JSObjectWithoutToString html page</h2>
-
-
- <applet code="JSObjectWithoutToString" archive="JSObjectWithoutToString.jar" width="1000" height="100" id="jswithouttostring" MAYSCRIPT>
- </applet>
+ <div id="notice"></div>
+ <div id="failMessage"></div>
+ <applet code="JSObjectWithoutToString"
+ archive="JSObjectWithoutToString.jar" width="1000" height="100"
+ id="applet" MAYSCRIPT> </applet>
<div id="messageDiv"></div>
- <script laguage="javascript">
- doToStringTest();
- </script>
-
- </body>
+ <script type="text/javascript" src="JSObjectWithoutToString.js"></script>
+</body>
</html>
diff -r cba0b900aa2b -r e261b17f4afd tests/reproducers/simple/JSObjectWithoutToString/resources/JSObjectWithoutToString.js
--- a/tests/reproducers/simple/JSObjectWithoutToString/resources/JSObjectWithoutToString.js Thu Jun 19 16:30:22 2014 +0200
+++ b/tests/reproducers/simple/JSObjectWithoutToString/resources/JSObjectWithoutToString.js Thu Jun 19 14:35:13 2014 -0400
@@ -1,8 +1,6 @@
-function doToStringTest(){
- var applet = document.getElementById('jswithouttostring');
-
+function attemptToStringTest() {
var null_obj = Object.create(null);
-
applet.callJSToString(null_obj);
}
+doTest(attemptToStringTest, applet);
diff -r cba0b900aa2b -r e261b17f4afd tests/reproducers/simple/JSToJFuncParam/resources/JSToJFuncParam.html
--- a/tests/reproducers/simple/JSToJFuncParam/resources/JSToJFuncParam.html Thu Jun 19 16:30:22 2014 +0200
+++ b/tests/reproducers/simple/JSToJFuncParam/resources/JSToJFuncParam.html Thu Jun 19 14:35:13 2014 -0400
@@ -1,23 +1,23 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html lang="en-US">
- <head>
- <title>JavaScript to Java LiveConnect - function parameter conversion</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<head>
+<title>JavaScript to Java LiveConnect - function parameter
+ conversion</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<script type="text/javascript" src="JSTest.js"></script>
+</head>
+<body>
- <script language="JavaScript" src="JSToJava_FuncParam.js"></script>
+ <h2>The JSToJFuncParam html page</h2>
- </head>
- <body>
-
- <h2> The JSToJFuncParam html page</h2>
-
- <applet code="JSToJFuncParam" width="1000" height="100" name="JSToJFuncParam" id="jstojFuncParamApplet" MAYSCRIPT>
- <param name="jnlp_href" value="jstoj-funcparam.jnlp">
+ <div id="notice"></div>
+ <div id="failMessage"></div>
+ <applet code="JSToJFuncParam" width="1000" height="100"
+ name="JSToJFuncParam" id="applet" MAYSCRIPT>
+ <param name="jnlp_href" value="jstoj-funcparam.jnlp">
</applet>
- <script language="javascript">
- doFuncParamTests();
- </script>
+ <script type="text/javascript" src="JSToJava_FuncParam.js"></script>
- </body>
+</body>
</html>
diff -r cba0b900aa2b -r e261b17f4afd tests/reproducers/simple/JSToJFuncParam/resources/JSToJava_FuncParam.js
--- a/tests/reproducers/simple/JSToJFuncParam/resources/JSToJava_FuncParam.js Thu Jun 19 16:30:22 2014 +0200
+++ b/tests/reproducers/simple/JSToJFuncParam/resources/JSToJava_FuncParam.js Thu Jun 19 14:35:13 2014 -0400
@@ -1,18 +1,21 @@
//dummy javascript class whose instance is passed as JSObject parameter:
-function JSCar(mph,color){
+function JSCar(mph, color) {
this.mph = mph;
this.color = color;
}
-//the main routine used for all tests:
-function doFuncParamTests( ){
-
+// the main routine used for all tests:
+function attemptFuncParamTests() {
var urlArgs = document.URL.split("?");
var testParams = urlArgs[1].split(";");
- var applet = document.getElementById('jstojFuncParamApplet');
+
var func = testParams[0];
var value = decodeURIComponent(testParams[1]);
+ notice.innerHTML = notice.innerHTML + func + " " + value;
eval('applet.' + func + '(' + value + ')');
+
applet.writeAfterTest();
}
+
+doTest(attemptFuncParamTests, applet);
diff -r cba0b900aa2b -r e261b17f4afd tests/reproducers/simple/JSToJFuncParam/srcs/JSToJFuncParam.java
--- a/tests/reproducers/simple/JSToJFuncParam/srcs/JSToJFuncParam.java Thu Jun 19 16:30:22 2014 +0200
+++ b/tests/reproducers/simple/JSToJFuncParam/srcs/JSToJFuncParam.java Thu Jun 19 14:35:13 2014 -0400
@@ -10,88 +10,92 @@
}
public void intParam(int i) {
- System.out.println("intParam "+i);
+ System.out.println("intParam " + i);
}
public void doubleParam(double d) {
- System.out.println("doubleParam "+d);
+ System.out.println("doubleParam " + d);
}
public void floatParam(float f) {
- System.out.println("floatParam "+f);
+ System.out.println("floatParam " + f);
}
public void longParam(long l) {
- System.out.println("longParam "+l);
+ System.out.println("longParam " + l);
}
public void booleanParam(boolean b) {
- System.out.println("booleanParam "+b);
+ System.out.println("booleanParam " + b);
}
public void charParam(char c) {
- System.out.println("charParam "+c);
+ System.out.println("charParam " + c);
}
public void byteParam(byte b) {
- System.out.println("byteParam "+b);
+ System.out.println("byteParam " + b);
}
public void charArrayParam(char[] ca) {
- System.out.println("charArrayParam "+Arrays.toString(ca));
+ System.out.println("charArrayParam " + Arrays.toString(ca));
}
public void StringParam(String s) {
- System.out.println("StringParam "+s);
+ System.out.println("StringParam " + s);
}
public void IntegerParam(Integer p) {
- System.out.println("IntegerParam "+p);
+ System.out.println("IntegerParam " + p);
}
public void DoubleParam(Double p) {
- System.out.println("DoubleParam "+p);
+ System.out.println("DoubleParam " + p);
}
public void FloatParam(Float p) {
- System.out.println("FloatParam "+p);
+ System.out.println("FloatParam " + p);
}
public void LongParam(Long p) {
- System.out.println("LongParam "+p);
+ System.out.println("LongParam " + p);
}
public void BooleanParam(Boolean p) {
- System.out.println("BooleanParam "+p);
+ System.out.println("BooleanParam " + p);
}
public void CharacterParam(Character p) {
- System.out.println("CharacterParam "+p);
+ System.out.println("CharacterParam " + p);
}
public void ByteParam(Byte p) {
- System.out.println("ByteParam "+p);
+ System.out.println("ByteParam " + p);
}
public void StringIntMixedParam(String[] s) {
- System.out.println("StringIntMixedParam "+Arrays.toString(s));
+ System.out.println("StringIntMixedParam " + Arrays.toString(s));
}
public void DummyObjectArrayParam(DummyObject[] ca) {
- System.out.println("DummyObjectArrayParam "+Arrays.toString(ca));
+ System.out.println("DummyObjectArrayParam " + Arrays.toString(ca));
}
- public void JSObjectParam(JSObject car){
- Integer mph = (Integer)car.getMember("mph");
- String color = (String)car.getMember("color");
+ public void JSObjectParam(JSObject car) {
+ Integer mph = (Integer) car.getMember("mph");
+ String color = (String) car.getMember("color");
- System.out.println("JSObjectParam "+mph+", "+color);
+ System.out.println("JSObjectParam " + mph + ", " + color);
}
- public void writeAfterTest(){
+ public void writeAfterTest() {
System.out.println("afterTests");
}
+ public void readFromJS(String message) {
+ System.out.println(message);
+ }
+
public class DummyObject {
private String str;
@@ -104,11 +108,11 @@
}
public String toString() {
- return str;
+ return str;
}
}
- public DummyObject getNewDummyObject(String str){
+ public DummyObject getNewDummyObject(String str) {
return new DummyObject(str);
}
}
diff -r cba0b900aa2b -r e261b17f4afd tests/reproducers/simple/JSToJFuncParam/testcases/JSToJFuncParamTest.java
--- a/tests/reproducers/simple/JSToJFuncParam/testcases/JSToJFuncParamTest.java Thu Jun 19 16:30:22 2014 +0200
+++ b/tests/reproducers/simple/JSToJFuncParam/testcases/JSToJFuncParamTest.java Thu Jun 19 14:35:13 2014 -0400
@@ -40,15 +40,16 @@
import net.sourceforge.jnlp.browsertesting.BrowserTest;
import net.sourceforge.jnlp.browsertesting.Browsers;
import net.sourceforge.jnlp.closinglisteners.CountingClosingListener;
+import net.sourceforge.jnlp.annotations.KnownToFail;
import net.sourceforge.jnlp.annotations.NeedsDisplay;
import net.sourceforge.jnlp.annotations.TestInBrowsers;
+
import org.junit.Assert;
-
import org.junit.Test;
public class JSToJFuncParamTest extends BrowserTest {
- //the JS<->J tests tend to make Opera unusable
+ // the JS<->J tests tend to make Opera unusable
public final boolean doNotRunInOpera = true;
private final String initStr = "JSToJFuncParam applet initialized.";
@@ -56,26 +57,25 @@
private class CountingClosingListenerImpl extends CountingClosingListener {
- @Override
- protected boolean isAlowedToFinish(String s) {
- return (s.contains(initStr) && s.contains(afterStr));
- }
+ @Override
+ protected boolean isAlowedToFinish(String s) {
+ return (s.contains(initStr) && s.contains(afterStr));
+ }
}
private void evaluateStdoutContents(String expectedStdout, ProcessResult pr) {
// Assert that the applet was initialized.
- Assert.assertTrue("JSToJFuncParam: the stdout should contain " + initStr
- + ", but it didnt.", pr.stdout.contains(initStr));
+ Assert.assertTrue("JSToJFuncParam: the stdout should contain " + initStr + ", but it didnt.", pr.stdout.contains(initStr));
// Assert that the values set by JavaScript are ok
- Assert.assertTrue("JSToJFuncParam: the output should include: "+expectedStdout+", but it didnt.", pr.stdout.contains(expectedStdout));
+ Assert.assertTrue("JSToJFuncParam: the output should include: " + expectedStdout + ", but it didnt.", pr.stdout.contains(expectedStdout));
}
private void jsToJavaFuncParamTest(String funcStr, String paramStr, String expectedVal) throws Exception {
- if( doNotRunInOpera){
- if(server.getCurrentBrowser().getID() == Browsers.opera){
+ if (doNotRunInOpera) {
+ if (server.getCurrentBrowser().getID() == Browsers.opera) {
return;
}
}
@@ -166,13 +166,16 @@
@Test
@TestInBrowsers(testIn = { Browsers.all })
@NeedsDisplay
+ @KnownToFail
public void AppletJSToJFuncParam_Float_Test() throws Exception {
jsToJavaFuncParamTest("FloatParam", "1.1", "1.1");
}
+ //
@Test
@TestInBrowsers(testIn = { Browsers.all })
@NeedsDisplay
+ @KnownToFail
public void AppletJSToJFuncParam_Long_Test() throws Exception {
jsToJavaFuncParamTest("LongParam", "10000", "10000");
}
@@ -194,6 +197,7 @@
@Test
@TestInBrowsers(testIn = { Browsers.all })
@NeedsDisplay
+ @KnownToFail
public void AppletJSToJFuncParam_Byte_Test() throws Exception {
jsToJavaFuncParamTest("ByteParam", "10", "10");
}
@@ -223,14 +227,14 @@
@TestInBrowsers(testIn = { Browsers.all })
@NeedsDisplay
public void AppletJSToJFuncParam_booleanFalseStr_Test() throws Exception {
- jsToJavaFuncParamTest("booleanParam", "false", "true");
+ jsToJavaFuncParamTest("booleanParam", "false", "false");
}
+ //
@Test
@TestInBrowsers(testIn = { Browsers.all })
@NeedsDisplay
public void AppletJSToJFuncParam_BooleanFalseStr_Test() throws Exception {
- jsToJavaFuncParamTest("BooleanParam", "false", "true");
+ jsToJavaFuncParamTest("BooleanParam", "false", "false");
}
More information about the distro-pkg-dev
mailing list