/hg/rhino-tests: Updated some tests in ScriptEngineManagerClassT...

[ptisnovs at icedtea.classpath.org]

changeset ff30b92ad88a in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=ff30b92ad88a
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Tue Jun 11 12:45:16 2013 +0200

	Updated some tests in ScriptEngineManagerClassTest for (Open)JDK8 API:
	getField, getFields, getDeclaredField and getDeclaredFields.


diffstat:

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

diffs (125 lines):

diff -r f05207753755 -r ff30b92ad88a ChangeLog
--- a/ChangeLog	Mon Jun 10 09:33:25 2013 +0200
+++ b/ChangeLog	Tue Jun 11 12:45:16 2013 +0200
@@ -1,3 +1,9 @@
+2013-06-11  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/ScriptEngineManagerClassTest.java:
+	Updated some tests in ScriptEngineManagerClassTest for (Open)JDK8 API:
+	getField, getFields, getDeclaredField and getDeclaredFields.
+
 2013-06-10  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/ScriptEngineClassTest.java:
diff -r f05207753755 -r ff30b92ad88a src/org/RhinoTests/ScriptEngineManagerClassTest.java
--- a/src/org/RhinoTests/ScriptEngineManagerClassTest.java	Mon Jun 10 09:33:25 2013 +0200
+++ b/src/org/RhinoTests/ScriptEngineManagerClassTest.java	Tue Jun 11 12:45:16 2013 +0200
@@ -481,9 +481,22 @@
         };
         final String[] fieldsThatShouldExist_jdk7 = {
         };
+        final String[] fieldsThatShouldExist_jdk8 = {
+        };
 
         // get the right array of field signatures
-        final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7;
+        String[] fieldsThatShouldExist = null;
+        switch (getJavaVersion()) {
+            case 6:
+                fieldsThatShouldExist = fieldsThatShouldExist_jdk6;
+                break;
+            case 7:
+                fieldsThatShouldExist = fieldsThatShouldExist_jdk7;
+                break;
+            case 8:
+                fieldsThatShouldExist = fieldsThatShouldExist_jdk8;
+                break;
+        }
 
         // get all fields
         Field[] fields = this.scriptEngineManagerClass.getFields();
@@ -520,10 +533,29 @@
             "private java.util.HashMap javax.script.ScriptEngineManager.mimeTypeAssociations",
             "private javax.script.Bindings javax.script.ScriptEngineManager.globalScope",
         };
+        final String[] declaredFieldsThatShouldExist_jdk8 = {
+            "private static final boolean javax.script.ScriptEngineManager.DEBUG",
+            "private java.util.HashSet javax.script.ScriptEngineManager.engineSpis",
+            "private java.util.HashMap javax.script.ScriptEngineManager.nameAssociations",
+            "private java.util.HashMap javax.script.ScriptEngineManager.extensionAssociations",
+            "private java.util.HashMap javax.script.ScriptEngineManager.mimeTypeAssociations",
+            "private javax.script.Bindings javax.script.ScriptEngineManager.globalScope",
+        };
 
         // get the right array of field signatures
         // following fields should be declared
-        final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7;
+        String[] declaredFieldsThatShouldExist = null;
+        switch (getJavaVersion()) {
+            case 6:
+                declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk6;
+                break;
+            case 7:
+                declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk7;
+                break;
+            case 8:
+                declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk8;
+                break;
+        }
 
         // get all declared fields
         Field[] declaredFields = this.scriptEngineManagerClass.getDeclaredFields();
@@ -548,8 +580,21 @@
         };
         final String[] fieldsThatShouldExist_jdk7 = {
         };
+        final String[] fieldsThatShouldExist_jdk8 = {
+        };
 
-        final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7;
+        String[] fieldsThatShouldExist = null;
+        switch (getJavaVersion()) {
+            case 6:
+                fieldsThatShouldExist = fieldsThatShouldExist_jdk6;
+                break;
+            case 7:
+                fieldsThatShouldExist = fieldsThatShouldExist_jdk7;
+                break;
+            case 8:
+                fieldsThatShouldExist = fieldsThatShouldExist_jdk8;
+                break;
+        }
 
         // check if all required fields really exists
         for (String fieldThatShouldExists : fieldsThatShouldExist) {
@@ -587,8 +632,29 @@
             "mimeTypeAssociations",
             "globalScope",
         };
+        final String[] declaredFieldsThatShouldExist_jdk8 = {
+            "DEBUG",
+            "engineSpis",
+            "nameAssociations",
+            "extensionAssociations",
+            "mimeTypeAssociations",
+            "globalScope",
+        };
 
-        final String[] declaredFieldsThatShouldExist = getJavaVersion() < 7 ? declaredFieldsThatShouldExist_jdk6 : declaredFieldsThatShouldExist_jdk7;
+        // get the right array of field signatures
+        // following fields should be declared
+        String[] declaredFieldsThatShouldExist = null;
+        switch (getJavaVersion()) {
+            case 6:
+                declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk6;
+                break;
+            case 7:
+                declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk7;
+                break;
+            case 8:
+                declaredFieldsThatShouldExist = declaredFieldsThatShouldExist_jdk8;
+                break;
+        }
 
         // check if all required declared fields really exists
         for (String declaredFieldThatShouldExists : declaredFieldsThatShouldExist) {