Test errorName, errorMessage, and errorStack. Fix a few related bugs.

Author: bterlson

lib/runners/console.js

@@ -20,8 +20,11 @@ var errorFn = function $ERROR(err) {
 }.toString()
 
 var batchDoneFn = function $DONE(err) {
-    if(err) { if(typeof err === "object" && err !== null && "name" in err)
-            $LOG("test262/error " + err.name + ": " + err.message)
+    if(err) {
+        if(typeof err === "object" && err !== null && "name" in err) {
+            if("stack" in err) $LOG("test262/error " + err.stack)
+            else $LOG("test262/error " + err.name + ": " + err.message)
+        }
         else $LOG("test262/error Error: " + err);
     }
     $LOG('test262/done');

lib/runners/node-ip.js

@@ -40,7 +40,8 @@ NodeRunner.prototype.execute = function(test, cb) {
                 result.errorMessage = error.message;
                 result.errorStack = error.stack
             } else {
-                result.errorName = error;
+                result.errorName = "Error";
+                result.errorMessage = error;
             }
         }
 

test/collateral/thrownError.js

@@ -0,0 +1,9 @@
+/*---
+description: Fails by throwing an error
+---*/
+
+function foo() {
+    throw new Error('failure message');
+}
+
+foo();

test/expected.js

@@ -7,8 +7,10 @@ var all = [
     { file: 'test/collateral/bothStrict.js', strictMode: true, pass: true },
     { file: 'test/collateral/strict.js', strictMode: true, pass: true },
     { file: 'test/collateral/noStrict.js', strictMode: false, pass: true },
-    { file: 'test/collateral/error.js', strictMode: false, pass: false },
-    { file: 'test/collateral/error.js', strictMode: true, pass: false },
+    { file: 'test/collateral/error.js', strictMode: false, pass: false, errorMessage: 'failure message', errorName: 'Error' },
+    { file: 'test/collateral/error.js', strictMode: true, pass: false, errorMessage: 'failure message', errorName: 'Error' },
+    { file: 'test/collateral/thrownError.js', strictMode: false, pass: false, errorMessage: 'failure message', errorName: 'Error', topOfStack: "foo" },
+    { file: 'test/collateral/thrownError.js', strictMode: true, pass: false, errorMessage: 'failure message', errorName: 'Error', topOfStack: "foo" },
 ]
 
 var seen = {};

test/nodeConfig.js

@@ -2,6 +2,6 @@ var t262 = require('../');
 t262.useConfig({
     batchConfig: {
         createEnv: 'require("vm").createContext()',
-        runBatched: 'env.process = process;require("vm").runInContext(test, env);'
+        runBatched: 'env.process = process;env.console=console;require("vm").runInContext(test, env);'
     }
 })

test/test.js

@@ -19,18 +19,21 @@ runners.forEach(function(runner) {
     utils.testResultsCorrect(runner, expected.noTestStrict);
     utils.testResultsCorrect(runner + ' --testStrict', expected);
     test("compiling failures: " + runner + " -C failures -o testOutput", function(t) {
-        t.plan(1);
+        t.plan(2);
         utils.run(runner + " -C failures -o testOutput", function(res, stderr) {
             t.ok(fs.existsSync('./testOutput/error.js'), 'testOutput/error.js exists');
+            t.ok(fs.existsSync('./testOutput/thrownError.js'), 'testOutput/thrownError.js exists');
             rimraf.sync('./testOutput');
         });
     });
 
     test("compiling failures: " + runner + " -C failures -o testOutput --testStrict", function(t) {
-        t.plan(2);
+        t.plan(4);
         utils.run(runner + " -C failures -o testOutput --testStrict", function(res, stderr) {
             t.ok(fs.existsSync('./testOutput/error.js'), 'testOutput/error.js exists');
             t.ok(fs.existsSync('./testOutput/error-0.js'), 'testOutput/error-0.js exists');
+            t.ok(fs.existsSync('./testOutput/thrownError.js'), 'testOutput/thrownError.js exists');
+            t.ok(fs.existsSync('./testOutput/thrownError-0.js'), 'testOutput/thrownError-0.js exists');
             rimraf.sync('./testOutput');
         });
     });
@@ -86,4 +89,3 @@ test('compile flag throws without output directory', function(t) {
         rimraf.sync('./testOutput');
     });
 });
-

test/utils.js

@@ -37,8 +37,17 @@ exports.testResultsCorrect = function testResultsCorrect(args, expectedResults)
             t.equal(res.length, expectedResults.length, expectedResults.length + " tests run");
             expectedResults.forEach(function(exp) {
                 var act = resultsForTest(res, exp);
-                t.equal(exp.pass, act.pass, expectedString(exp));
+                t.equal(act.pass, exp.pass, expectedString(exp));
 
+                if(!exp.pass) {
+                    // validate error message and such
+                    t.equal(act.errorName, exp.errorName, "Error name is " + exp.errorName);
+                    t.equal(act.errorMessage, exp.errorMessage, "Error message is " + exp.errorMessage);
+
+                    if(exp.topOfStack) {
+                        t.ok(act.errorStack.indexOf(exp.topOfStack) > -1, "Stack contains " + exp.topOfStack);
+                    }
+                }
             });
             t.end();
         });