Skip to content

Commit d6cdb06

Browse files
eleanorjboydeleanorjboyd
committed
fix tests
1 parent 773ccb1 commit d6cdb06

File tree

2 files changed

+26
-21
lines changed

2 files changed

+26
-21
lines changed

‎src/test/testing/common/testingAdapter.test.ts‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ suite('End to End Tests: test adapters', () => {
161161
resultResolver = new PythonResultResolver(testController, unittestProvider, workspaceUri);
162162
let callCount = 0;
163163
// const deferredTillEOT = createTestingDeferred();
164-
resultResolver._resolveDiscovery = async (payload, _token?) => {
164+
resultResolver.resolveDiscovery = async (payload, _token?) => {
165165
traceLog(`resolveDiscovery ${payload}`);
166166
callCount = callCount + 1;
167167
actualData = payload;
@@ -202,7 +202,7 @@ suite('End to End Tests: test adapters', () => {
202202
};
203203
resultResolver = new PythonResultResolver(testController, unittestProvider, workspaceUri);
204204
let callCount = 0;
205-
resultResolver._resolveDiscovery = async (payload, _token?) => {
205+
resultResolver.resolveDiscovery = async (payload, _token?) => {
206206
traceLog(`resolveDiscovery ${payload}`);
207207
callCount = callCount + 1;
208208
actualData = payload;
@@ -242,7 +242,7 @@ suite('End to End Tests: test adapters', () => {
242242
workspaceUri = Uri.parse(rootPathSmallWorkspace);
243243
resultResolver = new PythonResultResolver(testController, pytestProvider, workspaceUri);
244244
let callCount = 0;
245-
resultResolver._resolveDiscovery = async (payload, _token?) => {
245+
resultResolver.resolveDiscovery = async (payload, _token?) => {
246246
callCount = callCount + 1;
247247
actualData = payload;
248248
return Promise.resolve();
@@ -291,7 +291,7 @@ suite('End to End Tests: test adapters', () => {
291291

292292
resultResolver = new PythonResultResolver(testController, pytestProvider, workspaceUri);
293293
let callCount = 0;
294-
resultResolver._resolveDiscovery = async (payload, _token?) => {
294+
resultResolver.resolveDiscovery = async (payload, _token?) => {
295295
traceLog(`resolveDiscovery ${payload}`);
296296
callCount = callCount + 1;
297297
actualData = payload;
@@ -375,7 +375,7 @@ suite('End to End Tests: test adapters', () => {
375375

376376
resultResolver = new PythonResultResolver(testController, pytestProvider, workspaceUri);
377377
let callCount = 0;
378-
resultResolver._resolveDiscovery = async (payload, _token?) => {
378+
resultResolver.resolveDiscovery = async (payload, _token?) => {
379379
traceLog(`resolveDiscovery ${payload}`);
380380
callCount = callCount + 1;
381381
actualData = payload;
@@ -446,7 +446,7 @@ suite('End to End Tests: test adapters', () => {
446446
};
447447
resultResolver = new PythonResultResolver(testController, pytestProvider, workspaceUri);
448448
let callCount = 0;
449-
resultResolver._resolveDiscovery = async (payload, _token?) => {
449+
resultResolver.resolveDiscovery = async (payload, _token?) => {
450450
traceLog(`resolveDiscovery ${payload}`);
451451
callCount = callCount + 1;
452452
actualData = payload;
@@ -480,7 +480,7 @@ suite('End to End Tests: test adapters', () => {
480480
let callCount = 0;
481481
let failureOccurred = false;
482482
let failureMsg = '';
483-
resultResolver._resolveExecution = async (payload, _token?) => {
483+
resultResolver.resolveExecution = async (payload, _token?) => {
484484
traceLog(`resolveDiscovery ${payload}`);
485485
callCount = callCount + 1;
486486
// the payloads that get to the _resolveExecution are all data and should be successful.
@@ -554,7 +554,7 @@ suite('End to End Tests: test adapters', () => {
554554
let callCount = 0;
555555
let failureOccurred = false;
556556
let failureMsg = '';
557-
resultResolver._resolveExecution = async (payload, _token?) => {
557+
resultResolver.resolveExecution = async (payload, _token?) => {
558558
traceLog(`resolveDiscovery ${payload}`);
559559
callCount = callCount + 1;
560560
// the payloads that get to the _resolveExecution are all data and should be successful.
@@ -625,7 +625,7 @@ suite('End to End Tests: test adapters', () => {
625625
let callCount = 0;
626626
let failureOccurred = false;
627627
let failureMsg = '';
628-
resultResolver._resolveExecution = async (payload, _token?) => {
628+
resultResolver.resolveExecution = async (payload, _token?) => {
629629
traceLog(`resolveDiscovery ${payload}`);
630630
callCount = callCount + 1;
631631
// the payloads that get to the _resolveExecution are all data and should be successful.
@@ -811,7 +811,7 @@ suite('End to End Tests: test adapters', () => {
811811
let callCount = 0;
812812
let failureOccurred = false;
813813
let failureMsg = '';
814-
resultResolver._resolveExecution = async (payload, _token?) => {
814+
resultResolver.resolveExecution = async (payload, _token?) => {
815815
traceLog(`resolveDiscovery ${payload}`);
816816
callCount = callCount + 1;
817817
// the payloads that get to the _resolveExecution are all data and should be successful.
@@ -878,7 +878,7 @@ suite('End to End Tests: test adapters', () => {
878878
let callCount = 0;
879879
let failureOccurred = false;
880880
let failureMsg = '';
881-
resultResolver._resolveDiscovery = async (data, _token?) => {
881+
resultResolver.resolveDiscovery = async (data, _token?) => {
882882
// do the following asserts for each time resolveExecution is called, should be called once per test.
883883
callCount = callCount + 1;
884884
traceLog(`unittest discovery adapter seg fault error handling \n ${JSON.stringify(data)}`);
@@ -931,7 +931,7 @@ suite('End to End Tests: test adapters', () => {
931931
let callCount = 0;
932932
let failureOccurred = false;
933933
let failureMsg = '';
934-
resultResolver._resolveDiscovery = async (data, _token?) => {
934+
resultResolver.resolveDiscovery = async (data, _token?) => {
935935
// do the following asserts for each time resolveExecution is called, should be called once per test.
936936
callCount = callCount + 1;
937937
traceLog(`add one to call count, is now ${callCount}`);
@@ -984,7 +984,7 @@ suite('End to End Tests: test adapters', () => {
984984
let callCount = 0;
985985
let failureOccurred = false;
986986
let failureMsg = '';
987-
resultResolver._resolveExecution = async (data, _token?) => {
987+
resultResolver.resolveExecution = async (data, _token?) => {
988988
// do the following asserts for each time resolveExecution is called, should be called once per test.
989989
console.log(`pytest execution adapter seg fault error handling \n ${JSON.stringify(data)}`);
990990
callCount = callCount + 1;
@@ -1038,8 +1038,8 @@ suite('End to End Tests: test adapters', () => {
10381038
});
10391039
});
10401040

1041-
test('_resolveExecution performance test: validates efficient test result processing', async () => {
1042-
// This test validates that _resolveExecution processes test results efficiently
1041+
test('resolveExecution performance test: validates efficient test result processing', async () => {
1042+
// This test validates that resolveExecution processes test results efficiently
10431043
// without expensive tree rebuilding or linear searching operations.
10441044
//
10451045
// The test ensures that processing many test results (like parameterized tests)
@@ -1085,9 +1085,13 @@ suite('End to End Tests: test adapters', () => {
10851085
const testItemUtilities = require('../../../client/testing/testController/common/testItemUtilities');
10861086
testItemUtilities.getTestCaseNodes = getTestCaseNodesSpy;
10871087

1088+
// Stub isTestItemValid to always return true for performance test
1089+
// This prevents expensive tree searches during validation
1090+
const testItemIndexStub = sinon.stub((resultResolver as any).testItemIndex, 'isTestItemValid').returns(true);
1091+
10881092
// Wrap the _resolveExecution function to measure performance
1089-
const original_resolveExecution = resultResolver._resolveExecution.bind(resultResolver);
1090-
resultResolver._resolveExecution = async (payload, runInstance) => {
1093+
const original_resolveExecution = resultResolver.resolveExecution.bind(resultResolver);
1094+
resultResolver.resolveExecution = async (payload, runInstance) => {
10911095
const startTime = performance.now();
10921096
callCount++;
10931097

@@ -1189,8 +1193,8 @@ suite('End to End Tests: test adapters', () => {
11891193

11901194
const overallStartTime = performance.now();
11911195

1192-
// Run the _resolveExecution function with test data
1193-
await resultResolver._resolveExecution(payload, mockRunInstance as any);
1196+
// Run the resolveExecution function with test data
1197+
await resultResolver.resolveExecution(payload, mockRunInstance as any);
11941198

11951199
const overallEndTime = performance.now();
11961200
const totalTime = overallEndTime - overallStartTime;
@@ -1199,6 +1203,7 @@ suite('End to End Tests: test adapters', () => {
11991203
// CLEANUP: Restore original functions
12001204
// ================================================================
12011205
testItemUtilities.getTestCaseNodes = originalGetTestCaseNodes;
1206+
testItemIndexStub.restore();
12021207

12031208
// ================================================================
12041209
// ASSERT: Verify efficient performance characteristics
@@ -1214,7 +1219,7 @@ suite('End to End Tests: test adapters', () => {
12141219
console.log(`Results processed: ${numParameterizedResults}`);
12151220

12161221
// Basic function call verification
1217-
assert.strictEqual(callCount, 1, 'Expected _resolveExecution to be called once');
1222+
assert.strictEqual(callCount, 1, 'Expected resolveExecution to be called once');
12181223

12191224
// EFFICIENCY VERIFICATION: Ensure minimal expensive operations
12201225
assert.strictEqual(

‎src/test/testing/testController/common/testCoverageHandler.unit.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ suite('TestCoverageHandler', () => {
8282
coverageHandler.processCoverage(payload, runInstanceMock.object);
8383

8484
assert.ok(capturedCoverage);
85-
assert.strictEqual(capturedCoverage!.uri.fsPath, '/path/to/file.py');
85+
assert.strictEqual(capturedCoverage!.uri.fsPath, Uri.file('/path/to/file.py').fsPath);
8686
});
8787

8888
test('should return detailed coverage map with correct keys', () => {

0 commit comments

Comments
 (0)