/hg/rhino-tests: Updated ScriptContextClassTest to works correct...

[ptisnovs at icedtea.classpath.org]

changeset 4e0ddaf30a61 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=4e0ddaf30a61
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Thu Mar 21 10:51:55 2013 +0100

	Updated ScriptContextClassTest to works correctly with JDK6 and
	JDK7 too.


diffstat:

 ChangeLog                                      |   6 ++++++
 src/org/RhinoTests/ScriptContextClassTest.java |  19 +++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diffs (68 lines):

diff -r 6ab9e0e1ad94 -r 4e0ddaf30a61 ChangeLog
--- a/ChangeLog	Wed Mar 20 13:12:57 2013 +0100
+++ b/ChangeLog	Thu Mar 21 10:51:55 2013 +0100
@@ -1,3 +1,9 @@
+2013-03-21  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/RhinoTests/ScriptContextClassTest.java:
+	Updated ScriptContextClassTest to works correctly with JDK6 and
+	JDK7 too.
+
 2013-03-20  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/RhinoTests/CompiledScriptClassTest.java:
diff -r 6ab9e0e1ad94 -r 4e0ddaf30a61 src/org/RhinoTests/ScriptContextClassTest.java
--- a/src/org/RhinoTests/ScriptContextClassTest.java	Wed Mar 20 13:12:57 2013 +0100
+++ b/src/org/RhinoTests/ScriptContextClassTest.java	Thu Mar 21 10:51:55 2013 +0100
@@ -451,12 +451,19 @@
      */
     protected void testGetField() {
         // following fields should exists
-        final String[] fieldsThatShouldExists = {
+        final String[] fieldsThatShouldExist_jdk6 = {
             "ENGINE_SCOPE",
             "GLOBAL_SCOPE",
         };
+        final String[] fieldsThatShouldExist_jdk7 = {
+            "ENGINE_SCOPE",
+            "GLOBAL_SCOPE",
+        };
+
+        final String[] fieldsThatShouldExist = getJavaVersion() < 7 ? fieldsThatShouldExist_jdk6 : fieldsThatShouldExist_jdk7;
+
         // check if all required fields really exists
-        for (String fieldThatShouldExists : fieldsThatShouldExists) {
+        for (String fieldThatShouldExists : fieldsThatShouldExist) {
             try {
                 Field field = this.scriptContextClass.getField(fieldThatShouldExists);
                 String fieldName = field.getName();
@@ -475,7 +482,7 @@
      */
     protected void testGetMethods() {
         // following methods should be inherited
-        final String[] methodsThatShouldExists_jdk6 = {
+        final String[] methodsThatShouldExist_jdk6 = {
             "public abstract int javax.script.ScriptContext.getAttributesScope(java.lang.String)",
             "public abstract java.io.Reader javax.script.ScriptContext.getReader()",
             "public abstract java.io.Writer javax.script.ScriptContext.getErrorWriter()",
@@ -492,7 +499,7 @@
             "public abstract void javax.script.ScriptContext.setWriter(java.io.Writer)",
         };
 
-        final String[] methodsThatShouldExists_jdk7 = {
+        final String[] methodsThatShouldExist_jdk7 = {
             "public abstract int javax.script.ScriptContext.getAttributesScope(java.lang.String)",
             "public abstract java.io.Reader javax.script.ScriptContext.getReader()",
             "public abstract java.io.Writer javax.script.ScriptContext.getErrorWriter()",
@@ -516,9 +523,9 @@
         for (Method method : methods) {
             methodsAsString.add(method.toString());
         }
-        String[] methodsThatShouldExists = getJavaVersion() < 7 ? methodsThatShouldExists_jdk6 : methodsThatShouldExists_jdk7;
+        String[] methodsThatShouldExist = getJavaVersion() < 7 ? methodsThatShouldExist_jdk6 : methodsThatShouldExist_jdk7;
         // check if all required methods really exists
-        for (String methodThatShouldExists : methodsThatShouldExists) {
+        for (String methodThatShouldExists : methodsThatShouldExist) {
             assertTrue(methodsAsString.contains(methodThatShouldExists),
                     "method " + methodThatShouldExists + " not found");
         }