test: use single file tests as jest entries

LingyuCoder · LingyuCoder · commit 60a7b12f3be2 · 2025-09-25T16:34:07.000+08:00
diff --git a/packages/rspack-test-tools/etc/test-tools.api.md b/packages/rspack-test-tools/etc/test-tools.api.md
@@ -255,8 +255,6 @@ export interface IBasicCaseCreatorOptions<T extends ECompilerType> {
     // (undocumented)
     createContext?: (config: ITesterConfig) => ITestContext;
     // (undocumented)
-    describe?: boolean;
-    // (undocumented)
     description?: (name: string, step: number) => string;
     // (undocumented)
     runner?: TTestRunnerCreator;
@@ -508,6 +506,8 @@ export interface ITester {
     // (undocumented)
     check(env: ITestEnv): Promise<void>;
     // (undocumented)
+    close(): Promise<void>;
+    // (undocumented)
     compile(): Promise<void>;
     // (undocumented)
     getContext(): ITestContext;
@@ -843,6 +843,8 @@ export class Tester implements ITester {
     // (undocumented)
     check(env: ITestEnv): Promise<void>;
     // (undocumented)
+    close(): Promise<void>;
+    // (undocumented)
     compile(): Promise<void>;
     // (undocumented)
     getContext(): ITestContext;
diff --git a/packages/rspack-test-tools/src/case/builtin.ts b/packages/rspack-test-tools/src/case/builtin.ts
@@ -14,7 +14,6 @@ import { build, checkSnapshot, compiler, getCompiler } from "./common";
 
 const creator = new BasicCaseCreator({
 	clean: true,
-	describe: false,
 	description(name) {
 		return `${name} should match snapshot`;
 	},
diff --git a/packages/rspack-test-tools/src/case/cache.ts b/packages/rspack-test-tools/src/case/cache.ts
@@ -80,7 +80,6 @@ function getCreator(target: TTarget) {
 			target,
 			new BasicCaseCreator({
 				clean: true,
-				describe: true,
 				target,
 				steps: ({ name, src, target, temp }) => [
 					createCacheProcessor(name, src, temp!, target as TTarget)
diff --git a/packages/rspack-test-tools/src/case/compiler.ts b/packages/rspack-test-tools/src/case/compiler.ts
@@ -143,16 +143,12 @@ function createCompilerProcessor(
 					compiler: c
 				});
 			}
-		},
-		after: async (context: ITestContext) => {
-			await context.closeCompiler(name);
 		}
 	} as ITestProcessor;
 }
 
 const creator = new BasicCaseCreator({
 	clean: true,
-	describe: false,
 	steps: ({ name, caseConfig }) => {
 		return [createCompilerProcessor(name, caseConfig as TCompilerCaseConfig)];
 	},
diff --git a/packages/rspack-test-tools/src/case/config.ts b/packages/rspack-test-tools/src/case/config.ts
@@ -55,7 +55,6 @@ export function createConfigProcessor(name: string): ITestProcessor {
 
 const creator = new BasicCaseCreator({
 	clean: true,
-	describe: false,
 	testConfig: testConfig => {
 		const oldModuleScope = testConfig.moduleScope;
 		testConfig.moduleScope = (ms, stats, compilerOptions) => {
diff --git a/packages/rspack-test-tools/src/case/defaults.ts b/packages/rspack-test-tools/src/case/defaults.ts
@@ -14,7 +14,6 @@ const CURRENT_CWD = process.cwd();
 
 const creator = new BasicCaseCreator({
 	clean: true,
-	describe: false,
 	steps: ({ name, caseConfig: _caseConfig }) => {
 		const caseConfig = _caseConfig as TDefaultsCaseConfig;
 		return [
diff --git a/packages/rspack-test-tools/src/case/diagnostic.ts b/packages/rspack-test-tools/src/case/diagnostic.ts
@@ -14,7 +14,6 @@ import { getCompiler } from "./common";
 
 const creator = new BasicCaseCreator({
 	clean: true,
-	describe: false,
 	steps: ({ name }) => [
 		{
 			config: async (context: ITestContext) => {
diff --git a/packages/rspack-test-tools/src/case/error.ts b/packages/rspack-test-tools/src/case/error.ts
@@ -16,7 +16,6 @@ let addedSerializer = false;
 
 const creator = new BasicCaseCreator({
 	clean: true,
-	describe: true,
 	steps: ({ name, caseConfig }) => {
 		const config = caseConfig as TErrorCaseConfig;
 		return [
diff --git a/packages/rspack-test-tools/src/case/hook.ts b/packages/rspack-test-tools/src/case/hook.ts
@@ -30,7 +30,6 @@ const distDir = path.resolve(
 
 const creator = new BasicCaseCreator({
 	clean: true,
-	describe: true,
 	createContext: (config: ITesterConfig) =>
 		new HookCasesContext(config.src, config.name, config),
 	steps: ({ name, caseConfig: _caseConfig, src }) => {
diff --git a/packages/rspack-test-tools/src/case/hot-step.ts b/packages/rspack-test-tools/src/case/hot-step.ts
@@ -426,7 +426,6 @@ function getCreator(target: TTarget) {
 			target,
 			new BasicCaseCreator({
 				clean: true,
-				describe: false,
 				target,
 				steps: ({ name, target }) => [
 					createHotStepProcessor(name, target as TTarget)
diff --git a/packages/rspack-test-tools/src/case/hot.ts b/packages/rspack-test-tools/src/case/hot.ts
@@ -94,7 +94,6 @@ function getCreator(target: TTarget) {
 			target,
 			new BasicCaseCreator({
 				clean: true,
-				describe: true,
 				target,
 				steps: ({ name, target }) => [
 					createHotProcessor(name, target as TTarget)
diff --git a/packages/rspack-test-tools/src/case/incremental.ts b/packages/rspack-test-tools/src/case/incremental.ts
@@ -57,7 +57,6 @@ function getHotCreator(target: TTarget, webpackCases: boolean) {
 			key,
 			new BasicCaseCreator({
 				clean: true,
-				describe: true,
 				target,
 				steps: ({ name, target }) => [
 					createHotIncrementalProcessor(name, target as TTarget, webpackCases)
@@ -109,7 +108,6 @@ function getWatchCreator(options: WatchIncrementalOptions) {
 						? `${name} should compile`
 						: `should compile step ${index}`;
 				},
-				describe: false,
 				steps: ({ name, src, temp }) => {
 					const watchState = {};
 					const runs = fs
diff --git a/packages/rspack-test-tools/src/case/native-watcher.ts b/packages/rspack-test-tools/src/case/native-watcher.ts
@@ -20,7 +20,6 @@ const creator = new BasicCaseCreator({
 			? `${name} should compile`
 			: `should compile step ${index}`;
 	},
-	describe: false,
 	steps: ({ name, src, temp }) => {
 		const watchState = {};
 		const runs = fs
diff --git a/packages/rspack-test-tools/src/case/normal.ts b/packages/rspack-test-tools/src/case/normal.ts
@@ -25,7 +25,6 @@ const createCaseOptions = (
 ): IBasicCaseCreatorOptions<ECompilerType> => {
 	return {
 		clean: true,
-		describe: false,
 		steps: ({ name }) => [
 			{
 				config: async (context: ITestContext) => {
diff --git a/packages/rspack-test-tools/src/case/serial.ts b/packages/rspack-test-tools/src/case/serial.ts
@@ -10,7 +10,6 @@ export type TSerialCaseConfig = Omit<
 
 const creator = new BasicCaseCreator({
 	clean: true,
-	describe: false,
 	testConfig: testConfig => {
 		const oldModuleScope = testConfig.moduleScope;
 		testConfig.moduleScope = (ms, stats, compilerOptions) => {
diff --git a/packages/rspack-test-tools/src/case/stats-api.ts b/packages/rspack-test-tools/src/case/stats-api.ts
@@ -34,7 +34,6 @@ type TStatsAPICaseConfig = {
 
 const creator = new BasicCaseCreator({
 	clean: true,
-	describe: true,
 	steps: ({ name, caseConfig }) => {
 		const config = caseConfig as TStatsAPICaseConfig;
 		return [
diff --git a/packages/rspack-test-tools/src/case/stats-output.ts b/packages/rspack-test-tools/src/case/stats-output.ts
@@ -53,7 +53,6 @@ function createStatsProcessor(name: string) {
 
 const creator = new BasicCaseCreator({
 	clean: true,
-	describe: false,
 	steps: ({ name }) => [createStatsProcessor(name)],
 	description: () => "should print correct stats for"
 });
diff --git a/packages/rspack-test-tools/src/case/treeshaking.ts b/packages/rspack-test-tools/src/case/treeshaking.ts
@@ -10,7 +10,6 @@ import { build, checkSnapshot, compiler, getCompiler } from "./common";
 
 const creator = new BasicCaseCreator({
 	clean: true,
-	describe: false,
 	description(name, step) {
 		return `${name} with newTreeshaking should match snapshot`;
 	},
diff --git a/packages/rspack-test-tools/src/case/watch.ts b/packages/rspack-test-tools/src/case/watch.ts
@@ -313,7 +313,6 @@ const creator = new BasicCaseCreator({
 			? `${name} should compile`
 			: `should compile step ${index}`;
 	},
-	describe: false,
 	steps: ({ name, src, temp }) => {
 		const watchState = {};
 		const runs = fs
diff --git a/packages/rspack-test-tools/src/test/context.ts b/packages/rspack-test-tools/src/test/context.ts
@@ -1,14 +1,14 @@
 import path from "node:path";
 
 import { TestCompilerManager } from "../compiler";
-import {
+import type {
 	ECompilerType,
-	type ITestCompilerManager,
-	type ITestContext,
-	type ITestEnv,
-	type ITesterConfig,
-	type ITestRunner,
-	type TTestConfig
+	ITestCompilerManager,
+	ITestContext,
+	ITestEnv,
+	ITesterConfig,
+	ITestRunner,
+	TTestConfig
 } from "../type";
 
 export type TTestContextOptions = Omit<ITesterConfig, "name" | "steps">;
@@ -125,13 +125,10 @@ export class TestContext implements ITestContext {
 		}
 	}
 	async closeCompiler(name: string) {
-		const rspackCompiler = this.getCompiler(name, ECompilerType.Rspack);
-		if (rspackCompiler) {
-			await rspackCompiler.close();
-		}
-		const webpackCompiler = this.getCompiler(name, ECompilerType.Webpack);
-		if (webpackCompiler) {
-			await webpackCompiler.close();
+		const compiler = this.compilers.get(name);
+		if (compiler) {
+			await compiler.close();
+			this.compilers.delete(name);
 		}
 	}
 }
diff --git a/packages/rspack-test-tools/src/test/creator.ts b/packages/rspack-test-tools/src/test/creator.ts
@@ -26,7 +26,6 @@ interface IConcurrentTestEnv {
 
 export interface IBasicCaseCreatorOptions<T extends ECompilerType> {
 	clean?: boolean;
-	describe?: boolean;
 	timeout?: number;
 	contextValue?: Record<string, unknown>;
 	steps: (
@@ -90,32 +89,18 @@ export class BasicCaseCreator<T extends ECompilerType> {
 		const concurrent = process.env.WASM
 			? false
 			: testConfig.concurrent || options.concurrent;
-		if (options.describe) {
-			if (run) {
-				if (concurrent) {
-					describe(name, () =>
-						this.describeConcurrent(name, tester, testConfig, options)
-					);
-				} else {
-					describe(name, () =>
-						this.describe(name, tester, testConfig, options)
-					);
-				}
+		if (run) {
+			if (concurrent) {
+				describe(name, () =>
+					this.describeConcurrent(name, tester, testConfig, options)
+				);
 			} else {
-				describe.skip(name, () => {
-					it.skip("skipped", () => {});
-				});
+				describe(name, () => this.describe(name, tester, testConfig, options));
 			}
 		} else {
-			if (run) {
-				if (concurrent) {
-					this.describeConcurrent(name, tester, testConfig, options);
-				} else {
-					this.describe(name, tester, testConfig, options);
-				}
-			} else {
+			describe.skip(name, () => {
 				it.skip("skipped", () => {});
-			}
+			});
 		}
 
 		return tester;
@@ -214,6 +199,7 @@ export class BasicCaseCreator<T extends ECompilerType> {
 
 		afterAll(async () => {
 			await tester.resume();
+			await tester.close();
 		});
 	}
 
diff --git a/packages/rspack-test-tools/src/test/tester.ts b/packages/rspack-test-tools/src/test/tester.ts
@@ -9,7 +9,7 @@ import type {
 import { TestContext } from "./context";
 
 export class Tester implements ITester {
-	private context: ITestContext;
+	private context: ITestContext | null = null;
 	private steps: ITestProcessor[] = [];
 	step = 0;
 	total = 0;
@@ -30,17 +30,17 @@ export class Tester implements ITester {
 		}
 	}
 	getContext(): ITestContext {
-		return this.context;
+		return this.context!;
 	}
 	async prepare() {
-		fs.mkdirSync(this.context.getDist(), { recursive: true });
-		const tempDir = this.context.getTemp();
+		fs.mkdirSync(this.context!.getDist(), { recursive: true });
+		const tempDir = this.context!.getTemp();
 		if (tempDir) {
 			fs.mkdirSync(tempDir, { recursive: true });
 		}
 		for (const i of this.steps) {
 			if (typeof i.beforeAll === "function") {
-				await i.beforeAll(this.context);
+				await i.beforeAll(this.context!);
 			}
 		}
 	}
@@ -62,13 +62,13 @@ export class Tester implements ITester {
 		await this.runCheckStepMethods(
 			currentStep,
 			env,
-			this.context.hasError() ? ["check"] : ["run", "check"]
+			this.context!.hasError() ? ["check"] : ["run", "check"]
 		);
 		await this.runStepMethods(currentStep, ["after"], true);
 	}
 
 	next() {
-		if (this.context.hasError()) {
+		if (this.context!.hasError()) {
 			return false;
 		}
 		if (this.steps[this.step + 1]) {
@@ -81,10 +81,15 @@ export class Tester implements ITester {
 	async resume() {
 		for (const i of this.steps) {
 			if (typeof i.afterAll === "function") {
-				await i.afterAll(this.context);
+				await i.afterAll(this.context!);
 			}
 		}
-		await this.context.closeCompiler(this.config.name);
+		await this.context!.closeCompiler(this.config.name);
+	}
+
+	async close() {
+		this.steps = [];
+		this.context = null;
 	}
 
 	private async runStepMethods(
@@ -93,12 +98,12 @@ export class Tester implements ITester {
 		force = false
 	) {
 		for (const i of methods) {
-			if (!force && this.context.hasError()) return;
+			if (!force && this.context!.hasError()) return;
 			if (typeof step[i] === "function") {
 				try {
-					await step[i]!(this.context);
+					await step[i]!(this.context!);
 				} catch (e) {
-					this.context.emitError(this.config.name, e as Error);
+					this.context!.emitError(this.config.name, e as Error);
 				}
 			}
 		}
@@ -111,7 +116,7 @@ export class Tester implements ITester {
 	) {
 		for (const i of methods) {
 			if (typeof step[i] === "function") {
-				await step[i]!(env, this.context);
+				await step[i]!(env, this.context!);
 			}
 		}
 	}
diff --git a/packages/rspack-test-tools/src/type.ts b/packages/rspack-test-tools/src/type.ts
@@ -111,6 +111,7 @@ export interface ITester {
 	check(env: ITestEnv): Promise<void>;
 	next(): boolean;
 	resume(): Promise<void>;
+	close(): Promise<void>;
 }
 
 export interface ITestProcessor {
diff --git a/tests/rspack-test/compilerCases/tracing.js b/tests/rspack-test/compilerCases/tracing.js
@@ -8,6 +8,5 @@ defineCompileCase(Utils.basename(__filename), {
 		await compiler.rspack.experiments.globalTrace.cleanup();
 		await compiler.rspack.experiments.globalTrace.register('info', 'logger', 'stdout');
 		await compiler.rspack.experiments.globalTrace.cleanup();
-
 	}
 });
diff --git a/tests/rspack-test/jest.config.js b/tests/rspack-test/jest.config.js
@@ -73,7 +73,7 @@ const config = {
 		printLogger: process.argv.includes("--verbose")
 	},
 	verbose: true,
-	maxWorkers: 3,
+	maxWorkers: 5,
 	...(wasmConfig || {}),
 };
 

Original file line number	Diff line number	Diff line change
`@@ -143,16 +143,12 @@ function createCompilerProcessor(`
`143`	`143`	`compiler: c`
`144`	`144`	`});`
`145`	`145`	`}`
`146`		`- },`
`147`		`- after: async (context: ITestContext) => {`
`148`		`- await context.closeCompiler(name);`
`149`	`146`	`}`
`150`	`147`	`} as ITestProcessor;`
`151`	`148`	`}`
`152`	`149`
`153`	`150`	`const creator = new BasicCaseCreator({`
`154`	`151`	`clean: true,`
`155`		`- describe: false,`
`156`	`152`	`steps: ({ name, caseConfig }) => {`
`157`	`153`	`return [createCompilerProcessor(name, caseConfig as TCompilerCaseConfig)];`
`158`	`154`	`},`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ import { getCompiler } from "./common";`
`14`	`14`
`15`	`15`	`const creator = new BasicCaseCreator({`
`16`	`16`	`clean: true,`
`17`		`- describe: false,`
`18`	`17`	`steps: ({ name }) => [`
`19`	`18`	`{`
`20`	`19`	`config: async (context: ITestContext) => {`