From 8c7c459fe7f4614444f4f9d69745164223905a18 Mon Sep 17 00:00:00 2001
From: nzakas <nicholas.c.zakas@nczonline.net>
Date: Sat, 12 Feb 2011 13:36:57 -0500
Subject: [PATCH] Cleaned up node CLI

---
 javascript/build-node.properties              |   6 +-
 javascript/build/yuitest/npm/cli.js           | 120 +++--------
 .../build/yuitest/npm/lib/yuitest-node.js     | 191 ++++++++++++++++++
 .../build/yuitest/yuitest-node-debug.js       | 191 ++++++++++++++++++
 javascript/build/yuitest/yuitest-node-min.js  |   3 +-
 javascript/build/yuitest/yuitest-node.js      | 191 ++++++++++++++++++
 javascript/src/nodejs/CLI.Logger.js           |  89 ++++++++
 javascript/src/nodejs/CLI.XUnit.js            |  94 +++++++++
 javascript/src/nodejs/Node.js                 |   5 +
 javascript/src/nodejs/cli.js                  | 120 +++--------
 javascript/tests/asserts/AssertTests.js       |   2 +-
 javascript/tests/asserts/ObjectAssertTests.js |   6 +-
 12 files changed, 821 insertions(+), 197 deletions(-)
 create mode 100644 javascript/src/nodejs/CLI.Logger.js
 create mode 100644 javascript/src/nodejs/CLI.XUnit.js
 create mode 100644 javascript/src/nodejs/Node.js

diff --git a/javascript/build-node.properties b/javascript/build-node.properties
index e7d8b1d..926034f 100644
--- a/javascript/build-node.properties
+++ b/javascript/build-node.properties
@@ -31,7 +31,11 @@ component.jsfiles=  core/YUITest.js, \
                     reporting/TestFormat.js, \
                     reporting/CoverageFormat.js, \
                     core/TestRunner.js, \
+                    nodejs/Node.js, \
+                    nodejs/CLI.Logger.js, \
+                    nodejs/CLI.XUnit.js, \
                     commonjs/Exports.js
 
 #Override
-global.build.base = ${component.jsfiles.base}/../build
\ No newline at end of file
+global.build.base = ${component.jsfiles.base}/../build
+component.logger.regex=SHOULD_MATCH_NOTHING
diff --git a/javascript/build/yuitest/npm/cli.js b/javascript/build/yuitest/npm/cli.js
index 1d2d258..eefe1ac 100644
--- a/javascript/build/yuitest/npm/cli.js
+++ b/javascript/build/yuitest/npm/cli.js
@@ -4,10 +4,11 @@
  
 var fs      = require("fs"),
     path    = require("path"),
-    //YUITest = require(path.join(process.cwd(), "lib/yuitest-node.js")).YUITest,
+    vm      = require("vm"),
     YUITest = require("./lib/yuitest-node.js").YUITest,
     TestRunner = YUITest.TestRunner,
-    stdout  = process.stdout;
+    stdout  = process.stdout,
+    stderr  = process.stderr;
     
   
 //options collected from command line  
@@ -16,90 +17,7 @@ var options = {
 };
 
 //-----------------------------------------------------------------------------
