/hg/rhino-tests: Fixed minor issues in the test suite InvocableC...

[ptisnovs at icedtea.classpath.org]

changeset 89917103dafe in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=89917103dafe
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Fri May 31 14:26:53 2013 +0200

	Fixed minor issues in the test suite InvocableClassTest.


diffstat:

 ChangeLog                                  |   5 ++++
 src/org/RhinoTests/InvocableClassTest.java |  36 ++++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 2 deletions(-)

diffs (79 lines):

diff -r 70224e9b40f2 -r 89917103dafe ChangeLog
--- a/ChangeLog	Thu May 30 10:17:57 2013 +0200
+++ b/ChangeLog	Fri May 31 14:26:53 2013 +0200
@@ -1,3 +1,8 @@
+2013-05-31  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/InvocableClassTest.java:
+	Fixed minor issues in the test suite InvocableClassTest.
+
 2013-05-30  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/InvocableClassTest.java:
diff -r 70224e9b40f2 -r 89917103dafe src/org/RhinoTests/InvocableClassTest.java
--- a/src/org/RhinoTests/InvocableClassTest.java	Thu May 30 10:17:57 2013 +0200
+++ b/src/org/RhinoTests/InvocableClassTest.java	Fri May 31 14:26:53 2013 +0200
@@ -823,6 +823,9 @@
         final String[] annotationsThatShouldExists_jdk7 = {
         };
 
+        final String[] annotationsThatShouldExists_jdk8 = {
+        };
+
         // get all annotations
         Annotation[] annotations = this.invocableClass.getAnnotations();
         // and transform the array into a list of annotation names
@@ -830,7 +833,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),
@@ -849,6 +865,9 @@
         final String[] annotationsThatShouldExists_jdk7 = {
         };
 
+        final String[] annotationsThatShouldExists_jdk8 = {
+        };
+
         // get all annotations
         Annotation[] annotations = this.invocableClass.getDeclaredAnnotations();
         // and transform the array into a list of annotation names
@@ -856,7 +875,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),