/hg/rhino-tests: Updated four tests in InvocableClassTest for (O...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Thu May 30 01:14:30 PDT 2013
changeset 70224e9b40f2 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=70224e9b40f2
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Thu May 30 10:17:57 2013 +0200
Updated four tests in InvocableClassTest for (Open)JDK8 API:
getMethod, getMethods, getDeclaredMethod and getDeclaredMethods.
diffstat:
ChangeLog | 6 ++
src/org/RhinoTests/InvocableClassTest.java | 82 ++++++++++++++++++++++++++++-
2 files changed, 84 insertions(+), 4 deletions(-)
diffs (140 lines):
diff -r 08a0486c9c98 -r 70224e9b40f2 ChangeLog
--- a/ChangeLog Wed May 29 13:22:26 2013 +0200
+++ b/ChangeLog Thu May 30 10:17:57 2013 +0200
@@ -1,3 +1,9 @@
+2013-05-30 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * src/org/RhinoTests/InvocableClassTest.java:
+ Updated four tests in InvocableClassTest for (Open)JDK8 API:
+ getMethod, getMethods, getDeclaredMethod and getDeclaredMethods.
+
2013-05-29 Pavel Tisnovsky <ptisnovs at redhat.com>
* src/org/RhinoTests/CompiledScriptClassTest.java:
diff -r 08a0486c9c98 -r 70224e9b40f2 src/org/RhinoTests/InvocableClassTest.java
--- a/src/org/RhinoTests/InvocableClassTest.java Wed May 29 13:22:26 2013 +0200
+++ b/src/org/RhinoTests/InvocableClassTest.java Thu May 30 10:17:57 2013 +0200
@@ -613,6 +613,13 @@
"public abstract java.lang.Object javax.script.Invocable.invokeMethod(java.lang.Object,java.lang.String,java.lang.Object[]) throws javax.script.ScriptException,java.lang.NoSuchMethodException",
};
+ final String[] methodsThatShouldExist_jdk8 = {
+ "public abstract java.lang.Object javax.script.Invocable.getInterface(java.lang.Class)",
+ "public abstract java.lang.Object javax.script.Invocable.getInterface(java.lang.Object,java.lang.Class)",
+ "public abstract java.lang.Object javax.script.Invocable.invokeFunction(java.lang.String,java.lang.Object[]) throws javax.script.ScriptException,java.lang.NoSuchMethodException",
+ "public abstract java.lang.Object javax.script.Invocable.invokeMethod(java.lang.Object,java.lang.String,java.lang.Object[]) throws javax.script.ScriptException,java.lang.NoSuchMethodException",
+ };
+
// get all inherited methods
Method[] methods = this.invocableClass.getMethods();
// and transform the array into a list of method names
@@ -620,7 +627,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),
@@ -647,6 +667,13 @@
"public abstract java.lang.Object javax.script.Invocable.invokeMethod(java.lang.Object,java.lang.String,java.lang.Object[]) throws javax.script.ScriptException,java.lang.NoSuchMethodException",
};
+ final String[] declaredMethodsThatShouldExist_jdk8 = {
+ "public abstract java.lang.Object javax.script.Invocable.getInterface(java.lang.Class)",
+ "public abstract java.lang.Object javax.script.Invocable.getInterface(java.lang.Object,java.lang.Class)",
+ "public abstract java.lang.Object javax.script.Invocable.invokeFunction(java.lang.String,java.lang.Object[]) throws javax.script.ScriptException,java.lang.NoSuchMethodException",
+ "public abstract java.lang.Object javax.script.Invocable.invokeMethod(java.lang.Object,java.lang.String,java.lang.Object[]) throws javax.script.ScriptException,java.lang.NoSuchMethodException",
+ };
+
// get all declared methods
Method[] declaredMethods = this.invocableClass.getDeclaredMethods();
// and transform the array into a list of method names
@@ -654,7 +681,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),
@@ -679,7 +719,24 @@
methodsThatShouldExist_jdk7.put("getInterface", new Class[] {java.lang.Class.class});
methodsThatShouldExist_jdk7.put("invokeMethod", new Class[] {java.lang.Object.class, java.lang.String.class, Class.forName("[Ljava.lang.Object;")});
- Map<String, Class[]> methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7;
+ Map<String, Class[]> methodsThatShouldExist_jdk8 = new TreeMap<String, Class[]>();
+ methodsThatShouldExist_jdk8.put("invokeMethod", new Class[] {java.lang.Object.class, java.lang.String.class, Class.forName("[Ljava.lang.Object;")});
+ methodsThatShouldExist_jdk8.put("invokeFunction", new Class[] {java.lang.String.class, Class.forName("[Ljava.lang.Object;")});
+ methodsThatShouldExist_jdk8.put("getInterface", new Class[] {java.lang.Object.class, java.lang.Class.class});
+ methodsThatShouldExist_jdk8.put("getInterface", new Class[] {java.lang.Class.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()) {
@@ -717,7 +774,24 @@
methodsThatShouldExist_jdk7.put("getInterface", new Class[] {java.lang.Class.class});
methodsThatShouldExist_jdk7.put("invokeMethod", new Class[] {java.lang.Object.class, java.lang.String.class, Class.forName("[Ljava.lang.Object;")});
- Map<String, Class[]> methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7;
+ Map<String, Class[]> methodsThatShouldExist_jdk8 = new TreeMap<String, Class[]>();
+ methodsThatShouldExist_jdk8.put("invokeMethod", new Class[] {java.lang.Object.class, java.lang.String.class, Class.forName("[Ljava.lang.Object;")});
+ methodsThatShouldExist_jdk8.put("invokeFunction", new Class[] {java.lang.String.class, Class.forName("[Ljava.lang.Object;")});
+ methodsThatShouldExist_jdk8.put("getInterface", new Class[] {java.lang.Object.class, java.lang.Class.class});
+ methodsThatShouldExist_jdk8.put("getInterface", new Class[] {java.lang.Class.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