[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit/scripting ScriptableDelegate.java,1.2,1.3 ScriptingEngine.java,1.1,1.2

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

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

Modified Files:
	ScriptableDelegate.java ScriptingEngine.java 
Log Message:
Added support for javascript: URLs

Index: ScriptableDelegate.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/scripting/ScriptableDelegate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ScriptableDelegate.java	16 Aug 2002 17:24:00 -0000	1.2
+++ ScriptableDelegate.java	23 Aug 2002 19:33:13 -0000	1.3
@@ -31,11 +31,9 @@
     private ScriptingEngine _scriptEngine;
 
     private static final ScriptingEngine NULL_SCRIPT_ENGINE = new ScriptingEngine() {
-        public void executeScript( String script ) {
-        }
-        public boolean performEvent( String eventScript ) {
-            return true;
-        }
+        public void executeScript( String script ) {}
+        public boolean performEvent( String eventScript ) { return true; }
+        public String getURLContents( String urlString ) { return null; }
     };
 
 
@@ -53,6 +51,15 @@
      **/
     public void runScript( String script ) {
         if (script.length() != 0) getScriptEngine().executeScript( script );
+    }
+
+
+    /**
+     * Evaluates the specified javascript URL.
+     **/
+    public String evaluateURL( String urlString ) {
+        if (urlString.length() == 0) return null;
+        return getScriptEngine().getURLContents( urlString );
     }
 
 

Index: ScriptingEngine.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/scripting/ScriptingEngine.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ScriptingEngine.java	8 Aug 2002 20:47:22 -0000	1.1
+++ ScriptingEngine.java	23 Aug 2002 19:33:13 -0000	1.2
@@ -19,7 +19,6 @@
  * DEALINGS IN THE SOFTWARE.
  *
  *******************************************************************************************************************/
-import java.util.*;
 
 
 /**
@@ -29,9 +28,21 @@
 public interface ScriptingEngine {
 
 
+    /**
+     * Interprets the specified script, which may include global function definitions.
+     */
     public void executeScript( String script );
 
 
+    /**
+     * Interprets the specified script and returns a boolean result.
+     */
     public boolean performEvent( String eventScript );
+
+
+    /**
+     * Evaluates the specified string as JavaScript. Will return null if the script has no return value.
+     */
+    public String getURLContents( String urlString );
 
 }