/hg/rhino-tests: Updated two tests in AbstractScriptEngineClassT...

[ptisnovs at icedtea.classpath.org]

changeset d4b48d0f24fc in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=d4b48d0f24fc
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Fri May 17 14:40:06 2013 +0200

	Updated two tests in AbstractScriptEngineClassTest for (Open)JDK8 API:
	getAnnotation and getAnnotations.


diffstat:

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

diffs (80 lines):

diff -r 3ab1ee93ed90 -r d4b48d0f24fc ChangeLog
--- a/ChangeLog	Thu May 16 10:26:07 2013 +0200
+++ b/ChangeLog	Fri May 17 14:40:06 2013 +0200
@@ -1,3 +1,9 @@
+2013-05-17  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/AbstractScriptEngineClassTest.java:
+	Updated two tests in AbstractScriptEngineClassTest for (Open)JDK8 API:
+	getAnnotation and getAnnotations.
+
 2013-05-16  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/ScriptContextClassTest.java:
diff -r 3ab1ee93ed90 -r d4b48d0f24fc src/org/RhinoTests/AbstractScriptEngineClassTest.java
--- a/src/org/RhinoTests/AbstractScriptEngineClassTest.java	Thu May 16 10:26:07 2013 +0200
+++ b/src/org/RhinoTests/AbstractScriptEngineClassTest.java	Fri May 17 14:40:06 2013 +0200
@@ -1068,6 +1068,9 @@
         final String[] annotationsThatShouldExists_jdk7 = {
         };
 
+        final String[] annotationsThatShouldExists_jdk8 = {
+        };
+
         // get all annotations
         Annotation[] annotations = this.abstractScriptEngineClass.getAnnotations();
         // and transform the array into a list of annotation names
@@ -1075,7 +1078,20 @@
         for (Annotation annotation : annotations) {
             annotationsAsString.add(annotation.toString());
         }
-        String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7;
+
+        String[] annotationsThatShouldExists = null;
+        switch (getJavaVersion()) {
+            case 6:
+                annotationsThatShouldExists = annotationsThatShouldExists_jdk6;
+                break;
+            case 7:
+                annotationsThatShouldExists = annotationsThatShouldExists_jdk7;
+                break;
+            case 8:
+                annotationsThatShouldExists = annotationsThatShouldExists_jdk8;
+                break;
+        }
+
         // check if all required annotations really exists
         for (String annotationThatShouldExists : annotationsThatShouldExists) {
             assertTrue(annotationsAsString.contains(annotationThatShouldExists),
@@ -1094,6 +1110,9 @@
         final String[] annotationsThatShouldExists_jdk7 = {
         };
 
+        final String[] annotationsThatShouldExists_jdk8 = {
+        };
+
         // get all annotations
         Annotation[] annotations = this.abstractScriptEngineClass.getDeclaredAnnotations();
         // and transform the array into a list of annotation names
@@ -1101,7 +1120,20 @@
         for (Annotation annotation : annotations) {
             annotationsAsString.add(annotation.toString());
         }
-        String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7;
+
+        String[] annotationsThatShouldExists = null;
+        switch (getJavaVersion()) {
+            case 6:
+                annotationsThatShouldExists = annotationsThatShouldExists_jdk6;
+                break;
+            case 7:
+                annotationsThatShouldExists = annotationsThatShouldExists_jdk7;
+                break;
+            case 8:
+                annotationsThatShouldExists = annotationsThatShouldExists_jdk8;
+                break;
+        }
+
         // check if all required annotations really exists
         for (String annotationThatShouldExists : annotationsThatShouldExists) {
             assertTrue(annotationsAsString.contains(annotationThatShouldExists),