Mercurial > hg > rhino-tests

changeset 22:0a6ba1bff82f draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed various typos and added new methods to check to a test src/org/RhinoTests/SimpleScriptContextClassTest.java.
author Pavel Tisnovsky <ptisnovs@redhat.com>
date Tue, 14 Aug 2012 14:21:42 +0200
parents d1c40cccd80e
children 425a6823067b
files ChangeLog src/org/RhinoTests/SimpleScriptContextClassTest.java
diffstat 2 files changed, 55 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Aug 09 10:11:05 2012 +0200
+++ b/ChangeLog	Tue Aug 14 14:21:42 2012 +0200
@@ -1,3 +1,8 @@
+2012-08-14  Pavel Tisnovsky  <ptisnovs@redhat.com>
+
+	* src/org/RhinoTests/SimpleScriptContextClassTest.java:
+	Fixed various typos, added new methods to check.
+
 2012-08-09  Pavel Tisnovsky  <ptisnovs@redhat.com>
 
 	* src/org/RhinoTests/ScriptEngineTest.java:
--- a/src/org/RhinoTests/SimpleScriptContextClassTest.java	Thu Aug 09 10:11:05 2012 +0200
+++ b/src/org/RhinoTests/SimpleScriptContextClassTest.java	Tue Aug 14 14:21:42 2012 +0200
@@ -43,12 +43,14 @@
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.List;
+
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+
+import javax.script.SimpleScriptContext;
 import javax.script.ScriptContext;
-import javax.script.SimpleScriptContext;
 
 
 
@@ -126,7 +128,7 @@
     /**
      * Test for method javax.script.SimpleScriptContext.getClass().isPrimitive()
      */
