Moved all spec and benchmark tests

- Moved benchmark to test/benchmark
- Moved tests to test/spec
- Removed individual servers
- Implemented single test server
- Moved server assets to test/server
- Updated Gulpfile.js
- Moved tools/impact to test/impact

This commit move's nearly all code related to testing the PEG.js module into the test directory, and also ensures they run as they did before the move.

benchmark/server

@@ -1,36 +0,0 @@
-#!/usr/bin/env node
-
-"use strict";
-
-/* eslint-env node */
-
-// Small server whose main purpose is to ensure that both the benchmarked code
-// and the benchmark get passed through Babel & Browserify before they are
-// served to the browser.
-
-let babelify = require("babelify");
-let browserify = require("browserify");
-let express = require("express");
-let glob = require("glob");
-let logger = require("morgan");
-
-let app = express();
-
-app.use(logger("dev"));
-app.use(express.static(__dirname));
-app.use("/examples", express.static(`${__dirname}/../examples`));
-
-app.get("/bundle.js", (req, res) => {
-  let files = glob.sync(`${__dirname}/**/*.js`, {
-    ignore: `${__dirname}/vendor/**/*`
-  });
-
-  browserify(files)
-    .transform(babelify, { presets: "es2015", compact: false })
-    .bundle()
-    .pipe(res);
-});
-
-app.listen(8000, () => {
-  console.log("Benchmark server running at http://localhost:8000...");
-});

gulpfile.js

