Skip to content

Commit 5751861

Browse files
committed
Update to the latest coverage api
1 parent a4a28c8 commit 5751861

11 files changed

Lines changed: 18362 additions & 287 deletions

‎.azure-pipelines/vscode-java-test-nightly.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,6 @@ extends:
6767
command: custom
6868
verbose: false
6969
customCommand: run build-plugin
70-
- task: Npm@1
71-
displayName: npm run compile
72-
inputs:
73-
command: custom
74-
verbose: false
75-
customCommand: run compile
7670
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@2
7771
displayName: ESRP CodeSigning
7872
inputs:

‎.azure-pipelines/vscode-java-test-rc.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,6 @@ extends:
6262
command: custom
6363
verbose: false
6464
customCommand: run build-plugin
65-
- task: Npm@1
66-
displayName: npm run compile
67-
inputs:
68-
command: custom
69-
verbose: false
70-
customCommand: run compile
7165
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@2
7266
displayName: ESRP CodeSigning
7367
inputs:

‎.gitignore‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,4 @@ node_modules
5252
resources/templates/css/**
5353
resources/templates/js/**
5454
resources/templates/fonts/**
55-
dist
56-
**/vscode.d.ts
57-
**/vscode.proposed.d.ts
55+
dist

‎.vscodeignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ extension.bundle.ts
2121
javaConfig.json
2222
.github/**
2323
.azure-pipelines/**
24+
vscode.d.ts
2425

2526
# Ignore output of code sign
2627
server/*.md

‎package.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,8 @@
2121
"debug"
2222
],
2323
"aiKey": "90c182a8-8dab-45d4-bfb8-1353eb55aa7f",
24-
"enabledApiProposals": [
25-
"testCoverage"
26-
],
2724
"engines": {
28-
"vscode": "^1.69.0"
25+
"vscode": "^1.88.0"
2926
},
3027
"categories": [
3128
"Testing"

‎src/controller/testController.ts‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import * as _ from 'lodash';
55
import * as path from 'path';
6-
import { CancellationToken, DebugConfiguration, Disposable, FileSystemWatcher, RelativePattern, TestController, TestItem, TestRun, TestRunProfileKind, TestRunRequest, tests, TestTag, Uri, window, workspace, WorkspaceFolder } from 'vscode';
6+
import { CancellationToken, DebugConfiguration, Disposable, FileCoverage, FileCoverageDetail, FileSystemWatcher, RelativePattern, TestController, TestItem, TestRun, TestRunProfileKind, TestRunRequest, tests, TestTag, Uri, window, workspace, WorkspaceFolder } from 'vscode';
77
import { instrumentOperation, sendError, sendInfo } from 'vscode-extension-telemetry-wrapper';
88
import { refreshExplorer } from '../commands/testExplorerCommands';
99
import { IProgressReporter } from '../debugger.api';
@@ -167,7 +167,14 @@ export const runTests: (request: TestRunRequest, option: IRunOption) => any = in
167167
}
168168

169169
const run: TestRun = testController!.createTestRun(request);
170-
const coverageProvider: JavaTestCoverageProvider = new JavaTestCoverageProvider();
170+
let coverageProvider: JavaTestCoverageProvider | undefined;
171+
if (request.profile?.kind === TestRunProfileKind.Coverage) {
172+
coverageProvider = new JavaTestCoverageProvider();
173+
request.profile.loadDetailedCoverage = (_testRun: TestRun, fileCoverage: FileCoverage, _token: CancellationToken): Promise<FileCoverageDetail[]> => {
174+
return Promise.resolve(coverageProvider!.getCoverageDetails(fileCoverage.uri));
175+
};
176+
}
177+
171178
try {
172179
await new Promise<void>(async (resolve: () => void): Promise<void> => {
173180
const token: CancellationToken = option.token ?? run.token;
@@ -240,16 +247,13 @@ export const runTests: (request: TestRunRequest, option: IRunOption) => any = in
240247
}
241248
}
242249
if (request.profile?.kind === TestRunProfileKind.Coverage) {
243-
coverageProvider.addProject(projectName);
250+
await coverageProvider!.provideFileCoverage(run, projectName);
244251
}
245252
}
246253
}
247254
return resolve();
248255
});
249256
} finally {
250-
if (request.profile?.kind === TestRunProfileKind.Coverage) {
251-
run.coverageProvider = coverageProvider;
252-
}
253257
run.end();
254258
}
255259
});

‎src/provider/JavaTestCoverageProvider.ts‎

Lines changed: 27 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,42 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT license.
33

4-
import { BranchCoverage, CancellationToken, DeclarationCoverage, DetailedCoverage, FileCoverage, Position, StatementCoverage, TestCoverageProvider, Uri } from 'vscode';
4+
import { BranchCoverage, DeclarationCoverage, FileCoverage, FileCoverageDetail, Position, StatementCoverage, TestRun, Uri } from 'vscode';
55
import { getJacocoReportBasePath } from '../utils/coverageUtils';
66
import { executeJavaLanguageServerCommand } from '../utils/commandUtils';
77
import { JavaTestRunnerDelegateCommands } from '../constants';
88

9-
export class JavaTestCoverageProvider implements TestCoverageProvider {
9+
export class JavaTestCoverageProvider {
1010

11-
private projectNames: Set<string>;
11+
private coverageDetails: Map<Uri, FileCoverageDetail[]> = new Map<Uri, FileCoverageDetail[]>();
1212

13-
constructor() {
14-
this.projectNames = new Set<string>();
15-
}
16-
17-
public addProject(projectName: string): void {
18-
this.projectNames.add(projectName);
19-
}
20-
21-
public async provideFileCoverage(token: CancellationToken): Promise<FileCoverage[]> {
22-
const fileCoverages: FileCoverage[] = [];
23-
for (const projectName of this.projectNames) {
24-
const sourceFileCoverages: ISourceFileCoverage[] = await executeJavaLanguageServerCommand<void>(JavaTestRunnerDelegateCommands.GET_COVERAGE_DETAIL,
25-
projectName, getJacocoReportBasePath(projectName), token) || [];
26-
if (token.isCancellationRequested) {
27-
return [];
28-
}
29-
30-
for (const sourceFileCoverage of sourceFileCoverages) {
31-
const uri: Uri = Uri.parse(sourceFileCoverage.uriString);
32-
const detailedCoverage: DetailedCoverage[] = [];
33-
for (const lineCoverage of sourceFileCoverage.lineCoverages) {
34-
const branchCoverages: BranchCoverage[] = [];
35-
for (const branchCoverage of lineCoverage.branchCoverages) {
36-
branchCoverages.push(new BranchCoverage(branchCoverage.hit, new Position(lineCoverage.lineNumber - 1, 0)));
37-
}
38-
const statementCoverage: StatementCoverage = new StatementCoverage(lineCoverage.hit,
39-
new Position(lineCoverage.lineNumber - 1, 0), branchCoverages);
40-
detailedCoverage.push(statementCoverage);
41-
}
42-
for (const methodCoverage of sourceFileCoverage.methodCoverages) {
43-
const functionCoverage: DeclarationCoverage = new DeclarationCoverage(methodCoverage.name, methodCoverage.hit,
44-
new Position(methodCoverage.lineNumber - 1, 0));
45-
detailedCoverage.push(functionCoverage);
13+
public async provideFileCoverage(run: TestRun, projectName: string): Promise<void> {
14+
const sourceFileCoverages: ISourceFileCoverage[] = await executeJavaLanguageServerCommand<void>(JavaTestRunnerDelegateCommands.GET_COVERAGE_DETAIL,
15+
projectName, getJacocoReportBasePath(projectName)) || [];
16+
for (const sourceFileCoverage of sourceFileCoverages) {
17+
const uri: Uri = Uri.parse(sourceFileCoverage.uriString);
18+
const detailedCoverage: FileCoverageDetail[] = [];
19+
for (const lineCoverage of sourceFileCoverage.lineCoverages) {
20+
const branchCoverages: BranchCoverage[] = [];
21+
for (const branchCoverage of lineCoverage.branchCoverages) {
22+
branchCoverages.push(new BranchCoverage(branchCoverage.hit, new Position(lineCoverage.lineNumber - 1, 0)));
4623
}
47-
fileCoverages.push(FileCoverage.fromDetails(uri, detailedCoverage));
24+
const statementCoverage: StatementCoverage = new StatementCoverage(lineCoverage.hit,
25+
new Position(lineCoverage.lineNumber - 1, 0), branchCoverages);
26+
detailedCoverage.push(statementCoverage);
27+
}
28+
for (const methodCoverage of sourceFileCoverage.methodCoverages) {
29+
const functionCoverage: DeclarationCoverage = new DeclarationCoverage(methodCoverage.name, methodCoverage.hit,
30+
new Position(methodCoverage.lineNumber - 1, 0));
31+
detailedCoverage.push(functionCoverage);
4832
}
33+
run.addCoverage(FileCoverage.fromDetails(uri, detailedCoverage));
34+
this.coverageDetails.set(uri, detailedCoverage);
4935
}
50-
return fileCoverages;
36+
}
37+
38+
public getCoverageDetails(uri: Uri): FileCoverageDetail[] {
39+
return this.coverageDetails.get(uri) || [];
5140
}
5241
}
5342

‎src/runners/junitRunner/JUnitRunnerResultAnalyzer.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ export class JUnitRunnerResultAnalyzer extends RunnerResultAnalyzer {
101101
} else if (data.startsWith(MessageId.TraceStart)) {
102102
this.traces = new MarkdownString();
103103
this.traces.isTrusted = true;
104-
this.traces.supportHtml = true;
105104
this.recordingType = RecordingType.StackTrace;
106105
} else if (data.startsWith(MessageId.TraceEnd)) {
107106
if (!this.tracingItem) {

‎src/runners/testngRunner/TestNGRunnerResultAnalyzer.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ export class TestNGRunnerResultAnalyzer extends RunnerResultAnalyzer {
7777
if (outputData.attributes.trace) {
7878
const markdownTrace: MarkdownString = new MarkdownString();
7979
markdownTrace.isTrusted = true;
80-
markdownTrace.supportHtml = true;
8180

8281
for (const line of outputData.attributes.trace.split(/\r?\n/)) {
8382
this.processStackTrace(line, markdownTrace, this.currentItem, this.projectName);

0 commit comments

Comments
 (0)