refactor

Author: jdneo

extension/src/Extension.ts

@@ -227,6 +227,13 @@ export class Extension {
     }
 
     private async activate(): Promise<void> {
+        const testExtension = vscode.extensions.getExtension("vscjava.vscode-java-test");
+        if (testExtension) {
+            testExtension.activate().then((api: any) => {
+                api.registerTestProfile("Delegate Test to Gradle", vscode.TestRunProfileKind.Run,
+                        this.buildServerController.getGradleTestRunner());
+            });
+        }
         const activated = !!(await this.rootProjectsStore.getProjectRoots()).length;
         if (!this.server.isReady()) {
             await this.server.start();

extension/src/bs/BuildServerController.ts

@@ -16,7 +16,7 @@ import { sendInfo } from "vscode-extension-telemetry-wrapper";
 import { OpenBuildOutputValue, getOpenBuildOutput } from "../util/config";
 import * as path from "path";
 import * as fse from "fs-extra";
-import { gradleTestRunner } from "./GradleTestRunner";
+import { GradleTestRunner } from "./GradleTestRunner";
 
 const APPEND_BUILD_LOG_CMD = "_java.gradle.buildServer.appendBuildLog";
 const LOG_CMD = "_java.gradle.buildServer.log";
@@ -26,8 +26,10 @@ export class BuildServerController implements Disposable {
     private disposable: Disposable;
     private buildOutputChannel: OutputChannel;
     private logOutputChannel: OutputChannel;
+    private gradleTestRunner: GradleTestRunner;
 
     public constructor(readonly context: ExtensionContext) {
+        this.gradleTestRunner = new GradleTestRunner();
         this.buildOutputChannel = window.createOutputChannel("Build Server for Gradle (Build)", "gradle-build");
         this.logOutputChannel = window.createOutputChannel("Build Server for Gradle (Log)");
         this.disposable = Disposable.from(
@@ -87,7 +89,7 @@ export class BuildServerController implements Disposable {
             commands.registerCommand(
                 "java.gradle.buildServer.onDidFinishTestRun",
                 (status: number, message?: string) => {
-                    gradleTestRunner.finishTestRun({
+                    this.gradleTestRunner.finishTestRun({
                         status,
                         message,
                     });
@@ -96,7 +98,7 @@ export class BuildServerController implements Disposable {
             commands.registerCommand(
                 "java.gradle.buildServer.onDidChangeTestItemStatus",
                 (test: string, state: number, displayName?: string, message?: string, duration?: number) => {
-                    gradleTestRunner.updateTestItem({
+                    this.gradleTestRunner.updateTestItem({
                         test,
                         state,
                         displayName,
@@ -132,6 +134,10 @@ export class BuildServerController implements Disposable {
         this.checkMachineStatus();
     }
 
+    public getGradleTestRunner(): GradleTestRunner {
+        return this.gradleTestRunner;
+    }
+
     public dispose() {
         this.disposable.dispose();
     }

extension/src/bs/GradleTestRunner.ts

@@ -1,7 +1,7 @@
 import * as vscode from "vscode";
 import { TestRunner, TestItemStatusChangeEvent, TestFinishEvent, IRunTestContext } from "../java-test-runner.api";
 
-class GradleTestRunner implements TestRunner {
+export class GradleTestRunner implements TestRunner {
     private readonly _onDidChangeTestItemStatus = new vscode.EventEmitter<TestItemStatusChangeEvent>();
     private readonly _onDidFinishTestRun = new vscode.EventEmitter<TestFinishEvent>();
 
@@ -39,5 +39,3 @@ class GradleTestRunner implements TestRunner {
         this._onDidFinishTestRun.fire(event);
     }
 }
-
-export const gradleTestRunner: GradleTestRunner = new GradleTestRunner();

extension/src/index.ts

@@ -3,7 +3,6 @@ import { initializeFromJsonFile, instrumentOperation } from "vscode-extension-te
 
 import { Api } from "./api";
 import { Extension } from "./Extension";
-import { gradleTestRunner } from "./bs/GradleTestRunner";
 
 let extension: Extension;
 
@@ -14,12 +13,6 @@ export async function activate(context: vscode.ExtensionContext): Promise<Api> {
 
 function activateExtension(_operationId: string, context: vscode.ExtensionContext): Api {
     extension = new Extension(context);
-    const testExtension = vscode.extensions.getExtension("vscjava.vscode-java-test");
-    if (testExtension) {
-        testExtension.activate().then((api: any) => {
-            api.registerTestProfile("Delegate Test Run to Gradle", vscode.TestRunProfileKind.Run, gradleTestRunner);
-        });
-    }
     return extension.getApi();
 }