diff -Nu /home/hannes/helma/modules/jala/util/Test/code/Global/jala.Test.js modules/jala/test/jala.Test.js
--- /home/hannes/helma/modules/jala/util/Test/code/Global/jala.Test.js	2008-04-17 20:46:14.000000000 +0200
+++ modules/jala/test/jala.Test.js	2008-05-09 22:29:20.000000000 +0200
@@ -23,26 +23,21 @@
 
 
 /**
- * @fileoverview Fields and methods of the jala.Test class.
+ * @fileoverview Fields and methods of the Test class.
  */
 
-
-// Define the global namespace for Jala modules
-if (!global.jala) {
-   global.jala = {};
-}
-
 /**
  * HelmaLib dependencies
  */
-app.addRepository("modules/core/String.js");
-app.addRepository("modules/helma/Http.js");
+importModule("core.string");
+importModule("helma.http");
+importModule("helma.file");
+importModule("helma.rhino");
 
 /**
  * Jala dependencies
  */
-app.addRepository(getProperty("jala.dir", "modules/jala") + 
-                  "/code/Database.js");
+// importModule("jala.database");
 
 /**
  * Constructs a new Test instance.
@@ -52,7 +47,7 @@
  * @param {Number} capacity The capacity of the cache
  * @constructor
  */
