Skip to content

The _testCase field is no longer provided for non paramtereized tests #897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 14, 2024
Merged

The _testCase field is no longer provided for non paramtereized tests #897

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions src/TestExplorer/TestParsers/SwiftTestingOutputParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ interface BaseEvent {

interface TestCaseEvent {
sourceLocation: SourceLocation;
_testCase: TestCase;
_testCase?: TestCase;
}

interface TestStarted extends BaseEvent {
Expand Down Expand Up @@ -225,6 +225,12 @@ export class SwiftTestingOutputParser {
return testCase.id === "argumentIDs: nil" ? testCase.displayName : testCase.id;
}

private idFromOptionalTestCase(testID: string, testCase?: TestCase): string {
return testCase
? this.testCaseId(testID, this.idFromTestCase(testCase))
: this.testName(testID);
}

private parameterizedFunctionTestCaseToTestClass(
testId: string,
testCase: TestCase,
Expand Down Expand Up @@ -300,9 +306,9 @@ export class SwiftTestingOutputParser {
const testIndex = runState.getTestItemIndex(testName, undefined);
runState.started(testIndex, item.payload.instant.absolute);
} else if (item.payload.kind === "testCaseStarted") {
const testID = this.testCaseId(
const testID = this.idFromOptionalTestCase(
item.payload.testID,
this.idFromTestCase(item.payload._testCase)
item.payload._testCase
);
const testIndex = this.getTestCaseIndex(runState, testID);
runState.started(testIndex, item.payload.instant.absolute);
Expand All @@ -311,11 +317,12 @@ export class SwiftTestingOutputParser {
const testIndex = runState.getTestItemIndex(testName, undefined);
runState.skipped(testIndex);
} else if (item.payload.kind === "issueRecorded") {
const testID = this.testCaseId(
const testID = this.idFromOptionalTestCase(
item.payload.testID,
this.idFromTestCase(item.payload._testCase)
item.payload._testCase
);
const testIndex = this.getTestCaseIndex(runState, testID);

const isKnown = item.payload.issue.isKnown;
const sourceLocation = item.payload.issue.sourceLocation;
const location = sourceLocationToVSCodeLocation(
Expand All @@ -327,7 +334,7 @@ export class SwiftTestingOutputParser {
runState.recordIssue(testIndex, message.text, isKnown, location);
});

if (testID !== item.payload.testID) {
if (item.payload._testCase && testID !== item.payload.testID) {
const testIndex = this.getTestCaseIndex(runState, item.payload.testID);
item.payload.messages.forEach(message => {
runState.recordIssue(testIndex, message.text, isKnown, location);
Expand All @@ -345,9 +352,9 @@ export class SwiftTestingOutputParser {
this.completionMap.set(testIndex, true);
runState.completed(testIndex, { timestamp: item.payload.instant.absolute });
} else if (item.payload.kind === "testCaseEnded") {
const testID = this.testCaseId(
const testID = this.idFromOptionalTestCase(
item.payload.testID,
this.idFromTestCase(item.payload._testCase)
item.payload._testCase
);
const testIndex = this.getTestCaseIndex(runState, testID);

Expand Down