From 344ccb9f09d04f492865ac8d8838a3ecc2e73774 Mon Sep 17 00:00:00 2001
From: Ajani Bilby <11359344+AjaniBilby@users.noreply.github.com>
Date: Wed, 29 May 2024 15:46:19 +1000
Subject: [PATCH] cleaned up test logs

---
 package.json                             |  2 +-
 source/compiler/package.ts               |  6 +++---
 source/test.ts                           | 17 ++++++++---------
 tests/.gitignore                         |  1 +
 tests/{reflective => }/fibonacci.test.sa |  0
 tests/{reflective => }/numeric.test.sa   |  6 +++---
 tests/reflective/.gitignore              |  1 -
 7 files changed, 16 insertions(+), 17 deletions(-)
 create mode 100644 tests/.gitignore
 rename tests/{reflective => }/fibonacci.test.sa (100%)
 rename tests/{reflective => }/numeric.test.sa (88%)
 delete mode 100644 tests/reflective/.gitignore

diff --git a/package.json b/package.json
index 6dd7e81..dcaaa1d 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
 		"build:compiler": "deno compile --output salient.exe -A ./source/cli.ts",
 		"test": "run-s test:*",
 		"test:deno": "deno test",
-		"test:reflect": "npm run sa-test ./tests/reflective",
+		"test:reflect": "npm run sa-test ./tests",
 		"cli": "deno run -A ./source/cli.ts",
 		"sa-test": "deno run -A ./source/cli.ts test",
 		"compile": "deno run -A ./source/cli.ts compile"
diff --git a/source/compiler/package.ts b/source/compiler/package.ts
index f2a2794..a18bfe3 100644
--- a/source/compiler/package.ts
+++ b/source/compiler/package.ts
@@ -1,4 +1,4 @@
-import { dirname, relative } from "https://deno.land/std@0.201.0/path/mod.ts";
+import { relative } from "https://deno.land/std@0.201.0/path/mod.ts";
 
 import type Project from "~/compiler/project.ts";
 import { File } from "~/compiler/file.ts"
@@ -11,13 +11,13 @@ export default class Package {
 
 	failed: boolean;
 
-	constructor(project: Project, base: string, name: string = "~") {
+	constructor(project: Project, base: string, name = "~") {
 		this.project = project;
 		this.failed = false;
 		this.files = [];
 
 		this.name = name;
-		this.cwd = dirname(base);
+		this.cwd = base;
 	}
 
 	import(filePath: string) {
diff --git a/source/test.ts b/source/test.ts
index f1590c0..881fd2d 100644
--- a/source/test.ts
+++ b/source/test.ts
@@ -8,8 +8,6 @@ import TestCase from "~/compiler/test-case.ts";
 import Package from "~/compiler/package.ts";
 import Project from "~/compiler/project.ts";
 
-
-
 export async function Test() {
 	// Determine all of the files to test
 	const targets = Deno.args.length > 1
@@ -37,7 +35,8 @@ export async function Test() {
 
 	const index = new Array<TestCase>();
 
-	console.log("Compiling...");
+	console.log("Compilation");
+	const compStart = Date.now();
 	for (const path of files.values()) {
 		const file = mainPck.import(path);
 
@@ -48,10 +47,10 @@ export async function Test() {
 			index.push(test);
 		}
 	}
+	const compEnd = Date.now();
 
 	if (project.failed) Deno.exit(1);
-
-
+	console.log(`  Found and compiled ${index.length} test cases ${colors.gray(`(${compEnd-compStart}ms)`)}`)
 
 
 	// Run all of the tests
@@ -61,13 +60,13 @@ export async function Test() {
 	let fails = 0;
 	const exports = instance.exports;
 	let prev = "";
-	const start = Date.now();
+	const execStart = Date.now();
 	for (let i=0; i<index.length; i++) {
 		const test = index[i];
 
 		if (prev !== test.file.name) {
 			prev = test.file.name;
-			console.log("\n"+colors.gray(prev));
+			console.log("\n"+colors.gray(prev.replaceAll('\\', '/')));
 		}
 
 		const func = exports[`test${i}`];
@@ -84,12 +83,12 @@ export async function Test() {
 		);
 		if (!result) fails++;
 	}
-	const end = Date.now();
+	const execEnd = Date.now();
 
 	console.log(`\n ${fails == 0 ? colors.green("ok") : colors.red("FAIL")}`
 		+ ` | ${index.length-fails} passed`
 		+ ` | ${fails} failed`
-		+ colors.gray(` (${end-start}ms)`)
+		+ colors.gray(` (${execEnd-execStart}ms)`)
 	);
 }
 
diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 0000000..036bc9e
--- /dev/null
+++ b/tests/.gitignore
@@ -0,0 +1 @@
+!*.test.sa
\ No newline at end of file
diff --git a/tests/reflective/fibonacci.test.sa b/tests/fibonacci.test.sa
similarity index 100%
rename from tests/reflective/fibonacci.test.sa
rename to tests/fibonacci.test.sa
diff --git a/tests/reflective/numeric.test.sa b/tests/numeric.test.sa
similarity index 88%
rename from tests/reflective/numeric.test.sa
rename to tests/numeric.test.sa
index 700a296..1be0a74 100644
--- a/tests/reflective/numeric.test.sa
+++ b/tests/numeric.test.sa
@@ -1,7 +1,7 @@
 test "Order of operations: Remainder" {
-	// if ( 10.0 - ( 3.0 / 2.0 ) - 8.0 != 10.0 - 3.0 / 2.0 - 8.0 ) {
-	// 	return 20;
-	// };
+	if ( 10.0 - ( 3.0 / 2.0 ) - 8.0 != 10.0 - 3.0 / 2.0 - 8.0 ) {
+		return false;
+	};
 
 	// (-2.5 % 2.0) * -3.0 == 10.0 - ((1.0 / 2.0) % 10.0) - 8.0;
 	// 1.5 == 1.5
diff --git a/tests/reflective/.gitignore b/tests/reflective/.gitignore
deleted file mode 100644
index d2df391..0000000
--- a/tests/reflective/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!*.sa
\ No newline at end of file