-// Setup TestRunner
-//-----------------------------------------------------------------------------
-
-stdout.write("YUI Test for Node.js\n");
-
-//handles test runner events
-function handleEvent(event){
-var message = "";
-    switch(event.type){
-        case TestRunner.BEGIN_EVENT:
-            message = "Testing began at " + (new Date()).toString() + ".";
-            messageType = "info";
-            break;
-            
-        case TestRunner.COMPLETE_EVENT:
-            message = "Testing completed at " +
-                (new Date()).toString() + ".\n" +
-                "Passed:" + event.results.passed + " Failed:" + event.results.failed +
-                " Total:" + event.results.total + "(" + event.results.ignored + " ignored)"; 
-            messageType = "info";
-            break;
-            
-        case TestRunner.TEST_FAIL_EVENT:
-            message = event.testName + ": failed.\n" + event.error.getMessage();
-            messageType = "fail";
-            break;
-            
-        case TestRunner.TEST_IGNORE_EVENT:
-            message = event.testName + ": ignored.";
-            messageType = "ignore";
-            break;
-            
-        case TestRunner.TEST_PASS_EVENT:
-            message = event.testName + ": passed.";
-            messageType = "pass";
-            break;
-            
-        case TestRunner.TEST_SUITE_BEGIN_EVENT:
-            message = "Test suite \"" + event.testSuite.name + "\" started.";
-            messageType = "info";
-            break;
-            
-        case TestRunner.TEST_SUITE_COMPLETE_EVENT:
-            message = "Testing completed at " +
-                (new Date()).toString() + ".\n" +
-                "Passed:" + event.results.passed + " Failed:" + event.results.failed +
-                " Total:" + event.results.total + "(" + event.results.ignored + " ignored)";
-            messageType = "info";
-            break;
-            
-        case TestRunner.TEST_CASE_BEGIN_EVENT:
-            message = "Test case \"" + event.testCase.name + "\" started.";
-            messageType = "info";
-            break;
-            
-        case TestRunner.TEST_CASE_COMPLETE_EVENT:
-            message = "Testing completed at " +
-                (new Date()).toString() + ".\n" +
-                "Passed:" + event.results.passed + " Failed:" + event.results.failed +
-                " Total:" + event.results.total + "(" + event.results.ignored + " ignored)";
-            messageType = "info";
-            break;
-        default:
-            message = "Unexpected event " + event.type;
-            messageType = "info";
-    }    
-    
-    stdout.write(message + "\n");
-}
-
-
-TestRunner.subscribe(TestRunner.BEGIN_EVENT, handleEvent)
-TestRunner.subscribe(TestRunner.TEST_FAIL_EVENT, handleEvent);
-TestRunner.subscribe(TestRunner.TEST_PASS_EVENT, handleEvent);
-TestRunner.subscribe(TestRunner.TEST_IGNORE_EVENT, handleEvent);
-TestRunner.subscribe(TestRunner.TEST_CASE_BEGIN_EVENT, handleEvent);
-TestRunner.subscribe(TestRunner.TEST_CASE_COMPLETE_EVENT, handleEvent);
-TestRunner.subscribe(TestRunner.TEST_SUITE_BEGIN_EVENT, handleEvent);
-TestRunner.subscribe(TestRunner.TEST_SUITE_COMPLETE_EVENT, handleEvent);
-TestRunner.subscribe(TestRunner.COMPLETE_EVENT, handleEvent); 
-
-
-//-----------------------------------------------------------------------------
-// Function get all files in a directory
+// Function to get all files in a directory
 //-----------------------------------------------------------------------------
 
 function getFiles(dir){
@@ -161,21 +79,33 @@ files = files.map(function(filename){
     return path.join(process.cwd(), filename);
 });
 
+//-----------------------------------------------------------------------------
+// Setup TestRunner
+//-----------------------------------------------------------------------------
+
+//TODO: Other types of output
+YUITest.Node.CLI.XUnit();
+
 //-----------------------------------------------------------------------------
 // Include test files
 //-----------------------------------------------------------------------------
 
-var code = [];
+var code = [], i, len;
 
-files.forEach(function(filename){
+if (files.length){
+    for (i=0, len=files.length; i < len; i++){
 
-    if (options.verbose){
-        stdout.write("Loading " + filename + "\n");
+        if (options.verbose){
+            stderr.write("Loading " + files[i] + "\n");
+        }
+        
+        var output = fs.readFileSync(files[i]);
+        vm.runInThisContext("(function(YUITest){\n" + output + "\n})", files[i])(YUITest);
+        //code.push(output);
     }
-    
-    var output = fs.readFileSync(filename);
-    code.push(output);
-});
+} else {
+    process.stdout.write("No tests to run.\n");
+}
 
-eval(code.join("\n\n"));
+//eval(code.join("\n\n"));
 TestRunner.run();
\ No newline at end of file
diff --git a/javascript/build/yuitest/npm/lib/yuitest-node.js b/javascript/build/yuitest/npm/lib/yuitest-node.js
index 0bfcc3a..8d9b20c 100644
--- a/javascript/build/yuitest/npm/lib/yuitest-node.js
+++ b/javascript/build/yuitest/npm/lib/yuitest-node.js
@@ -3358,6 +3358,197 @@ YUITest.CoverageFormat = {
         
     }();
 
+//define namespace
+
+YUITest.Node = {
+    CLI:{}
+};
+
+
+
+/**
+ * Console output that mimics logger output from YUI Test for YUI 2/3.
+ * @namespace YUITest.Node.CLI
+ * @class Logger
+ * @constructor
+ */
+YUITest.Node.CLI.Logger = function(){
+
+    var testRunner = YUITest.TestRunner;
+
+    //handles test runner events
+    function handleEvent(event){
+    
+        var message = "";
+        switch(event.type){
+            case testRunner.BEGIN_EVENT:
+                message = "Testing began at " + (new Date()).toString() + ".";
+                messageType = "info";
+                break;
+                
+            case testRunner.COMPLETE_EVENT:
+                message = "Testing completed at " +
+                    (new Date()).toString() + ".\n" +
+                    "Passed:" + event.results.passed + " Failed:" + event.results.failed +
+                    " Total:" + event.results.total + "(" + event.results.ignored + " ignored)"; 
+                messageType = "info";
+                break;
+                
+            case testRunner.TEST_FAIL_EVENT:
+                message = event.testName + ": failed.\n" + event.error.getMessage();
+                messageType = "fail";
+                break;
+                
+            case testRunner.TEST_IGNORE_EVENT:
+                message = event.testName + ": ignored.";
+                messageType = "ignore";
+                break;
+                
+            case testRunner.TEST_PASS_EVENT:
+                message = event.testName + ": passed.";
+                messageType = "pass";
+                break;
+                
+            case testRunner.TEST_SUITE_BEGIN_EVENT:
+                message = "Test suite \"" + event.testSuite.name + "\" started.";
+                messageType = "info";
+                break;
+                
+            case testRunner.TEST_SUITE_COMPLETE_EVENT:
+                message = "Testing completed at " +
+                    (new Date()).toString() + ".\n" +
+                    "Passed:" + event.results.passed + " Failed:" + event.results.failed +
+                    " Total:" + event.results.total + "(" + event.results.ignored + " ignored)";
+                messageType = "info";
+                break;
+                
+            case testRunner.TEST_CASE_BEGIN_EVENT:
+                message = "Test case \"" + event.testCase.name + "\" started.";
+                messageType = "info";
+                break;
+                
+            case testRunner.TEST_CASE_COMPLETE_EVENT:
+                message = "Testing completed at " +
+                    (new Date()).toString() + ".\n" +
+                    "Passed:" + event.results.passed + " Failed:" + event.results.failed +
+                    " Total:" + event.results.total + "(" + event.results.ignored + " ignored)";
+                messageType = "info";
+                break;
+            default:
+                message = "Unexpected event " + event.type;
+                messageType = "info";
+        }    
+        
+        process.stdout.write(message + "\n");
+    }
+
+    testRunner.subscribe(testRunner.BEGIN_EVENT, handleEvent)
+    testRunner.subscribe(testRunner.TEST_FAIL_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_PASS_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_IGNORE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_CASE_BEGIN_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_CASE_COMPLETE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_SUITE_BEGIN_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_SUITE_COMPLETE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.COMPLETE_EVENT, handleEvent); 
+
+};
+
+
+
+/**
+ * Console output that mimics XUnit output.
+ * @namespace YUITest.Node.CLI
+ * @class XUnit
+ * @constructor
+ */
+YUITest.Node.CLI.XUnit = function(){
+
+    var testRunner  = YUITest.TestRunner,
+        stdout      = process.stdout,
+        failures    = [],
+        stack       = [];
+
+    //handles test runner events
+    function handleEvent(event){
+    
+        var message = "",
+            results = event.results,
+            sys     = require('sys'),
+            i, len;
+            
+        switch(event.type){
+            case testRunner.BEGIN_EVENT:
+                message = "YUITest for Node.js\n";
+                break;
+                
+            case testRunner.COMPLETE_EVENT:
+                message = "\nTotal tests: " + results.total + ", Failures: " + 
+                    results.failed + ", Skipped: " + results.ignored +
+                    ", Time: " + (results.duration/1000) + " seconds\n";
+                    
+                if (failures.length){
+                    message += "\nTests failed:\n";
+                    
+                    for (i=0,len=failures.length; i < len; i++){
+                        message += "\n" + (i+1) + ") " + failures[i].name + " : " + failures[i].error.getMessage() + "\n";
+                        //message += "Stack trace:\n" + failures[i].error.stack + "\n";
+                    }
+                
+                    message += "\n";
+                }
+                
+                message += "\n";
+                break;
+                
+            case testRunner.TEST_FAIL_EVENT:
+                message = "F";
+                failures.push({
+                    name: stack.concat([event.testName]).join(" > "),
+                    error: event.error
+                });
+
+                break;
+                
+            case testRunner.TEST_IGNORE_EVENT:
+                message = "S";
+                break;
+                
+            case testRunner.TEST_PASS_EVENT:
+                message = ".";
+                break;
+                
+            case testRunner.TEST_SUITE_BEGIN_EVENT:
+                stack.push(event.testSuite.name);
+                break;
+                
+            case testRunner.TEST_CASE_COMPLETE_EVENT:
+            case testRunner.TEST_SUITE_COMPLETE_EVENT:
+                stack.pop();
+                break;
+                
+            case testRunner.TEST_CASE_BEGIN_EVENT:
+                stack.push(event.testCase.name);
+                break;
+                
+            //no default
+        }    
+        
+        sys.print(message);
+    }
+
+    testRunner.subscribe(testRunner.BEGIN_EVENT, handleEvent)
+    testRunner.subscribe(testRunner.TEST_FAIL_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_PASS_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_IGNORE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_CASE_BEGIN_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_CASE_COMPLETE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_SUITE_BEGIN_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_SUITE_COMPLETE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.COMPLETE_EVENT, handleEvent); 
+
+};
+
 //export in CommonJS format
 exports.YUITest = YUITest;
 
diff --git a/javascript/build/yuitest/yuitest-node-debug.js b/javascript/build/yuitest/yuitest-node-debug.js
index 0bfcc3a..8d9b20c 100644
--- a/javascript/build/yuitest/yuitest-node-debug.js
+++ b/javascript/build/yuitest/yuitest-node-debug.js
@@ -3358,6 +3358,197 @@ YUITest.CoverageFormat = {
         
     }();
 
+//define namespace
+
+YUITest.Node = {
+    CLI:{}
+};
+
+
+
+/**
+ * Console output that mimics logger output from YUI Test for YUI 2/3.
+ * @namespace YUITest.Node.CLI
+ * @class Logger
+ * @constructor
+ */
+YUITest.Node.CLI.Logger = function(){
+
+    var testRunner = YUITest.TestRunner;
+
+    //handles test runner events
+    function handleEvent(event){
+    
+        var message = "";
+        switch(event.type){
+            case testRunner.BEGIN_EVENT:
+                message = "Testing began at " + (new Date()).toString() + ".";
+                messageType = "info";
+                break;
+                
+            case testRunner.COMPLETE_EVENT:
+                message = "Testing completed at " +
+                    (new Date()).toString() + ".\n" +
+                    "Passed:" + event.results.passed + " Failed:" + event.results.failed +
+                    " Total:" + event.results.total + "(" + event.results.ignored + " ignored)"; 
+                messageType = "info";
+                break;
+                
+            case testRunner.TEST_FAIL_EVENT:
+                message = event.testName + ": failed.\n" + event.error.getMessage();
+                messageType = "fail";
+                break;
+                
+            case testRunner.TEST_IGNORE_EVENT:
+                message = event.testName + ": ignored.";
+                messageType = "ignore";
+                break;
+                
+            case testRunner.TEST_PASS_EVENT:
+                message = event.testName + ": passed.";
+                messageType = "pass";
+                break;
+                
+            case testRunner.TEST_SUITE_BEGIN_EVENT:
+                message = "Test suite \"" + event.testSuite.name + "\" started.";
+                messageType = "info";
+                break;
+                
+            case testRunner.TEST_SUITE_COMPLETE_EVENT:
+                message = "Testing completed at " +
+                    (new Date()).toString() + ".\n" +
+                    "Passed:" + event.results.passed + " Failed:" + event.results.failed +
+                    " Total:" + event.results.total + "(" + event.results.ignored + " ignored)";
+                messageType = "info";
+                break;
+                
+            case testRunner.TEST_CASE_BEGIN_EVENT:
+                message = "Test case \"" + event.testCase.name + "\" started.";
+                messageType = "info";
+                break;
+                
+            case testRunner.TEST_CASE_COMPLETE_EVENT:
+                message = "Testing completed at " +
+                    (new Date()).toString() + ".\n" +
+                    "Passed:" + event.results.passed + " Failed:" + event.results.failed +
+                    " Total:" + event.results.total + "(" + event.results.ignored + " ignored)";
+                messageType = "info";
+                break;
+            default:
+                message = "Unexpected event " + event.type;
+                messageType = "info";
+        }    
+        
+        process.stdout.write(message + "\n");
+    }
+
+    testRunner.subscribe(testRunner.BEGIN_EVENT, handleEvent)
+    testRunner.subscribe(testRunner.TEST_FAIL_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_PASS_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_IGNORE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_CASE_BEGIN_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_CASE_COMPLETE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_SUITE_BEGIN_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_SUITE_COMPLETE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.COMPLETE_EVENT, handleEvent); 
+
+};
+
+
+
+/**
+ * Console output that mimics XUnit output.
+ * @namespace YUITest.Node.CLI
+ * @class XUnit
+ * @constructor
+ */
+YUITest.Node.CLI.XUnit = function(){
+
+    var testRunner  = YUITest.TestRunner,
+        stdout      = process.stdout,
+        failures    = [],
+        stack       = [];
+
+    //handles test runner events
+    function handleEvent(event){
+    
+        var message = "",
+            results = event.results,
+            sys     = require('sys'),
+            i, len;
+            
+        switch(event.type){
+            case testRunner.BEGIN_EVENT:
+                message = "YUITest for Node.js\n";
+                break;
+                
+            case testRunner.COMPLETE_EVENT:
+                message = "\nTotal tests: " + results.total + ", Failures: " + 
+                    results.failed + ", Skipped: " + results.ignored +
+                    ", Time: " + (results.duration/1000) + " seconds\n";
+                    
+                if (failures.length){
+                    message += "\nTests failed:\n";
+                    
+                    for (i=0,len=failures.length; i < len; i++){
+                        message += "\n" + (i+1) + ") " + failures[i].name + " : " + failures[i].error.getMessage() + "\n";
+                        //message += "Stack trace:\n" + failures[i].error.stack + "\n";
+                    }
+                
+                    message += "\n";
+                }
+                
+                message += "\n";
+                break;
+                
+            case testRunner.TEST_FAIL_EVENT:
+                message = "F";
+                failures.push({
+                    name: stack.concat([event.testName]).join(" > "),
+                    error: event.error
+                });
+
+                break;
+                
+            case testRunner.TEST_IGNORE_EVENT:
+                message = "S";
+                break;
+                
+            case testRunner.TEST_PASS_EVENT:
+                message = ".";
+                break;
+                
+            case testRunner.TEST_SUITE_BEGIN_EVENT:
+                stack.push(event.testSuite.name);
+                break;
+                
+            case testRunner.TEST_CASE_COMPLETE_EVENT:
+            case testRunner.TEST_SUITE_COMPLETE_EVENT:
+                stack.pop();
+                break;
+                
+            case testRunner.TEST_CASE_BEGIN_EVENT:
+                stack.push(event.testCase.name);
+                break;
+                
+            //no default
+        }    
+        
+        sys.print(message);
+    }
+
+    testRunner.subscribe(testRunner.BEGIN_EVENT, handleEvent)
+    testRunner.subscribe(testRunner.TEST_FAIL_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_PASS_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_IGNORE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_CASE_BEGIN_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_CASE_COMPLETE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_SUITE_BEGIN_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_SUITE_COMPLETE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.COMPLETE_EVENT, handleEvent); 
+
+};
+
 //export in CommonJS format
 exports.YUITest = YUITest;
 
diff --git a/javascript/build/yuitest/yuitest-node-min.js b/javascript/build/yuitest/yuitest-node-min.js
index 03c0683..a0a75e5 100644
--- a/javascript/build/yuitest/yuitest-node-min.js
+++ b/javascript/build/yuitest/yuitest-node-min.js
@@ -2,4 +2,5 @@ var YUITest={version:"@VERSION@"};YUITest.EventTarget=function(){this._handlers=
 }},isInstanceOf:function(B,C,A){YUITest.Assert._increment();if(!(C instanceof B)){throw new YUITest.ComparisonFailure(YUITest.Assert._formatMessage(A,"Value isn't an instance of expected type."),B,C);}},isNumber:function(B,A){YUITest.Assert._increment();if(typeof B!="number"){throw new YUITest.UnexpectedValue(YUITest.Assert._formatMessage(A,"Value should be a number."),B);}},isObject:function(B,A){YUITest.Assert._increment();if(!B||(typeof B!="object"&&typeof B!="function")){throw new YUITest.UnexpectedValue(YUITest.Assert._formatMessage(A,"Value should be an object."),B);}},isString:function(B,A){YUITest.Assert._increment();if(typeof B!="string"){throw new YUITest.UnexpectedValue(YUITest.Assert._formatMessage(A,"Value should be a string."),B);}},isTypeOf:function(A,C,B){YUITest.Assert._increment();if(typeof C!=A){throw new YUITest.ComparisonFailure(YUITest.Assert._formatMessage(B,"Value should be of type "+A+"."),A,typeof C);}},throwsError:function(D,E,C){YUITest.Assert._increment();var A=false;try{E();}catch(B){if(typeof D=="string"){if(B.message!=D){A=true;}}else{if(typeof D=="function"){if(!(B instanceof D)){A=true;}}else{if(typeof D=="object"&&D!==null){if(!(B instanceof D.constructor)||B.message!=D.message){A=true;}}else{A=true;}}}if(A){throw new YUITest.UnexpectedError(B);}else{return;}}throw new YUITest.AssertionError(YUITest.Assert._formatMessage(C,"Error should have been thrown."));}};YUITest.ArrayAssert={_indexOf:function(B,C){if(B.indexOf){return B.indexOf(C);}else{for(var A=0;A<B.length;A++){if(B[A]===C){return A;}}return -1;}},_some:function(B,C){if(B.some){return B.some(C);}else{for(var A=0;A<B.length;A++){if(C(B[A])){return true;}}return false;}},contains:function(C,B,A){YUITest.Assert._increment();if(this._indexOf(B,C)==-1){YUITest.Assert.fail(YUITest.Assert._formatMessage(A,"Value "+C+" ("+(typeof C)+") not found in array ["+B+"]."));}},containsItems:function(C,D,B){YUITest.Assert._increment();for(var A=0;A<C.length;A++){if(this._indexOf(D,C[A])==-1){YUITest.Assert.fail(YUITest.Assert._formatMessage(B,"Value "+C[A]+" ("+(typeof C[A])+") not found in array ["+D+"]."));}}},containsMatch:function(C,B,A){YUITest.Assert._increment();if(typeof C!="function"){throw new TypeError("ArrayAssert.containsMatch(): First argument must be a function.");}if(!this._some(B,C)){YUITest.Assert.fail(YUITest.Assert._formatMessage(A,"No match found in array ["+B+"]."));}},doesNotContain:function(C,B,A){YUITest.Assert._increment();if(this._indexOf(B,C)>-1){YUITest.Assert.fail(YUITest.Assert._formatMessage(A,"Value found in array ["+B+"]."));}},doesNotContainItems:function(C,D,B){YUITest.Assert._increment();for(var A=0;A<C.length;A++){if(this._indexOf(D,C[A])>-1){YUITest.Assert.fail(YUITest.Assert._formatMessage(B,"Value found in array ["+D+"]."));}}},doesNotContainMatch:function(C,B,A){YUITest.Assert._increment();if(typeof C!="function"){throw new TypeError("ArrayAssert.doesNotContainMatch(): First argument must be a function.");}if(this._some(B,C)){YUITest.Assert.fail(YUITest.Assert._formatMessage(A,"Value found in array ["+B+"]."));}},indexOf:function(E,D,A,C){YUITest.Assert._increment();for(var B=0;B<D.length;B++){if(D[B]===E){if(A!=B){YUITest.Assert.fail(YUITest.Assert._formatMessage(C,"Value exists at index "+B+" but should be at index "+A+"."));}return;}}YUITest.Assert.fail(YUITest.Assert._formatMessage(C,"Value doesn't exist in array ["+D+"]."));},itemsAreEqual:function(C,D,B){YUITest.Assert._increment();if(C.length!=D.length){YUITest.Assert.fail(YUITest.Assert._formatMessage(B,"Array should have a length of "+C.length+" but has a length of "+D.length));}for(var A=0;A<C.length;A++){if(C[A]!=D[A]){throw new YUITest.Assert.ComparisonFailure(YUITest.Assert._formatMessage(B,"Values in position "+A+" are not equal."),C[A],D[A]);}}},itemsAreEquivalent:function(D,E,A,C){YUITest.Assert._increment();if(typeof A!="function"){throw new TypeError("ArrayAssert.itemsAreEquivalent(): Third argument must be a function.");}if(D.length!=E.length){YUITest.Assert.fail(YUITest.Assert._formatMessage(C,"Array should have a length of "+D.length+" but has a length of "+E.length));}for(var B=0;B<D.length;B++){if(!A(D[B],E[B])){throw new YUITest.Assert.ComparisonFailure(YUITest.Assert._formatMessage(C,"Values in position "+B+" are not equivalent."),D[B],E[B]);}}},isEmpty:function(B,A){YUITest.Assert._increment();if(B.length>0){YUITest.Assert.fail(YUITest.Assert._formatMessage(A,"Array should be empty."));}},isNotEmpty:function(B,A){YUITest.Assert._increment();if(B.length===0){YUITest.Assert.fail(YUITest.Assert._formatMessage(A,"Array should not be empty."));}},itemsAreSame:function(C,D,B){YUITest.Assert._increment();if(C.length!=D.length){YUITest.Assert.fail(YUITest.Assert._formatMessage(B,"Array should have a length of "+C.length+" but has a length of "+D.length));}for(var A=0;A<C.length;A++){if(C[A]!==D[A]){throw new YUITest.Assert.ComparisonFailure(YUITest.Assert._formatMessage(B,"Values in position "+A+" are not the same."),C[A],D[A]);}}},lastIndexOf:function(E,D,A,C){for(var B=D.length;B>=0;B--){if(D[B]===E){if(A!=B){YUITest.Assert.fail(YUITest.Assert._formatMessage(C,"Value exists at index "+B+" but should be at index "+A+"."));}return;}}YUITest.Assert.fail(YUITest.Assert._formatMessage(C,"Value doesn't exist in array."));}};YUITest.ObjectAssert={areEqual:function(C,D,B){YUITest.Assert._increment();for(var A in C){if(C.hasOwnProperty(A)){if(C[A]!=D[A]){throw new YUITest.ComparisonFailure(YUITest.Assert._formatMessage(B,"Values should be equal for property "+A),C[A],D[A]);}}}},hasKey:function(A,B,C){YUITest.ObjectAssert.ownsOrInheritsKey(A,B,C);},hasKeys:function(B,A,C){YUITest.ObjectAssert.ownsOrInheritsKeys(B,objects,C);},inheritsKey:function(A,B,C){YUITest.Assert._increment();if(!(A in B&&!B.hasOwnProperty(A))){YUITest.Assert.fail(YUITest.Assert._formatMessage(C,"Property '"+A+"' not found on object instance."));}},inheritsKeys:function(C,A,D){YUITest.Assert._increment();for(var B=0;B<C.length;B++){if(!(propertyName in A&&!A.hasOwnProperty(C[B]))){YUITest.Assert.fail(YUITest.Assert._formatMessage(D,"Property '"+C[B]+"' not found on object instance."));
 }}},ownsKey:function(A,B,C){YUITest.Assert._increment();if(!B.hasOwnProperty(A)){YUITest.Assert.fail(YUITest.Assert._formatMessage(C,"Property '"+A+"' not found on object instance."));}},ownsKeys:function(C,A,D){YUITest.Assert._increment();for(var B=0;B<C.length;B++){if(!A.hasOwnProperty(C[B])){YUITest.Assert.fail(YUITest.Assert._formatMessage(D,"Property '"+C[B]+"' not found on object instance."));}}},ownsNoKeys:function(B,D){YUITest.Assert._increment();var C=0,A;for(A in B){if(B.hasOwnProperty(A)){C++;}}if(C!==0){YUITest.Assert.fail(YUITest.Assert._formatMessage(D,"Object owns "+C+" properties but should own none."));}},ownsOrInheritsKey:function(A,B,C){YUITest.Assert._increment();if(!(A in B)){YUITest.Assert.fail(YUITest.Assert._formatMessage(C,"Property '"+A+"' not found on object."));}},ownsOrInheritsKeys:function(C,A,D){YUITest.Assert._increment();for(var B=0;B<C.length;B++){if(!(C[B] in A)){YUITest.Assert.fail(YUITest.Assert._formatMessage(D,"Property '"+C[B]+"' not found on object."));}}}};YUITest.DateAssert={datesAreEqual:function(B,D,A){YUITest.Assert._increment();if(B instanceof Date&&D instanceof Date){var C="";if(B.getFullYear()!=D.getFullYear()){C="Years should be equal.";}if(B.getMonth()!=D.getMonth()){C="Months should be equal.";}if(B.getDate()!=D.getDate()){C="Days of month should be equal.";}if(C.length){throw new YUITest.ComparisonFailure(YUITest.Assert._formatMessage(A,C),B,D);}}else{throw new TypeError("YUITest.DateAssert.datesAreEqual(): Expected and actual values must be Date objects.");}},timesAreEqual:function(B,D,A){YUITest.Assert._increment();if(B instanceof Date&&D instanceof Date){var C="";if(B.getHours()!=D.getHours()){C="Hours should be equal.";}if(B.getMinutes()!=D.getMinutes()){C="Minutes should be equal.";}if(B.getSeconds()!=D.getSeconds()){C="Seconds should be equal.";}if(C.length){throw new YUITest.ComparisonFailure(YUITest.Assert._formatMessage(A,C),B,D);}}else{throw new TypeError("YUITest.DateAssert.timesAreEqual(): Expected and actual values must be Date objects.");}}};YUITest.Mock=function(D){D=D||{};var A,B;try{function E(){}E.prototype=D;A=new E();}catch(C){A={};}for(B in D){if(D.hasOwnProperty(B)){if(typeof D[B]=="function"){A[B]=function(F){return function(){YUITest.Assert.fail("Method "+F+"() was called but was not expected to be.");};}(B);}}}return A;};YUITest.Mock.expect=function(F,B){if(!F.__expectations){F.__expectations={};}if(B.method){var A=B.method,G=B.args||[],I=B.returns,E=(typeof B.callCount=="number")?B.callCount:1,H=B.error,C=B.run||function(){},D;F.__expectations[A]=B;B.callCount=E;B.actualCallCount=0;for(D=0;D<G.length;D++){if(!(G[D] instanceof YUITest.Mock.Value)){G[D]=YUITest.Mock.Value(YUITest.Assert.areSame,[G[D]],"Argument "+D+" of "+A+"() is incorrect.");}}if(E>0){F[A]=function(){try{B.actualCallCount++;YUITest.Assert.areEqual(G.length,arguments.length,"Method "+A+"() passed incorrect number of arguments.");for(var L=0,J=G.length;L<J;L++){G[L].verify(arguments[L]);}C.apply(this,arguments);if(H){throw H;}}catch(K){YUITest.TestRunner._handleError(K);}return I;};}else{F[A]=function(){try{YUITest.Assert.fail("Method "+A+"() should not have been called.");}catch(J){YUITest.TestRunner._handleError(J);}};}}else{if(B.property){F.__expectations[A]=B;}}};YUITest.Mock.verify=function(A){try{for(var C in A.__expectations){if(A.__expectations.hasOwnProperty(C)){var B=A.__expectations[C];if(B.method){YUITest.Assert.areEqual(B.callCount,B.actualCallCount,"Method "+B.method+"() wasn't called the expected number of times.");}else{if(B.property){YUITest.Assert.areEqual(B.value,A[B.property],"Property "+B.property+" wasn't set to the correct value.");}}}}}catch(D){YUITest.TestRunner._handleError(D);}};YUITest.Mock.Value=function(C,A,B){if(this instanceof YUITest.Mock.Value){this.verify=function(E){var D=[].concat(A||[]);D.push(E);D.push(B);C.apply(null,D);};}else{return new YUITest.Mock.Value(C,A,B);}};YUITest.Mock.Value.Any=YUITest.Mock.Value(function(){});YUITest.Mock.Value.Boolean=YUITest.Mock.Value(YUITest.Assert.isBoolean);YUITest.Mock.Value.Number=YUITest.Mock.Value(YUITest.Assert.isNumber);YUITest.Mock.Value.String=YUITest.Mock.Value(YUITest.Assert.isString);YUITest.Mock.Value.Object=YUITest.Mock.Value(YUITest.Assert.isObject);YUITest.Mock.Value.Function=YUITest.Mock.Value(YUITest.Assert.isFunction);YUITest.Results=function(A){this.name=A;this.passed=0;this.failed=0;this.errors=0;this.ignored=0;this.total=0;this.duration=0;};YUITest.Results.prototype.include=function(A){this.passed+=A.passed;this.failed+=A.failed;this.ignored+=A.ignored;this.total+=A.total;this.errors+=A.errors;};YUITest.TestCase=function(A){this._should={};for(var B in A){this[B]=A[B];}if(typeof this.name!="string"){this.name="testCase"+(+new Date());}};YUITest.TestCase.prototype={constructor:YUITest.TestCase,callback:function(){return YUITest.TestRunner.callback.apply(YUITest.TestRunner,arguments);},resume:function(A){YUITest.TestRunner.resume(A);},wait:function(B,A){A=(typeof A=="number"?A:10000);if(typeof B=="function"){throw new YUITest.Wait(B,A);}else{throw new YUITest.Wait(function(){YUITest.Assert.fail("Timeout: wait() called but resume() never called.");},A);}},assert:function(B,A){YUITest.Assert._increment();if(!B){throw new YUITest.AssertionError(YUITest.Assert._formatMessage(A,"Assertion failed."));}},fail:function(A){YUITest.Assert.fail(A);},init:function(){},destroy:function(){},setUp:function(){},tearDown:function(){}};YUITest.TestSuite=function(A){this.name="";this.items=[];if(typeof A=="string"){this.name=A;}else{if(A instanceof Object){for(var B in A){if(A.hasOwnProperty(B)){this[B]=A[B];}}}}if(this.name===""){this.name="testSuite"+(+new Date());}};YUITest.TestSuite.prototype={constructor:YUITest.TestSuite,add:function(A){if(A instanceof YUITest.TestSuite||A instanceof YUITest.TestCase){this.items.push(A);}return this;},setUp:function(){},tearDown:function(){}};YUITest.TestFormat=function(){function A(B){return B.replace(/[<>"'&]/g,function(C){switch(C){case"<":return"&lt;";
 case">":return"&gt;";case'"':return"&quot;";case"'":return"&apos;";case"&":return"&amp;";}});}return{JSON:function(B){return YUITest.Util.JSON.stringify(B);},XML:function(C){function B(E){var D="<"+E.type+' name="'+A(E.name)+'"';if(typeof(E.duration)=="number"){D+=' duration="'+E.duration+'"';}if(E.type=="test"){D+=' result="'+E.result+'" message="'+A(E.message)+'">';}else{D+=' passed="'+E.passed+'" failed="'+E.failed+'" ignored="'+E.ignored+'" total="'+E.total+'">';for(var F in E){if(E.hasOwnProperty(F)){if(E[F]&&typeof E[F]=="object"&&!(E[F] instanceof Array)){D+=B(E[F]);}}}}D+="</"+E.type+">";return D;}return'<?xml version="1.0" encoding="UTF-8"?>'+B(C);},JUnitXML:function(B){function C(E){var D="";switch(E.type){case"test":if(E.result!="ignore"){D='<testcase name="'+A(E.name)+'" time="'+(E.duration/1000)+'">';if(E.result=="fail"){D+='<failure message="'+A(E.message)+'"><![CDATA['+E.message+"]]></failure>";}D+="</testcase>";}break;case"testcase":D='<testsuite name="'+A(E.name)+'" tests="'+E.total+'" failures="'+E.failed+'" time="'+(E.duration/1000)+'">';for(var F in E){if(E.hasOwnProperty(F)){if(E[F]&&typeof E[F]=="object"&&!(E[F] instanceof Array)){D+=C(E[F]);}}}D+="</testsuite>";break;case"testsuite":for(var F in E){if(E.hasOwnProperty(F)){if(E[F]&&typeof E[F]=="object"&&!(E[F] instanceof Array)){D+=C(E[F]);}}}break;case"report":D="<testsuites>";for(var F in E){if(E.hasOwnProperty(F)){if(E[F]&&typeof E[F]=="object"&&!(E[F] instanceof Array)){D+=C(E[F]);}}}D+="</testsuites>";}return D;}return'<?xml version="1.0" encoding="UTF-8"?>'+C(B);},TAP:function(C){var D=1;function B(E){var F="";switch(E.type){case"test":if(E.result!="ignore"){F="ok "+(D++)+" - "+E.name;if(E.result=="fail"){F="not "+F+" - "+E.message;}F+="\n";}else{F="#Ignored test "+E.name+"\n";}break;case"testcase":F="#Begin testcase "+E.name+"("+E.failed+" failed of "+E.total+")\n";for(var G in E){if(E.hasOwnProperty(G)){if(E[G]&&typeof E[G]=="object"&&!(E[G] instanceof Array)){F+=B(E[G]);}}}F+="#End testcase "+E.name+"\n";break;case"testsuite":F="#Begin testsuite "+E.name+"("+E.failed+" failed of "+E.total+")\n";for(var G in E){if(E.hasOwnProperty(G)){if(E[G]&&typeof E[G]=="object"&&!(E[G] instanceof Array)){F+=B(E[G]);}}}F+="#End testsuite "+E.name+"\n";break;case"report":for(var G in E){if(E.hasOwnProperty(G)){if(E[G]&&typeof E[G]=="object"&&!(E[G] instanceof Array)){F+=B(E[G]);}}}}return F;}return"1.."+C.total+"\n"+B(C);}};}();YUITest.CoverageFormat={JSON:function(A){return YUITest.Util.JSON.stringify(A);},XdebugJSON:function(B){var A={};for(var C in B){if(B.hasOwnProperty(C)){A[C]=B[C].lines;}}return YUITest.Util.JSON.stringify(B);}};YUITest.TestRunner=function(){function B(C){this.testObject=C;this.firstChild=null;this.lastChild=null;this.parent=null;this.next=null;this.results=new YUITest.Results();if(C instanceof YUITest.TestSuite){this.results.type="testsuite";this.results.name=C.name;}else{if(C instanceof YUITest.TestCase){this.results.type="testcase";this.results.name=C.name;}}}B.prototype={appendChild:function(C){var D=new B(C);if(this.firstChild===null){this.firstChild=this.lastChild=D;}else{this.lastChild.next=D;this.lastChild=D;}D.parent=this;return D;}};function A(){YUITest.EventTarget.call(this);this.masterSuite=new YUITest.TestSuite("yuitests"+(new Date()).getTime());this._cur=null;this._root=null;this._log=true;this._waiting=false;this._running=false;this._lastResults=null;this._context=null;}A.prototype=YUITest.Util.mix(new YUITest.EventTarget(),{constructor:YUITest.TestRunner,TEST_CASE_BEGIN_EVENT:"testcasebegin",TEST_CASE_COMPLETE_EVENT:"testcasecomplete",TEST_SUITE_BEGIN_EVENT:"testsuitebegin",TEST_SUITE_COMPLETE_EVENT:"testsuitecomplete",TEST_PASS_EVENT:"pass",TEST_FAIL_EVENT:"fail",ERROR_EVENT:"error",TEST_IGNORE_EVENT:"ignore",COMPLETE_EVENT:"complete",BEGIN_EVENT:"begin",_addTestCaseToTestTree:function(D,E){var F=D.appendChild(E),G,C;for(G in E){if((G.indexOf("test")===0||G.indexOf(" ")>-1)&&typeof E[G]=="function"){F.appendChild(G);}}},_addTestSuiteToTestTree:function(C,F){var E=C.appendChild(F);for(var D=0;D<F.items.length;D++){if(F.items[D] instanceof YUITest.TestSuite){this._addTestSuiteToTestTree(E,F.items[D]);}else{if(F.items[D] instanceof YUITest.TestCase){this._addTestCaseToTestTree(E,F.items[D]);}}}},_buildTestTree:function(){this._root=new B(this.masterSuite);for(var C=0;C<this.masterSuite.items.length;C++){if(this.masterSuite.items[C] instanceof YUITest.TestSuite){this._addTestSuiteToTestTree(this._root,this.masterSuite.items[C]);}else{if(this.masterSuite.items[C] instanceof YUITest.TestCase){this._addTestCaseToTestTree(this._root,this.masterSuite.items[C]);}}}},_handleTestObjectComplete:function(D){var C;if(typeof D.testObject=="object"&&D!==null){C=D.parent;if(C){C.results.include(D.results);C.results[D.testObject.name]=D.results;}if(D.testObject instanceof YUITest.TestSuite){this._execNonTestMethod(D,"tearDown",false);D.results.duration=(new Date())-D._start;this.fire({type:this.TEST_SUITE_COMPLETE_EVENT,testSuite:D.testObject,results:D.results});}else{if(D.testObject instanceof YUITest.TestCase){this._execNonTestMethod(D,"destroy",false);D.results.duration=(new Date())-D._start;this.fire({type:this.TEST_CASE_COMPLETE_EVENT,testCase:D.testObject,results:D.results});}}}},_next:function(){if(this._cur===null){this._cur=this._root;}else{if(this._cur.firstChild){this._cur=this._cur.firstChild;}else{if(this._cur.next){this._cur=this._cur.next;}else{while(this._cur&&!this._cur.next&&this._cur!==this._root){this._handleTestObjectComplete(this._cur);this._cur=this._cur.parent;}this._handleTestObjectComplete(this._cur);if(this._cur==this._root){this._cur.results.type="report";this._cur.results.timestamp=(new Date()).toLocaleString();this._cur.results.duration=(new Date())-this._cur._start;this._lastResults=this._cur.results;this._running=false;this.fire({type:this.COMPLETE_EVENT,results:this._lastResults});this._cur=null;}else{this._cur=this._cur.next;}}}}return this._cur;},_execNonTestMethod:function(G,C,H){var D=G.testObject,F={type:this.ERROR_EVENT};
-try{if(H&&D["async:"+C]){D["async:"+C](this._context);return true;}else{D[C](this._context);}}catch(E){G.results.errors++;F.error=E;F.methodName=C;if(D instanceof YUITest.TestCase){F.testCase=D;}else{F.testSuite=testSuite;}this.fire(F);}return false;},_run:function(){var E=false;var D=this._next();if(D!==null){this._running=true;this._lastResult=null;var C=D.testObject;if(typeof C=="object"&&C!==null){if(C instanceof YUITest.TestSuite){this.fire({type:this.TEST_SUITE_BEGIN_EVENT,testSuite:C});D._start=new Date();this._execNonTestMethod(D,"setUp",false);}else{if(C instanceof YUITest.TestCase){this.fire({type:this.TEST_CASE_BEGIN_EVENT,testCase:C});D._start=new Date();if(this._execNonTestMethod(D,"init",true)){return;}}}if(typeof setTimeout!="undefined"){setTimeout(function(){YUITest.TestRunner._run();},0);}else{this._run();}}else{this._runTest(D);}}},_resumeTest:function(H){var C=this._cur;this._waiting=false;if(!C){return;}var I=C.testObject;var F=C.parent.testObject;if(F.__yui_wait){clearTimeout(F.__yui_wait);delete F.__yui_wait;}var L=(F._should.fail||{})[I];var D=(F._should.error||{})[I];var G=false;var J=null;try{H.call(F,this._context);if(YUITest.Assert._getCount()==0){throw new YUITest.AssertionError("Test has no asserts.");}else{if(L){J=new YUITest.ShouldFail();G=true;}else{if(D){J=new YUITest.ShouldError();G=true;}}}}catch(K){if(F.__yui_wait){clearTimeout(F.__yui_wait);delete F.__yui_wait;}if(K instanceof YUITest.AssertionError){if(!L){J=K;G=true;}}else{if(K instanceof YUITest.Wait){if(typeof K.segment=="function"){if(typeof K.delay=="number"){if(typeof setTimeout!="undefined"){F.__yui_wait=setTimeout(function(){YUITest.TestRunner._resumeTest(K.segment);},K.delay);this._waiting=true;}else{throw new Error("Asynchronous tests not supported in this environment.");}}}return;}else{if(!D){J=new YUITest.UnexpectedError(K);G=true;}else{if(typeof D=="string"){if(K.message!=D){J=new YUITest.UnexpectedError(K);G=true;}}else{if(typeof D=="function"){if(!(K instanceof D)){J=new YUITest.UnexpectedError(K);G=true;}}else{if(typeof D=="object"&&D!==null){if(!(K instanceof D.constructor)||K.message!=D.message){J=new YUITest.UnexpectedError(K);G=true;}}}}}}}}if(G){this.fire({type:this.TEST_FAIL_EVENT,testCase:F,testName:I,error:J});}else{this.fire({type:this.TEST_PASS_EVENT,testCase:F,testName:I});}this._execNonTestMethod(C.parent,"tearDown",false);YUITest.Assert._reset();var E=(new Date())-C._start;C.parent.results[I]={result:G?"fail":"pass",message:J?J.getMessage():"Test passed",type:"test",name:I,duration:E};if(G){C.parent.results.failed++;}else{C.parent.results.passed++;}C.parent.results.total++;if(typeof setTimeout!="undefined"){setTimeout(function(){YUITest.TestRunner._run();},0);}else{this._run();}},_handleError:function(C){if(this._waiting){this._resumeTest(function(){throw C;});}else{throw C;}},_runTest:function(F){var C=F.testObject;var D=F.parent.testObject;var G=D[C];var E=(D._should.ignore||{})[C];if(E){F.parent.results[C]={result:"ignore",message:"Test ignored",type:"test",name:C};F.parent.results.ignored++;F.parent.results.total++;this.fire({type:this.TEST_IGNORE_EVENT,testCase:D,testName:C});if(typeof setTimeout!="undefined"){setTimeout(function(){YUITest.TestRunner._run();},0);}else{this._run();}}else{F._start=new Date();this._execNonTestMethod(F.parent,"setUp",false);this._resumeTest(G);}},getName:function(){return this.masterSuite.name;},setName:function(C){this.masterSuite.name=C;},add:function(C){this.masterSuite.add(C);return this;},clear:function(){this.masterSuite=new YUITest.TestSuite("yuitests"+(new Date()).getTime());},isWaiting:function(){return this._waiting;},isRunning:function(){return this._running;},getResults:function(C){if(!this._running&&this._lastResults){if(typeof C=="function"){return C(this._lastResults);}else{return this._lastResults;}}else{return null;}},getCoverage:function(C){if(!this._running&&typeof _yuitest_coverage=="object"){if(typeof C=="function"){return C(_yuitest_coverage);}else{return _yuitest_coverage;}}else{return null;}},callback:function(){var E=arguments,D=this._context,C=this;return function(){for(var F=0;F<arguments.length;F++){D[E[F]]=arguments[F];}C._run();};},resume:function(C){if(this._waiting){this._resumeTest(C||function(){});}else{throw new Error("resume() called without wait().");}},run:function(C){var D=YUITest.TestRunner;if(!C&&this.masterSuite.items.length==1&&this.masterSuite.items[0] instanceof YUITest.TestSuite){this.masterSuite=this.masterSuite.items[0];}D._buildTestTree();D._context={};D._root._start=new Date();D.fire(D.BEGIN_EVENT);D._run();}});return new A();}();exports.YUITest=YUITest;
\ No newline at end of file
+try{if(H&&D["async:"+C]){D["async:"+C](this._context);return true;}else{D[C](this._context);}}catch(E){G.results.errors++;F.error=E;F.methodName=C;if(D instanceof YUITest.TestCase){F.testCase=D;}else{F.testSuite=testSuite;}this.fire(F);}return false;},_run:function(){var E=false;var D=this._next();if(D!==null){this._running=true;this._lastResult=null;var C=D.testObject;if(typeof C=="object"&&C!==null){if(C instanceof YUITest.TestSuite){this.fire({type:this.TEST_SUITE_BEGIN_EVENT,testSuite:C});D._start=new Date();this._execNonTestMethod(D,"setUp",false);}else{if(C instanceof YUITest.TestCase){this.fire({type:this.TEST_CASE_BEGIN_EVENT,testCase:C});D._start=new Date();if(this._execNonTestMethod(D,"init",true)){return;}}}if(typeof setTimeout!="undefined"){setTimeout(function(){YUITest.TestRunner._run();},0);}else{this._run();}}else{this._runTest(D);}}},_resumeTest:function(H){var C=this._cur;this._waiting=false;if(!C){return;}var I=C.testObject;var F=C.parent.testObject;if(F.__yui_wait){clearTimeout(F.__yui_wait);delete F.__yui_wait;}var L=(F._should.fail||{})[I];var D=(F._should.error||{})[I];var G=false;var J=null;try{H.call(F,this._context);if(YUITest.Assert._getCount()==0){throw new YUITest.AssertionError("Test has no asserts.");}else{if(L){J=new YUITest.ShouldFail();G=true;}else{if(D){J=new YUITest.ShouldError();G=true;}}}}catch(K){if(F.__yui_wait){clearTimeout(F.__yui_wait);delete F.__yui_wait;}if(K instanceof YUITest.AssertionError){if(!L){J=K;G=true;}}else{if(K instanceof YUITest.Wait){if(typeof K.segment=="function"){if(typeof K.delay=="number"){if(typeof setTimeout!="undefined"){F.__yui_wait=setTimeout(function(){YUITest.TestRunner._resumeTest(K.segment);},K.delay);this._waiting=true;}else{throw new Error("Asynchronous tests not supported in this environment.");}}}return;}else{if(!D){J=new YUITest.UnexpectedError(K);G=true;}else{if(typeof D=="string"){if(K.message!=D){J=new YUITest.UnexpectedError(K);G=true;}}else{if(typeof D=="function"){if(!(K instanceof D)){J=new YUITest.UnexpectedError(K);G=true;}}else{if(typeof D=="object"&&D!==null){if(!(K instanceof D.constructor)||K.message!=D.message){J=new YUITest.UnexpectedError(K);G=true;}}}}}}}}if(G){this.fire({type:this.TEST_FAIL_EVENT,testCase:F,testName:I,error:J});}else{this.fire({type:this.TEST_PASS_EVENT,testCase:F,testName:I});}this._execNonTestMethod(C.parent,"tearDown",false);YUITest.Assert._reset();var E=(new Date())-C._start;C.parent.results[I]={result:G?"fail":"pass",message:J?J.getMessage():"Test passed",type:"test",name:I,duration:E};if(G){C.parent.results.failed++;}else{C.parent.results.passed++;}C.parent.results.total++;if(typeof setTimeout!="undefined"){setTimeout(function(){YUITest.TestRunner._run();},0);}else{this._run();}},_handleError:function(C){if(this._waiting){this._resumeTest(function(){throw C;});}else{throw C;}},_runTest:function(F){var C=F.testObject;var D=F.parent.testObject;var G=D[C];var E=(D._should.ignore||{})[C];if(E){F.parent.results[C]={result:"ignore",message:"Test ignored",type:"test",name:C};F.parent.results.ignored++;F.parent.results.total++;this.fire({type:this.TEST_IGNORE_EVENT,testCase:D,testName:C});if(typeof setTimeout!="undefined"){setTimeout(function(){YUITest.TestRunner._run();},0);}else{this._run();}}else{F._start=new Date();this._execNonTestMethod(F.parent,"setUp",false);this._resumeTest(G);}},getName:function(){return this.masterSuite.name;},setName:function(C){this.masterSuite.name=C;},add:function(C){this.masterSuite.add(C);return this;},clear:function(){this.masterSuite=new YUITest.TestSuite("yuitests"+(new Date()).getTime());},isWaiting:function(){return this._waiting;},isRunning:function(){return this._running;},getResults:function(C){if(!this._running&&this._lastResults){if(typeof C=="function"){return C(this._lastResults);}else{return this._lastResults;}}else{return null;}},getCoverage:function(C){if(!this._running&&typeof _yuitest_coverage=="object"){if(typeof C=="function"){return C(_yuitest_coverage);}else{return _yuitest_coverage;}}else{return null;}},callback:function(){var E=arguments,D=this._context,C=this;return function(){for(var F=0;F<arguments.length;F++){D[E[F]]=arguments[F];}C._run();};},resume:function(C){if(this._waiting){this._resumeTest(C||function(){});}else{throw new Error("resume() called without wait().");}},run:function(C){var D=YUITest.TestRunner;if(!C&&this.masterSuite.items.length==1&&this.masterSuite.items[0] instanceof YUITest.TestSuite){this.masterSuite=this.masterSuite.items[0];}D._buildTestTree();D._context={};D._root._start=new Date();D.fire(D.BEGIN_EVENT);D._run();}});return new A();}();YUITest.Node={CLI:{}};YUITest.Node.CLI.Logger=function(){var B=YUITest.TestRunner;function A(D){var C="";switch(D.type){case B.BEGIN_EVENT:C="Testing began at "+(new Date()).toString()+".";messageType="info";break;case B.COMPLETE_EVENT:C="Testing completed at "+(new Date()).toString()+".\n"+"Passed:"+D.results.passed+" Failed:"+D.results.failed+" Total:"+D.results.total+"("+D.results.ignored+" ignored)";messageType="info";break;case B.TEST_FAIL_EVENT:C=D.testName+": failed.\n"+D.error.getMessage();messageType="fail";break;case B.TEST_IGNORE_EVENT:C=D.testName+": ignored.";messageType="ignore";break;case B.TEST_PASS_EVENT:C=D.testName+": passed.";messageType="pass";break;case B.TEST_SUITE_BEGIN_EVENT:C='Test suite "'+D.testSuite.name+'" started.';messageType="info";break;case B.TEST_SUITE_COMPLETE_EVENT:C="Testing completed at "+(new Date()).toString()+".\n"+"Passed:"+D.results.passed+" Failed:"+D.results.failed+" Total:"+D.results.total+"("+D.results.ignored+" ignored)";messageType="info";break;case B.TEST_CASE_BEGIN_EVENT:C='Test case "'+D.testCase.name+'" started.';messageType="info";break;case B.TEST_CASE_COMPLETE_EVENT:C="Testing completed at "+(new Date()).toString()+".\n"+"Passed:"+D.results.passed+" Failed:"+D.results.failed+" Total:"+D.results.total+"("+D.results.ignored+" ignored)";messageType="info";break;default:C="Unexpected event "+D.type;messageType="info";
+}process.stdout.write(C+"\n");}B.subscribe(B.BEGIN_EVENT,A);B.subscribe(B.TEST_FAIL_EVENT,A);B.subscribe(B.TEST_PASS_EVENT,A);B.subscribe(B.TEST_IGNORE_EVENT,A);B.subscribe(B.TEST_CASE_BEGIN_EVENT,A);B.subscribe(B.TEST_CASE_COMPLETE_EVENT,A);B.subscribe(B.TEST_SUITE_BEGIN_EVENT,A);B.subscribe(B.TEST_SUITE_COMPLETE_EVENT,A);B.subscribe(B.COMPLETE_EVENT,A);};YUITest.Node.CLI.XUnit=function(){var E=YUITest.TestRunner,B=process.stdout,D=[],A=[];function C(J){var I="",H=J.results,K=require("sys"),G,F;switch(J.type){case E.BEGIN_EVENT:I="YUITest for Node.js\n";break;case E.COMPLETE_EVENT:I="\nTotal tests: "+H.total+", Failures: "+H.failed+", Skipped: "+H.ignored+", Time: "+(H.duration/1000)+" seconds\n";if(D.length){I+="\nTests failed:\n";for(G=0,F=D.length;G<F;G++){I+="\n"+(G+1)+") "+D[G].name+" : "+D[G].error.getMessage()+"\n";}I+="\n";}I+="\n";break;case E.TEST_FAIL_EVENT:I="F";D.push({name:A.concat([J.testName]).join(" > "),error:J.error});break;case E.TEST_IGNORE_EVENT:I="S";break;case E.TEST_PASS_EVENT:I=".";break;case E.TEST_SUITE_BEGIN_EVENT:A.push(J.testSuite.name);break;case E.TEST_CASE_COMPLETE_EVENT:case E.TEST_SUITE_COMPLETE_EVENT:A.pop();break;case E.TEST_CASE_BEGIN_EVENT:A.push(J.testCase.name);break;}K.print(I);}E.subscribe(E.BEGIN_EVENT,C);E.subscribe(E.TEST_FAIL_EVENT,C);E.subscribe(E.TEST_PASS_EVENT,C);E.subscribe(E.TEST_IGNORE_EVENT,C);E.subscribe(E.TEST_CASE_BEGIN_EVENT,C);E.subscribe(E.TEST_CASE_COMPLETE_EVENT,C);E.subscribe(E.TEST_SUITE_BEGIN_EVENT,C);E.subscribe(E.TEST_SUITE_COMPLETE_EVENT,C);E.subscribe(E.COMPLETE_EVENT,C);};exports.YUITest=YUITest;
\ No newline at end of file
diff --git a/javascript/build/yuitest/yuitest-node.js b/javascript/build/yuitest/yuitest-node.js
index 0bfcc3a..8d9b20c 100644
--- a/javascript/build/yuitest/yuitest-node.js
+++ b/javascript/build/yuitest/yuitest-node.js
@@ -3358,6 +3358,197 @@ YUITest.CoverageFormat = {
         
     }();
 
