revert some changes due to regression bug

matepek · Jul 26, 2023 · 9f2f710 · 9f2f710
1 parent 9c6da28
commit 9f2f710
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
+## [4.5.1]
+
+### Fixed
+
+- regression issue related to [doctest](https://github.com/matepek/vscode-catch2-test-adapter/issues/392)
+
 ## [4.5.0] - 2023-07-23
 
 ### Changed

diff --git a/src/TestItemManager.ts b/src/TestItemManager.ts
@@ -24,12 +24,13 @@ export class TestItemManager {
 
   createOrReplace(
     parent: vscode.TestItem | undefined,
-    id: string,
+    testId: string,
     label: string,
     file: string | undefined,
     line: string | number | undefined,
     testData: AbstractTest | undefined,
   ): vscode.TestItem {
+    const id = testId;
     const uri: vscode.Uri | undefined = file ? vscode.Uri.file(file) : undefined;
     const item = this.controller.createTestItem(id, label, uri);
     if (uri) {

diff --git a/src/framework/doctest/DOCExecutable.ts b/src/framework/doctest/DOCExecutable.ts
@@ -78,19 +78,18 @@ export class DOCExecutable extends AbstractExecutable<DOCTest> {
     description: string | undefined,
     skipped: string | undefined,
   ): Promise<DOCTest> => {
-    const resolvedFile = this.findSourceFilePath(file);
-    const id = `${resolvedFile}:${line}:${testName}`;
     const tags: string[] = suiteName ? [suiteName] : [];
     const skippedB = skipped === 'true';
+    const resolvedFile = this.findSourceFilePath(file);
     return this._createTreeAndAddTest(
       this.getTestGrouping(),
-      id,
+      testName,
       resolvedFile,
       line,
       tags,
       description,
       (parent: TestItemParent) =>
-        new DOCTest(this, parent, id, testName, tags, resolvedFile, line, description, skippedB),
+        new DOCTest(this, parent, testName, suiteName, tags, resolvedFile, line, description, skippedB),
       (test: DOCTest) => test.update2(resolvedFile, line, tags, skippedB, description),
     );
   };
@@ -156,8 +155,8 @@ export class DOCExecutable extends AbstractExecutable<DOCTest> {
         subTests.unshift(p);
         p = p.parentTest;
       }
-      assert(p instanceof DOCTest);
-      params.push('--test-case=' + (p as DOCTest).getEscapedTestName());
+      if (!(p instanceof DOCTest)) throw Error('unexpected doctest issue');
+      params.push('--test-case=' + p.getEscapedTestName());
       params.push('--subcase=' + subTests.map(s => s.id.replaceAll(',', '?')).join(','));
       params.push('--subcase-filter-levels=' + subTests.length);
     } else if (childrenToRun.every(v => v instanceof DOCTest)) {

diff --git a/src/framework/doctest/DOCTest.ts b/src/framework/doctest/DOCTest.ts
@@ -7,8 +7,8 @@ export class DOCTest extends AbstractTest {
   constructor(
     executable: AbstractExecutable,
     parent: TestItemParent,
-    id: string,
-    testName: string,
+    testNameAsId: string,
+    public readonly suiteName: string | undefined,
     tags: string[],
     file: string | undefined,
     line: string | undefined,
@@ -18,8 +18,8 @@ export class DOCTest extends AbstractTest {
     super(
       executable,
       parent,
-      id,
-      testName.startsWith('  Scenario:') ? testName.trimStart() : testName,
+      testNameAsId,
+      testNameAsId.startsWith('  Scenario:') ? testNameAsId.trimStart() : testNameAsId,
       file,
       line,
       skipped,