/hg/rhino-tests: Updated four tests in CompiledScriptClassTest f...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Tue May 14 02:06:29 PDT 2013
changeset deea398a4d3c in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=deea398a4d3c
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Tue May 14 11:09:57 2013 +0200
Updated four tests in CompiledScriptClassTest for (Open)JDK8 API:
getMethod, getDeclaredMethod, getMethods and getDeclaredMethods.
diffstat:
ChangeLog | 6 +
src/org/RhinoTests/CompiledScriptClassTest.java | 100 +++++++++++++++++++++++-
2 files changed, 102 insertions(+), 4 deletions(-)
diffs (158 lines):
diff -r a572cad21e85 -r deea398a4d3c ChangeLog
--- a/ChangeLog Mon May 13 09:38:58 2013 +0200
+++ b/ChangeLog Tue May 14 11:09:57 2013 +0200
@@ -1,3 +1,9 @@
+2013-05-14 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * src/org/RhinoTests/CompiledScriptClassTest.java:
+ Updated four tests in CompiledScriptClassTest for (Open)JDK8 API:
+ getMethod, getDeclaredMethod, getMethods and getDeclaredMethods.
+
2013-05-13 Pavel Tisnovsky <ptisnovs at redhat.com>
* src/org/RhinoTests/BindingsClassTest.java:
diff -r a572cad21e85 -r deea398a4d3c src/org/RhinoTests/CompiledScriptClassTest.java
--- a/src/org/RhinoTests/CompiledScriptClassTest.java Mon May 13 09:38:58 2013 +0200
+++ b/src/org/RhinoTests/CompiledScriptClassTest.java Tue May 14 11:09:57 2013 +0200
@@ -714,6 +714,22 @@
"public native int java.lang.Object.hashCode()",
};
+ final String[] methodsThatShouldExist_jdk8 = {
+ "public abstract java.lang.Object javax.script.CompiledScript.eval(javax.script.ScriptContext) throws javax.script.ScriptException",
+ "public abstract javax.script.ScriptEngine javax.script.CompiledScript.getEngine()",
+ "public boolean java.lang.Object.equals(java.lang.Object)",
+ "public final native java.lang.Class java.lang.Object.getClass()",
+ "public final native void java.lang.Object.notify()",
+ "public final native void java.lang.Object.notifyAll()",
+ "public final native void java.lang.Object.wait(long) throws java.lang.InterruptedException",
+ "public final void java.lang.Object.wait() throws java.lang.InterruptedException",
+ "public final void java.lang.Object.wait(long,int) throws java.lang.InterruptedException",
+ "public java.lang.Object javax.script.CompiledScript.eval() throws javax.script.ScriptException",
+ "public java.lang.Object javax.script.CompiledScript.eval(javax.script.Bindings) throws javax.script.ScriptException",
+ "public java.lang.String java.lang.Object.toString()",
+ "public native int java.lang.Object.hashCode()",
+ };
+
// get all inherited methods
Method[] methods = this.compiledScriptClass.getMethods();
// and transform the array into a list of method names
@@ -721,7 +737,20 @@
for (Method method : methods) {
methodsAsString.add(method.toString());
}
- String[] methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7;
+
+ String[] methodsThatShouldExist = null;
+ switch (getJavaVersion()) {
+ case 6:
+ methodsThatShouldExist = methodsThatShouldExist_jdk6;
+ break;
+ case 7:
+ methodsThatShouldExist = methodsThatShouldExist_jdk7;
+ break;
+ case 8:
+ methodsThatShouldExist = methodsThatShouldExist_jdk8;
+ break;
+ }
+
// check if all required methods really exists
for (String methodThatShouldExists : methodsThatShouldExist) {
assertTrue(methodsAsString.contains(methodThatShouldExists),
@@ -748,6 +777,13 @@
"public java.lang.Object javax.script.CompiledScript.eval(javax.script.Bindings) throws javax.script.ScriptException",
};
+ final String[] declaredMethodsThatShouldExist_jdk8 = {
+ "public abstract java.lang.Object javax.script.CompiledScript.eval(javax.script.ScriptContext) throws javax.script.ScriptException",
+ "public abstract javax.script.ScriptEngine javax.script.CompiledScript.getEngine()",
+ "public java.lang.Object javax.script.CompiledScript.eval() throws javax.script.ScriptException",
+ "public java.lang.Object javax.script.CompiledScript.eval(javax.script.Bindings) throws javax.script.ScriptException",
+ };
+
// get all declared methods
Method[] declaredMethods = this.compiledScriptClass.getDeclaredMethods();
// and transform the array into a list of method names
@@ -755,7 +791,20 @@
for (Method method : declaredMethods) {
methodsAsString.add(method.toString());
}
- String[] declaredMethodsThatShouldExist = getJavaVersion() < 7 ? declaredMethodsThatShouldExist_jdk6 : declaredMethodsThatShouldExist_jdk7;
+
+ String[] declaredMethodsThatShouldExist = null;
+ switch (getJavaVersion()) {
+ case 6:
+ declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk6;
+ break;
+ case 7:
+ declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk7;
+ break;
+ case 8:
+ declaredMethodsThatShouldExist = declaredMethodsThatShouldExist_jdk8;
+ break;
+ }
+
// check if all required methods really exists
for (String methodThatShouldExists : declaredMethodsThatShouldExist) {
assertTrue(methodsAsString.contains(methodThatShouldExists),
@@ -798,7 +847,33 @@
methodsThatShouldExist_jdk7.put("notify", new Class[] {});
methodsThatShouldExist_jdk7.put("notifyAll", new Class[] {});
- Map<String, Class[]> methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7;
+ Map<String, Class[]> methodsThatShouldExist_jdk8 = new TreeMap<String, Class[]>();
+ methodsThatShouldExist_jdk8.put("eval", new Class[] {javax.script.Bindings.class});
+ methodsThatShouldExist_jdk8.put("eval", new Class[] {javax.script.ScriptContext.class});
+ methodsThatShouldExist_jdk8.put("eval", new Class[] {});
+ methodsThatShouldExist_jdk8.put("getEngine", new Class[] {});
+ methodsThatShouldExist_jdk8.put("wait", new Class[] {long.class, int.class});
+ methodsThatShouldExist_jdk8.put("wait", new Class[] {long.class});
+ methodsThatShouldExist_jdk8.put("wait", new Class[] {});
+ methodsThatShouldExist_jdk8.put("equals", new Class[] {java.lang.Object.class});
+ methodsThatShouldExist_jdk8.put("toString", new Class[] {});
+ methodsThatShouldExist_jdk8.put("hashCode", new Class[] {});
+ methodsThatShouldExist_jdk8.put("getClass", new Class[] {});
+ methodsThatShouldExist_jdk8.put("notify", new Class[] {});
+ methodsThatShouldExist_jdk8.put("notifyAll", new Class[] {});
+
+ Map<String, Class[]> methodsThatShouldExist = null;
+ switch (getJavaVersion()) {
+ case 6:
+ methodsThatShouldExist = methodsThatShouldExist_jdk6;
+ break;
+ case 7:
+ methodsThatShouldExist = methodsThatShouldExist_jdk7;
+ break;
+ case 8:
+ methodsThatShouldExist = methodsThatShouldExist_jdk8;
+ break;
+ }
// check if all required methods really exist
for (Map.Entry<String, Class[]> methodThatShouldExists : methodsThatShouldExist.entrySet()) {
@@ -836,7 +911,24 @@
methodsThatShouldExist_jdk7.put("eval", new Class[] {javax.script.ScriptContext.class});
methodsThatShouldExist_jdk7.put("getEngine", new Class[] {});
- Map<String, Class[]> methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7;
+ Map<String, Class[]> methodsThatShouldExist_jdk8 = new TreeMap<String, Class[]>();
+ methodsThatShouldExist_jdk8.put("eval", new Class[] {javax.script.Bindings.class});
+ methodsThatShouldExist_jdk8.put("eval", new Class[] {javax.script.ScriptContext.class});
+ methodsThatShouldExist_jdk8.put("eval", new Class[] {});
+ methodsThatShouldExist_jdk8.put("getEngine", new Class[] {});
+
+ Map<String, Class[]> methodsThatShouldExist = null;
+ switch (getJavaVersion()) {
+ case 6:
+ methodsThatShouldExist = methodsThatShouldExist_jdk6;
+ break;
+ case 7:
+ methodsThatShouldExist = methodsThatShouldExist_jdk7;
+ break;
+ case 8:
+ methodsThatShouldExist = methodsThatShouldExist_jdk8;
+ break;
+ }
// check if all required methods really exist
for (Map.Entry<String, Class[]> methodThatShouldExists : methodsThatShouldExist.entrySet()) {
More information about the distro-pkg-dev
mailing list