/hg/rhino-tests: Updated two tests in CompilableClassTest for (O...

[ptisnovs at icedtea.classpath.org]

changeset c4adcc4e0eb0 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=c4adcc4e0eb0
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Tue May 21 11:18:13 2013 +0200

	Updated two tests in CompilableClassTest for (Open)JDK8 API:
	getMethod, getMethods, getDeclaredMethod and getDeclaredMethods.


diffstat:

 ChangeLog                                   |   6 ++
 src/org/RhinoTests/CompilableClassTest.java |  74 +++++++++++++++++++++++++++-
 2 files changed, 76 insertions(+), 4 deletions(-)

diffs (132 lines):

diff -r a4b6ee7d30e6 -r c4adcc4e0eb0 ChangeLog
--- a/ChangeLog	Mon May 20 10:08:26 2013 +0200
+++ b/ChangeLog	Tue May 21 11:18:13 2013 +0200
@@ -1,3 +1,9 @@
+2013-05-21  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/CompilableClassTest.java:
+	Updated two tests in CompilableClassTest for (Open)JDK8 API:
+	getMethod, getMethods, getDeclaredMethod and getDeclaredMethods.
+
 2013-05-20  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/BindingsClassTest.java:
diff -r a4b6ee7d30e6 -r c4adcc4e0eb0 src/org/RhinoTests/CompilableClassTest.java
--- a/src/org/RhinoTests/CompilableClassTest.java	Mon May 20 10:08:26 2013 +0200
+++ b/src/org/RhinoTests/CompilableClassTest.java	Tue May 21 11:18:13 2013 +0200
@@ -609,6 +609,11 @@
             "public abstract javax.script.CompiledScript javax.script.Compilable.compile(java.lang.String) throws javax.script.ScriptException",
         };
 
+        final String[] methodsThatShouldExist_jdk8 = {
+            "public abstract javax.script.CompiledScript javax.script.Compilable.compile(java.io.Reader) throws javax.script.ScriptException",
+            "public abstract javax.script.CompiledScript javax.script.Compilable.compile(java.lang.String) throws javax.script.ScriptException",
+        };
+
         // get all inherited methods
         Method[] methods = this.compilableClass.getMethods();
         // and transform the array into a list of method names
@@ -616,7 +621,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),
@@ -639,6 +657,11 @@
             "public abstract javax.script.CompiledScript javax.script.Compilable.compile(java.lang.String) throws javax.script.ScriptException",
         };
 
+        final String[] declaredMethodsThatShouldExist_jdk8 = {
+            "public abstract javax.script.CompiledScript javax.script.Compilable.compile(java.io.Reader) throws javax.script.ScriptException",
+            "public abstract javax.script.CompiledScript javax.script.Compilable.compile(java.lang.String) throws javax.script.ScriptException",
+        };
+
         // get all declared methods
         Method[] declaredMethods = this.compilableClass.getDeclaredMethods();
         // and transform the array into a list of method names
@@ -646,7 +669,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),
@@ -667,7 +703,22 @@
         methodsThatShouldExist_jdk7.put("compile", new Class[] {java.lang.String.class});
         methodsThatShouldExist_jdk7.put("compile", new Class[] {java.io.Reader.class});
 
-        Map<String, Class[]> methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7;
+        Map<String, Class[]> methodsThatShouldExist_jdk8 = new TreeMap<String, Class[]>();
+        methodsThatShouldExist_jdk8.put("compile", new Class[] {java.lang.String.class});
+        methodsThatShouldExist_jdk8.put("compile", new Class[] {java.io.Reader.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()) {
@@ -701,7 +752,22 @@
         methodsThatShouldExist_jdk7.put("compile", new Class[] {java.lang.String.class});
         methodsThatShouldExist_jdk7.put("compile", new Class[] {java.io.Reader.class});
 
-        Map<String, Class[]> methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7;
+        Map<String, Class[]> methodsThatShouldExist_jdk8 = new TreeMap<String, Class[]>();
+        methodsThatShouldExist_jdk8.put("compile", new Class[] {java.lang.String.class});
+        methodsThatShouldExist_jdk8.put("compile", new Class[] {java.io.Reader.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()) {