Move PASS, FAIL to suite.js

Author: stasm

test/ebnf.js

@@ -2,7 +2,7 @@ import fs from "fs";
 import color from "cli-color";
 import difflib from "difflib";
 import ebnf from "../lib/ebnf.js";
-import {PASS, FAIL} from "./util.js";
+import {PASS, FAIL} from "./suite.js";
 
 let args = process.argv.slice(2);
 

test/parser.js

@@ -1,9 +1,9 @@
 import assert from "assert";
 import path from "path";
 import fs from "fs";
-import {diffString} from "json-diff";
 import {Resource} from "../syntax/grammar.js";
-import {PASS, FAIL} from "./util.js";
+import {print_generic_error, print_assert_error, exit_summary, PASS, FAIL}
+    from "./suite.js";
 
 const bail = process.argv[2] === "--bail";
 const fixtures_dir = process.argv[bail ? 3 : 2];
@@ -78,32 +78,3 @@ function validate(actual_ast, expected_serialized) {
     const expected_json = JSON.parse(expected_serialized);
     assert.deepEqual(actual_json, expected_json);
 }
-
-function print_assert_error(ftl_path, err) {
-    console.log(`
-========================================================================
-${FAIL} ${ftl_path}
-------------------------------------------------------------------------
-${diffString(err.expected, err.actual)}
-`);
-}
-
-function print_generic_error(ftl_path, err) {
-    console.log(`
-========================================================================
-${FAIL} ${ftl_path}
-------------------------------------------------------------------------
-${err.message}
-`);
-}
-
-function exit_summary(error_count) {
-    const message = error_count
-        ? `Tests ${FAIL}: ${error_count}.`
-        : `All tests ${PASS}.`;
-    console.log(`
-========================================================================
-${message}
-`);
-    process.exit(Number(error_count > 0));
-}

test/suite.js

@@ -1,9 +1,11 @@
 import assert from "assert";
 import {diffString} from "json-diff";
-import {PASS, FAIL} from "./util.js";
+import color from "cli-color";
 
-export default
-function suite(fn) {
+export const PASS = color.green("PASS");
+export const FAIL = color.red("FAIL");
+
+export default function suite(fn) {
     let errors = new Map();
     fn(create_tester(errors));
 
@@ -35,7 +37,16 @@ function create_tester(errors) {
     };
 }
 
-function print_assert_error(title, err) {
+export function print_generic_error(ftl_path, err) {
+    console.log(`
+========================================================================
+${FAIL} ${ftl_path}
+------------------------------------------------------------------------
+${err.message}
+`);
+}
+
+export function print_assert_error(title, err) {
     console.log(`
 ========================================================================
 ${FAIL} ${title}
@@ -44,7 +55,7 @@ ${diffString(err.expected, err.actual)}
 `);
 }
 
-function exit_summary(error_count) {
+export function exit_summary(error_count) {
     const message = error_count
         ? `Tests ${FAIL}: ${error_count}.`
         : `All tests ${PASS}.`;