+//define namespace
+
+YUITest.Node = {
+    CLI:{}
+};
+
+
+
+/**
+ * Console output that mimics logger output from YUI Test for YUI 2/3.
+ * @namespace YUITest.Node.CLI
+ * @class Logger
+ * @constructor
+ */
+YUITest.Node.CLI.Logger = function(){
+
+    var testRunner = YUITest.TestRunner;
+
+    //handles test runner events
+    function handleEvent(event){
+    
+        var message = "";
+        switch(event.type){
+            case testRunner.BEGIN_EVENT:
+                message = "Testing began at " + (new Date()).toString() + ".";
+                messageType = "info";
+                break;
+                
+            case testRunner.COMPLETE_EVENT:
+                message = "Testing completed at " +
+                    (new Date()).toString() + ".\n" +
+                    "Passed:" + event.results.passed + " Failed:" + event.results.failed +
+                    " Total:" + event.results.total + "(" + event.results.ignored + " ignored)"; 
+                messageType = "info";
+                break;
+                
+            case testRunner.TEST_FAIL_EVENT:
+                message = event.testName + ": failed.\n" + event.error.getMessage();
+                messageType = "fail";
+                break;
+                
+            case testRunner.TEST_IGNORE_EVENT:
+                message = event.testName + ": ignored.";
+                messageType = "ignore";
+                break;
+                
+            case testRunner.TEST_PASS_EVENT:
+                message = event.testName + ": passed.";
+                messageType = "pass";
+                break;
+                
+            case testRunner.TEST_SUITE_BEGIN_EVENT:
+                message = "Test suite \"" + event.testSuite.name + "\" started.";
+                messageType = "info";
+                break;
+                
+            case testRunner.TEST_SUITE_COMPLETE_EVENT:
+                message = "Testing completed at " +
+                    (new Date()).toString() + ".\n" +
+                    "Passed:" + event.results.passed + " Failed:" + event.results.failed +
+                    " Total:" + event.results.total + "(" + event.results.ignored + " ignored)";
+                messageType = "info";
+                break;
+                
+            case testRunner.TEST_CASE_BEGIN_EVENT:
+                message = "Test case \"" + event.testCase.name + "\" started.";
+                messageType = "info";
+                break;
+                
+            case testRunner.TEST_CASE_COMPLETE_EVENT:
+                message = "Testing completed at " +
+                    (new Date()).toString() + ".\n" +
+                    "Passed:" + event.results.passed + " Failed:" + event.results.failed +
+                    " Total:" + event.results.total + "(" + event.results.ignored + " ignored)";
+                messageType = "info";
+                break;
+            default:
+                message = "Unexpected event " + event.type;
+                messageType = "info";
+        }    
+        
+        process.stdout.write(message + "\n");
+    }
+
+    testRunner.subscribe(testRunner.BEGIN_EVENT, handleEvent)
+    testRunner.subscribe(testRunner.TEST_FAIL_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_PASS_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_IGNORE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_CASE_BEGIN_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_CASE_COMPLETE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_SUITE_BEGIN_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_SUITE_COMPLETE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.COMPLETE_EVENT, handleEvent); 
+
+};
+
+
+
+/**
+ * Console output that mimics XUnit output.
+ * @namespace YUITest.Node.CLI
+ * @class XUnit
+ * @constructor
+ */
+YUITest.Node.CLI.XUnit = function(){
+
+    var testRunner  = YUITest.TestRunner,
+        stdout      = process.stdout,
+        failures    = [],
+        stack       = [];
+
+    //handles test runner events
+    function handleEvent(event){
+    
+        var message = "",
+            results = event.results,
+            sys     = require('sys'),
+            i, len;
+            
+        switch(event.type){
+            case testRunner.BEGIN_EVENT:
+                message = "YUITest for Node.js\n";
+                break;
+                
+            case testRunner.COMPLETE_EVENT:
+                message = "\nTotal tests: " + results.total + ", Failures: " + 
+                    results.failed + ", Skipped: " + results.ignored +
+                    ", Time: " + (results.duration/1000) + " seconds\n";
+                    
+                if (failures.length){
+                    message += "\nTests failed:\n";
+                    
+                    for (i=0,len=failures.length; i < len; i++){
+                        message += "\n" + (i+1) + ") " + failures[i].name + " : " + failures[i].error.getMessage() + "\n";
+                        //message += "Stack trace:\n" + failures[i].error.stack + "\n";
+                    }
+                
+                    message += "\n";
+                }
+                
+                message += "\n";
+                break;
+                
+            case testRunner.TEST_FAIL_EVENT:
+                message = "F";
+                failures.push({
+                    name: stack.concat([event.testName]).join(" > "),
+                    error: event.error
+                });
+
+                break;
+                
+            case testRunner.TEST_IGNORE_EVENT:
+                message = "S";
+                break;
+                
+            case testRunner.TEST_PASS_EVENT:
+                message = ".";
+                break;
+                
+            case testRunner.TEST_SUITE_BEGIN_EVENT:
+                stack.push(event.testSuite.name);
+                break;
+                
+            case testRunner.TEST_CASE_COMPLETE_EVENT:
+            case testRunner.TEST_SUITE_COMPLETE_EVENT:
+                stack.pop();
+                break;
+                
+            case testRunner.TEST_CASE_BEGIN_EVENT:
+                stack.push(event.testCase.name);
+                break;
+                
+            //no default
+        }    
+        
+        sys.print(message);
+    }
+
+    testRunner.subscribe(testRunner.BEGIN_EVENT, handleEvent)
+    testRunner.subscribe(testRunner.TEST_FAIL_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_PASS_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_IGNORE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_CASE_BEGIN_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_CASE_COMPLETE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_SUITE_BEGIN_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_SUITE_COMPLETE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.COMPLETE_EVENT, handleEvent); 
+
+};
+
 //export in CommonJS format
 exports.YUITest = YUITest;
 
