/hg/rhino-tests: Updated four tests in ScriptEngineManagerClassT...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Thu Jun 13 05:17:34 PDT 2013
changeset 7bd1fe8fb827 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=7bd1fe8fb827
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Thu Jun 13 14:21:04 2013 +0200
Updated four tests in ScriptEngineManagerClassTest for (Open)JDK8 API:
getMethod, getMethods, getDeclaredMethod and getDeclaredMethods.
diffstat:
ChangeLog | 6 +
src/org/RhinoTests/ScriptEngineManagerClassTest.java | 140 ++++++++++++++++++-
2 files changed, 142 insertions(+), 4 deletions(-)
diffs (198 lines):
diff -r ff30b92ad88a -r 7bd1fe8fb827 ChangeLog
--- a/ChangeLog Tue Jun 11 12:45:16 2013 +0200
+++ b/ChangeLog Thu Jun 13 14:21:04 2013 +0200
@@ -1,3 +1,9 @@
+2013-06-13 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * src/org/RhinoTests/ScriptEngineManagerClassTest.java:
+ Updated four tests in ScriptEngineManagerClassTest for (Open)JDK8 API:
+ getMethod, getMethods, getDeclaredMethod and getDeclaredMethods.
+
2013-06-11 Pavel Tisnovsky <ptisnovs at redhat.com>
* src/org/RhinoTests/ScriptEngineManagerClassTest.java:
diff -r ff30b92ad88a -r 7bd1fe8fb827 src/org/RhinoTests/ScriptEngineManagerClassTest.java
--- a/src/org/RhinoTests/ScriptEngineManagerClassTest.java Tue Jun 11 12:45:16 2013 +0200
+++ b/src/org/RhinoTests/ScriptEngineManagerClassTest.java Thu Jun 13 14:21:04 2013 +0200
@@ -722,6 +722,29 @@
"public void javax.script.ScriptEngineManager.setBindings(javax.script.Bindings)",
};
+ final String[] methodsThatShouldExist_jdk8 = {
+ "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.ScriptEngineManager.get(java.lang.String)",
+ "public java.lang.String java.lang.Object.toString()",
+ "public java.util.List javax.script.ScriptEngineManager.getEngineFactories()",
+ "public javax.script.Bindings javax.script.ScriptEngineManager.getBindings()",
+ "public javax.script.ScriptEngine javax.script.ScriptEngineManager.getEngineByExtension(java.lang.String)",
+ "public javax.script.ScriptEngine javax.script.ScriptEngineManager.getEngineByMimeType(java.lang.String)",
+ "public javax.script.ScriptEngine javax.script.ScriptEngineManager.getEngineByName(java.lang.String)",
+ "public native int java.lang.Object.hashCode()",
+ "public void javax.script.ScriptEngineManager.put(java.lang.String,java.lang.Object)",
+ "public void javax.script.ScriptEngineManager.registerEngineExtension(java.lang.String,javax.script.ScriptEngineFactory)",
+ "public void javax.script.ScriptEngineManager.registerEngineMimeType(java.lang.String,javax.script.ScriptEngineFactory)",
+ "public void javax.script.ScriptEngineManager.registerEngineName(java.lang.String,javax.script.ScriptEngineFactory)",
+ "public void javax.script.ScriptEngineManager.setBindings(javax.script.Bindings)",
+ };
+
// get all inherited methods
Method[] methods = this.scriptEngineManagerClass.getMethods();
// and transform the array into a list of method names
@@ -729,7 +752,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),
@@ -782,6 +818,26 @@
"static void javax.script.ScriptEngineManager.access$000(javax.script.ScriptEngineManager,java.lang.ClassLoader)",
};
+ final String[] declaredMethodsThatShouldExist_jdk8 = {
+ "private boolean javax.script.ScriptEngineManager.canCallerAccessLoader(java.lang.ClassLoader)",
+ "private boolean javax.script.ScriptEngineManager.isAncestor(java.lang.ClassLoader,java.lang.ClassLoader)",
+ "private java.lang.ClassLoader javax.script.ScriptEngineManager.getCallerClassLoader()",
+ "private void javax.script.ScriptEngineManager.init(java.lang.ClassLoader)",
+ "private void javax.script.ScriptEngineManager.initEngines(java.lang.ClassLoader)",
+ "public java.lang.Object javax.script.ScriptEngineManager.get(java.lang.String)",
+ "public java.util.List javax.script.ScriptEngineManager.getEngineFactories()",
+ "public javax.script.Bindings javax.script.ScriptEngineManager.getBindings()",
+ "public javax.script.ScriptEngine javax.script.ScriptEngineManager.getEngineByExtension(java.lang.String)",
+ "public javax.script.ScriptEngine javax.script.ScriptEngineManager.getEngineByMimeType(java.lang.String)",
+ "public javax.script.ScriptEngine javax.script.ScriptEngineManager.getEngineByName(java.lang.String)",
+ "public void javax.script.ScriptEngineManager.put(java.lang.String,java.lang.Object)",
+ "public void javax.script.ScriptEngineManager.registerEngineExtension(java.lang.String,javax.script.ScriptEngineFactory)",
+ "public void javax.script.ScriptEngineManager.registerEngineMimeType(java.lang.String,javax.script.ScriptEngineFactory)",
+ "public void javax.script.ScriptEngineManager.registerEngineName(java.lang.String,javax.script.ScriptEngineFactory)",
+ "public void javax.script.ScriptEngineManager.setBindings(javax.script.Bindings)",
+ "static void javax.script.ScriptEngineManager.access$000(javax.script.ScriptEngineManager,java.lang.ClassLoader)",
+ };
+
// get all declared methods
Method[] declaredMethods = this.scriptEngineManagerClass.getDeclaredMethods();
// and transform the array into a list of method names
@@ -789,7 +845,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),
@@ -846,7 +915,40 @@
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("setBindings", new Class[] {javax.script.Bindings.class});
+ methodsThatShouldExist_jdk8.put("getBindings", new Class[] {});
+ methodsThatShouldExist_jdk8.put("getEngineByName", new Class[] {java.lang.String.class});
+ methodsThatShouldExist_jdk8.put("getEngineByExtension", new Class[] {java.lang.String.class});
+ methodsThatShouldExist_jdk8.put("getEngineByMimeType", new Class[] {java.lang.String.class});
+ methodsThatShouldExist_jdk8.put("getEngineFactories", new Class[] {});
+ methodsThatShouldExist_jdk8.put("registerEngineName", new Class[] {java.lang.String.class, javax.script.ScriptEngineFactory.class});
+ methodsThatShouldExist_jdk8.put("registerEngineMimeType", new Class[] {java.lang.String.class, javax.script.ScriptEngineFactory.class});
+ methodsThatShouldExist_jdk8.put("registerEngineExtension", new Class[] {java.lang.String.class, javax.script.ScriptEngineFactory.class});
+ methodsThatShouldExist_jdk8.put("get", new Class[] {java.lang.String.class});
+ methodsThatShouldExist_jdk8.put("put", new Class[] {java.lang.String.class, java.lang.Object.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()) {
@@ -910,7 +1012,37 @@
methodsThatShouldExist_jdk7.put("registerEngineMimeType", new Class[] {java.lang.String.class, javax.script.ScriptEngineFactory.class});
methodsThatShouldExist_jdk7.put("registerEngineName", new Class[] {java.lang.String.class, javax.script.ScriptEngineFactory.class});
- Map<String, Class[]> methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7;
+ Map<String, Class[]> methodsThatShouldExist_jdk8 = new TreeMap<String, Class[]>();
+ methodsThatShouldExist_jdk8.put("setBindings", new Class[] {javax.script.Bindings.class});
+ methodsThatShouldExist_jdk8.put("getBindings", new Class[] {});
+ methodsThatShouldExist_jdk8.put("initEngines", new Class[] {java.lang.ClassLoader.class});
+ methodsThatShouldExist_jdk8.put("getEngineByName", new Class[] {java.lang.String.class});
+ methodsThatShouldExist_jdk8.put("getEngineByExtension", new Class[] {java.lang.String.class});
+ methodsThatShouldExist_jdk8.put("getEngineByMimeType", new Class[] {java.lang.String.class});
+ methodsThatShouldExist_jdk8.put("getEngineFactories", new Class[] {});
+ methodsThatShouldExist_jdk8.put("registerEngineName", new Class[] {java.lang.String.class, javax.script.ScriptEngineFactory.class});
+ methodsThatShouldExist_jdk8.put("registerEngineMimeType", new Class[] {java.lang.String.class, javax.script.ScriptEngineFactory.class});
+ methodsThatShouldExist_jdk8.put("registerEngineExtension", new Class[] {java.lang.String.class, javax.script.ScriptEngineFactory.class});
+ methodsThatShouldExist_jdk8.put("canCallerAccessLoader", new Class[] {java.lang.ClassLoader.class});
+ methodsThatShouldExist_jdk8.put("get", new Class[] {java.lang.String.class});
+ methodsThatShouldExist_jdk8.put("put", new Class[] {java.lang.String.class, java.lang.Object.class});
+ methodsThatShouldExist_jdk8.put("getCallerClassLoader", new Class[] {});
+ methodsThatShouldExist_jdk8.put("isAncestor", new Class[] {java.lang.ClassLoader.class, java.lang.ClassLoader.class});
+ methodsThatShouldExist_jdk8.put("access$000", new Class[] {javax.script.ScriptEngineManager.class, java.lang.ClassLoader.class});
+ methodsThatShouldExist_jdk8.put("init", new Class[] {java.lang.ClassLoader.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