/hg/rhino-tests: Updated four tests in SimpleScriptContextClassT...

[ptisnovs at icedtea.classpath.org]

changeset d99e0391a6af in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=d99e0391a6af
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Wed May 15 09:39:26 2013 +0200

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


diffstat:

 ChangeLog                                            |   6 +
 src/org/RhinoTests/SimpleScriptContextClassTest.java |  76 ++++++++++++++++++-
 2 files changed, 77 insertions(+), 5 deletions(-)

diffs (132 lines):

diff -r deea398a4d3c -r d99e0391a6af ChangeLog
--- a/ChangeLog	Tue May 14 11:09:57 2013 +0200
+++ b/ChangeLog	Wed May 15 09:39:26 2013 +0200
@@ -1,3 +1,9 @@
+2013-05-15  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/SimpleScriptContextClassTest.java:
+	Updated four tests in SimpleScriptContextClassTest for (Open)JDK8 API:
+	getField, getDeclaredField, getFields and getDeclaredFields.
+
 2013-05-14  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/CompiledScriptClassTest.java:
diff -r deea398a4d3c -r d99e0391a6af src/org/RhinoTests/SimpleScriptContextClassTest.java
--- a/src/org/RhinoTests/SimpleScriptContextClassTest.java	Tue May 14 11:09:57 2013 +0200
+++ b/src/org/RhinoTests/SimpleScriptContextClassTest.java	Wed May 15 09:39:26 2013 +0200
@@ -481,7 +481,18 @@
         };
 
         // 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.simpleScriptContextClass.getFields();
@@ -501,7 +512,7 @@
      * Test for method javax.script.SimpleScriptContext.getClass().getDeclaredFields()
      */
     protected void testGetDeclaredFields() {
-        // following fields should be declared
+        // following declared fields should exists
         final String[] declaredFieldsThatShouldExist_jdk6 = {
             "protected java.io.Writer javax.script.SimpleScriptContext.writer",
             "protected java.io.Writer javax.script.SimpleScriptContext.errorWriter",
@@ -518,10 +529,29 @@
             "protected javax.script.Bindings javax.script.SimpleScriptContext.globalScope",
             "private static java.util.List javax.script.SimpleScriptContext.scopes",
         };
+        final String[] declaredFieldsThatShouldExist_jdk8 = {
+            "protected java.io.Writer javax.script.SimpleScriptContext.writer",
+            "protected java.io.Writer javax.script.SimpleScriptContext.errorWriter",
+            "protected java.io.Reader javax.script.SimpleScriptContext.reader",
+            "protected javax.script.Bindings javax.script.SimpleScriptContext.engineScope",
+            "protected javax.script.Bindings javax.script.SimpleScriptContext.globalScope",
+            "private static java.util.List javax.script.SimpleScriptContext.scopes",
+        };
 
         // 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.simpleScriptContextClass.getDeclaredFields();
@@ -550,8 +580,23 @@
             "ENGINE_SCOPE",
             "GLOBAL_SCOPE",
         };
+        final String[] fieldsThatShouldExist_jdk8 = {
+            "ENGINE_SCOPE",
+            "GLOBAL_SCOPE",
+        };
 
-        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) {
@@ -589,8 +634,29 @@
             "globalScope",
             "scopes",
         };
+        final String[] declaredFieldsThatShouldExist_jdk8 = {
+            "writer",
+            "errorWriter",
+            "reader",
+            "engineScope",
+            "globalScope",
+            "scopes",
+        };
 
-        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) {