diff --git a/javascript/src/nodejs/CLI.Logger.js b/javascript/src/nodejs/CLI.Logger.js
new file mode 100644
index 0000000..5997335
--- /dev/null
+++ b/javascript/src/nodejs/CLI.Logger.js
@@ -0,0 +1,89 @@
+
+
+/**
+ * Console output that mimics logger output from YUI Test for YUI 2/3.
+ * @namespace YUITest.Node.CLI
+ * @class Logger
+ * @constructor
+ */
+YUITest.Node.CLI.Logger = function(){
+
+    var testRunner = YUITest.TestRunner;
+
+    //handles test runner events
+    function handleEvent(event){
+    
+        var message = "";
+        switch(event.type){
+            case testRunner.BEGIN_EVENT:
+                message = "Testing began at " + (new Date()).toString() + ".";
+                messageType = "info";
+                break;
+                
+            case testRunner.COMPLETE_EVENT:
+                message = "Testing completed at " +
+                    (new Date()).toString() + ".\n" +
+                    "Passed:" + event.results.passed + " Failed:" + event.results.failed +
+                    " Total:" + event.results.total + "(" + event.results.ignored + " ignored)"; 
+                messageType = "info";
+                break;
+                
+            case testRunner.TEST_FAIL_EVENT:
+                message = event.testName + ": failed.\n" + event.error.getMessage();
+                messageType = "fail";
+                break;
+                
+            case testRunner.TEST_IGNORE_EVENT:
+                message = event.testName + ": ignored.";
+                messageType = "ignore";
+                break;
+                
+            case testRunner.TEST_PASS_EVENT:
+                message = event.testName + ": passed.";
+                messageType = "pass";
+                break;
+                
+            case testRunner.TEST_SUITE_BEGIN_EVENT:
+                message = "Test suite \"" + event.testSuite.name + "\" started.";
+                messageType = "info";
+                break;
+                
+            case testRunner.TEST_SUITE_COMPLETE_EVENT:
+                message = "Testing completed at " +
+                    (new Date()).toString() + ".\n" +
+                    "Passed:" + event.results.passed + " Failed:" + event.results.failed +
+                    " Total:" + event.results.total + "(" + event.results.ignored + " ignored)";
+                messageType = "info";
+                break;
+                
+            case testRunner.TEST_CASE_BEGIN_EVENT:
+                message = "Test case \"" + event.testCase.name + "\" started.";
+                messageType = "info";
+                break;
+                
+            case testRunner.TEST_CASE_COMPLETE_EVENT:
+                message = "Testing completed at " +
+                    (new Date()).toString() + ".\n" +
+                    "Passed:" + event.results.passed + " Failed:" + event.results.failed +
+                    " Total:" + event.results.total + "(" + event.results.ignored + " ignored)";
+                messageType = "info";
+                break;
+            default:
+                message = "Unexpected event " + event.type;
+                messageType = "info";
+        }    
+        
+        process.stdout.write(message + "\n");
+    }
+
+    testRunner.subscribe(testRunner.BEGIN_EVENT, handleEvent)
+    testRunner.subscribe(testRunner.TEST_FAIL_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_PASS_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_IGNORE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_CASE_BEGIN_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_CASE_COMPLETE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_SUITE_BEGIN_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_SUITE_COMPLETE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.COMPLETE_EVENT, handleEvent); 
+
+};
\ No newline at end of file
diff --git a/javascript/src/nodejs/CLI.XUnit.js b/javascript/src/nodejs/CLI.XUnit.js
new file mode 100644
index 0000000..96d8a5a
--- /dev/null
+++ b/javascript/src/nodejs/CLI.XUnit.js
@@ -0,0 +1,94 @@
+
+
+/**
+ * Console output that mimics XUnit output.
+ * @namespace YUITest.Node.CLI
+ * @class XUnit
+ * @constructor
+ */
+YUITest.Node.CLI.XUnit = function(){
+
+    var testRunner  = YUITest.TestRunner,
+        stdout      = process.stdout,
+        failures    = [],
+        stack       = [];
+
+    //handles test runner events
+    function handleEvent(event){
+    
+        var message = "",
+            results = event.results,
+            sys     = require('sys'),
+            i, len;
+            
+        switch(event.type){
+            case testRunner.BEGIN_EVENT:
+                message = "YUITest for Node.js\n";
+                break;
+                
+            case testRunner.COMPLETE_EVENT:
+                message = "\nTotal tests: " + results.total + ", Failures: " + 
+                    results.failed + ", Skipped: " + results.ignored +
+                    ", Time: " + (results.duration/1000) + " seconds\n";
+                    
+                if (failures.length){
+                    message += "\nTests failed:\n";
+                    
+                    for (i=0,len=failures.length; i < len; i++){
+                        message += "\n" + (i+1) + ") " + failures[i].name + " : " + failures[i].error.getMessage() + "\n";
+                        //message += "Stack trace:\n" + failures[i].error.stack + "\n";
+                    }
+                
+                    message += "\n";
+                }
+                
+                message += "\n";
+                break;
+                
+            case testRunner.TEST_FAIL_EVENT:
+                message = "F";
+                failures.push({
+                    name: stack.concat([event.testName]).join(" > "),
+                    error: event.error
+                });
+
+                break;
+                
+            case testRunner.TEST_IGNORE_EVENT:
+                message = "S";
+                break;
+                
+            case testRunner.TEST_PASS_EVENT:
+                message = ".";
+                break;
+                
+            case testRunner.TEST_SUITE_BEGIN_EVENT:
+                stack.push(event.testSuite.name);
+                break;
+                
+            case testRunner.TEST_CASE_COMPLETE_EVENT:
+            case testRunner.TEST_SUITE_COMPLETE_EVENT:
+                stack.pop();
+                break;
+                
+            case testRunner.TEST_CASE_BEGIN_EVENT:
+                stack.push(event.testCase.name);
+                break;
+                
+            //no default
+        }    
+        
+        sys.print(message);
+    }
+
+    testRunner.subscribe(testRunner.BEGIN_EVENT, handleEvent)
+    testRunner.subscribe(testRunner.TEST_FAIL_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_PASS_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_IGNORE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_CASE_BEGIN_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_CASE_COMPLETE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_SUITE_BEGIN_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.TEST_SUITE_COMPLETE_EVENT, handleEvent);
+    testRunner.subscribe(testRunner.COMPLETE_EVENT, handleEvent); 
+
+};
\ No newline at end of file
diff --git a/javascript/src/nodejs/Node.js b/javascript/src/nodejs/Node.js
new file mode 100644
index 0000000..13270ec
--- /dev/null
+++ b/javascript/src/nodejs/Node.js
@@ -0,0 +1,5 @@
+//define namespace
+
+YUITest.Node = {
+    CLI:{}
+};
\ No newline at end of file
diff --git a/javascript/src/nodejs/cli.js b/javascript/src/nodejs/cli.js
index 1d2d258..eefe1ac 100644
--- a/javascript/src/nodejs/cli.js
+++ b/javascript/src/nodejs/cli.js
@@ -4,10 +4,11 @@
  
 var fs      = require("fs"),
     path    = require("path"),