-jala.Test = function() {
+Test = function() {
 
    /**
     * Contains the number of tests that were executed
@@ -99,14 +94,14 @@
  * @type String
  * @final
  */
-jala.Test.PASSED = "passed";
+Test.PASSED = "passed";
 
 /**
  * Constant indicating "failed" status
  * @type String
  * @final
  */
-jala.Test.FAILED = "failed";
+Test.FAILED = "failed";
 
 /**
  * Helper method useable for displaying a value
@@ -114,7 +109,7 @@
  * @returns The value rendered as string
  * @type String
  */
-jala.Test.valueToString = function(val) {
+Test.valueToString = function(val) {
    res.push();
    if (val === null) {
       res.write("null");
@@ -155,14 +150,17 @@
  * @returns The directory containing the test files
  * @type helma.File
  */
-jala.Test.getTestsDirectory = function() {
+Test.getTestsDirectory = function() {
    var dir;
+   if (true) {
+       dir = new helma.file.File("/home/hannes/svn/helma-ng/modules/tests");
+   } else
    if (getProperty("jala.testDir") != null) {
-      dir = new helma.File(getProperty("jala.testDir"));
+      dir = new helma.file.File(getProperty("jala.testDir"));
    }
    if (!dir || !dir.exists()) {
-      var appDir = new helma.File(app.dir);
-      dir = new helma.File(appDir.getParent(), "tests");
+      var appDir = new helma.file.File(app.dir);
+      dir = new helma.file.File(appDir.getParent(), "tests");
       if (!dir.exists())
          return null;
    }
@@ -175,9 +173,9 @@
  * @returns An array containing the names of all test files
  * @type Array
  */
-jala.Test.getTestFiles = function() {
+Test.getTestFiles = function() {
    var dir;
-   if ((dir = jala.Test.getTestsDirectory()) != null) {
+   if ((dir = Test.getTestsDirectory()) != null) {
       return dir.list(/.*\.js/).sort();
    }
    return null;
@@ -189,10 +187,10 @@
  * @returns The test file
  * @type helma.File
  */
-jala.Test.getTestFile = function(fileName) {
-   var dir = jala.Test.getTestsDirectory();
+Test.getTestFile = function(fileName) {
+   var dir = Test.getTestsDirectory();
    if (dir != null) {
-      return new helma.File(dir, fileName);
+      return new helma.file.File(dir, fileName);
    }
    return null;
 };
@@ -204,10 +202,10 @@
  * the expected amount, false otherwise.
  * @type Boolean
  */
-jala.Test.evalArguments = function(args, argsExpected) {
+Test.evalArguments = function(args, argsExpected) {
    if (!(args.length == argsExpected ||
              (args.length == argsExpected + 1 && typeof(args[0]) == "string"))) {
-      throw new jala.Test.ArgumentsException("Insufficient arguments passed to assertion function");
+      throw new Test.ArgumentsException("Insufficient arguments passed to assertion function");
    }
    return;
 };
@@ -221,7 +219,7 @@
  * @returns True if the arguments contain a comment, false otherwise.
  * @type Boolean
  */
-jala.Test.argsContainComment = function(args, argsExpected) {
+Test.argsContainComment = function(args, argsExpected) {
    return !(args.length <= argsExpected
                || (args.length == argsExpected + 1 && typeof(args[0]) != "string"))
 };
@@ -234,8 +232,8 @@
  * @returns The comment, if existing. Null otherwise.
  * @type String
  */
-jala.Test.getComment = function(args, argsExpected) {
-   if (jala.Test.argsContainComment(args, argsExpected))
+Test.getComment = function(args, argsExpected) {
+   if (Test.argsContainComment(args, argsExpected))
       return args[0];
    return null;
 };
@@ -251,8 +249,8 @@
  * @returns The non-comment value, or null.
  * @type Object
  */
-jala.Test.getValue = function(args, argsExpected, idx) {
-   return jala.Test.argsContainComment(args, argsExpected) ? args[idx+1] : args[idx];
+Test.getValue = function(args, argsExpected, idx) {
+   return Test.argsContainComment(args, argsExpected) ? args[idx+1] : args[idx];
 };
 
 
@@ -263,7 +261,7 @@
  * @returns The parsed stack trace
  * @type String
  */
-jala.Test.getStackTrace = function(trace) {
+Test.getStackTrace = function(trace) {
    /**
     * Private method for filtering out only JS parts of the stack trace
     * @param {Object} name
@@ -288,11 +286,11 @@
       fileName = el.getFileName();
       lineNumber = el.getLineNumber();
       if (fileName != null && lineNumber > -1 && accept(fileName)) {
-         if (fileName.endsWith(res.meta.currentTest)) {
+         if (fileName.endsWith(res.currentTest)) {
             inTrace = true;
          }
          if (inTrace == true) {
-            // ignore all trace lines that refer to jala.Test
+            // ignore all trace lines that refer to Test
             if (fileName.endsWith("jala.Test.js")) {
                break;
             }
@@ -312,34 +310,33 @@
  * @type helma.scripting.rhino.GlobalObject
  * @private
  */
-jala.Test.getTestScope = function() {
+Test.getTestScope = function() {
    // create a new vanilla global object
-   var engine = Packages.helma.scripting.rhino.RhinoEngine.getRhinoEngine();
-   var scope = new Packages.helma.scripting.rhino.GlobalObject(engine.getCore(),
-                         app.__app__, true);
+   var engine = helma.rhino.getRhinoEngine();
+   var scope = engine.createThreadScope(helma.rhino.getRhinoContext())
    // put the necessary global objects into the scope
-   scope.root = root;
+   // scope.root = root;
    scope.session = session;
    scope.req = req;
    scope.res = res;
-   scope.path = path;
+   // scope.path = path;
    // define global assertion functions
-   for (var i in jala.Test.prototype) {
+   for (var i in Test.prototype) {
       if (i.indexOf("assert") == 0) {
-         scope[i] = jala.Test.prototype[i];
+         scope[i] = Test.prototype[i];
       }
    }
    // add global include method
    scope.include = function(file) {
-      jala.Test.include(scope, file);
+      Test.include(scope, file);
       return;
    };
    // instantiate a global HttpClient
-   scope.httpClient = new jala.Test.HttpClient();
+   scope.httpClient = new Test.HttpClient();
    // instantiate the test database manager
-   scope.testDatabases = new jala.Test.DatabaseMgr();
+   scope.testDatabases = new Test.DatabaseMgr();
    // instantiate the smtp server
-   scope.smtpServer = new jala.Test.SmtpServer();
+   scope.smtpServer = new Test.SmtpServer();
    return scope;
 };
 
@@ -350,7 +347,7 @@
  * @param {Object} scope The scope in which the file should be evaluated
  * @param {String} fileName The name of the file to include, including the path
  */
-jala.Test.include = function(scope, file) {
+Test.include = function(scope, file) {
    var file = new helma.File(file);
    var fileName = file.getName();
    if (file.canRead() && file.exists()) {
@@ -374,13 +371,13 @@
  * @returns A newly created Exception instance
  * @constructor
  */
-jala.Test.Exception = function Exception() {
+Test.Exception = function Exception() {
    return this;
 };
 
 /** @ignore */
-jala.Test.Exception.prototype.toString = function() {
-   return "[jala.Test.Exception: " + this.message + "]";
+Test.Exception.prototype.toString = function() {
+   return "[Test.Exception: " + this.message + "]";
 };
 
 /**
@@ -392,18 +389,18 @@
  * @returns A newly created TestException instance
  * @constructor
  */
-jala.Test.TestException = function TestException(comment, message) {
+Test.TestException = function TestException(comment, message) {
    this.functionName = null;
    this.comment = comment;
    this.message = message;
-   this.stackTrace = jala.Test.getStackTrace();
+   this.stackTrace = Test.getStackTrace();
    return this;
 };
-jala.Test.TestException.prototype = new jala.Test.Exception();
+Test.TestException.prototype = new Test.Exception();
 
 /** @ignore */
-jala.Test.TestException.prototype.toString = function() {
-   return "[jala.Test.TestException in " + this.functionName +
+Test.TestException.prototype.toString = function() {
+   return "[Test.TestException in " + this.functionName +
           ": " + this.message + "]";
 };
 
@@ -415,17 +412,17 @@
  * @returns A newly created ArgumentsException instance
  * @constructor
  */
-jala.Test.ArgumentsException = function ArgumentsException(message) {
+Test.ArgumentsException = function ArgumentsException(message) {
    this.functionName = null;
    this.message = message;
-   this.stackTrace = jala.Test.getStackTrace();
+   this.stackTrace = Test.getStackTrace();
    return this;
 };
-jala.Test.ArgumentsException.prototype = new jala.Test.Exception();
+Test.ArgumentsException.prototype = new Test.Exception();
 
 /** @ignore */
-jala.Test.ArgumentsException.prototype.toString = function() {
-   return "[jala.Test.ArgumentsException in " + this.functionName +
+Test.ArgumentsException.prototype.toString = function() {
+   return "[Test.ArgumentsException in " + this.functionName +
           ": " + this.message + "]";
 };
 
@@ -439,7 +436,7 @@
  * @returns A newly created EvaluatorException instance
  * @constructor
  */
-jala.Test.EvaluatorException = function EvaluatorException(message, exception) {
+Test.EvaluatorException = function EvaluatorException(message, exception) {
    this.functionName = null;
    this.message = null;
    this.stackTrace = null;
@@ -458,7 +455,7 @@
       if (exception.rhinoException != null) {
          var e = exception.rhinoException;
          this.message += e.details();
-         this.stackTrace = jala.Test.getStackTrace(e.getStackTrace());
+         this.stackTrace = Test.getStackTrace(e.getStackTrace());
       } else if (exception instanceof Error) {
          this.message = exception.message;
       }
@@ -471,11 +468,11 @@
 
    return this;
 };
-jala.Test.EvaluatorException.prototype = new jala.Test.Exception();
+Test.EvaluatorException.prototype = new Test.Exception();
 
 /** @ignore */
-jala.Test.EvaluatorException.prototype.toString = function() {
-   return "[jala.Test.EvaluatorException: " + this.message + "]";
+Test.EvaluatorException.prototype.toString = function() {
+   return "[Test.EvaluatorException: " + this.message + "]";
 };
 
 
@@ -493,10 +490,10 @@
  * @returns A new TestResult instance
  * @constructor
  */
-jala.Test.TestResult = function(testFileName) {
+Test.TestResult = function(testFileName) {
    this.name = testFileName;
    this.elapsed = 0;
-   this.status = jala.Test.PASSED;
+   this.status = Test.PASSED;
    this.log = [];
    return this;
 };
@@ -511,7 +508,7 @@
  * @returns A new TestFunctionResult instance
  * @constructor
  */
-jala.Test.TestFunctionResult = function(functionName, startTime) {
+Test.TestFunctionResult = function(functionName, startTime) {
    this.functionName = functionName;
    this.elapsed = (new Date()) - startTime;
    return this;
@@ -528,18 +525,18 @@
  * Executes a single test file
  * @param {helma.File} testFile The file containing the test to run
  */
-jala.Test.prototype.executeTest = function(testFile) {
+Test.prototype.executeTest = function(testFile) {
    var testFileName = testFile.getName();
-   // store the name of the current test in res.meta.currentTest
+   // store the name of the current test in res.currentTest
    // as this is needed in getStackTrace
-   res.meta.currentTest = testFileName;
+   res.currentTest = testFileName;
 
    var cx = Packages.org.mozilla.javascript.Context.enter();
    var code = new java.lang.String(testFile.readAll() || "");
-   var testResult = new jala.Test.TestResult(testFileName);
+   var testResult = new Test.TestResult(testFileName);
    try {
       // instantiate a new test scope
-      var scope = jala.Test.getTestScope(scope);
+      var scope = Test.getTestScope(scope);
       // evaluate the test file in the per-thread which is garbage
       // collected at the end of the test run and prevents the application
       // scope from being polluted
@@ -560,20 +557,20 @@
             try {
                functionName = scope.tests[i];
                if (!scope[functionName] || scope[functionName].constructor != Function) {
-                  throw new jala.Test.EvaluatorException("Test function '" +
+                  throw new Test.EvaluatorException("Test function '" +
                                             functionName + "' is not defined.");
                }
                testResult.log.push(this.executeTestFunction(functionName, scope));
             } catch (e) {
                this.testsFailed += 1;
-               testResult.status = jala.Test.FAILED;
+               testResult.status = Test.FAILED;
                e.functionName = functionName;
                testResult.log.push(e);
             }
          }
       } catch (e) {
          this.testsFailed += 1;
-         testResult.status = jala.Test.FAILED;
+         testResult.status = Test.FAILED;
          testResult.log.push(e);
       } finally {
          // call any existing "cleanup" method
@@ -583,13 +580,13 @@
       }
    } catch (e) {
       this.testsFailed += 1;
-      testResult.status = jala.Test.FAILED;
-      testResult.log.push(new jala.Test.EvaluatorException(e));
+      testResult.status = Test.FAILED;
+      testResult.log.push(new Test.EvaluatorException(e));
    } finally {
       // exit the js context created above
       cx.exit();
-      // clear res.meta.currentTest
-      res.meta.currentTest = null;
+      // clear res.currentTest
+      res.currentTest = null;
    }
    testResult.elapsed = (new Date()) - start;
    this.results.push(testResult);
@@ -602,23 +599,23 @@
  * @param {helma.scripting.rhino.GlobalObject} scope The scope to execute
  * the test method in
  */
-jala.Test.prototype.executeTestFunction = function(functionName, scope) {
-   // store the name of the current function in res.meta.currentTestFunction
-   res.meta.currentTestFunction = functionName;
+Test.prototype.executeTestFunction = function(functionName, scope) {
+   // store the name of the current function in res.currentTestFunction
+   res.currentTestFunction = functionName;
    var start = new Date();
    try {
       scope[functionName]();
       this.functionsPassed += 1;
-      return new jala.Test.TestFunctionResult(functionName, start);
+      return new Test.TestFunctionResult(functionName, start);
    } catch (e) {
-      if (!(e instanceof jala.Test.Exception)) {
-         e = new jala.Test.EvaluatorException(e);
+      if (!(e instanceof Test.Exception)) {
+         e = new Test.EvaluatorException(e);
       }
       this.functionsFailed += 1;
       throw e;
    } finally {
-      // clear res.meta.currentFunction
-      res.meta.currentTestFunction = null;
+      // clear res.currentFunction
+      res.currentTestFunction = null;
    }
 };
 
@@ -628,10 +625,10 @@
  * or an array containing the names of several function files that should
  * be executed.
  */
-jala.Test.prototype.execute = function(what) {
+Test.prototype.execute = function(what) {
    var self = this;
    var executeTest = function(fileName) {
-      var file = jala.Test.getTestFile(fileName);
+      var file = Test.getTestFile(fileName);
       if (file != null && file.exists()) {
          self.testsRun += 1;
          self.executeTest(file);
@@ -649,15 +646,15 @@
 };
 
 /** @ignore */
-jala.Test.prototype.toString = function() {
-   return "[jala.Test]";
+Test.prototype.toString = function() {
+   return "[Test]";
 };
 
 /**
  * Renders the results of all tests done by this test instance
  * to response.
  */
-jala.Test.prototype.renderResults = function() {
+Test.prototype.renderResults = function() {
    if (this.results.length > 0) {
       for (var i=0;i<this.results.length;i++) {
          this.renderResult(this.results[i]);
@@ -668,14 +665,14 @@
 
 /**
  * Renders the result of a single test
- * @param {jala.Test.TestResult} The result to render
+ * @param {Test.TestResult} The result to render
  */
-jala.Test.prototype.renderResult = function(result) {
+Test.prototype.renderResult = function(result) {
    res.push();
    var logItem;
    for (var i=0;i<result.log.length;i++) {
       logItem = result.log[i];
-      if (logItem instanceof jala.Test.Exception) {
+      if (logItem instanceof Test.Exception) {
          renderSkin("jala.Test#logFailed", logItem);
       } else {
          renderSkin("jala.Test#logPassed", logItem);
@@ -701,8 +698,8 @@
 /**
  * Renders the list of available tests
  */
-jala.Test.prototype.list_macro = function() {
-   var list = jala.Test.getTestFiles();
+Test.prototype.list_macro = function() {
+   var list = Test.getTestFiles();
    if (list && list.length > 0) {
       var fileName, skinParam;
       for (var i=0;i<list.length;i++) {
@@ -721,7 +718,7 @@
 /**
  * Renders the test results
  */
-jala.Test.prototype.results_macro = function() {
+Test.prototype.results_macro = function() {
    this.renderResults();
    return;
 };
@@ -731,8 +728,8 @@
  * @returns The path to the tests directory
  * @type String
  */
-jala.Test.prototype.directory_macro = function() {
-   return jala.Test.getTestsDirectory();
+Test.prototype.directory_macro = function() {
+   return Test.getTestsDirectory();
 };
 
 
@@ -745,22 +742,22 @@
 /**
  * Checks if the value passed as argument is boolean true.
  * @param {Object} val The value that should be boolean true.
- * @throws jala.Test.ArgumentsException
- * @throws jala.Test.TestException
+ * @throws Test.ArgumentsException
+ * @throws Test.TestException
  */
-jala.Test.prototype.assertTrue = function assertTrue(val) {
+Test.prototype.assertTrue = function assertTrue(val) {
    var functionName = arguments.callee.name;
    var argsExpected = arguments.callee.length;
-   jala.Test.evalArguments(arguments, argsExpected);
-   var comment = jala.Test.getComment(arguments, argsExpected);
-   var value = jala.Test.getValue(arguments, argsExpected, 0);
+   Test.evalArguments(arguments, argsExpected);
+   var comment = Test.getComment(arguments, argsExpected);
+   var value = Test.getValue(arguments, argsExpected, 0);
    if (typeof(value) != "boolean") {
-      throw new jala.Test.ArgumentsException("Invalid argument to assertTrue(boolean): " +
-                      jala.Test.valueToString(value));
+      throw new Test.ArgumentsException("Invalid argument to assertTrue(boolean): " +
+                      Test.valueToString(value));
    } else if (value !== true) {
-      throw new jala.Test.TestException(comment,
+      throw new Test.TestException(comment,
                       "assertTrue(boolean) called with argument " +
-                      jala.Test.valueToString(value));
+                      Test.valueToString(value));
    }
    return;
 };
@@ -768,22 +765,22 @@
 /**
  * Checks if the value passed as argument is boolean false.
  * @param {Object} val The value that should be boolean false.
- * @throws jala.Test.ArgumentsException
- * @throws jala.Test.TestException
+ * @throws Test.ArgumentsException
+ * @throws Test.TestException
  */
-jala.Test.prototype.assertFalse = function assertFalse(val) {
+Test.prototype.assertFalse = function assertFalse(val) {
    var functionName = arguments.callee.name;
    var argsExpected = arguments.callee.length;
-   jala.Test.evalArguments(arguments, argsExpected);
-   var comment = jala.Test.getComment(arguments, argsExpected);
-   var value = jala.Test.getValue(arguments, argsExpected, 0);
+   Test.evalArguments(arguments, argsExpected);
+   var comment = Test.getComment(arguments, argsExpected);
+   var value = Test.getValue(arguments, argsExpected, 0);
    if (typeof(value) != "boolean") {
-      throw new jala.Test.ArgumentsException("Invalid argument to assertFalse(boolean): " +
-                      jala.Test.valueToString(value));
+      throw new Test.ArgumentsException("Invalid argument to assertFalse(boolean): " +
+                      Test.valueToString(value));
    } else if (value === true) {
-      throw new jala.Test.TestException(comment,
+      throw new Test.TestException(comment,
                       "assertFalse(boolean) called with argument " +
-                      jala.Test.valueToString(value));
+                      Test.valueToString(value));
    }
    return;
 };
@@ -792,20 +789,20 @@
  * Checks if the values passed as arguments are equal.
  * @param {Object} val1 The value that should be compared to the second argument.
  * @param {Object} val2 The value that should be compared to the first argument.
- * @throws jala.Test.ArgumentsException
- * @throws jala.Test.TestException
+ * @throws Test.ArgumentsException
+ * @throws Test.TestException
  */
-jala.Test.prototype.assertEqual = function assertEqual(val1, val2) {
+Test.prototype.assertEqual = function assertEqual(val1, val2) {
    var functionName = arguments.callee.name;
    var argsExpected = arguments.callee.length;
-   jala.Test.evalArguments(arguments, argsExpected);
-   var comment = jala.Test.getComment(arguments, argsExpected);
-   var value1 = jala.Test.getValue(arguments, argsExpected, 0);
-   var value2 = jala.Test.getValue(arguments, argsExpected, 1);
+   Test.evalArguments(arguments, argsExpected);
+   var comment = Test.getComment(arguments, argsExpected);
+   var value1 = Test.getValue(arguments, argsExpected, 0);
+   var value2 = Test.getValue(arguments, argsExpected, 1);
    if (value1 !== value2) {
-      throw new jala.Test.TestException(comment,
-                      "Expected " + jala.Test.valueToString(value1) +
-                      " to be equal to " + jala.Test.valueToString(value2));
+      throw new Test.TestException(comment,
+                      "Expected " + Test.valueToString(value1) +
+                      " to be equal to " + Test.valueToString(value2));
    }
    return;
 };
@@ -816,16 +813,16 @@
  * the file on disk.
  * @param {String|helma.File} file Either a file name (including a path), or
  * an instance of helma.File representing the file to use for comparison.
- * @throws jala.Test.ArgumentsException
- * @throws jala.Test.TestException
+ * @throws Test.ArgumentsException
+ * @throws Test.TestException
  */
-jala.Test.prototype.assertEqualFile = function assertEqualFile(val, file) {
+Test.prototype.assertEqualFile = function assertEqualFile(val, file) {
    var functionName = arguments.callee.name;
    var argsExpected = arguments.callee.length;
-   jala.Test.evalArguments(arguments, argsExpected);
-   var comment = jala.Test.getComment(arguments, argsExpected);
-   var value1 = jala.Test.getValue(arguments, argsExpected, 0);
-   var file = new helma.File(jala.Test.getValue(arguments, argsExpected, 1));
+   Test.evalArguments(arguments, argsExpected);
+   var comment = Test.getComment(arguments, argsExpected);
+   var value1 = Test.getValue(arguments, argsExpected, 0);
+   var file = new helma.File(Test.getValue(arguments, argsExpected, 1));
    var equals;
    if (value1.getClass && value1.getClass().isArray() &&
           value1.getClass().getComponentType() === java.lang.Byte.TYPE) {
@@ -837,8 +834,8 @@
       equals = str === file.readAll();
    }      
    if (!equals) {
-      throw new jala.Test.TestException(comment,
-                      "Expected " + jala.Test.valueToString(value1) +
+      throw new Test.TestException(comment,
+                      "Expected " + Test.valueToString(value1) +
                       " to be equal to the contents of the file " +
                       file.getAbsolutePath());
    }
@@ -849,20 +846,20 @@
  * Checks if the values passed as arguments are not equal.
  * @param {Object} val1 The value that should be compared to the second argument.
  * @param {Object} val2 The value that should be compared to the first argument.
- * @throws jala.Test.ArgumentsException
- * @throws jala.Test.TestException
+ * @throws Test.ArgumentsException
+ * @throws Test.TestException
  */
-jala.Test.prototype.assertNotEqual = function assertNotEqual(val1, val2) {
+Test.prototype.assertNotEqual = function assertNotEqual(val1, val2) {
    var functionName = arguments.callee.name;
    var argsExpected = arguments.callee.length;
-   jala.Test.evalArguments(arguments, argsExpected);
-   var value1 = jala.Test.getValue(arguments, argsExpected, 0);
-   var value2 = jala.Test.getValue(arguments, argsExpected, 1);
-   var comment = jala.Test.getComment(arguments, argsExpected);
+   Test.evalArguments(arguments, argsExpected);
+   var value1 = Test.getValue(arguments, argsExpected, 0);
+   var value2 = Test.getValue(arguments, argsExpected, 1);
+   var comment = Test.getComment(arguments, argsExpected);
    if (value1 === value2) {
-      throw new jala.Test.TestException(comment,
-                      "Expected " + jala.Test.valueToString(value1) +
-                      " to be not equal to " + jala.Test.valueToString(value2));
+      throw new Test.TestException(comment,
+                      "Expected " + Test.valueToString(value1) +
+                      " to be not equal to " + Test.valueToString(value2));
    }
    return;
 };
@@ -870,18 +867,18 @@
 /**
  * Checks if the value passed as argument is null.
  * @param {Object} val The value that should be null.
- * @throws jala.Test.ArgumentsException
- * @throws jala.Test.TestException
+ * @throws Test.ArgumentsException
+ * @throws Test.TestException
  */
-jala.Test.prototype.assertNull = function assertNull(val) {
+Test.prototype.assertNull = function assertNull(val) {
    var functionName = arguments.callee.name;
    var argsExpected = arguments.callee.length;
-   jala.Test.evalArguments(arguments, argsExpected);
-   var comment = jala.Test.getComment(arguments, argsExpected);
-   var value = jala.Test.getValue(arguments, argsExpected, 0);
+   Test.evalArguments(arguments, argsExpected);
+   var comment = Test.getComment(arguments, argsExpected);
+   var value = Test.getValue(arguments, argsExpected, 0);
    if (value !== null) {
-      throw new jala.Test.TestException(comment,
-                           "Expected " + jala.Test.valueToString(value) +
+      throw new Test.TestException(comment,
+                           "Expected " + Test.valueToString(value) +
                            " to be null");
    }
    return;
@@ -890,18 +887,18 @@
 /**
  * Checks if the value passed as argument is not null.
  * @param {Object} val The value that should be not null.
- * @throws jala.Test.ArgumentsException
- * @throws jala.Test.TestException
+ * @throws Test.ArgumentsException
+ * @throws Test.TestException
  */
-jala.Test.prototype.assertNotNull = function assertNotNull(val) {
+Test.prototype.assertNotNull = function assertNotNull(val) {
    var functionName = arguments.callee.name;
    var argsExpected = arguments.callee.length;
-   jala.Test.evalArguments(arguments, argsExpected);
-   var comment = jala.Test.getComment(arguments, argsExpected);
-   var value = jala.Test.getValue(arguments, argsExpected, 0);
+   Test.evalArguments(arguments, argsExpected);
+   var comment = Test.getComment(arguments, argsExpected);
+   var value = Test.getValue(arguments, argsExpected, 0);
    if (value === null) {
-      throw new jala.Test.TestException(comment,
-                           "Expected " + jala.Test.valueToString(value) +
+      throw new Test.TestException(comment,
+                           "Expected " + Test.valueToString(value) +
                            " to be not null");
    }
    return;
@@ -910,18 +907,18 @@
 /**
  * Checks if the value passed as argument is undefined.
  * @param {Object} val The value that should be undefined.
- * @throws jala.Test.ArgumentsException
- * @throws jala.Test.TestException
+ * @throws Test.ArgumentsException
+ * @throws Test.TestException
  */
-jala.Test.prototype.assertUndefined = function assertUndefined(val) {
+Test.prototype.assertUndefined = function assertUndefined(val) {
    var functionName = arguments.callee.name;
    var argsExpected = arguments.callee.length;
-   jala.Test.evalArguments(arguments, argsExpected);
-   var comment = jala.Test.getComment(arguments, argsExpected);
-   var value = jala.Test.getValue(arguments, argsExpected, 0);
+   Test.evalArguments(arguments, argsExpected);
+   var comment = Test.getComment(arguments, argsExpected);
+   var value = Test.getValue(arguments, argsExpected, 0);
    if (value !== undefined) {
-      throw new jala.Test.TestException(comment,
-                           "Expected " + jala.Test.valueToString(value) +
+      throw new Test.TestException(comment,
+                           "Expected " + Test.valueToString(value) +
                            " to be undefined");
    }
    return;
@@ -930,17 +927,17 @@
 /**
  * Checks if the value passed as argument is not undefined.
  * @param {Object} val The value that should be not undefined.
- * @throws jala.Test.ArgumentsException
- * @throws jala.Test.TestException
+ * @throws Test.ArgumentsException
+ * @throws Test.TestException
  */
-jala.Test.prototype.assertNotUndefined = function assertNotUndefined(val) {
+Test.prototype.assertNotUndefined = function assertNotUndefined(val) {
    var functionName = arguments.callee.name;
    var argsExpected = arguments.callee.length;
-   jala.Test.evalArguments(arguments, argsExpected);
-   var comment = jala.Test.getComment(arguments, argsExpected);
-   var value = jala.Test.getValue(arguments, argsExpected, 0);
+   Test.evalArguments(arguments, argsExpected);
+   var comment = Test.getComment(arguments, argsExpected);
+   var value = Test.getValue(arguments, argsExpected, 0);
    if (value === undefined) {
-      throw new jala.Test.TestException(comment,
+      throw new Test.TestException(comment,
                            "Expected argument to be not undefined");
    }
    return;
@@ -949,18 +946,18 @@
 /**
  * Checks if the value passed as argument is NaN.
  * @param {Object} val The value that should be NaN.
- * @throws jala.Test.ArgumentsException
- * @throws jala.Test.TestException
+ * @throws Test.ArgumentsException
+ * @throws Test.TestException
  */
-jala.Test.prototype.assertNaN = function assertNaN(val) {
+Test.prototype.assertNaN = function assertNaN(val) {
    var functionName = arguments.callee.name;
    var argsExpected = arguments.callee.length;
-   jala.Test.evalArguments(arguments, argsExpected);
-   var comment = jala.Test.getComment(arguments, argsExpected);
-   var value = jala.Test.getValue(arguments, argsExpected, 0);
+   Test.evalArguments(arguments, argsExpected);
+   var comment = Test.getComment(arguments, argsExpected);
+   var value = Test.getValue(arguments, argsExpected, 0);
    if (!isNaN(value)) {
-      throw new jala.Test.TestException(comment,
-                           "Expected " + jala.Test.valueToString(value) +
+      throw new Test.TestException(comment,
+                           "Expected " + Test.valueToString(value) +
                            " to be NaN");
    }
    return;
@@ -969,18 +966,18 @@
 /**
  * Checks if the value passed as argument is not NaN.
  * @param {Object} val The value that should be not NaN.
- * @throws jala.Test.ArgumentsException
- * @throws jala.Test.TestException
+ * @throws Test.ArgumentsException
+ * @throws Test.TestException
  */
-jala.Test.prototype.assertNotNaN = function assertNotNaN(val) {
+Test.prototype.assertNotNaN = function assertNotNaN(val) {
    var functionName = arguments.callee.name;
    var argsExpected = arguments.callee.length;
-   jala.Test.evalArguments(arguments, argsExpected);
-   var comment = jala.Test.getComment(arguments, argsExpected);
-   var value = jala.Test.getValue(arguments, argsExpected, 0);
+   Test.evalArguments(arguments, argsExpected);
+   var comment = Test.getComment(arguments, argsExpected);
+   var value = Test.getValue(arguments, argsExpected, 0);
    if (isNaN(value)) {
-      throw new jala.Test.TestException(comment,
-                           "Expected " + jala.Test.valueToString(value) +
+      throw new Test.TestException(comment,
+                           "Expected " + Test.valueToString(value) +
                            " to be a number");
    }
    return;
@@ -990,25 +987,25 @@
  * Checks if the value passed as argument contains the pattern specified.
  * @param {String} val The string that should contain the pattern
  * @param {String} str The string that should be contained
- * @throws jala.Test.ArgumentsException
- * @throws jala.Test.TestException
+ * @throws Test.ArgumentsException
+ * @throws Test.TestException
  */
-jala.Test.prototype.assertStringContains = function assertStringContains(val, str) {
+Test.prototype.assertStringContains = function assertStringContains(val, str) {
    var functionName = arguments.callee.name;
    var argsExpected = arguments.callee.length;
-   jala.Test.evalArguments(arguments, argsExpected);
-   var comment = jala.Test.getComment(arguments, argsExpected);
-   var value = jala.Test.getValue(arguments, argsExpected, 0);
-   var pattern = jala.Test.getValue(arguments, argsExpected, 1);
+   Test.evalArguments(arguments, argsExpected);
+   var comment = Test.getComment(arguments, argsExpected);
+   var value = Test.getValue(arguments, argsExpected, 0);
+   var pattern = Test.getValue(arguments, argsExpected, 1);
    if (pattern.constructor == String) {
       if (value.indexOf(pattern) < 0) {
-         throw new jala.Test.TestException(comment,
-                              "Expected string " + jala.Test.valueToString(pattern) +
-                              " to be found in " + jala.Test.valueToString(value));
+         throw new Test.TestException(comment,
+                              "Expected string " + Test.valueToString(pattern) +
+                              " to be found in " + Test.valueToString(value));
       }
    } else {
-      throw new jala.Test.ArgumentsException("Invalid argument to assertStringContains(string, string): " +
-                      jala.Test.valueToString(pattern));
+      throw new Test.ArgumentsException("Invalid argument to assertStringContains(string, string): " +
+                      Test.valueToString(pattern));
    }
    return;
 };
@@ -1017,25 +1014,25 @@
  * Checks if the regular expression matches the string.
  * @param {String} val The string that should contain the regular expression pattern
  * @param {RegExp} rxp The regular expression that should match the value
- * @throws jala.Test.ArgumentsException
- * @throws jala.Test.TestException
+ * @throws Test.ArgumentsException
+ * @throws Test.TestException
  */
-jala.Test.prototype.assertMatch = function assertMatch(val, rxp) {
+Test.prototype.assertMatch = function assertMatch(val, rxp) {
    var functionName = arguments.callee.name;
    var argsExpected = arguments.callee.length;
-   jala.Test.evalArguments(arguments, argsExpected);
-   var comment = jala.Test.getComment(arguments, argsExpected);
-   var value = jala.Test.getValue(arguments, argsExpected, 0);
-   var exp = jala.Test.getValue(arguments, argsExpected, 1);
+   Test.evalArguments(arguments, argsExpected);
+   var comment = Test.getComment(arguments, argsExpected);
+   var value = Test.getValue(arguments, argsExpected, 0);
+   var exp = Test.getValue(arguments, argsExpected, 1);
    if (exp.constructor == RegExp) {
       if (exp.test(value) == false) {
-         throw new jala.Test.TestException(comment,
-                              "Expected pattern " + jala.Test.valueToString(exp) +
-                              " to match " + jala.Test.valueToString(value));
+         throw new Test.TestException(comment,
+                              "Expected pattern " + Test.valueToString(exp) +
+                              " to match " + Test.valueToString(value));
       }
    } else {
-      throw new jala.Test.ArgumentsException("Invalid argument to assertMatch(string, regexp): " +
-                      jala.Test.valueToString(pattern));
+      throw new Test.ArgumentsException("Invalid argument to assertMatch(string, regexp): " +
+                      Test.valueToString(pattern));
    }
    return;
 };
@@ -1045,18 +1042,18 @@
  * @param {Object} func The function to call
  * @param {Object} exception Optional object expected to be thrown when executing
  * the function
- * @throws jala.Test.ArgumentsException
- * @throws jala.Test.TestException
+ * @throws Test.ArgumentsException
+ * @throws Test.TestException
  */
-jala.Test.prototype.assertThrows = function assertThrows(func, exception) {
+Test.prototype.assertThrows = function assertThrows(func, exception) {
    var functionName = arguments.callee.name;
    var argsExpected = arguments.callee.length;
    if (!func || !(func instanceof Function)) {
-      throw new jala.Test.ArgumentsException("Insufficient arguments passed to assertion function");
+      throw new Test.ArgumentsException("Insufficient arguments passed to assertion function");
    }
-   var comment = jala.Test.getComment(arguments, argsExpected);
-   var func = jala.Test.getValue(arguments, argsExpected, 0);
-   var expected = jala.Test.getValue(arguments, argsExpected, 1);
+   var comment = Test.getComment(arguments, argsExpected);
+   var func = Test.getValue(arguments, argsExpected, 0);
+   var expected = Test.getValue(arguments, argsExpected, 1);
 
    try {
       func();
@@ -1086,13 +1083,13 @@
          }
       }
       if (!isExpected) {
-         throw new jala.Test.TestException(comment, "Expected " + jala.Test.valueToString(expected) +
-                                   " being thrown, but got '" + jala.Test.valueToString(thrown) + "' instead");
+         throw new Test.TestException(comment, "Expected " + Test.valueToString(expected) +
+                                   " being thrown, but got '" + Test.valueToString(thrown) + "' instead");
       }
       return;
    }
-   throw new jala.Test.TestException(comment, "Expected exception " +
-                             jala.Test.valueToString(expected) + " being thrown");
+   throw new Test.TestException(comment, "Expected exception " +
+                             Test.valueToString(expected) + " being thrown");
    return;
 };
 
@@ -1112,8 +1109,8 @@
  * @returns A newly constructed HttpClient
  * @constructor
  */
-jala.Test.HttpClient = function() {
-   var client = new helma.Http();
+Test.HttpClient = function() {
+   var client = new helma.http.Client();
    var cookies = null;
 
    /**
@@ -1154,7 +1151,7 @@
  * @return An object containing response values
  * @see helma.Http.prototype.getUrl
  */
-jala.Test.HttpClient.prototype.executeRequest = function(method, url, param) {
+Test.HttpClient.prototype.executeRequest = function(method, url, param) {
    var client = this.getClient();
    client.setMethod(method);
    client.setCookies(this.getCookies());
@@ -1183,7 +1180,7 @@
  * @return An object containing response values
  * @see helma.Http.prototype.getUrl
  */
-jala.Test.HttpClient.prototype.getUrl = function(url, param) {
+Test.HttpClient.prototype.getUrl = function(url, param) {
    return this.executeRequest("GET", url, param);
 };
 
@@ -1194,13 +1191,13 @@
  * @return An object containing response values
  * @see helma.Http.prototype.getUrl
  */
-jala.Test.HttpClient.prototype.submitForm = function(url, param) {
+Test.HttpClient.prototype.submitForm = function(url, param) {
    return this.executeRequest("POST", url, param);
 };
 
 /** @ignore */
-jala.Test.HttpClient.prototype.toString = function() {
-   return "[jala.Test.HttpClient]";
+Test.HttpClient.prototype.toString = function() {
+   return "[Test.HttpClient]";
 };
 
 
@@ -1219,7 +1216,7 @@
  * @returns A newly created instance of DatabaseMgr
  * @constructor
  */
-jala.Test.DatabaseMgr = function() {
+Test.DatabaseMgr = function() {
    /**
     * Map containing all test databases
     */
@@ -1235,8 +1232,8 @@
    return this;
 };
 
-jala.Test.DatabaseMgr.prototype.toString = function() {
-   return "[jala.Test DatabaseMgr]";
+Test.DatabaseMgr.prototype.toString = function() {
+   return "[Test DatabaseMgr]";
 };
 
 /**
@@ -1257,11 +1254,11 @@
  * should be created in the test database. If not specified this method
  * collects all tables that are mapped in the application.
  * @returns The test database
- * @type jala.db.RamDatabase
+ * @type db.RamDatabase
  */
-jala.Test.DatabaseMgr.prototype.startDatabase = function(dbSourceName, copyTables, tables) {
+Test.DatabaseMgr.prototype.startDatabase = function(dbSourceName, copyTables, tables) {
    try {
-      var testDb = new jala.db.RamDatabase(dbSourceName);
+      var testDb = new db.RamDatabase(dbSourceName);
       // switch the datasource to the test database
       var dbSource = app.getDbSource(dbSourceName);
       if (copyTables === true) {
@@ -1287,7 +1284,7 @@
       root.invalidate();
       return testDb;
    } catch (e) {
-      throw new jala.Test.EvaluatorException("Unable to switch to test database because of ", e);
+      throw new Test.EvaluatorException("Unable to switch to test database because of ", e);
    }
 };
 
@@ -1298,7 +1295,7 @@
  * cleares the application cache and invalidates the root object
  * to ensure no traces of the test database are left behind.
  */
-jala.Test.DatabaseMgr.prototype.stopAll = function() {
+Test.DatabaseMgr.prototype.stopAll = function() {
    // commit all pending changes
    res.commit();
    try {
@@ -1315,7 +1312,7 @@
       app.clearCache();
       root.invalidate();
    } catch (e) {
-      throw new jala.Test.EvaluatorException("Unable to stop test databases because of ", e);
+      throw new Test.EvaluatorException("Unable to stop test databases because of ", e);
    }
    return;
 };
@@ -1330,7 +1327,7 @@
 /**
  * Creates a new SmtpServer instance
  * @class Instances of this class represent an SMTP server listening on
- * localhost. By default jala.Test will create a global variable called
+ * localhost. By default Test will create a global variable called
  * "smtpServer" that contains an instance of this class. To use the server call
  * {@link #start} in a test method (eg. in the basic setup method) and
  * {@link #stop} in the cleanup method.
@@ -1338,7 +1335,7 @@
  * @returns A newly created SmtpServer instance
  * @constructor
  */
-jala.Test.SmtpServer = function(port) {
+Test.SmtpServer = function(port) {
    var server = null;
    
    var oldSmtpServer = null;
@@ -1383,7 +1380,7 @@
 
    /**
     * Returns an array containing all mails received by the server,
-    * where each one is an instance of {@link jala.Test.SmtpServer.Message}
+    * where each one is an instance of {@link Test.SmtpServer.Message}
     * @returns An array with all messages
     * @type Array
     */
@@ -1391,7 +1388,7 @@
       var it = server.getMessages().listIterator();
       var result = [];
       while (it.hasNext()) {
-         result.push(new jala.Test.SmtpServer.Message(it.next()));
+         result.push(new Test.SmtpServer.Message(it.next()));
       }
       return result;
    };
@@ -1400,7 +1397,7 @@
 };
 
 /** @ignore */
-jala.Test.SmtpServer.prototype.toString = function() {
+Test.SmtpServer.prototype.toString = function() {
    return "[Jala Test SmtpServer]";
 };
 
@@ -1413,7 +1410,7 @@
  * @returns A newly created Mail instance
  * @constructor
  */
-jala.Test.SmtpServer.Message = function(message) {
+Test.SmtpServer.Message = function(message) {
    /**
     * The wrapped message as MimeMessage instance
     * @type javax.mail.internet.MimeMessage
@@ -1441,7 +1438,7 @@
 };
 
 /** @ignore */
-jala.Test.SmtpServer.Message.prototype.toString = function() {
+Test.SmtpServer.Message.prototype.toString = function() {
    return "[Jala Test Mail]";
 };
 
@@ -1450,7 +1447,7 @@
  * @returns An array with all senders of this mail
  * @type Array
  */
-jala.Test.SmtpServer.Message.prototype.getFrom = function() {
+Test.SmtpServer.Message.prototype.getFrom = function() {
    var result = [];
    this.getMimeMessage().getFrom().forEach(function(addr) {
       result.push(addr.toString())
@@ -1463,7 +1460,7 @@
  * @returns An array with all recipients of this mail
  * @type Array
  */
-jala.Test.SmtpServer.Message.prototype.getTo = function() {
+Test.SmtpServer.Message.prototype.getTo = function() {
    var type = Packages.javax.mail.internet.MimeMessage.RecipientType.TO;
    var result = [];
    this.getMimeMessage().getRecipients(type).forEach(function(addr) {
@@ -1477,7 +1474,7 @@
  * @returns An array with all CC recipients of this mail
  * @type Array
  */
-jala.Test.SmtpServer.Message.prototype.getCc = function() {
+Test.SmtpServer.Message.prototype.getCc = function() {
    var type = Packages.javax.mail.internet.MimeMessage.RecipientType.CC;
    var result = [];
    this.getMimeMessage().getRecipients(type).forEach(function(addr) {
@@ -1491,7 +1488,7 @@
  * @returns An array with all reply-to addresses of this mail
  * @type Array
  */
-jala.Test.SmtpServer.Message.prototype.getReplyTo = function() {
+Test.SmtpServer.Message.prototype.getReplyTo = function() {
    var result = [];
    this.getMimeMessage().getReplyTo().forEach(function(addr) {
       result.push(addr.toString())
@@ -1505,7 +1502,7 @@
  * @returns The encoding of this mail
  * @type String
  */
-jala.Test.SmtpServer.Message.prototype.getEncoding = function() {
+Test.SmtpServer.Message.prototype.getEncoding = function() {
    return this.getMimeMessage().getEncoding();
 };
 
@@ -1514,7 +1511,7 @@
  * @returns The subject of this mail
  * @type String
  */
-jala.Test.SmtpServer.Message.prototype.getSubject = function() {
+Test.SmtpServer.Message.prototype.getSubject = function() {
    return this.getMimeMessage().getSubject();
 };
 
@@ -1522,7 +1519,7 @@
  * Returns the content of this mail
  * @returns The content of this mail
  */
-jala.Test.SmtpServer.Message.prototype.getContent = function() {
+Test.SmtpServer.Message.prototype.getContent = function() {
    return this.getMimeMessage().getContent();
 };
 
@@ -1532,6 +1529,6 @@
  * @returns The content type of this mail
  * @type String
  */
-jala.Test.SmtpServer.Message.prototype.getContentType = function() {
+Test.SmtpServer.Message.prototype.getContentType = function() {
    return this.getMimeMessage().getContentType();
 };
diff -Nu /home/hannes/helma/modules/jala/util/Test/code/Global/jala.Test.skin modules/jala/test/jala.Test.skin
--- /home/hannes/helma/modules/jala/util/Test/code/Global/jala.Test.skin	2007-10-29 11:27:29.000000000 +0100
+++ modules/jala/test/jala.Test.skin	2008-05-09 17:29:21.000000000 +0200
@@ -27,7 +27,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
 <head>
 <title>Jala Unit Test Runner</title>
-<link rel="stylesheet" type="text/css" media="screen" href="<% root.href action="jala.test.css" %>" />
+<link rel="stylesheet" type="text/css" media="screen" href="jala.test.css" />
 <script type="text/javascript">
 <!--
 
@@ -58,7 +58,7 @@
    </div>
    <div class="main">
       <div class="list">
-         <form id="tests" method="post" action="<% root.href action="jala.test" %>">
+         <form id="tests" method="post" action="jala.test">
          <% test.list prefix='<h4>Available Tests</h4><ul>'
                       suffix='<li><br /><input id="toggle" type="checkbox" onclick="toggleCheckboxes()" /><a href="#" onclick="toggleCheckboxes(true);">select all</a></li></ul><input class="submit" type="submit" name="run" value="Execute" />' %>
          </form>
@@ -86,14 +86,14 @@
 
 
 
-<% #result ------------------------------------------------------------------ %>
+<% subskin result ------------------------------------------------------------------ %>
 
 <h4 class="<% param.status %>">Results of '<% param.name %>':</h4>
 <% param.log prefix="<dl>" suffix="</dl>" %>
 
 
 
-<% #item -------------------------------------------------------------------- %>
+<% subskin item -------------------------------------------------------------------- %>
 
 <li>
    <input type="checkbox" name="test" value="<% param.name %>" <% param.checked %>/><a href="?test=<% param.name %>"><% param.name %></a>
@@ -101,7 +101,7 @@
 
 
 
-<% #logFailed --------------------------------------------------------------- %>
+<% subskin logFailed --------------------------------------------------------------- %>
 
 <dt class="test error">Error</dt>
 <dd>
@@ -114,14 +114,14 @@
 
 
 
-<% #logPassed --------------------------------------------------------------- %>
+<% subskin logPassed --------------------------------------------------------------- %>
 
 <dt class="test passed">Passed</dt>
 <dd><span class="function"><% param.functionName %>()</span><span class="elapsed">(in <% param.elapsed %> ms)</span></dd>
 
 
 
-<% #stylesheet -------------------------------------------------------------- %>
+<% subskin stylesheet -------------------------------------------------------------- %>
 
 body {
    font-family: Verdana, Arial, Helvetica;
diff -Nu /home/hannes/helma/modules/jala/util/Test/code/Global/Root.js modules/jala/test/Root.js
--- /home/hannes/helma/modules/jala/util/Test/code/Global/Root.js	2007-10-29 11:27:29.000000000 +0100
+++ modules/jala/test/Root.js	2008-05-11 18:10:13.000000000 +0200
@@ -25,19 +25,22 @@
 /**
  * Module dependencies
  */
-app.addRepository("modules/core/HopObject.js");
-app.addRepository("modules/core/Array.js");
-app.addRepository("modules/helma/File.js");
+// importModule("core.hopobject");
+// importModule("core.array");
+// importModule("helma.file");
+
+importFromModule("helma.helma1", "renderSkin", "addMacroHandler");
 
 /**
  * Test runner
  */
-Root.prototype.jala_test_action = function() {
-   res.handlers.test = new jala.Test();
-   if (req.isGet() && req.data.test) {
-      res.handlers.test.execute(req.data.test);
-   } else if (req.isPost() && (req.data.test_array || req.data.test)) {
-      res.handlers.test.execute(req.data.test_array || req.data.test);
+jala_test_action = function() {
+   var test = new Test();
+   addMacroHandler("test", test);
+   if (req.method == "POST" && req.data.test) {
+      test.execute(req.data.test);
+   } else if (req.method == "GET" && (req.data.test_array || req.data.test)) {
+      test.execute(req.data.test_array || req.data.test);
    }
    renderSkin("jala.Test");
    return;
@@ -46,7 +49,7 @@
 /**
  * External stylesheet for test runner
  */
-Root.prototype.jala_test_css_action = function() {
+jala_test_css_action = function() {
    res.contentType = "text/css";
    renderSkin("jala.Test#stylesheet");
    return;
Gemeinsame Unterverzeichnisse: /home/hannes/helma/modules/jala/util/Test/code/Global/.svn und modules/jala/test/.svn.