Add tests, fix a few bugs

bin/run.js

@@ -9,12 +9,19 @@ const argv = require('../lib/cli.js').argv;
 const validator = require('../lib/validator.js');
 const Rx = require('rx');
 const util = require('util');
-const simpleReporter = require('../lib/reporters/simple.js');
 const resultsEmitter = require('../lib/resultsEmitter.js');
 const agentPool = require('../lib/agentPool.js');
 const test262Finder = require('../lib/findTest262.js');
 const scenariosForTest = require('../lib/scenarios.js');
 
+let reporter;
+if (fs.existsSync('lib/reporters/' + argv.reporter + '.js')) {
+  reporter = require('../lib/reporters/' + argv.reporter + '.js');
+} else {
+  console.error(`Reporter ${argv.reporter} not found.`);
+  process.exit(1);
+}
+
 let includesDir = argv.includesDir;
 let test262Dir = argv.test262Dir;
 
@@ -34,7 +41,7 @@ const results = rawResults.map(function (test) {
   return test;
 });
 const resultEmitter = resultsEmitter(results);
-simpleReporter(resultEmitter);
+reporter(resultEmitter);
 
 function printVersion() {
     var p = require(path.resolve(__dirname, "..", "package.json"));

lib/agentPool.js

@@ -24,7 +24,7 @@ function makePool(agents, hostType, hostArgs, hostPath) {
   pool.runTest = function (record) {
     const agent = record[0];
     const test = record[1];
-    return agent.evalScript(test.contents)
+    return agent.evalScript(test.contents, { async: true })
     .then(result => {
       pool.onNext(agent);
       test.rawResult = result;

lib/cli.js

@@ -11,9 +11,10 @@ const yargv = yargs
   .nargs('threads', 1)
   .default('threads', 1)
   .alias('threads', 't')
-  .describe('reporter', 'select a reporter to use (simple, json, or tap)')
+  .describe('reporter', 'select a reporter to use (simple or json)')
   .nargs('reporter', 1)
   .alias('reporter', 'r')
+  .default('reporter', 'simple')
   .help('help')
   .alias('help', 'h')
   .example('test262-harness path/to/test.js')

lib/reporters/json.js

@@ -0,0 +1,25 @@
+'use strict';
+
+function jsonReporter(results) {
+  let started = false;
+
+  results.on('start', function () {
+    console.log('[');
+  });
+
+  results.on('end', function () { 
+    console.log(']');
+  });
+
+  results.on('test end', function (test) {
+    if (started) {
+      process.stdout.write(',');
+    } else {
+      started = true;
+    }
+
+    console.log(JSON.stringify(test));
+  });
+}
+
+module.exports = jsonReporter;

lib/resultsEmitter.js

@@ -3,10 +3,15 @@
 const EventEmitter = require('events');
 
 function resultsEmitter(results) {
+  let started = false;
   const emitter = new EventEmitter();
-  emitter.emit('start');
   results.forEach(
     function (test) {
+      if (!started) {
+        emitter.emit('start');
+        started = true;
+      }
+
       emitter.emit('test end', test);
 
       if (test.result.pass) {

package.json

@@ -11,9 +11,8 @@
     "test": "node_modules/.bin/tape test/test.js"
   },
   "dependencies": {
-    "async": "^2.0.0-rc.6",
     "eshost": "^3.0.0",
-    "glob": "~4.0.3",
+    "glob": "^7.0.5",
     "rx": "^4.1.0",
     "test262-compiler": "^1.0.0",
     "yargs": "^4.7.1"
@@ -28,6 +27,6 @@
   ],
   "devDependencies": {
     "rimraf": "^2.5.3",
-    "tape": "^3.0.3"
+    "tape": "^3.6.1"
   }
 }

test/collateral/async.js

@@ -1,8 +1,11 @@
 /*---
 description: Async test
-note: Will only work in hosts with setTimeout...
+expected:
+  pass: true
 ---*/
 
-process.nextTick(function() {
-    $DONE()
-})
+var p = new Promise(function(resolve) {
+  resolve();
+});
+
+p.then($DONE, $DONE);

test/collateral/asyncNegative.js

@@ -1,6 +1,8 @@
 /*---
 description: Async test
 negative: RangeError
+expected:
+  pass: true
 ---*/
 
 process.nextTick(function() {

test/collateral/bothStrict.js

@@ -1,6 +1,8 @@
 /*---
 description: Should test in both modes
 negative: ReferenceError
+expected:
+  pass: true
 ---*/
 var strict;
 try { x = 1; strict = false;} catch(e) { strict = true }

test/collateral/error.js

@@ -1,5 +1,8 @@
 /*---
 description: Fails by calling $ERROR
+expected:
+  pass: false
+  message: failure message
 ---*/
 
 $ERROR('failure message');

test/collateral/negativeMessage.js

@@ -1,4 +1,6 @@
 /*---
 description: Should report the expected error indicated by the "negative" frontmatter
 negative: ExpectedError
+expected:
+  pass: false
 ---*/

test/collateral/noStrict.js

@@ -1,5 +1,7 @@
 /*---
 description: Should not test in strict mode
 flags: [noStrict]
+expected:
+  pass: true
 ---*/
 x = 5;

test/collateral/rawNoStrict.js

@@ -1,6 +1,8 @@
 /*---
 description: Should not test in strict mode
 flags: [raw]
+expected:
+  pass: true
 ---*/
 var seemsStrict;
 try {

test/collateral/rawStrict.js

@@ -1,6 +1,8 @@
 /*---
 description: Should not test in strict mode
 flags: [raw]
+expected:
+  pass: true
 ---*/
 'use strict';
 var seemsStrict;

test/collateral/strict.js

@@ -2,6 +2,8 @@
 description: Should not test in sloppy mode
 flags: [onlyStrict]
 negative: ReferenceError
+expected:
+  pass: true
 ---*/
 x = 5;
 $ERROR('Not in strict mode');

test/collateral/thrownError.js

@@ -1,5 +1,8 @@
 /*---
 description: Fails by throwing an error
+expected:
+  pass: false
+  message: "Expected no error, got Error: failure message"
 ---*/
 
 function foo() {

test/test-includes/Date_constants.js

@@ -0,0 +1,83 @@
+//Date_constants.js
+// Copyright 2009 the Sputnik authors.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+var HoursPerDay = 24;
+var MinutesPerHour = 60;
+var SecondsPerMinute = 60;
+
+var msPerDay = 86400000;
+var msPerSecond = 1000;
+var msPerMinute = 60000;
+var msPerHour = 3600000;
+
+var date_1899_end = -2208988800001;
+var date_1900_start = -2208988800000;
+var date_1969_end = -1;
+var date_1970_start = 0;
+var date_1999_end = 946684799999;
+var date_2000_start = 946684800000;
+var date_2099_end = 4102444799999;
+var date_2100_start = 4102444800000;
+
+// Copyright 2009 the Sputnik authors.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+//the following values are normally generated by the sputnik.py driver
+var $LocalTZ,
+    $DST_start_month,
+    $DST_start_sunday,
+    $DST_start_hour,
+    $DST_start_minutes,
+    $DST_end_month,
+    $DST_end_sunday,
+    $DST_end_hour,
+    $DST_end_minutes;
+
+(function () {
+    /**
+      * Finds the first date, starting from |start|, where |predicate|
+      * holds.
+      */
+    var findNearestDateBefore = function(start, predicate) {
+        var current = start;
+        var month = 1000 * 60 * 60 * 24 * 30;
+        for (var step = month; step > 0; step = Math.floor(step / 3)) {
+            if (!predicate(current)) {
+                while (!predicate(current))
+                    current = new Date(current.getTime() + step);
+                    current = new Date(current.getTime() - step);
+                }
+        }
+        while (!predicate(current)) {
+            current = new Date(current.getTime() + 1);
+        }
+        return current;
+    };
+
+    var juneDate = new Date(2000, 5, 20, 0, 0, 0, 0);
+    var decemberDate = new Date(2000, 11, 20, 0, 0, 0, 0);
+    var juneOffset = juneDate.getTimezoneOffset();
+    var decemberOffset = decemberDate.getTimezoneOffset();
+    var isSouthernHemisphere = (juneOffset > decemberOffset);
+    var winterTime = isSouthernHemisphere ? juneDate : decemberDate;
+    var summerTime = isSouthernHemisphere ? decemberDate : juneDate;
+
+    var dstStart = findNearestDateBefore(winterTime, function (date) {
+        return date.getTimezoneOffset() == summerTime.getTimezoneOffset();
+    });
+    $DST_start_month = dstStart.getMonth();
+    $DST_start_sunday = dstStart.getDate() > 15 ? '"last"' : '"first"';
+    $DST_start_hour = dstStart.getHours();
+    $DST_start_minutes = dstStart.getMinutes();
+
+    var dstEnd = findNearestDateBefore(summerTime, function (date) {
+        return date.getTimezoneOffset() == winterTime.getTimezoneOffset();
+    });
+    $DST_end_month = dstEnd.getMonth();
+    $DST_end_sunday = dstEnd.getDate() > 15 ? '"last"' : '"first"';
+    $DST_end_hour = dstEnd.getHours();
+    $DST_end_minutes = dstEnd.getMinutes();
+
+    return;
+})();