[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit/javascript JavaScript.java,1.11,1.12 JavaScriptEngineFactory.java,1.2,1.3

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/javascript
In directory usw-pr-cvs1:/tmp/cvs-serv7684/src/com/meterware/httpunit/javascript

Modified Files:
	JavaScript.java JavaScriptEngineFactory.java 
Log Message:
Added support for form.submit and Button.onClick

Index: JavaScript.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/javascript/JavaScript.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JavaScript.java	16 Aug 2002 18:52:51 -0000	1.11
+++ JavaScript.java	19 Aug 2002 18:52:26 -0000	1.12
@@ -32,6 +32,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
+import java.io.IOException;
 
 import org.mozilla.javascript.*;
 import org.xml.sax.SAXException;
@@ -93,7 +94,7 @@
             try {
                 final Context context = Context.getCurrentContext();
                 Function f = context.compileFunction( this, "function x() { " + eventScript + "}", "httpunit", 0, null );
-                Object result = f.call( context, this, null, NO_ARGS );
+                Object result = f.call( context, this, this, NO_ARGS );
                 return (result instanceof Boolean) ? ((Boolean) result).booleanValue() : true;
             } catch (Exception e) {
                 e.printStackTrace();
@@ -107,7 +108,7 @@
             _scriptable = scriptable;
             _scriptable.setScriptEngine( this );
             if (parent != null) setParentScope( parent );
-        }
+       }
 
 
         public boolean has( String propertyName, Scriptable scriptable ) {
@@ -396,6 +397,11 @@
         }
 
 
+        public void jsFunction_submit() throws IOException, SAXException {
+            getDelegate().submit();
+        }
+
+
         void initialize( JavaScriptEngine parent, ScriptableDelegate scriptable )
                 throws JavaScriptException, NotAFunctionException, PropertyException, SAXException {
             super.initialize( parent, scriptable );
@@ -422,14 +428,26 @@
 
     static public class Control extends JavaScriptEngine {
 
+        private Form _form;
+
         public String getClassName() {
             return "Control";
         }
 
+        public Form jsGet_form() {
+            return _form;
+        }
 
         public void jsFunction_focus() {}
 
         public void jsFunction_select() {}
+
+
+        void initialize( JavaScriptEngine parent, ScriptableDelegate scriptable )
+                throws JavaScriptException, NotAFunctionException, PropertyException, SAXException {
+            super.initialize( parent, scriptable );
+            _form = (Form) parent;
+        }
 
 
         Scriptable toScriptable( ScriptableDelegate delegate )

Index: JavaScriptEngineFactory.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/javascript/JavaScriptEngineFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JavaScriptEngineFactory.java	8 Aug 2002 20:47:22 -0000	1.2
+++ JavaScriptEngineFactory.java	19 Aug 2002 18:52:26 -0000	1.3
@@ -23,6 +23,8 @@
 import com.meterware.httpunit.WebResponse;
 
 import java.lang.reflect.InvocationTargetException;
+import java.io.FileWriter;
+import java.io.PrintWriter;
 
 import org.mozilla.javascript.ClassDefinitionException;
 import org.mozilla.javascript.NotAFunctionException;