/hg/rhino-tests: Updated four tests in CompiledScriptClassTest f...

[ptisnovs at icedtea.classpath.org]

changeset 32315f7a8cb8 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=32315f7a8cb8
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Fri May 03 09:30:03 2013 +0200

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


diffstat:

 ChangeLog                                       |   6 ++
 src/org/RhinoTests/CompiledScriptClassTest.java |  62 +++++++++++++++++++++++-
 2 files changed, 64 insertions(+), 4 deletions(-)

diffs (113 lines):

diff -r b4e6c7746fe3 -r 32315f7a8cb8 ChangeLog
--- a/ChangeLog	Thu May 02 10:08:03 2013 +0200
+++ b/ChangeLog	Fri May 03 09:30:03 2013 +0200
@@ -1,3 +1,9 @@
+2013-05-03  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/CompiledScriptClassTest.java:
+	Updated four tests in CompiledScriptClassTest for (Open)JDK8 API:
+	getField, getDeclaredField, getFields and getDeclaredFields.
+
 2013-05-02  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/CompilableClassTest.java:
diff -r b4e6c7746fe3 -r 32315f7a8cb8 src/org/RhinoTests/CompiledScriptClassTest.java
--- a/src/org/RhinoTests/CompiledScriptClassTest.java	Thu May 02 10:08:03 2013 +0200
+++ b/src/org/RhinoTests/CompiledScriptClassTest.java	Fri May 03 09:30:03 2013 +0200
@@ -523,9 +523,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.compiledScriptClass.getFields();
@@ -550,10 +563,23 @@
         };
         final String[] declaredFieldsThatShouldExist_jdk7 = {
         };
+        final String[] declaredFieldsThatShouldExist_jdk8 = {
+        };
 
         // 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.compiledScriptClass.getDeclaredFields();
@@ -578,8 +604,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) {
@@ -605,8 +644,23 @@
         };
         final String[] declaredFieldsThatShouldExist_jdk7 = {
         };
+        final String[] declaredFieldsThatShouldExist_jdk8 = {
+        };
 
-        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) {