fluencelabs/assemblyscript
1
0
Fork 0
mirror of https://github.com/fluencelabs/assemblyscript synced 2025-06-17 00:41:32 +00:00
Code Issues Projects Releases Wiki Activity

Remove chalk dependency and replace it with something simpler, fixes #138

Browse Source
This commit is contained in:
dcodeIO
2018-06-12 18:34:39 +02:00
parent 09c328faa6
commit e18165bbbc
10 changed files with 104 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/compiler.js
View File

@ -1,7 +1,7 @@
const fs = require("fs");
const path = require("path");
const os = require("os");
const chalk = require("chalk");
const colors = require("../cli/util/colors");
const glob = require("glob");
const minimist = require("minimist");
@ -54,7 +54,7 @@ function getExpectedErrors(filePath) {
// TODO: asc's callback is synchronous here. This might change.
tests.forEach(filename => {
console.log(chalk.whiteBright("Testing compiler/" + filename) + "\n");
console.log(colors.white("Testing compiler/" + filename) + "\n");
const expectedErrors = getExpectedErrors(path.join(basedir, filename));
const basename = filename.replace(/\.ts$/, "");
@ -85,13 +85,13 @@ tests.forEach(filename => {
for (const expectedError of expectedErrors) {
if (!stderrString.includes(expectedError)) {
console.log(`Expected error "${expectedError}" was not in the error output.`);
console.log("- " + chalk.red("error check ERROR"));
console.log("- " + colors.red("error check ERROR"));
failedTests.push(basename);
console.log();
return;
}
}
console.log("- " + chalk.green("error check OK"));
console.log("- " + colors.green("error check OK"));
++successes;
console.log();
return;
@ -102,16 +102,16 @@ tests.forEach(filename => {
var actual = stdout.toString().replace(/\r\n/g, "\n");
if (args.create) {
fs.writeFileSync(path.join(basedir, basename + ".untouched.wat"), actual, { encoding: "utf8" });
console.log("- " + chalk.yellow("Created fixture"));
console.log("- " + colors.yellow("Created fixture"));
} else {
let expected = fs.readFileSync(path.join(basedir, basename + ".untouched.wat"), { encoding: "utf8" }).replace(/\r\n/g, "\n");
let diffs = diff(basename + ".untouched.wat", expected, actual);
if (diffs !== null) {
console.log(diffs);
console.log("- " + chalk.red("diff ERROR"));
console.log("- " + colors.red("diff ERROR"));
failed = true;
} else
console.log("- " + chalk.green("diff OK"));
console.log("- " + colors.green("diff OK"));
}
console.log();
@ -161,9 +161,9 @@ tests.forEach(filename => {
JSMath: Math
});
});
console.log("- " + chalk.green("instantiate OK") + " (" + asc.formatTime(runTime) + ")");
console.log("- " + colors.green("instantiate OK") + " (" + asc.formatTime(runTime) + ")");
} catch (e) {
console.log("- " + chalk.red("instantiate ERROR: ") + e);
console.log("- " + colors.red("instantiate ERROR: ") + e);
failed = true;
}
@ -176,6 +176,6 @@ tests.forEach(filename => {
if (failedTests.length) {
process.exitCode = 1;
console.log(chalk.red("ERROR: ") + failedTests.length + " compiler tests failed: " + failedTests.join(", "));
console.log(colors.red("ERROR: ") + failedTests.length + " compiler tests failed: " + failedTests.join(", "));
} else
console.log("[ " + chalk.whiteBright("SUCCESS") + " ]");
console.log("[ " + colors.white("SUCCESS") + " ]");

12
tests/parser.js
View File

@ -1,5 +1,5 @@
var fs = require("fs");
var chalk = require("chalk");
var colors = require("../cli/util/colors");
var glob = require("glob");
var diff = require("./util/diff");
@ -17,7 +17,7 @@ glob.sync(filter, { cwd: __dirname + "/parser" }).forEach(filename => {
if (filename.charAt(0) == "_" || filename.endsWith(".fixture.ts"))
return;
console.log(chalk.default.whiteBright("Testing parser/" + filename));
console.log(colors.white("Testing parser/" + filename));
var failed = false;
var parser = new Parser();
@ -36,9 +36,9 @@ glob.sync(filter, { cwd: __dirname + "/parser" }).forEach(filename => {
if (diffs !== null) {
failed = true;
console.log(diffs);
console.log(chalk.default.red("diff ERROR"));
console.log(colors.red("diff ERROR"));
} else {
console.log(chalk.default.green("diff OK"));
console.log(colors.green("diff OK"));
}
}
@ -49,6 +49,6 @@ glob.sync(filter, { cwd: __dirname + "/parser" }).forEach(filename => {
if (failures) {
process.exitCode = 1;
console.log(chalk.red("ERROR: ") + failures + " parser tests failed");
console.log(colors.red("ERROR: ") + failures + " parser tests failed");
} else
console.log("[ " + chalk.whiteBright("SUCCESS") + " ]");
console.log("[ " + colors.white("SUCCESS") + " ]");

6
tests/util/diff.js
View File

@ -1,5 +1,5 @@
var JsDiff = require("diff");
var chalk = require("chalk");
var colors = require("../../cli/util/colors");
module.exports = function diff(filename, expected, actual) {
var diff = JsDiff.structuredPatch(filename, filename, expected, actual, "expected", "actual", { context: 5 });
@ -19,9 +19,9 @@ module.exports = function diff(filename, expected, actual) {
);
ret.push.apply(ret, hunk.lines.map(line =>
line.charAt(0) === "+"
? chalk.default.green(line)
? colors.green(line)
: line.charAt(0) === "-"
? line = chalk.default.red(line)
? line = colors.red(line)
: line
));
}