/hg/rhino-tests: Updated four tests in ScriptEngineClassTest for...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Fri Jun 7 04:35:15 PDT 2013
changeset 7a2365e86a6d in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=7a2365e86a6d
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Fri Jun 07 13:38:43 2013 +0200
Updated four tests in ScriptEngineClassTest for (Open)JDK8 API:
getMethod, getMethods, getDeclaredMethod and getDeclaredMethods.
diffstat:
ChangeLog | 6 +
src/org/RhinoTests/ScriptEngineClassTest.java | 122 +++++++++++++++++++++++++-
2 files changed, 124 insertions(+), 4 deletions(-)
diffs (180 lines):
diff -r 55a3c2780d77 -r 7a2365e86a6d ChangeLog
--- a/ChangeLog Thu Jun 06 09:40:50 2013 +0200
+++ b/ChangeLog Fri Jun 07 13:38:43 2013 +0200
@@ -1,3 +1,9 @@
+2013-06-07 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * src/org/RhinoTests/ScriptEngineClassTest.java:
+ Updated four tests in ScriptEngineClassTest for (Open)JDK8 API:
+ getMethod, getMethods, getDeclaredMethod and getDeclaredMethods.
+
2013-06-06 Pavel Tisnovsky <ptisnovs at redhat.com>
* src/org/RhinoTests/ScriptEngineClassTest.java:
diff -r 55a3c2780d77 -r 7a2365e86a6d src/org/RhinoTests/ScriptEngineClassTest.java
--- a/src/org/RhinoTests/ScriptEngineClassTest.java Thu Jun 06 09:40:50 2013 +0200
+++ b/src/org/RhinoTests/ScriptEngineClassTest.java Fri Jun 07 13:38:43 2013 +0200
@@ -717,6 +717,23 @@
"public abstract void javax.script.ScriptEngine.setContext(javax.script.ScriptContext)",
};
+ final String[] methodsThatShouldExist_jdk8 = {
+ "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.io.Reader) throws javax.script.ScriptException",
+ "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.io.Reader,javax.script.Bindings) throws javax.script.ScriptException",
+ "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.io.Reader,javax.script.ScriptContext) throws javax.script.ScriptException",
+ "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.lang.String) throws javax.script.ScriptException",
+ "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.lang.String,javax.script.Bindings) throws javax.script.ScriptException",
+ "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.lang.String,javax.script.ScriptContext) throws javax.script.ScriptException",
+ "public abstract java.lang.Object javax.script.ScriptEngine.get(java.lang.String)",
+ "public abstract javax.script.Bindings javax.script.ScriptEngine.createBindings()",
+ "public abstract javax.script.Bindings javax.script.ScriptEngine.getBindings(int)",
+ "public abstract javax.script.ScriptContext javax.script.ScriptEngine.getContext()",
+ "public abstract javax.script.ScriptEngineFactory javax.script.ScriptEngine.getFactory()",
+ "public abstract void javax.script.ScriptEngine.put(java.lang.String,java.lang.Object)",
+ "public abstract void javax.script.ScriptEngine.setBindings(javax.script.Bindings,int)",
+ "public abstract void javax.script.ScriptEngine.setContext(javax.script.ScriptContext)",
+ };
+
// get all inherited methods
Method[] methods = this.scriptEngineClass.getMethods();
// and transform the array into a list of method names
@@ -724,7 +741,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),
@@ -771,6 +801,23 @@
"public abstract void javax.script.ScriptEngine.setContext(javax.script.ScriptContext)",
};
+ final String[] declaredMethodsThatShouldExist_jdk8 = {
+ "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.io.Reader) throws javax.script.ScriptException",
+ "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.io.Reader,javax.script.Bindings) throws javax.script.ScriptException",
+ "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.io.Reader,javax.script.ScriptContext) throws javax.script.ScriptException",
+ "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.lang.String) throws javax.script.ScriptException",
+ "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.lang.String,javax.script.Bindings) throws javax.script.ScriptException",
+ "public abstract java.lang.Object javax.script.ScriptEngine.eval(java.lang.String,javax.script.ScriptContext) throws javax.script.ScriptException",
+ "public abstract java.lang.Object javax.script.ScriptEngine.get(java.lang.String)",
+ "public abstract javax.script.Bindings javax.script.ScriptEngine.createBindings()",
+ "public abstract javax.script.Bindings javax.script.ScriptEngine.getBindings(int)",
+ "public abstract javax.script.ScriptContext javax.script.ScriptEngine.getContext()",
+ "public abstract javax.script.ScriptEngineFactory javax.script.ScriptEngine.getFactory()",
+ "public abstract void javax.script.ScriptEngine.put(java.lang.String,java.lang.Object)",
+ "public abstract void javax.script.ScriptEngine.setBindings(javax.script.Bindings,int)",
+ "public abstract void javax.script.ScriptEngine.setContext(javax.script.ScriptContext)",
+ };
+
// get all declared methods
Method[] declaredMethods = this.scriptEngineClass.getDeclaredMethods();
// and transform the array into a list of method names
@@ -778,7 +825,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),
@@ -823,7 +883,34 @@
methodsThatShouldExist_jdk7.put("createBindings", new Class[] {});
methodsThatShouldExist_jdk7.put("setContext", new Class[] {javax.script.ScriptContext.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[] {java.io.Reader.class, javax.script.Bindings.class});
+ methodsThatShouldExist_jdk8.put("eval", new Class[] {java.lang.String.class, javax.script.Bindings.class});
+ methodsThatShouldExist_jdk8.put("eval", new Class[] {java.io.Reader.class});
+ methodsThatShouldExist_jdk8.put("eval", new Class[] {java.lang.String.class, javax.script.ScriptContext.class});
+ methodsThatShouldExist_jdk8.put("eval", new Class[] {java.io.Reader.class, javax.script.ScriptContext.class});
+ methodsThatShouldExist_jdk8.put("eval", new Class[] {java.lang.String.class});
+ methodsThatShouldExist_jdk8.put("setBindings", new Class[] {javax.script.Bindings.class, int.class});
+ methodsThatShouldExist_jdk8.put("getBindings", new Class[] {int.class});
+ methodsThatShouldExist_jdk8.put("createBindings", new Class[] {});
+ methodsThatShouldExist_jdk8.put("setContext", new Class[] {javax.script.ScriptContext.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("getFactory", new Class[] {});
+ methodsThatShouldExist_jdk8.put("getContext", 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()) {
@@ -881,7 +968,34 @@
methodsThatShouldExist_jdk7.put("createBindings", new Class[] {});
methodsThatShouldExist_jdk7.put("setContext", new Class[] {javax.script.ScriptContext.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[] {java.io.Reader.class, javax.script.Bindings.class});
+ methodsThatShouldExist_jdk8.put("eval", new Class[] {java.lang.String.class, javax.script.Bindings.class});
+ methodsThatShouldExist_jdk8.put("eval", new Class[] {java.io.Reader.class});
+ methodsThatShouldExist_jdk8.put("eval", new Class[] {java.lang.String.class, javax.script.ScriptContext.class});
+ methodsThatShouldExist_jdk8.put("eval", new Class[] {java.io.Reader.class, javax.script.ScriptContext.class});
+ methodsThatShouldExist_jdk8.put("eval", new Class[] {java.lang.String.class});
+ methodsThatShouldExist_jdk8.put("setBindings", new Class[] {javax.script.Bindings.class, int.class});
+ methodsThatShouldExist_jdk8.put("getBindings", new Class[] {int.class});
+ methodsThatShouldExist_jdk8.put("createBindings", new Class[] {});
+ methodsThatShouldExist_jdk8.put("setContext", new Class[] {javax.script.ScriptContext.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("getFactory", new Class[] {});
+ methodsThatShouldExist_jdk8.put("getContext", 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