Fix unittest subtest names that have spaces

microsoft · Sep 7, 2023 · c8b9e1d · c8b9e1d
1 parent 6e9e656
commit c8b9e1d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/client/testing/testController/common/resultResolver.ts b/src/client/testing/testController/common/resultResolver.ts
@@ -217,8 +217,8 @@ export class PythonResultResolver implements ITestResultResolver {
                     }
                 } else if (rawTestExecData.result[keyTemp].outcome === 'subtest-success') {
                     // split on " " since the subtest ID has the parent test ID in the first part of the ID.
-                    const parentTestCaseId = keyTemp.split(' ')[0];
-                    const subtestId = keyTemp.split(' ')[1];
+                    const parentTestCaseId = keyTemp.split(' [')[0];
+                    const subtestId = `[${keyTemp.split(' [')[1]}`;
                     const parentTestItem = this.runIdToTestItem.get(parentTestCaseId);
 
                     // find the subtest's parent test item

diff --git a/src/test/testing/testController/resultResolver.unit.test.ts b/src/test/testing/testController/resultResolver.unit.test.ts
@@ -270,15 +270,15 @@ suite('Result Resolver tests', () => {
                 testProvider,
                 workspaceUri,
             );
-            const mockSubtestItem = createMockTestItem('parentTest subTest');
+            const mockSubtestItem = createMockTestItem('parentTest [subTest with spaces]');
             // add a mock test item to the map of known VSCode ids to run ids
             resultResolver.runIdToVSid.set('mockTestItem2', 'mockTestItem2');
             // creates a mock test item with a space which will be used to split the runId
-            resultResolver.runIdToVSid.set('parentTest subTest', 'parentTest subTest');
+            resultResolver.runIdToVSid.set('parentTest [subTest with spaces]', 'parentTest [subTest with spaces]');
 
             // add this mock test to the map of known test items
             resultResolver.runIdToTestItem.set('parentTest', mockTestItem2);
-            resultResolver.runIdToTestItem.set('parentTest subTest', mockSubtestItem);
+            resultResolver.runIdToTestItem.set('parentTest [subTest with spaces]', mockSubtestItem);
 
             let generatedId: string | undefined;
             testControllerMock
@@ -294,12 +294,12 @@ suite('Result Resolver tests', () => {
                 cwd: workspaceUri.fsPath,
                 status: 'success',
                 result: {
-                    'parentTest subTest': {
-                        test: 'test',
+                    'parentTest [subTest with spaces]': {
+                        test: 'parentTest',
                         outcome: 'subtest-success', // failure, passed-unexpected, skipped, success, expected-failure, subtest-failure, subtest-succcess
                         message: 'message',
                         traceback: 'traceback',
-                        subtest: 'subtest',
+                        subtest: 'parentTest [subTest with spaces]',
                     },
                 },
                 error: '',
@@ -310,7 +310,7 @@ suite('Result Resolver tests', () => {
 
             // verify that the passed function was called for the single test item
             assert.ok(generatedId);
-            assert.strictEqual(generatedId, 'subTest');
+            assert.strictEqual(generatedId, '[subTest with spaces]');
         });
         test('resolveExecution handles failed tests correctly', async () => {
             // test specific constants used expected values