/hg/rhino-tests: Updated four tests for (Open)JDK8 API: getConst...

[ptisnovs at icedtea.classpath.org]

changeset b3477ca1f6b3 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=b3477ca1f6b3
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Mon Apr 08 10:16:25 2013 +0200

	Updated four tests for (Open)JDK8 API: getConstructor,
	getDeclaredConstructor, getConstructors and getDeclaredConstructors.


diffstat:

 ChangeLog                                             |   6 +
 src/org/RhinoTests/AbstractScriptEngineClassTest.java |  66 +++++++++++++++++-
 2 files changed, 68 insertions(+), 4 deletions(-)

diffs (126 lines):

diff -r 93cd198056e3 -r b3477ca1f6b3 ChangeLog
--- a/ChangeLog	Fri Apr 05 09:38:32 2013 +0200
+++ b/ChangeLog	Mon Apr 08 10:16:25 2013 +0200
@@ -1,3 +1,9 @@
+2013-04-08  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/AbstractScriptEngineClassTest.java:
+	Updated four tests for (Open)JDK8 API: getConstructor,
+	getDeclaredConstructor, getConstructors and getDeclaredConstructors.
+
 2013-04-05  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/ScriptEngineManagerClassTest.java:
diff -r 93cd198056e3 -r b3477ca1f6b3 src/org/RhinoTests/AbstractScriptEngineClassTest.java
--- a/src/org/RhinoTests/AbstractScriptEngineClassTest.java	Fri Apr 05 09:38:32 2013 +0200
+++ b/src/org/RhinoTests/AbstractScriptEngineClassTest.java	Mon Apr 08 10:16:25 2013 +0200
@@ -288,6 +288,7 @@
         Map<String, String> testedConstructors = null;
         Map<String, String> testedConstructors_jdk6 = new HashMap<String, String>();
         Map<String, String> testedConstructors_jdk7 = new HashMap<String, String>();
+        Map<String, String> testedConstructors_jdk8 = new HashMap<String, String>();
 
         testedConstructors_jdk6.put("public javax.script.AbstractScriptEngine()", "javax.script.AbstractScriptEngine");
         testedConstructors_jdk6.put("public javax.script.AbstractScriptEngine(javax.script.Bindings)", "javax.script.AbstractScriptEngine");
@@ -295,8 +296,21 @@
         testedConstructors_jdk7.put("public javax.script.AbstractScriptEngine()", "javax.script.AbstractScriptEngine");
         testedConstructors_jdk7.put("public javax.script.AbstractScriptEngine(javax.script.Bindings)", "javax.script.AbstractScriptEngine");
 
+        testedConstructors_jdk8.put("public javax.script.AbstractScriptEngine()", "javax.script.AbstractScriptEngine");
+        testedConstructors_jdk8.put("public javax.script.AbstractScriptEngine(javax.script.Bindings)", "javax.script.AbstractScriptEngine");
+
         // get the right map containing constructor signatures
-        testedConstructors = getJavaVersion() < 7 ? testedConstructors_jdk6 : testedConstructors_jdk7;
+        switch (getJavaVersion()) {
+            case 6:
+                testedConstructors = testedConstructors_jdk6;
+                break;
+            case 7:
+                testedConstructors = testedConstructors_jdk7;
+                break;
+            case 8:
+                testedConstructors = testedConstructors_jdk8;
+                break;
+        }
 
         // get all constructors for this class
         Constructor<?>[] constructors = this.abstractScriptEngineClass.getConstructors();
@@ -321,6 +335,7 @@
         Map<String, String> testedConstructors = null;
         Map<String, String> testedConstructors_jdk6 = new HashMap<String, String>();
         Map<String, String> testedConstructors_jdk7 = new HashMap<String, String>();
+        Map<String, String> testedConstructors_jdk8 = new HashMap<String, String>();
 
         testedConstructors_jdk6.put("public javax.script.AbstractScriptEngine()", "javax.script.AbstractScriptEngine");
         testedConstructors_jdk6.put("public javax.script.AbstractScriptEngine(javax.script.Bindings)", "javax.script.AbstractScriptEngine");
