[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit/scripting ScriptableDelegate.java,1.5,1.6 ScriptingEngine.java,1.3,1.4

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

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

Modified Files:
	ScriptableDelegate.java ScriptingEngine.java 
Log Message:
Added support for document.write

Index: ScriptableDelegate.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/scripting/ScriptableDelegate.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ScriptableDelegate.java	13 Oct 2002 23:53:48 -0000	1.5
+++ ScriptableDelegate.java	24 Oct 2002 13:28:54 -0000	1.6
@@ -29,8 +29,9 @@
 
     private ScriptingEngine _scriptEngine;
 
+
     private static final ScriptingEngine NULL_SCRIPT_ENGINE = new ScriptingEngine() {
-        public void executeScript( String script ) {}
+        public String executeScript( String script ) { return ""; }
         public boolean performEvent( String eventScript ) { return true; }
         public String getURLContents( String urlString ) { return null; }
         public ScriptingEngine newScriptingEngine( ScriptableDelegate child ) { return this; }
@@ -47,10 +48,11 @@
 
 
     /**
-     * Executes the specified script.
+     * Executes the specified script, returning any intended replacement text.
+     * @return the replacement text, which may be empty.
      **/
-    public void runScript( String script ) {
-        if (script.length() != 0) getScriptEngine().executeScript( script );
+    public String runScript( String script ) {
+        return (script.length() == 0) ? "" : getScriptEngine().executeScript( script );
     }
 
 

Index: ScriptingEngine.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/scripting/ScriptingEngine.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ScriptingEngine.java	13 Oct 2002 23:53:48 -0000	1.3
+++ ScriptingEngine.java	24 Oct 2002 13:28:54 -0000	1.4
@@ -31,7 +31,7 @@
     /**
      * Interprets the specified script, which may include global function definitions.
      */
-    public void executeScript( String script );
+    public String executeScript( String script );
 
 
     /**