Skip to content

support Junit5 parallel execution #1472 #1519

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
jdneo merged 2 commits into from
Jan 24, 2023
Merged

support Junit5 parallel execution #1472 #1519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b6530c
support Junit5 parallel execution #1472
fladdimir Jan 11, 2023
f8d614b
Merge branch 'main' into feat/junit5-parallel-tests
jdneo Jan 20, 2023
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
129 changes: 81 additions & 48 deletions src/runners/junitRunner/JUnitRunnerResultAnalyzer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,24 @@ import { IJavaTestItem, IRunTestContext, TestKind, TestLevel } from '../../types
import { RunnerResultAnalyzer } from '../baseRunner/RunnerResultAnalyzer';
import { findTestLocation, setTestState, TestResultState } from '../utils';


export class JUnitRunnerResultAnalyzer extends RunnerResultAnalyzer {

private testOutputMapping: Map<string, ITestInfo> = new Map();
private triggeredTestsMapping: Map<string, TestItem> = new Map();
private currentTestState: TestResultState;
private currentItem: TestItem | undefined;
private currentDuration: number = 0;
private projectName: string;
private incompleteTestSuite: ITestInfo[] = [];

// tests may be run concurrently, so each item's current state needs to be remembered
private currentStates: Map<TestItem, CurrentItemState> = new Map();

// failure info for a test is received consecutively:
private tracingItem: TestItem | undefined;
private traces: MarkdownString;
private assertionFailure: TestMessage | undefined;
private recordingType: RecordingType;
private expectString: string;
private actualString: string;
private projectName: string;
private incompleteTestSuite: ITestInfo[] = [];

constructor(protected testContext: IRunTestContext) {
super(testContext);
Expand Down Expand Up @@ -60,40 +64,26 @@ export class JUnitRunnerResultAnalyzer extends RunnerResultAnalyzer {
if (!item) {
return;
}
if (item.id !== this.currentItem?.id) {
this.initializeCache(item);
}
this.testContext.testRun.started(item);

const start: number = Date.now();
if (this.currentDuration === 0) {
this.currentDuration = -start;
} else if (this.currentDuration > 0) {
// Some test cases may executed multiple times (@RepeatedTest), we need to calculate the time for each execution
this.currentDuration -= start;
}
this.setCurrentState(item, TestResultState.Running, 0);
this.setDurationAtStart(this.getCurrentState(item));
setTestState(this.testContext.testRun, item, this.getCurrentState(item).resultState);
} else if (data.startsWith(MessageId.TestEnd)) {
if (!this.currentItem) {
const item: TestItem | undefined = this.getTestItem(data.substr(MessageId.TestEnd.length));
if (!item) {
return;
}

if (this.currentDuration < 0) {
const end: number = Date.now();
this.currentDuration += end;
}

if (data.indexOf(MessageId.IGNORE_TEST_PREFIX) > -1) {
this.currentTestState = TestResultState.Skipped;
} else if (this.currentTestState === TestResultState.Running) {
this.currentTestState = TestResultState.Passed;
}
setTestState(this.testContext.testRun, this.currentItem, this.currentTestState, undefined, this.currentDuration);
const currentState: CurrentItemState = this.getCurrentState(item);
this.calcDurationAtEnd(currentState);
this.determineResultStateAtEnd(data, currentState);
setTestState(this.testContext.testRun, item, currentState.resultState, undefined, currentState.duration);
} else if (data.startsWith(MessageId.TestFailed)) {
if (data.indexOf(MessageId.ASSUMPTION_FAILED_TEST_PREFIX) > -1) {
this.currentTestState = TestResultState.Skipped;
} else {
this.currentTestState = TestResultState.Failed;
const item: TestItem | undefined = this.getTestItem(data.substr(MessageId.TestFailed.length));
if (!item) {
return;
}
const currentState: CurrentItemState = this.getCurrentState(item);
this.determineResultStateOnFailure(data, currentState);
this.initializeTracingItemProcessingCache(item); // traces or comparison failure info might follow immediately
} else if (data.startsWith(MessageId.TestError)) {
let item: TestItem | undefined = this.getTestItem(data.substr(MessageId.TestError.length));
if (!item) {
Expand All @@ -104,25 +94,25 @@ export class JUnitRunnerResultAnalyzer extends RunnerResultAnalyzer {
return;
}
}
if (item.id !== this.currentItem?.id) {
this.initializeCache(item);
this.getCurrentState(item).resultState = TestResultState.Errored;
if (item.id !== this.tracingItem?.id) {
this.initializeTracingItemProcessingCache(item);
}
this.currentTestState = TestResultState.Errored;
} else if (data.startsWith(MessageId.TraceStart)) {
this.traces = new MarkdownString();
this.traces.isTrusted = true;
this.traces.supportHtml = true;
this.recordingType = RecordingType.StackTrace;
} else if (data.startsWith(MessageId.TraceEnd)) {
if (!this.currentItem) {
if (!this.tracingItem) {
return;
}

const testMessage: TestMessage = new TestMessage(this.traces);
this.tryAppendMessage(this.currentItem, testMessage, this.currentTestState);
const currentResultState: TestResultState = this.getCurrentState(this.tracingItem).resultState;
this.tryAppendMessage(this.tracingItem, testMessage, currentResultState);
this.recordingType = RecordingType.None;
if (this.currentTestState === TestResultState.Errored) {
setTestState(this.testContext.testRun, this.currentItem, this.currentTestState);
if (currentResultState === TestResultState.Errored) {
setTestState(this.testContext.testRun, this.tracingItem, currentResultState);
}
} else if (data.startsWith(MessageId.ExpectStart)) {
this.recordingType = RecordingType.ExpectMessage;
Expand Down Expand Up @@ -150,7 +140,38 @@ export class JUnitRunnerResultAnalyzer extends RunnerResultAnalyzer {
}
}

this.processStackTrace(data, this.traces, this.assertionFailure, this.currentItem, this.projectName);
this.processStackTrace(data, this.traces, this.assertionFailure, this.tracingItem, this.projectName);
}
}

private determineResultStateOnFailure(data: string, currentState: CurrentItemState): void {
const isSkip: boolean = data.indexOf(MessageId.ASSUMPTION_FAILED_TEST_PREFIX) > -1;
currentState.resultState = isSkip ? TestResultState.Skipped : TestResultState.Failed;
}

private determineResultStateAtEnd(data: string, currentState: CurrentItemState): void {
const isIgnore: boolean = data.indexOf(MessageId.IGNORE_TEST_PREFIX) > -1;
if (isIgnore) {
currentState.resultState = TestResultState.Skipped;
} else if (currentState.resultState === TestResultState.Running) {
currentState.resultState = TestResultState.Passed;
}
}

private setDurationAtStart(currentState: CurrentItemState): void {
const start: number = Date.now();
if (currentState.duration === 0) {
currentState.duration = -start;
} else if (currentState.duration > 0) {
// Some test cases may executed multiple times (@RepeatedTest), we need to calculate the time for each execution
currentState.duration -= start;
}
}

private calcDurationAtEnd(currentState: CurrentItemState): void {
if (currentState.duration < 0) {
const end: number = Date.now();
currentState.duration += end;
}
}

Expand Down Expand Up @@ -182,10 +203,17 @@ export class JUnitRunnerResultAnalyzer extends RunnerResultAnalyzer {
return `${this.projectName}@${message}`;
}

protected initializeCache(item: TestItem): void {
this.currentTestState = TestResultState.Running;
this.currentItem = item;
this.currentDuration = 0;
private setCurrentState(testItem: TestItem, resultState: TestResultState, duration: number): void {
this.currentStates.set(testItem, { resultState, duration });
}

private getCurrentState(testItem: TestItem): CurrentItemState {
if (!this.currentStates.has(testItem)) this.setCurrentState(testItem, TestResultState.Running, 0);
return this.currentStates.get(testItem)!;
}

private initializeTracingItemProcessingCache(item: TestItem): void {
this.tracingItem = item;
this.assertionFailure = undefined;
this.expectString = '';
this.actualString = '';
Expand Down Expand Up @@ -288,7 +316,7 @@ export class JUnitRunnerResultAnalyzer extends RunnerResultAnalyzer {

if (testItem) {
if (dataCache.get(testItem)?.testKind === TestKind.JUnit5 &&
this.getLabelWithoutCodicon(testItem.label) !== displayName) {
this.getLabelWithoutCodicon(testItem.label) !== displayName) {
testItem.description = displayName;
} else {
testItem.description = '';
Expand Down Expand Up @@ -390,3 +418,8 @@ enum RecordingType {
ExpectMessage,
ActualMessage,
}

interface CurrentItemState {
resultState: TestResultState;
duration: number;
}
Loading