@@ -328,8 +343,21 @@
         testedConstructors_jdk7.put("public javax.script.AbstractScriptEngine()", "javax.script.AbstractScriptEngine");
         testedConstructors_jdk7.put("public javax.script.AbstractScriptEngine(javax.script.Bindings)", "javax.script.AbstractScriptEngine");
 
+        testedConstructors_jdk8.put("public javax.script.AbstractScriptEngine()", "javax.script.AbstractScriptEngine");
+        testedConstructors_jdk8.put("public javax.script.AbstractScriptEngine(javax.script.Bindings)", "javax.script.AbstractScriptEngine");
+
         // get the right map containing constructor signatures
-        testedConstructors = getJavaVersion() < 7 ? testedConstructors_jdk6 : testedConstructors_jdk7;
+        switch (getJavaVersion()) {
+            case 6:
+                testedConstructors = testedConstructors_jdk6;
+                break;
+            case 7:
+                testedConstructors = testedConstructors_jdk7;
+                break;
+            case 8:
+                testedConstructors = testedConstructors_jdk8;
+                break;
+        }
 
         // get all declared constructors for this class
         Constructor<?>[] declaredConstructors = this.abstractScriptEngineClass.getDeclaredConstructors();
@@ -359,7 +387,22 @@
         constructorsThatShouldExist_jdk7.put("javax.script.AbstractScriptEngine", new Class[] {});
         constructorsThatShouldExist_jdk7.put("javax.script.AbstractScriptEngine", new Class[] {javax.script.Bindings.class});
 
-        Map<String, Class[]> constructorsThatShouldExist = getJavaVersion() < 7 ? constructorsThatShouldExist_jdk6 : constructorsThatShouldExist_jdk7;
+        Map<String, Class[]> constructorsThatShouldExist_jdk8 = new TreeMap<String, Class[]>();
+        constructorsThatShouldExist_jdk8.put("javax.script.AbstractScriptEngine", new Class[] {});
+        constructorsThatShouldExist_jdk8.put("javax.script.AbstractScriptEngine", new Class[] {javax.script.Bindings.class});
+
+        Map<String, Class[]> constructorsThatShouldExist = null;
+        switch (getJavaVersion()) {
+            case 6:
+                constructorsThatShouldExist = constructorsThatShouldExist_jdk6;
+                break;
+            case 7:
+                constructorsThatShouldExist = constructorsThatShouldExist_jdk7;
+                break;
+            case 8:
+                constructorsThatShouldExist = constructorsThatShouldExist_jdk8;
+                break;
+        }
 
         // check if all required constructors really exist
         for (Map.Entry<String, Class[]> constructorThatShouldExists : constructorsThatShouldExist.entrySet()) {
@@ -393,7 +436,22 @@
         constructorsThatShouldExist_jdk7.put("javax.script.AbstractScriptEngine", new Class[] {});
         constructorsThatShouldExist_jdk7.put("javax.script.AbstractScriptEngine", new Class[] {javax.script.Bindings.class});
 
-        Map<String, Class[]> constructorsThatShouldExist = getJavaVersion() < 7 ? constructorsThatShouldExist_jdk6 : constructorsThatShouldExist_jdk7;
+        Map<String, Class[]> constructorsThatShouldExist_jdk8 = new TreeMap<String, Class[]>();
+        constructorsThatShouldExist_jdk8.put("javax.script.AbstractScriptEngine", new Class[] {});
+        constructorsThatShouldExist_jdk8.put("javax.script.AbstractScriptEngine", new Class[] {javax.script.Bindings.class});
+
+        Map<String, Class[]> constructorsThatShouldExist = null;
+        switch (getJavaVersion()) {
+            case 6:
+                constructorsThatShouldExist = constructorsThatShouldExist_jdk6;
+                break;
+            case 7:
+                constructorsThatShouldExist = constructorsThatShouldExist_jdk7;
+                break;
+            case 8:
+                constructorsThatShouldExist = constructorsThatShouldExist_jdk8;
+                break;
+        }
 
         // check if all required constructors really exist
         for (Map.Entry<String, Class[]> constructorThatShouldExists : constructorsThatShouldExist.entrySet()) {