chore: Fix error in CI test process (#388)

Author: xqzlgy2

.travis.yml

@@ -7,10 +7,9 @@ matrix:
     jdk: openjdk11
     env:
       - JDK_HOME=~/openjdk11 # force launching JLS using JDK11
-  # Temporary disable osx since it will stuck after finishing test
-  #- os: osx
-  #  osx_image: xcode10.1
-  #  jdk: oraclejdk11
+  - os: osx
+    osx_image: xcode10.1
+    jdk: oraclejdk11
 
 addons:
   apt:

extension.bundle.ts

@@ -20,3 +20,4 @@ export { WorkspaceNode } from "./src/views/workspaceNode";
 export { contextManager } from "./src/contextManager";
 export { DependencyExplorer } from "./src/views/dependencyExplorer";
 export { Commands } from "./src/commands";
+export { LanguageServerMode } from "./src/extension";

src/extension.ts

@@ -98,7 +98,7 @@ export function isSwitchingServer(): boolean {
 
 let serverMode: string | undefined;
 
-const enum LanguageServerMode {
+export const enum LanguageServerMode {
     LightWeight = "LightWeight",
     Standard = "Standard",
     Hybrid = "Hybrid",

test/gradle-suite/projectView.test.ts

@@ -2,19 +2,14 @@
 // Licensed under the MIT license.
 
 import * as assert from "assert";
-import { commands, extensions } from "vscode";
-import { Commands, ContainerNode, contextManager, DependencyExplorer,
+import { ContainerNode, contextManager, DependencyExplorer,
     PackageRootNode, PrimaryTypeNode, ProjectNode } from "../../extension.bundle";
-import { fsPath, Uris } from "../shared";
+import { fsPath, setupTestEnv, Uris } from "../shared";
 
 // tslint:disable: only-arrow-functions
 suite("Gradle Project View Tests", () => {
 
-    suiteSetup(async function() {
-        await extensions.getExtension("vscjava.vscode-java-dependency")!.activate();
-        // context would be initialized after this command
-        await commands.executeCommand(Commands.JAVA_PROJECT_ACTIVATE);
-    });
+    suiteSetup(setupTestEnv);
 
     test("Can node render correctly", async function() {
         const explorer = DependencyExplorer.getInstance(contextManager.context);

test/index.ts

@@ -61,6 +61,9 @@ async function main(): Promise<void> {
                 path.join(__dirname, "..", "..", "test", "gradle"),
             ],
         });
+
+        process.exit(0);
+
     } catch (err) {
         process.exit(1);
     }

test/maven-suite/projectView.test.ts

@@ -2,19 +2,14 @@
 // Licensed under the MIT license.
 
 import * as assert from "assert";
-import { commands, extensions } from "vscode";
-import { Commands, ContainerNode, contextManager, DependencyExplorer,
+import { ContainerNode, contextManager, DependencyExplorer,
     PackageNode, PackageRootNode, PrimaryTypeNode, ProjectNode } from "../../extension.bundle";
-import { fsPath, Uris } from "../shared";
+import { fsPath, setupTestEnv, Uris } from "../shared";
 
 // tslint:disable: only-arrow-functions
 suite("Maven Project View Tests", () => {
 
-    suiteSetup(async function() {
-        await extensions.getExtension("vscjava.vscode-java-dependency")!.activate();
-        // context would be initialized after this command
-        await commands.executeCommand(Commands.JAVA_PROJECT_ACTIVATE);
-    });
+    suiteSetup(setupTestEnv);
 
     test("Can node render correctly", async function() {
         const explorer = DependencyExplorer.getInstance(contextManager.context);

test/shared.ts

@@ -2,8 +2,8 @@
 // Licensed under the MIT license.
 
 import * as path from "path";
-import { Uri } from "vscode";
-import { DataNode } from "../extension.bundle";
+import { commands, Event, extensions, Uri } from "vscode";
+import { Commands, DataNode, LanguageServerMode } from "../extension.bundle";
 
 export namespace Uris {
     // Simple Project
@@ -37,3 +37,18 @@ export function truePath(...paths: string[]) {
     const basePath = path.join(__dirname, "..", "..", "test");
     return path.join(basePath, ...paths);
 }
+
+export async function setupTestEnv() {
+    await new Promise(async (resolve) => {
+        const extensionApi: any = extensions.getExtension("redhat.java")!.exports;
+        extensionApi.onDidServerModeChange(async (mode: string) => {
+            if (mode === LanguageServerMode.Standard) {
+                resolve();
+            }
+        });
+
+        await extensions.getExtension("vscjava.vscode-java-dependency")!.activate();
+        // context would be initialized after this command
+        await commands.executeCommand(Commands.JAVA_PROJECT_ACTIVATE);
+    });
+}

test/simple-suite/projectView.test.ts

@@ -2,19 +2,14 @@
 // Licensed under the MIT license.
 
 import * as assert from "assert";
-import { commands, extensions } from "vscode";
-import { Commands, ContainerNode, contextManager, DependencyExplorer,
+import { ContainerNode, contextManager, DependencyExplorer,
     PackageRootNode, PrimaryTypeNode, ProjectNode } from "../../extension.bundle";
-import { fsPath, Uris } from "../shared";
+import { fsPath, setupTestEnv, Uris } from "../shared";
 
 // tslint:disable: only-arrow-functions
 suite("Simple Project View Tests", () => {
 
-    suiteSetup(async function() {
-        await extensions.getExtension("vscjava.vscode-java-dependency")!.activate();
-        // context would be initialized after this command
-        await commands.executeCommand(Commands.JAVA_PROJECT_ACTIVATE);
-    });
+    suiteSetup(setupTestEnv);
 
     test("Can node render correctly", async function() {
         const explorer = DependencyExplorer.getInstance(contextManager.context);