-    protected void testIsIsPrimitive() {
+    protected void testIsPrimitive() {
         assertFalse(this.simpleScriptContextClass.isPrimitive(),
                 "Method SimpleScriptContext.getClass().isPrimitive() returns wrong value");
     }
@@ -134,7 +136,7 @@
     /**
      * Test for method javax.script.SimpleScriptContext.getClass().isSynthetic()
      */
-    protected void testIsIsSynthetic() {
+    protected void testIsSynthetic() {
         assertFalse(this.simpleScriptContextClass.isSynthetic(),
                 "Method SimpleScriptContext.getClass().isSynthetic() returns wrong value");
     }
@@ -145,7 +147,7 @@
     protected void testGetInterfaces() {
         List interfaces = Arrays.asList(this.simpleScriptContextClass.getInterfaces());
         assertTrue(interfaces.contains(ScriptContext.class),
-                "list of implemented interfaces does not contains ScriptContex");
+                "list of implemented interfaces does not contain ScriptContext");
     }
 
     /**
@@ -218,13 +220,15 @@
     }
 
     /**
-     * Test for method javax.script.SimpleScriptContext.getClass().getGetConstructors()
+     * Test for method javax.script.SimpleScriptContext.getClass().getConstructors()
      */
     protected void testGetConstructors() {
         Constructor[] constructors = this.simpleScriptContextClass.getConstructors();
         assertEquals(constructors.length, 1, "only one constructor should be set");
-        String constructorName = constructors[0].getName();
-        String constructorString = constructors[0].toString();
+        String constructorName;
+        String constructorString;
+        constructorName = constructors[0].getName();
+        constructorString = constructors[0].toString();
         assertEquals(constructorName, "javax.script.SimpleScriptContext",
                 "wrong constructor name " + constructorName);
         assertEquals(constructorString, "public javax.script.SimpleScriptContext()",
@@ -232,13 +236,15 @@
     }
 
     /**
-     * Test for method javax.script.SimpleScriptContext.getClass().getGetDeclaredConstructors()
+     * Test for method javax.script.SimpleScriptContext.getClass().getDeclaredConstructors()
      */
     protected void testGetDeclaredConstructors() {
         Constructor[] constructors = this.simpleScriptContextClass.getDeclaredConstructors();
         assertEquals(constructors.length, 1, "only one constructor should be set");
-        String constructorName = constructors[0].getName();
-        String constructorString = constructors[0].toString();
+        String constructorName;
+        String constructorString;
+        constructorName = constructors[0].getName();
+        constructorString = constructors[0].toString();
         assertEquals(constructorName, "javax.script.SimpleScriptContext",
                 "wrong constructor name " + constructorName);
         assertEquals(constructorString, "public javax.script.SimpleScriptContext()",
@@ -246,19 +252,19 @@
     }
 
     /**
-     * Test for method javax.script.SimpleScriptContext.getClass().getGetFields()
+     * Test for method javax.script.SimpleScriptContext.getClass().getFields()
      */
     protected void testGetFields() {
-        // following fields should be inherited
+        // following fields should exists
         final String[] fieldsThatShouldExists = {
             "public static final int javax.script.ScriptContext.ENGINE_SCOPE",
             "public static final int javax.script.ScriptContext.GLOBAL_SCOPE",
         };
-        // get all inherited fields
-        Field[] declaredFields = this.simpleScriptContextClass.getFields();
+        // get all fields
+        Field[] fields = this.simpleScriptContextClass.getFields();
         // and transform the array into a list of field names
         List<String> fieldsAsString = new ArrayList<String>();
-        for (Field field : declaredFields) {
+        for (Field field : fields) {
             fieldsAsString.add(field.toString());
         }
         // check if all required fields really exists
@@ -269,7 +275,7 @@
     }
 
     /**
-     * Test for method javax.script.SimpleScriptContext.getClass().getGetDeclaredFields()
+     * Test for method javax.script.SimpleScriptContext.getClass().getDeclaredFields()
      */
     protected void testGetDeclaredFields() {
         // following fields should be declared
@@ -279,6 +285,7 @@
             "protected java.io.Reader javax.script.SimpleScriptContext.reader",
             "protected javax.script.Bindings javax.script.SimpleScriptContext.engineScope",
             "protected javax.script.Bindings javax.script.SimpleScriptContext.globalScope",
+            "private static java.util.List javax.script.SimpleScriptContext.scopes",
         };
         // get all declared fields
         Field[] declaredFields = this.simpleScriptContextClass.getDeclaredFields();
@@ -295,20 +302,29 @@
     }
 
     /**
-     * Test for method javax.script.SimpleScriptContext.getClass().getGetMethods()
+     * Test for method javax.script.SimpleScriptContext.getClass().getMethods()
      */
     protected void testGetMethods() {
         // following methods should be inherited
         final String[] methodsThatShouldExists = {
+            "public boolean java.lang.Object.equals(java.lang.Object)",
+            "public final native java.lang.Class java.lang.Object.getClass()",
+            "public final native void java.lang.Object.notify()",
+            "public final native void java.lang.Object.notifyAll()",
+            "public final native void java.lang.Object.wait(long) throws java.lang.InterruptedException",
+            "public final void java.lang.Object.wait() throws java.lang.InterruptedException",
+            "public final void java.lang.Object.wait(long,int) throws java.lang.InterruptedException",
+            "public int javax.script.SimpleScriptContext.getAttributesScope(java.lang.String)",
+            "public java.io.Reader javax.script.SimpleScriptContext.getReader()",
+            "public java.io.Writer javax.script.SimpleScriptContext.getErrorWriter()",
+            "public java.io.Writer javax.script.SimpleScriptContext.getWriter()",
             "public java.lang.Object javax.script.SimpleScriptContext.getAttribute(java.lang.String)",
             "public java.lang.Object javax.script.SimpleScriptContext.getAttribute(java.lang.String,int)",
-            "public int javax.script.SimpleScriptContext.getAttributesScope(java.lang.String)",
+            "public java.lang.Object javax.script.SimpleScriptContext.removeAttribute(java.lang.String,int)",
+            "public java.lang.String java.lang.Object.toString()",
+            "public java.util.List javax.script.SimpleScriptContext.getScopes()",
             "public javax.script.Bindings javax.script.SimpleScriptContext.getBindings(int)",
-            "public java.io.Writer javax.script.SimpleScriptContext.getErrorWriter()",
-            "public java.io.Reader javax.script.SimpleScriptContext.getReader()",
-            "public java.util.List javax.script.SimpleScriptContext.getScopes()",
-            "public java.io.Writer javax.script.SimpleScriptContext.getWriter()",
-            "public java.lang.Object javax.script.SimpleScriptContext.removeAttribute(java.lang.String,int)",
+            "public native int java.lang.Object.hashCode()",
             "public void javax.script.SimpleScriptContext.setAttribute(java.lang.String,java.lang.Object,int)",
             "public void javax.script.SimpleScriptContext.setBindings(javax.script.Bindings,int)",
             "public void javax.script.SimpleScriptContext.setErrorWriter(java.io.Writer)",
@@ -330,25 +346,25 @@
     }
 
     /**
-     * Test for method javax.script.SimpleScriptContext.getClass().getGetDeclaredMethods()
+     * Test for method javax.script.SimpleScriptContext.getClass().getDeclaredMethods()
      */
     protected void testGetDeclaredMethods() {
         // following methods should be declared
         final String[] declaredMethodsThatShouldExists = {
-            "public void javax.script.SimpleScriptContext.setBindings(javax.script.Bindings,int)",
-            "public java.io.Writer javax.script.SimpleScriptContext.getWriter()",
+            "public int javax.script.SimpleScriptContext.getAttributesScope(java.lang.String)",
             "public java.io.Reader javax.script.SimpleScriptContext.getReader()",
-            "public void javax.script.SimpleScriptContext.setReader(java.io.Reader)",
-            "public void javax.script.SimpleScriptContext.setWriter(java.io.Writer)",
             "public java.io.Writer javax.script.SimpleScriptContext.getErrorWriter()",
-            "public void javax.script.SimpleScriptContext.setErrorWriter(java.io.Writer)",
-            "public int javax.script.SimpleScriptContext.getAttributesScope(java.lang.String)",
-            "public javax.script.Bindings javax.script.SimpleScriptContext.getBindings(int)",
-            "public java.util.List javax.script.SimpleScriptContext.getScopes()",
+            "public java.io.Writer javax.script.SimpleScriptContext.getWriter()",
             "public java.lang.Object javax.script.SimpleScriptContext.getAttribute(java.lang.String)",
             "public java.lang.Object javax.script.SimpleScriptContext.getAttribute(java.lang.String,int)",
             "public java.lang.Object javax.script.SimpleScriptContext.removeAttribute(java.lang.String,int)",
+            "public java.util.List javax.script.SimpleScriptContext.getScopes()",
+            "public javax.script.Bindings javax.script.SimpleScriptContext.getBindings(int)",
             "public void javax.script.SimpleScriptContext.setAttribute(java.lang.String,java.lang.Object,int)",
+            "public void javax.script.SimpleScriptContext.setBindings(javax.script.Bindings,int)",
+            "public void javax.script.SimpleScriptContext.setErrorWriter(java.io.Writer)",
+            "public void javax.script.SimpleScriptContext.setReader(java.io.Reader)",
+            "public void javax.script.SimpleScriptContext.setWriter(java.io.Writer)",
         };
         // get all declared methods
         Method[] declaredMethods = this.simpleScriptContextClass.getDeclaredMethods();
@@ -369,7 +385,8 @@
      */
     protected void testInstanceOf() {
         // tested object
-        Object o = this.simpleScriptContextInstance;
+        Object o = new SimpleScriptContext();
+
         // basic check of instanceof operator
         assertTrue(o instanceof SimpleScriptContext, "instanceof SimpleScriptContext is wrongly evaluated to false");