Skip to content

ux: Improve the experience showing the JUnit4's parameterized tests #1302

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
Sep 22, 2021
Merged

ux: Improve the experience showing the JUnit4's parameterized tests #1302

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4cdf5d
ux: Improve the experience showing the JUnit4's parameterized tests
jdneo Sep 22, 2021
0081513
Merge branch 'main' into cs/issue-1296
jdneo Sep 22, 2021
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
25 changes: 17 additions & 8 deletions src/runners/junitRunner/JUnitRunnerResultAnalyzer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,10 @@ export class JUnitRunnerResultAnalyzer extends RunnerResultAnalyzer {
* The following regex expression is used to parse the test runner's output, which match the following components:
* '(?:@AssumptionFailure: |@Ignore: )?' - indicate if the case is ignored due to assumption failure or disabled
* '(.*?)' - test method name
* '(?:\[\d+.*?\])?' - execution index, it will appear for the JUnit4's parameterized test
* '\(([^)]*)\)[^(]*$' - class fully qualified name which wrapped by the last paired brackets, see:
* https://github.com/microsoft/vscode-java-test/issues/1075
*/
const regexp: RegExp = /(?:@AssumptionFailure: |@Ignore: )?(.*?)(?:\[\d+.*?\])?\(([^)]*)\)[^(]*$/;
const regexp: RegExp = /(?:@AssumptionFailure: |@Ignore: )?(.*?)\(([^)]*)\)[^(]*$/;
const matchResults: RegExpExecArray | null = regexp.exec(message);
if (matchResults && matchResults.length === 3) {
return `${this.projectName}@${matchResults[2]}#${matchResults[1]}`;
Expand Down Expand Up @@ -195,10 +194,6 @@ export class JUnitRunnerResultAnalyzer extends RunnerResultAnalyzer {
// See MessageId.TestTree's comment for its format
const result: RegExpMatchArray | null = message.match(regExp);
if (result && result.length > 6) {
// for now, skip the param test for JUnit 4
if (/^\[\d+.*?\]$/.test(result[1])) {
return;
}
const index: string = result[0];
const testId: string = this.getTestId(result[1]);
const isSuite: boolean = result[2] === 'true';
Expand All @@ -220,7 +215,7 @@ export class JUnitRunnerResultAnalyzer extends RunnerResultAnalyzer {
range: parent.range,
jdtHandler: parentData.jdtHandler,
fullName: parentData.fullName,
label: displayName,
label: this.getTestMethodName(displayName),
id: `${INVOCATION_PREFIX}${parent.id}[#${parent.children.size + 1}]`,
projectName: parentData.projectName,
testKind: parentData.testKind,
Expand All @@ -245,7 +240,7 @@ export class JUnitRunnerResultAnalyzer extends RunnerResultAnalyzer {
range: undefined,
jdtHandler: '',
fullName: testId.substr(testId.indexOf('@') + 1),
label: displayName,
label: this.getTestMethodName(displayName),
id: `${INVOCATION_PREFIX}${testId}`,
projectName: this.projectName,
testKind: this.testContext.kind,
Expand Down Expand Up @@ -283,12 +278,26 @@ export class JUnitRunnerResultAnalyzer extends RunnerResultAnalyzer {
let id: string = item.id;
if (id.startsWith(INVOCATION_PREFIX)) {
id = id.substring(INVOCATION_PREFIX.length);
if (this.testContext.kind === TestKind.JUnit) {
// change test[0] -> test
// to fix: https://github.com/microsoft/vscode-java-test/issues/1296
id = id.substring(0, id.lastIndexOf('['));
}
}
const location: Location | undefined = await findTestLocation(id);
testMessage.location = location;
}
setTestState(this.testContext.testRun, item, TestResultState.Failed, testMessage);
}

// See: org.eclipse.jdt.internal.junit.model.TestCaseElement#getTestMethodName()
private getTestMethodName(testName: string): string {
const index: number = testName.lastIndexOf('(');
if (index > 0) {
return testName.substring(0, index);
}
return testName;
}
}

enum MessageId {
Expand Down