Ensure runId is formatted the same way as results. (microsoft#17086)

karthiknadig · web-flow · commit f158ceff3b44 · 2021-08-24T12:04:43.000-07:00
* Ensure runId is formatted the same way as results.

* Add news item.
diff --git a/news/2 Fixes/17079.md b/news/2 Fixes/17079.md
@@ -0,0 +1 @@
+Fix for testing ui update issue when `pytest` parameter has '/'.
diff --git a/src/client/testing/testController/common/resultsHelper.ts b/src/client/testing/testController/common/resultsHelper.ts
@@ -3,7 +3,7 @@
 
 import * as fsapi from 'fs-extra';
 import { Location, TestItem, TestMessage, TestRun } from 'vscode';
-import { getTestCaseNodes } from './testItemUtilities';
+import { getRunIdFromRawData, getTestCaseNodes } from './testItemUtilities';
 import { TestData } from './types';
 
 type TestSuiteResult = {
@@ -97,7 +97,7 @@ export async function updateResultFromJunitXml(
             }
 
             const result = junitSuite.testcase.find((t) => {
-                const idResult = `${t.$.classname}.${t.$.name}`;
+                const idResult = getRunIdFromRawData(`${t.$.classname}.${t.$.name}`);
                 const idNode = rawTestCaseNode.runId;
                 return idResult === idNode || idNode.endsWith(idResult);
             });
diff --git a/src/client/testing/testController/common/testItemUtilities.ts b/src/client/testing/testController/common/testItemUtilities.ts
@@ -87,9 +87,9 @@ function getRangeFromRawSource(raw: { source: string }): Range | undefined {
     return undefined;
 }
 
-function getRunIdFromRawData(raw: { id: string }): string {
+export function getRunIdFromRawData(id: string): string {
     // This is the id that will be used to compare with the results.
-    const runId = raw.id
+    const runId = id
         .replace(/\.py/g, '')
         .replace(/[\\\:\/]/g, '.')
         .replace(/\:\:/g, '.')
@@ -166,7 +166,7 @@ function createCollectionTestItem(
     const label = rawData.name;
 
     const parentId = getParentIdFromRawParentId(idToRawData, testRoot, rawData);
-    const runId = getRunIdFromRawData(rawData);
+    const runId = getRunIdFromRawData(rawData.id);
 
     const testItem = testController.createTestItem(id, label, uri);
 
@@ -197,7 +197,7 @@ function updateCollectionTestItem(
     item.label = rawData.name;
 
     const parentId = getParentIdFromRawParentId(idToRawData, testRoot, rawData);
-    const runId = getRunIdFromRawData(rawData);
+    const runId = getRunIdFromRawData(rawData.id);
 
     item.canResolveChildren = true;
 
@@ -230,7 +230,7 @@ function createTestCaseItem(
     const label = rawData.name;
 
     const parentId = getParentIdFromRawParentId(idToRawData, testRoot, rawData);
-    const runId = getRunIdFromRawData(rawData);
+    const runId = getRunIdFromRawData(rawData.id);
 
     const testItem = testController.createTestItem(id, label, uri);
 
@@ -262,7 +262,7 @@ function updateTestCaseItem(
     item.label = rawData.name;
 
     const parentId = getParentIdFromRawParentId(idToRawData, testRoot, rawData);
-    const runId = getRunIdFromRawData(rawData);
+    const runId = getRunIdFromRawData(rawData.id);
 
     item.canResolveChildren = false;
     item.range = getRangeFromRawSource(rawData);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix for testing ui update issue when `pytest` parameter has '/'.