fix

Author: XMadrid

assembly/env.ts

@@ -12,10 +12,6 @@ export namespace assertResult {
   export declare function registerTestFunction(index: u32): void;
 
 
-  @external("__unittest_framework_env","finishTestFunction")
-  export declare function finishTestFunction(): void;
-
-
   @external("__unittest_framework_env","collectCheckResult")
   export declare function collectCheckResult(
     result: bool,

assembly/implement.ts

@@ -12,7 +12,6 @@ export function describeImpl(
 export function testImpl(description: string, testFunction: () => void): void {
   assertResult.addDescription(description);
   assertResult.registerTestFunction(testFunction.index);
-  assertResult.finishTestFunction();
   assertResult.removeDescription();
 }
 

src/core/execute.ts

@@ -31,7 +31,7 @@ async function nodeExecutor(
   const executionRecorder = new ExecutionRecorder();
   const coverageRecorder = new CoverageRecorder();
 
-  const importsArg = new ImportsArgument();
+  const importsArg = new ImportsArgument(executionRecorder);
   const userDefinedImportsObject = imports === undefined ? {} : imports!(importsArg);
   const importObject: ASImports = {
     wasi_snapshot_preview1: wasi.wasiImport,
@@ -53,18 +53,21 @@ async function nodeExecutor(
     const execTestFunction = ins.exports["executeTestFunction"];
     assert(typeof execTestFunction === "function");
     if (matchedTestNames === undefined) {
-      // means execute all testFunctions
+      // By default, all testcases are executed
       for (const functionInfo of executionRecorder.registerFunctions) {
-        const functionIndex = functionInfo[1];
+        const [testCaseName, functionIndex] = functionInfo;
+        executionRecorder.startTestFunction(testCaseName);
         (execTestFunction as (a: number) => void)(functionIndex);
+        executionRecorder.finishTestFunction();
         mockInstrumentFunc["mockFunctionStatus.clear"]();
       }
     } else {
       for (const functionInfo of executionRecorder.registerFunctions) {
-        const [testName, functionIndex] = functionInfo;
-        if (matchedTestNames.includes(testName)) {
-          console.log(testName);
+        const [testCaseName, functionIndex] = functionInfo;
+        if (matchedTestNames.includes(testCaseName)) {
+          executionRecorder.startTestFunction(testCaseName);
           (execTestFunction as (a: number) => void)(functionIndex);
+          executionRecorder.finishTestFunction();
           mockInstrumentFunc["mockFunctionStatus.clear"]();
         }
       }

src/core/executionRecorder.ts

@@ -46,10 +46,11 @@ export class ExecutionRecorder implements UnitTestFramework {
 
   registerFunctions: [string, number][] = [];
   #currentTestDescriptions: string[] = [];
-  #logRecorder = new LogRecorder();
+  #testCaseFullName: string = "";
+  logRecorder = new LogRecorder();
 
-  get #currentTestDescription(): string {
-    return this.#currentTestDescriptions.join(" ");
+  set testCaseFullName(testCaseFullName: string) {
+    this.#testCaseFullName = testCaseFullName;
   }
 
   _addDescription(description: string): void {
@@ -58,34 +59,37 @@ export class ExecutionRecorder implements UnitTestFramework {
   _removeDescription(): void {
     this.#currentTestDescriptions.pop();
   }
-  registerTestFunction(fncIndex: number): void {
-    this.registerFunctions.push([this.#currentTestDescription, fncIndex]);
-    this.#logRecorder.onStartTest();
+  _registerTestFunction(fncIndex: number): void {
+    const testCaseFullName = this.#currentTestDescriptions.join(" ");
+    this.registerFunctions.push([testCaseFullName, fncIndex]);
   }
-  _finishTestFunction(): void {
-    const logMessages: string[] | null = this.#logRecorder.onFinishTest();
+  startTestFunction(testCaseFullName: string): void {
+    this.#testCaseFullName = testCaseFullName;
+    this.logRecorder.onStartTest();
+  }
+  finishTestFunction(): void {
+    const logMessages: string[] | null = this.logRecorder.onFinishTest();
     if (logMessages !== null) {
-      const testCaseFullName = this.#currentTestDescription;
-      this.result.failedLogMessages[testCaseFullName] = (this.result.failedLogMessages[testCaseFullName] || []).concat(
-        logMessages
-      );
+      this.result.failedLogMessages[this.#testCaseFullName] = (
+        this.result.failedLogMessages[this.#testCaseFullName] || []
+      ).concat(logMessages);
     }
   }
 
   collectCheckResult(result: boolean, codeInfoIndex: number, actualValue: string, expectValue: string): void {
     this.result.total++;
     if (!result) {
-      this.#logRecorder.markTestFailed();
+      this.logRecorder.markTestFailed();
       this.result.fail++;
-      const testCaseFullName = this.#currentTestDescription;
+      const testCaseFullName = this.#testCaseFullName;
       const assertMessage: AssertMessage = [codeInfoIndex.toString(), actualValue, expectValue];
       this.result.failedInfo[testCaseFullName] = this.result.failedInfo[testCaseFullName] || [];
       this.result.failedInfo[testCaseFullName].push(assertMessage);
     }
   }
 
   log(msg: string): void {
-    this.#logRecorder.addLog(msg);
+    this.logRecorder.addLog(msg);
   }
 
   getCollectionFuncSet(arg: ImportsArgument): Record<string, Record<string, unknown>> {
@@ -98,10 +102,7 @@ export class ExecutionRecorder implements UnitTestFramework {
           this._removeDescription();
         },
         registerTestFunction: (index: number): void => {
-          this.registerTestFunction(index);
-        },
-        finishTestFunction: () => {
-          this._finishTestFunction();
+          this._registerTestFunction(index);
         },
         collectCheckResult: (result: number, codeInfoIndex: number, actualValue: number, expectValue: number): void => {
           this.collectCheckResult(

src/interface.ts

@@ -186,6 +186,7 @@ export class ImportsArgument {
   module: WebAssembly.Module | null = null;
   instance: WebAssembly.Instance | null = null;
   exports: (ASUtil & Record<string, unknown>) | null = null;
+  constructor(public framework: UnitTestFramework) {}
 }
 
 export type Imports = ((arg: ImportsArgument) => Record<string, unknown>) | null;

tests/ts/test/core/executionRecorder.test.ts

@@ -5,15 +5,21 @@ describe("execution recorder", () => {
     test("add single description", () => {
       const recorder = new ExecutionRecorder();
       recorder._addDescription("description");
+      recorder._registerTestFunction(1);
+      expect(recorder.registerFunctions).toEqual([["description", 1]]);
 
+      recorder.startTestFunction("description");
       recorder.collectCheckResult(false, 0, "", "");
       expect(recorder.result.failedInfo).toHaveProperty("description");
     });
     test("add multiple descriptions", () => {
       const recorder = new ExecutionRecorder();
       recorder._addDescription("description1");
       recorder._addDescription("description2");
+      recorder._registerTestFunction(1);
+      expect(recorder.registerFunctions).toEqual([["description1 description2", 1]]);
 
+      recorder.startTestFunction("description1 description2");
       recorder.collectCheckResult(false, 0, "", "");
       expect(recorder.result.failedInfo).toHaveProperty("description1 description2");
     });
@@ -23,7 +29,10 @@ describe("execution recorder", () => {
       recorder._addDescription("description1");
       recorder._addDescription("description2");
       recorder._removeDescription();
+      recorder._registerTestFunction(1);
+      expect(recorder.registerFunctions).toEqual([["description1", 1]]);
 
+      recorder.startTestFunction("description1");
       recorder.collectCheckResult(false, 0, "", "");
       expect(recorder.result.failedInfo).toHaveProperty("description1");
     });