improve tests (#3399)

package.json

@@ -31,7 +31,7 @@
     "semver": "~6.0.0"
   },
   "scripts": {
-    "test": "node test/run-tests.js"
+    "test": "node test/compress.js && node test/mocha.js"
   },
   "keywords": [
     "cli",

test/compress.js

@@ -1,25 +1,32 @@
 #! /usr/bin/env node
 
-var U = require("./node");
-var path = require("path");
-var fs = require("fs");
 var assert = require("assert");
+var fs = require("fs");
+var path = require("path");
 var sandbox = require("./sandbox");
 var semver = require("semver");
+var U = require("./node");
 
-var tests_dir = path.dirname(module.filename);
 var failures = 0;
-var failed_files = {};
+var failed_files = Object.create(null);
 var minify_options = require("./ufuzz.json").map(JSON.stringify);
-
+var dir = path.resolve(path.dirname(module.filename), "compress");
-run_compress_tests();
+fs.readdirSync(dir).filter(function(name) {
+    return /\.js$/i.test(name);
+}).forEach(function(file) {
+    log("--- {file}", { file: file });
+    var tests = parse_test(path.resolve(dir, file));
+    for (var i in tests) if (!test_case(tests[i])) {
+        failures++;
+        failed_files[file] = 1;
+    }
+});
 if (failures) {
-    console.error("\n!!! Failed " + failures + " test cases.");
+    console.error();
+    console.error("!!! Failed " + failures + " test case(s).");
     console.error("!!! " + Object.keys(failed_files).join(", "));
     process.exit(1);
 }
-console.log();
-require("./mocha.js");
 
 /* -----[ utils ]----- */
 
@@ -46,11 +53,11 @@ function parse_test(file) {
             filename: file
         });
     } catch (e) {
-        console.log("Caught error while parsing tests in " + file + "\n");
+        console.error("Caught error while parsing tests in " + file);
-        console.log(e);
+        console.error(e);
-        throw e;
+        process.exit(1);
     }