-    //YUITest = require(path.join(process.cwd(), "lib/yuitest-node.js")).YUITest,
+    vm      = require("vm"),
     YUITest = require("./lib/yuitest-node.js").YUITest,
     TestRunner = YUITest.TestRunner,
-    stdout  = process.stdout;
+    stdout  = process.stdout,
+    stderr  = process.stderr;
     
   
 //options collected from command line  
@@ -16,90 +17,7 @@ var options = {
 };
 
 //-----------------------------------------------------------------------------
-// Setup TestRunner
-//-----------------------------------------------------------------------------
-
-stdout.write("YUI Test for Node.js\n");
-
-//handles test runner events
-function handleEvent(event){
-var message = "";
-    switch(event.type){
-        case TestRunner.BEGIN_EVENT:
-            message = "Testing began at " + (new Date()).toString() + ".";
-            messageType = "info";
-            break;
-            
-        case TestRunner.COMPLETE_EVENT:
-            message = "Testing completed at " +
-                (new Date()).toString() + ".\n" +
-                "Passed:" + event.results.passed + " Failed:" + event.results.failed +
-                " Total:" + event.results.total + "(" + event.results.ignored + " ignored)"; 
-            messageType = "info";
-            break;
-            
-        case TestRunner.TEST_FAIL_EVENT:
-            message = event.testName + ": failed.\n" + event.error.getMessage();
-            messageType = "fail";
-            break;
-            
-        case TestRunner.TEST_IGNORE_EVENT:
-            message = event.testName + ": ignored.";
-            messageType = "ignore";
-            break;
-            
-        case TestRunner.TEST_PASS_EVENT:
-            message = event.testName + ": passed.";
-            messageType = "pass";
-            break;
-            
-        case TestRunner.TEST_SUITE_BEGIN_EVENT:
-            message = "Test suite \"" + event.testSuite.name + "\" started.";
-            messageType = "info";
-            break;
-            
-        case TestRunner.TEST_SUITE_COMPLETE_EVENT:
-            message = "Testing completed at " +
-                (new Date()).toString() + ".\n" +
-                "Passed:" + event.results.passed + " Failed:" + event.results.failed +
-                " Total:" + event.results.total + "(" + event.results.ignored + " ignored)";
-            messageType = "info";
-            break;
-            
-        case TestRunner.TEST_CASE_BEGIN_EVENT:
-            message = "Test case \"" + event.testCase.name + "\" started.";
-            messageType = "info";
-            break;
-            
-        case TestRunner.TEST_CASE_COMPLETE_EVENT:
-            message = "Testing completed at " +
-                (new Date()).toString() + ".\n" +
-                "Passed:" + event.results.passed + " Failed:" + event.results.failed +
-                " Total:" + event.results.total + "(" + event.results.ignored + " ignored)";
-            messageType = "info";
-            break;
-        default:
-            message = "Unexpected event " + event.type;
-            messageType = "info";
-    }    
-    
-    stdout.write(message + "\n");
-}
-
-
-TestRunner.subscribe(TestRunner.BEGIN_EVENT, handleEvent)
-TestRunner.subscribe(TestRunner.TEST_FAIL_EVENT, handleEvent);
-TestRunner.subscribe(TestRunner.TEST_PASS_EVENT, handleEvent);
-TestRunner.subscribe(TestRunner.TEST_IGNORE_EVENT, handleEvent);
-TestRunner.subscribe(TestRunner.TEST_CASE_BEGIN_EVENT, handleEvent);
-TestRunner.subscribe(TestRunner.TEST_CASE_COMPLETE_EVENT, handleEvent);
-TestRunner.subscribe(TestRunner.TEST_SUITE_BEGIN_EVENT, handleEvent);
-TestRunner.subscribe(TestRunner.TEST_SUITE_COMPLETE_EVENT, handleEvent);
-TestRunner.subscribe(TestRunner.COMPLETE_EVENT, handleEvent); 
-
-
-//-----------------------------------------------------------------------------
-// Function get all files in a directory
+// Function to get all files in a directory
 //-----------------------------------------------------------------------------
 
 function getFiles(dir){
@@ -161,21 +79,33 @@ files = files.map(function(filename){
     return path.join(process.cwd(), filename);
 });
 
+//-----------------------------------------------------------------------------
+// Setup TestRunner
+//-----------------------------------------------------------------------------
+
+//TODO: Other types of output
+YUITest.Node.CLI.XUnit();
+
 //-----------------------------------------------------------------------------
 // Include test files
 //-----------------------------------------------------------------------------
 
-var code = [];
+var code = [], i, len;
 
-files.forEach(function(filename){
+if (files.length){
+    for (i=0, len=files.length; i < len; i++){
 
-    if (options.verbose){
-        stdout.write("Loading " + filename + "\n");
+        if (options.verbose){
+            stderr.write("Loading " + files[i] + "\n");
+        }
+        
+        var output = fs.readFileSync(files[i]);
+        vm.runInThisContext("(function(YUITest){\n" + output + "\n})", files[i])(YUITest);
+        //code.push(output);
     }
-    
-    var output = fs.readFileSync(filename);
-    code.push(output);
-});
+} else {
+    process.stdout.write("No tests to run.\n");
+}
 
-eval(code.join("\n\n"));
+//eval(code.join("\n\n"));
 TestRunner.run();
\ No newline at end of file
diff --git a/javascript/tests/asserts/AssertTests.js b/javascript/tests/asserts/AssertTests.js
index 118cbe0..6ff49bc 100644
--- a/javascript/tests/asserts/AssertTests.js
+++ b/javascript/tests/asserts/AssertTests.js
@@ -1032,7 +1032,7 @@
         },
 
         "isObject() should pass for global object": function(){
-            Assert.isObject(self);
+            Assert.isObject((function(){ return this; })());
         },
 
         "isObject() should fail for zero numbers": function(){
diff --git a/javascript/tests/asserts/ObjectAssertTests.js b/javascript/tests/asserts/ObjectAssertTests.js
index 5b6819b..29f5a3a 100644
--- a/javascript/tests/asserts/ObjectAssertTests.js
+++ b/javascript/tests/asserts/ObjectAssertTests.js
@@ -1,5 +1,5 @@
 (function(){
-    process.stdout.write("HERE");
+    
     var Assert          = YUITest.Assert,
         ObjectAssert    = YUITest.ObjectAssert;
         
@@ -272,6 +272,4 @@
 
     YUITest.TestRunner.add(suite);
 
-})();
-
-process.stdout.write("THERE");
\ No newline at end of file
+})();
\ No newline at end of file