/hg/rhino-tests: Updated some tests in ScriptEngineClassTest for...

[ptisnovs at icedtea.classpath.org]

changeset 55a3c2780d77 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=55a3c2780d77
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Thu Jun 06 09:40:50 2013 +0200

	Updated some tests in ScriptEngineClassTest for (Open)JDK8 API:
	getFields and getDeclaredFields.


diffstat:

 ChangeLog                                     |   6 +
 src/org/RhinoTests/ScriptEngineClassTest.java |  90 +++++++++++++++++++++++++-
 2 files changed, 92 insertions(+), 4 deletions(-)

diffs (141 lines):

diff -r 4de9c7877164 -r 55a3c2780d77 ChangeLog
--- a/ChangeLog	Wed Jun 05 10:42:41 2013 +0200
+++ b/ChangeLog	Thu Jun 06 09:40:50 2013 +0200
@@ -1,3 +1,9 @@
+2013-06-06  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/ScriptEngineClassTest.java:
+	Updated some tests in ScriptEngineClassTest for (Open)JDK8 API:
+	getFields and getDeclaredFields.
+
 2013-06-05  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/ScriptContextClassTest.java:
diff -r 4de9c7877164 -r 55a3c2780d77 src/org/RhinoTests/ScriptEngineClassTest.java
--- a/src/org/RhinoTests/ScriptEngineClassTest.java	Wed Jun 05 10:42:41 2013 +0200
+++ b/src/org/RhinoTests/ScriptEngineClassTest.java	Thu Jun 06 09:40:50 2013 +0200
@@ -454,9 +454,29 @@
             "public static final java.lang.String javax.script.ScriptEngine.LANGUAGE",
             "public static final java.lang.String javax.script.ScriptEngine.LANGUAGE_VERSION",
         };
+        final String[] fieldsThatShouldExist_jdk8 = {
+            "public static final java.lang.String javax.script.ScriptEngine.ARGV",
+            "public static final java.lang.String javax.script.ScriptEngine.FILENAME",
+            "public static final java.lang.String javax.script.ScriptEngine.ENGINE",
+            "public static final java.lang.String javax.script.ScriptEngine.ENGINE_VERSION",
+            "public static final java.lang.String javax.script.ScriptEngine.NAME",
+            "public static final java.lang.String javax.script.ScriptEngine.LANGUAGE",
+            "public static final java.lang.String javax.script.ScriptEngine.LANGUAGE_VERSION",
+        };
 
         // 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.scriptEngineClass.getFields();
@@ -495,10 +515,30 @@
             "public static final java.lang.String javax.script.ScriptEngine.LANGUAGE",
             "public static final java.lang.String javax.script.ScriptEngine.LANGUAGE_VERSION",
         };
+        final String[] declaredFieldsThatShouldExist_jdk8 = {
+            "public static final java.lang.String javax.script.ScriptEngine.ARGV",
+            "public static final java.lang.String javax.script.ScriptEngine.FILENAME",
+            "public static final java.lang.String javax.script.ScriptEngine.ENGINE",
+            "public static final java.lang.String javax.script.ScriptEngine.ENGINE_VERSION",
+            "public static final java.lang.String javax.script.ScriptEngine.NAME",
+            "public static final java.lang.String javax.script.ScriptEngine.LANGUAGE",
+            "public static final java.lang.String javax.script.ScriptEngine.LANGUAGE_VERSION",
+        };
 
         // 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.scriptEngineClass.getDeclaredFields();
@@ -537,8 +577,28 @@
             "LANGUAGE",
             "LANGUAGE_VERSION",
         };
+        final String[] fieldsThatShouldExist_jdk8 = {
+            "ARGV",
+            "FILENAME",
+            "ENGINE",
+            "ENGINE_VERSION",
+            "NAME",
+            "LANGUAGE",
+            "LANGUAGE_VERSION",
+        };
 
-        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) {
@@ -578,8 +638,30 @@
             "LANGUAGE",
             "LANGUAGE_VERSION",
         };
+        final String[] declaredFieldsThatShouldExist_jdk8 = {
+            "ARGV",
+            "FILENAME",
+            "ENGINE",
+            "ENGINE_VERSION",
+            "NAME",
+            "LANGUAGE",
+            "LANGUAGE_VERSION",
+        };
 
-        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) {