xunit.ts 2.0.0 → 3.0.0

package/src/Runners/TestSuiteLoader.ts

@@ -1,6 +1,7 @@
+import path from "node:path";
+
 import TestSuite from "../Framework/TestSuite";
 import FileSystem from "../IO/FileSystem";
-import path from "path";
 
 export default class TestSuiteLoader {
 	constructor(private readonly file_system: FileSystem) {
@@ -8,17 +9,23 @@ export default class TestSuiteLoader {
 
 	static async loadTestSuite(file: string, filters: RegExp[]) {
 		const module_path = TestSuiteLoader.getModulePath(__dirname, file);
-		const test_class = await import(module_path);
-		if (!(test_class.default?.prototype instanceof TestSuite)) {
+		const test_class = await import(module_path) as { default?: new () => TestSuite };
+		const constructor = test_class.default;
+		if (!constructor) {
+			return null;
+		}
+
+		const prototype = constructor.prototype as TestSuite;
+		if (!(prototype instanceof TestSuite)) {
 			return null;
 		}
 
-		const tests = test_class.default?.prototype.getTests(filters);
+		const tests = prototype.getTests(filters);
 		if (tests === undefined || Object.keys(tests).length === 0) {
 			return null;
 		}
 
-		const suite: TestSuite = new test_class.default();
+		const suite = new constructor();
 		suite.setTests(tests);
 		return suite;
 	}
@@ -35,7 +42,7 @@ export default class TestSuiteLoader {
 	}
 
 	static isFromNodeModules(dir: string) {
-		return dir.indexOf("node_modules") !== -1;
+		return dir.includes("node_modules");
 	}
 
 	async loadTestSuites(dir: string, filters: RegExp[]): Promise<Record<string, TestSuite>> {
@@ -46,7 +53,7 @@ export default class TestSuiteLoader {
 
 		for (const file of files) {
 			const suite = await TestSuiteLoader.loadTestSuite(file, filters);
-			if (suite !== undefined && suite !== null) {
+			if (suite !== null) {
 				suites[file] = suite;
 			}
 		}

package/src/Runners/TestSuiteRunner.ts

@@ -1,26 +1,26 @@
-import ResultReporter from "../Reporters/ResultReporter";
+import TestInfo from "../Framework/TestInfo";
 import TestSuite from "../Framework/TestSuite";
 import TestSuiteResults from "../Framework/TestSuiteResults";
-import TestInfo from "../Framework/TestInfo";
+import ResultReporter from "../Reporters/ResultReporter";
 import TestRunner from "./TestRunner";
 
 export default class TestSuiteRunner {
 
-	constructor(private readonly runner: TestRunner, private readonly reporters: ReadonlyArray<ResultReporter>) {
+	constructor(private readonly runner: TestRunner, private readonly reporters: readonly ResultReporter[]) {
 	}
 
 	async runSuite(suite: TestSuite, filters: RegExp[]) {
-		await Promise.all(this.reporters.map(r => r.suiteStarted(suite)));
+		this.reporters.map(r => r.suiteStarted(suite));
 		const tests = suite.getTests(filters);
 		const results = await this.runTests(suite, tests);
-		await Promise.all(this.reporters.map(r => r.suiteCompleted(suite, results)));
+		this.reporters.map(r => r.suiteCompleted(suite, results));
 		return results;
 	}
 
-	async runTests(suite: TestSuite, tests: Record<string, TestInfo>) {
+	async runTests(suite: TestSuite, tests?: Record<string, TestInfo> | null) {
 		const results = new TestSuiteResults(suite);
 		if (tests === undefined || tests === null || Object.keys(tests).length === 0) {
-			await Promise.all(this.reporters.map(r => r.testIncomplete(suite, "(no tests found)")));
+			this.reporters.map(r => r.testIncomplete(suite, "(no tests found)"));
 			return results;
 		}
 

package/tsconfig.json

@@ -3,6 +3,9 @@
 		"target": "ES2015",
 		"module": "CommonJS",
 		"outDir": "dist/",
+		"lib": [
+			"ES2024"
+		],
 		"strict": true,
 		"sourceMap": true,
 		"declaration": true,

package/xunit.ts

@@ -1,9 +1,8 @@
+import Assert from "./src/Assertions";
 import Test from "./src/Framework/Test";
 import TestSuite from "./src/Framework/TestSuite";
-import Assert from "./src/Assertions";
 
 export {
+	Assert,
 	Test,
-	TestSuite,
-	Assert
-};
+	TestSuite };