@@ -32,20 +32,16 @@ const HEADER = [
 const JS_FILES = [
   "lib/**/*.js",
   "!lib/parser.js",
-  "test/**/*.js",
+  "test/benchmark/**/*.js",
-  "test/server",
+  "test/benchmark/run",
-  "!test/vendor/**/*",
+  "test/spec/**/*.js",
-  "benchmark/**/*.js",
+  "test/server/run",
-  "benchmark/run",
-  "benchmark/server",
-  "!benchmark/vendor/**/*",
   "bin/*.js",
   "gulpfile.js"
 ];
 
 const TEST_FILES = [
-  "test/**/*.js",
+  "test/spec/**/*.js"
-  "!test/vendor/**/*"
 ];
 
 function generate(contents) {
@@ -71,7 +67,7 @@ gulp.task("test", () =>
 
 // Run benchmarks.
 gulp.task("benchmark", () =>
-  spawn("node", ["benchmark/run"], { stdio: "inherit" })
+  spawn("node", ["test/benchmark/run"], { stdio: "inherit" })
 );
 
 // Create the browser build.

package.json

@@ -49,6 +49,7 @@
     "lint": "gulp lint",
     "spec": "gulp test",
     "test": "gulp",
+    "test:server": "node test/server/run",
     "benchmark": "gulp benchmark",
     "browser:build": "gulp browser:build",
     "browser:clean": "gulp browser:build",

test/benchmark/index.js

@@ -10,12 +10,6 @@ $("#run").click(() => {
 
   let resultsTable = $("#results-table");
 
-  function appendHeading(heading) {
-    resultsTable.append(
-      "<tr class='heading'><th colspan='4'>" + heading + "</th></tr>"
-    );
-  }
-
   function appendResult(klass, title, url, inputSize, parseTime) {
     const KB = 1024;
     const MS_IN_S = 1000;
@@ -76,7 +70,7 @@ $("#run").click(() => {
     readFile(file) {
       return $.ajax({
         type: "GET",
-        url: file,
+        url: "benchmark/" + file,
         dataType: "text",
         async: false
       }).responseText;
@@ -90,14 +84,20 @@ $("#run").click(() => {
       appendResult(
         "individual",
         test.title,
-        benchmark.id + "/" + test.file,
+        "benchmark/" + benchmark.id + "/" + test.file,
         inputSize,
         parseTime
       );
     },
 
     benchmarkStart(benchmark) {
-      appendHeading(benchmark.title);
+      resultsTable.append(
+          "<tr class='heading'><th colspan='4'>"
+        +   "<a href='../../examples/" + benchmark.id + ".pegjs'>"
+        +     benchmark.title
+        +   "</a>"
+        + "</th></tr>"
+      );
     },
 
     benchmarkFinish(benchmark, inputSize, parseTime) {

test/benchmark/runner.js

@@ -2,7 +2,7 @@
 
 /* global setTimeout */
 
-let peg = require("../lib/peg");
+let peg = require("../../lib/peg");
 
 let Runner = {
   run(benchmarks, runCount, options, callbacks) {
@@ -53,7 +53,7 @@ let Runner = {
         callbacks.benchmarkStart(benchmark);
 
         state.parser = peg.generate(
-          callbacks.readFile("../examples/" + benchmark.id + ".pegjs"),
+          callbacks.readFile("../../examples/" + benchmark.id + ".pegjs"),
           options
         );
         state.benchmarkInputSize = 0;

test/server

@@ -1,35 +0,0 @@
-#!/usr/bin/env node
-
-"use strict";
-
-/* eslint-env node */
-
-// Small server whose main purpose is to ensure that both the tested code and
-// the tests get passed through Babel & Browserify before they are served to the
-// browser.
-
-let babelify = require("babelify");
-let browserify = require("browserify");
-let express = require("express");
-let glob = require("glob");
-let logger = require("morgan");
-
-let app = express();
-
-app.use(logger("dev"));
-app.use(express.static(__dirname));
-
-app.get("/bundle.js", (req, res) => {
-  let files = glob.sync(`${__dirname}/**/*.js`, {
-    ignore: `${__dirname}/vendor/**/*`
-  });
-
-  browserify(files)
-    .transform(babelify, { presets: "es2015", compact: false })
-    .bundle()
-    .pipe(res);
-});
-
-app.listen(8000, () => {
-  console.log("Test server running at http://localhost:8000...");
-});

test/server/benchmark.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>PEG.js Benchmark Suite</title>
-    <link rel="stylesheet" href="index.css">
+    <link rel="stylesheet" href="benchmark.css">
   </head>
   <body>
     <h1>PEG.js Benchmark Suite</h1>
@@ -35,6 +35,6 @@
 
     <script src="vendor/jquery/jquery.js"></script>
     <script src="vendor/jquery.scrollto/jquery.scrollTo.js"></script>
-    <script src="bundle.js"></script>
+    <script src="benchmark/bundle.js"></script>
   </body>
 </html>

test/server/index.html

@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>PEG.js Test Suites</title>
+    <style>
+      a {
+        text-decoration: none;
+        color: #1A0BF1;
+      }
+      a:hover {
+        text-decoration: underline;
+        color: #9D0BF1;
+      }
+    </style>
+  </head>
+  <body>
+    <p>
+      <h1>PEG.js Test Suites</h1>
+    </p>
+    &bull; <a href="/benchmark.html">Benchmark Suite</a><br />
+    &bull; <a href="/spec.html">Spec Suite</a>
+  </body>
+</html>

test/server/run

@@ -0,0 +1,34 @@
+#!/usr/bin/env node
+
+"use strict";
+
+/* eslint-env node */
+
+let babelify = require("babelify");
+let browserify = require("browserify");
+let express = require("express");
+let glob = require("glob");
+let logger = require("morgan");
+
+let app = express();
+
+app.use(logger("dev"));
+app.use(express.static(__dirname));
+app.use("/benchmark", express.static(`${__dirname}/../benchmark`));
+app.use("/examples", express.static(`${__dirname}/../../examples`));
+
+app.get("/:dir/bundle.js", (req, res) => {
+  browserify(glob.sync(
+    `${__dirname}/../${req.params.dir}/**/*.js`
+  ))
+    .transform(babelify, {
+      presets: "es2015",
+      compact: false
+    })
+    .bundle()
+    .pipe(res);
+});
+
+app.listen(8000, () => {
+  console.log("Test server running at: http://localhost:8000/");
+});

test/server/spec.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>PEG.js Test Suite</title>
+    <title>PEG.js Spec Suite</title>
     <link rel="stylesheet" href="vendor/mocha/mocha.css">
   </head>
   <body>
@@ -11,7 +11,7 @@
     <script>
       mocha.setup('bdd');
     </script>
-    <script src="bundle.js"></script>
+    <script src="spec/bundle.js"></script>
     <script>
       mocha.run();
     </script>

test/spec/api/generated-parser-api.spec.js

@@ -3,7 +3,7 @@
 /* global console */
 
 let chai = require("chai");
-let peg = require("../../lib/peg");
+let peg = require("../../../lib/peg");
 let sinon = require("sinon");
 
 let expect = chai.expect;

test/spec/api/pegjs-api.spec.js

@@ -1,7 +1,7 @@
 "use strict";
 
 let chai = require("chai");
-let peg = require("../../lib/peg");
+let peg = require("../../../lib/peg");
 let sinon = require("sinon");
 
 let expect = chai.expect;

test/spec/api/plugin-api.spec.js

@@ -1,7 +1,7 @@
 "use strict";
 
 let chai = require("chai");
-let peg = require("../../lib/peg");
+let peg = require("../../../lib/peg");
 
 let expect = chai.expect;
 

test/spec/behavior/generated-parser-behavior.spec.js

@@ -3,7 +3,7 @@
 /* global console */
 
 let chai = require("chai");
-let peg = require("../../lib/peg");
+let peg = require("../../../lib/peg");
 let sinon = require("sinon");
 
 let expect = chai.expect;

test/spec/unit/compiler/passes/generate-bytecode.spec.js

@@ -2,7 +2,7 @@
 
 let chai = require("chai");
 let helpers = require("./helpers");
-let pass = require("../../../../lib/compiler/passes/generate-bytecode");
+let pass = require("../../../../../lib/compiler/passes/generate-bytecode");
 
 chai.use(helpers);
 

test/spec/unit/compiler/passes/helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 
-let parser = require("../../../../lib/parser");
+let parser = require("../../../../../lib/parser");
 
 module.exports = function(chai, utils) {
   let Assertion = chai.Assertion;

test/spec/unit/compiler/passes/remove-proxy-rules.spec.js

@@ -2,7 +2,7 @@
 
 let chai = require("chai");
 let helpers = require("./helpers");
-let pass = require("../../../../lib/compiler/passes/remove-proxy-rules");
+let pass = require("../../../../../lib/compiler/passes/remove-proxy-rules");
 
 chai.use(helpers);
 

test/spec/unit/compiler/passes/report-duplicate-labels.spec.js

@@ -2,7 +2,7 @@
 
 let chai = require("chai");
 let helpers = require("./helpers");
-let pass = require("../../../../lib/compiler/passes/report-duplicate-labels");
+let pass = require("../../../../../lib/compiler/passes/report-duplicate-labels");
 
 chai.use(helpers);
 

test/spec/unit/compiler/passes/report-duplicate-rules.spec.js

@@ -2,7 +2,7 @@
 
 let chai = require("chai");
 let helpers = require("./helpers");
-let pass = require("../../../../lib/compiler/passes/report-duplicate-rules");
+let pass = require("../../../../../lib/compiler/passes/report-duplicate-rules");
 
 chai.use(helpers);
 

test/spec/unit/compiler/passes/report-infinite-recursion.spec.js

@@ -2,7 +2,7 @@
 
 let chai = require("chai");
 let helpers = require("./helpers");
-let pass = require("../../../../lib/compiler/passes/report-infinite-recursion");
+let pass = require("../../../../../lib/compiler/passes/report-infinite-recursion");
 
 chai.use(helpers);
 

test/spec/unit/compiler/passes/report-infinite-repetition.spec.js

@@ -2,7 +2,7 @@
 
 let chai = require("chai");
 let helpers = require("./helpers");
-let pass = require("../../../../lib/compiler/passes/report-infinite-repetition");
+let pass = require("../../../../../lib/compiler/passes/report-infinite-repetition");
 
 chai.use(helpers);
 

test/spec/unit/compiler/passes/report-undefined-rules.spec.js

@@ -2,7 +2,7 @@
 
 let chai = require("chai");
 let helpers = require("./helpers");
-let pass = require("../../../../lib/compiler/passes/report-undefined-rules");
+let pass = require("../../../../../lib/compiler/passes/report-undefined-rules");
 
 chai.use(helpers);
 

test/spec/unit/parser.spec.js

@@ -1,7 +1,7 @@
 "use strict";
 
 let chai = require("chai");
-let parser = require("../../lib/parser");
+let parser = require("../../../lib/parser");
 
 let expect = chai.expect;