/hg/rhino-tests: Updated two tests in BindingsClassTest for (Ope...

[ptisnovs at icedtea.classpath.org]

changeset a4b6ee7d30e6 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=a4b6ee7d30e6
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Mon May 20 10:08:26 2013 +0200

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


diffstat:

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

diffs (80 lines):

diff -r d4b48d0f24fc -r a4b6ee7d30e6 ChangeLog
--- a/ChangeLog	Fri May 17 14:40:06 2013 +0200
+++ b/ChangeLog	Mon May 20 10:08:26 2013 +0200
@@ -1,3 +1,9 @@
+2013-05-20  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/BindingsClassTest.java:
+	Updated two tests in BindingsClassTest for (Open)JDK8 API:
+	getAnnotation and getAnnotations.
+
 2013-05-17  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/AbstractScriptEngineClassTest.java:
diff -r d4b48d0f24fc -r a4b6ee7d30e6 src/org/RhinoTests/BindingsClassTest.java
--- a/src/org/RhinoTests/BindingsClassTest.java	Fri May 17 14:40:06 2013 +0200
+++ b/src/org/RhinoTests/BindingsClassTest.java	Mon May 20 10:08:26 2013 +0200
@@ -897,6 +897,9 @@
             // this should be really empty
         };
 
+        final String[] annotationsThatShouldExists_jdk8 = {
+        };
+
         // get all annotations
         Annotation[] annotations = this.bindingsClass.getAnnotations();
         // and transform the array into a list of annotation names
@@ -904,7 +907,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),
@@ -923,6 +939,9 @@
         final String[] annotationsThatShouldExists_jdk7 = {
         };
 
+        final String[] annotationsThatShouldExists_jdk8 = {
+        };
+
         // get all annotations
         Annotation[] annotations = this.bindingsClass.getDeclaredAnnotations();
         // and transform the array into a list of annotation names
@@ -930,7 +949,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),