-    var tests = {};
+    var tests = Object.create(null);
     var tw = new U.TreeWalker(function(node, descend) {
         if (node instanceof U.AST_LabeledStatement
             && tw.parent() instanceof U.AST_Toplevel) {
@@ -167,7 +174,17 @@ function reminify(orig_options, input_code, input_formatted, expect_stdout) {
         var options_formatted = JSON.stringify(options, null, 4);
         var result = U.minify(input_code, options);
         if (result.error) {
-            log("!!! failed input reminify\n---INPUT---\n{input}\n---OPTIONS---\n{options}\n--ERROR---\n{error}\n\n", {
+            log([
+                "!!! failed input reminify",
+                "---INPUT---",
+                "{input}",
+                "---OPTIONS---",
+                "{options}",
+                "--ERROR---",
+                "{error}",
+                "",
+                "",
+            ].join("\n"), {
                 input: input_formatted,
                 options: options_formatted,
                 error: result.error,
@@ -179,7 +196,21 @@ function reminify(orig_options, input_code, input_formatted, expect_stdout) {
                 stdout = expect_stdout;
             }
             if (!sandbox.same_stdout(expect_stdout, stdout)) {
-                log("!!! failed running reminified input\n---INPUT---\n{input}\n---OPTIONS---\n{options}\n---OUTPUT---\n{output}\n---EXPECTED {expected_type}---\n{expected}\n---ACTUAL {actual_type}---\n{actual}\n\n", {
+                log([
+                    "!!! failed running reminified input",
+                    "---INPUT---",
+                    "{input}",
+                    "---OPTIONS---",
+                    "{options}",
+                    "---OUTPUT---",
+                    "{output}",
+                    "---EXPECTED {expected_type}---",
+                    "{expected}",
+                    "---ACTUAL {actual_type}---",
+                    "{actual}",
+                    "",
+                    "",
+                ].join("\n"), {
                     input: input_formatted,
                     options: options_formatted,
                     output: result.code,
@@ -200,12 +231,6 @@ function run_code(code) {
     return typeof result == "string" ? result.replace(/\u001b\[\d+m/g, "") : result;
 }
 
-function run_compress_tests() {
-    var dir = path.resolve(tests_dir, "compress");
-    fs.readdirSync(dir).filter(function(name) {
-        return /\.js$/i.test(name);
-    }).forEach(function(file) {
-        log("--- {file}", { file: file });
 function test_case(test) {
     log("    Running test [{name}]", { name: test.name });
     var output_options = test.beautify || {};
@@ -226,7 +251,15 @@ function run_compress_tests() {
     try {
         U.parse(input_code);
     } catch (ex) {
-                log("!!! Cannot parse input\n---INPUT---\n{input}\n--PARSE ERROR--\n{error}\n\n", {
+        log([
+            "!!! Cannot parse input",
+            "---INPUT---",
+            "{input}",
+            "--PARSE ERROR--",
+            "{error}",
+            "",
+            "",
+        ].join("\n"), {
             input: input_formatted,
             error: ex,
         });
@@ -264,7 +297,17 @@ function run_compress_tests() {
     }
     output = make_code(output, output_options);
     if (expect != output) {
-                log("!!! failed\n---INPUT---\n{input}\n---OUTPUT---\n{output}\n---EXPECTED---\n{expected}\n\n", {
+        log([
+            "!!! failed",
+            "---INPUT---",
+            "{input}",
+            "---OUTPUT---",
+            "{output}",
+            "---EXPECTED---",
+            "{expected}",
+            "",
+            "",
+        ].join("\n"), {
             input: input_formatted,
             output: output,
             expected: expect
@@ -275,7 +318,17 @@ function run_compress_tests() {
     try {
         U.parse(output);
     } catch (ex) {
-                log("!!! Test matched expected result but cannot parse output\n---INPUT---\n{input}\n---OUTPUT---\n{output}\n--REPARSE ERROR--\n{error}\n\n", {
+        log([
+            "!!! Test matched expected result but cannot parse output",
+            "---INPUT---",
+            "{input}",
+            "---OUTPUT---",
+            "{output}",
+            "--REPARSE ERROR--",
+            "{error}",
+            "",
+            "",
+        ].join("\n"), {
             input: input_formatted,
             output: output,
             error: ex,
@@ -288,7 +341,17 @@ function run_compress_tests() {
         });
         var actual_warnings = JSON.stringify(warnings_emitted);
         if (expected_warnings != actual_warnings) {
-                    log("!!! failed\n---INPUT---\n{input}\n---EXPECTED WARNINGS---\n{expected_warnings}\n---ACTUAL WARNINGS---\n{actual_warnings}\n\n", {
+            log([
+                "!!! failed",
+                "---INPUT---",
+                "{input}",
+                "---EXPECTED WARNINGS---",
+                "{expected_warnings}",
+                "---ACTUAL WARNINGS---",
+                "{actual_warnings}",
+                "",
+                "",
+            ].join("\n"), {
                 input: input_formatted,
                 expected_warnings: expected_warnings,
                 actual_warnings: actual_warnings,
@@ -303,7 +366,17 @@ function run_compress_tests() {
             test.expect_stdout = stdout;
         }
         if (!sandbox.same_stdout(test.expect_stdout, stdout)) {
-                    log("!!! Invalid input or expected stdout\n---INPUT---\n{input}\n---EXPECTED {expected_type}---\n{expected}\n---ACTUAL {actual_type}---\n{actual}\n\n", {
+            log([
+                "!!! Invalid input or expected stdout",
+                "---INPUT---",
+                "{input}",
+                "---EXPECTED {expected_type}---",
+                "{expected}",
+                "---ACTUAL {actual_type}---",
+                "{actual}",
+                "",
+                "",
+            ].join("\n"), {
                 input: input_formatted,
                 expected_type: typeof test.expect_stdout == "string" ? "STDOUT" : "ERROR",
                 expected: test.expect_stdout,
@@ -314,7 +387,17 @@ function run_compress_tests() {
         }
         stdout = run_code(output);
         if (!sandbox.same_stdout(test.expect_stdout, stdout)) {
-                    log("!!! failed\n---INPUT---\n{input}\n---EXPECTED {expected_type}---\n{expected}\n---ACTUAL {actual_type}---\n{actual}\n\n", {
+            log([
+                "!!! failed",
+                "---INPUT---",
+                "{input}",
+                "---EXPECTED {expected_type}---",
+                "{expected}",
+                "---ACTUAL {actual_type}---",
+                "{actual}",
+                "",
+                "",
+            ].join("\n"), {
                 input: input_formatted,
                 expected_type: typeof test.expect_stdout == "string" ? "STDOUT" : "ERROR",
                 expected: test.expect_stdout,
@@ -329,15 +412,6 @@ function run_compress_tests() {
     }
     return true;
 }
-        var tests = parse_test(path.resolve(dir, file));
-        for (var i in tests) if (tests.hasOwnProperty(i)) {
-            if (!test_case(tests[i])) {
-                failures++;
-                failed_files[file] = 1;
-            }
-        }
-    });
-}
 
 function tmpl() {
     return U.string_template.apply(null, arguments);

test/mocha/release.js

@@ -3,6 +3,7 @@ var semver = require("semver");
 var spawn = require("child_process").spawn;
 
 if (!process.env.UGLIFYJS_TEST_ALL) return;
+if (semver.satisfies(process.version, "0.12")) return;
 
 function run(command, args, done) {
     spawn(command, args, {
@@ -33,7 +34,6 @@ describe("test/benchmark.js", function() {
     });
 });
 
-if (semver.satisfies(process.version, "0.12")) return;
 describe("test/jetstream.js", function() {
     this.timeout(20 * 60 * 1000);
     [