Merge branch 'master' of https://github.com/bterlson/test262-harness

bterlson · Sep 24, 2015 · ff0670b · ff0670b
2 parents 6fef5a0 + 3191698
commit ff0670b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 18 deletions.
diff --git a/lib/runner.js b/lib/runner.js
@@ -157,7 +157,7 @@ var errorLogRe = /^test262\/error (.*)$/;
 // errorStack: stack trace of error thrown (used for debugging purposes)
 Runner.prototype.validateResult = function(test, result) {
     var expectingStack = false;
-    var isNegative = test.attrs.flags.negative || test.attrs.negative;
+    var negative = test.attrs.negative;
     // parse result from log
     (result.log || []).forEach(function(log) {
         var errorMatch = log.match(errorLogRe);
@@ -203,17 +203,13 @@ Runner.prototype.validateResult = function(test, result) {
         test.errorMessage = result.errorMessage;
         test.errorStack = result.errorStack;
 
-        if(isNegative) {
-            if(test.attrs.negative) {
-                // failure can either match against error name, or an exact match
-                // against error message (the latter case is thus far only to support
-                // NotEarlyError thrown errors which have an error type of "Error").
-                test.pass =
-                    !!result.errorName.match(new RegExp(test.attrs.negative)) ||
-                    result.errorMessage === test.attrs.negative;
-            } else {
-                test.pass = true
-            }
+        if(negative) {
+            // failure can either match against error name, or an exact match
+            // against error message (the latter case is thus far only to support
+            // NotEarlyError thrown errors which have an error type of "Error").
+            test.pass =
+                !!result.errorName.match(new RegExp(negative)) ||
+                result.errorMessage === negative;
         } else {
             test.pass = false
         }
@@ -223,8 +219,10 @@ Runner.prototype.validateResult = function(test, result) {
             test.pass = false;
             test.errorName = "Test262 Error";
             test.errorMessage = "Test did not run to completion ($DONE not called)";
-        } else if(isNegative) {
+        } else if(negative) {
             test.pass = false;
+            test.errorName = "Error Expected";
+            test.errorMessage = "'" + negative + "' is expected, but was not thrown";
         } else {
             test.pass = true;
         }

diff --git a/lib/simpleReporter.js b/lib/simpleReporter.js
@@ -1,6 +1,5 @@
 var through = require('through');
 var readline = require('readline');
-var util = require('util');
 var path = require('path');
 
 var state = {
@@ -35,8 +34,10 @@ function actualString(test) {
 }
 
 module.exports = through(function(data) {
-    process.stdout.clearLine();
-    process.stdout.cursorTo(0);
+    if (process.stdout.clearLine && process.stdout.cursorTo) {
+        process.stdout.clearLine();
+        process.stdout.cursorTo(0);
+    }
 
     if(data.pass) {
         state.pass++;
@@ -50,8 +51,10 @@ module.exports = through(function(data) {
                              "     Got: " + actualString(data) + "\n\n");
     }
 }, function() {
-    process.stdout.clearLine();
-    process.stdout.cursorTo(0);
+    if (process.stdout.clearLine && process.stdout.cursorTo) {
+        process.stdout.clearLine();
+        process.stdout.cursorTo(0);
+    }
     console.log("Ran " + (state.pass + state.fail) + " tests")
     console.log(state.pass + " passed")
     console.log(state.fail + " failed")

diff --git a/test/collateral/negativeMessage.js b/test/collateral/negativeMessage.js
@@ -0,0 +1,4 @@
+/*---
+description: Should report the expected error indicated by the "negative" frontmatter
+negative: ExpectedError
+---*/
diff --git a/test/expected.js b/test/expected.js
@@ -15,6 +15,8 @@ var all = [
     { file: 'test/collateral/error.js', strictMode: true, pass: false, errorMessage: 'failure message', errorName: 'Test262Error' },
     { 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" },
+    { file: 'test/collateral/negativeMessage.js', strictMode: false, pass: false, errorMessage: "'ExpectedError' is expected, but was not thrown", errorName: 'Error Expected'},
+    { file: 'test/collateral/negativeMessage.js', strictMode: true, pass: false, errorMessage: "'ExpectedError' is expected, but was not thrown", errorName: 'Error Expected'},
 ]
 
 var seen = {};