fix: unexpected Java 8 expected error message eclipse-che4z#333 (eclipse-che4z#396)

fix: unexpected Java 8 expected error message eclipse-che4z#333

Author: ishche

clients/cobol-lsp-vscode-extension/src/__tests__/JavaCheckTest.ts

@@ -66,11 +66,29 @@ describe("Checks Java installation", () => {
         await expect(promise).resolves.toEqual(undefined);
     });
 
-    it("when required version is not supported", async () => {
-        (cp as any).spawn = jest.fn().mockReturnValue({stderr: {on: stderrFn}, on: jest.fn()});
+    it("should skip not relevant lines", async () => {
+        (cp as any).spawn = jest.fn().mockReturnValue({stderr: {on: stderrFn}, on: checkFn});
+        const promise = javaCheck.isJavaInstalled();
+        map.data("Picked up JAVA_TOOL_OPTIONS: -Xmx2254m");
+        map.data("java 11 2018-09-25");
+        map.close(0);
+        await expect(promise).resolves.toEqual(undefined);
+    });
+
+    it("should skip not relevant lines and fail", async () => {
+        (cp as any).spawn = jest.fn().mockReturnValue({stderr: {on: stderrFn}, on: checkFn});
         const promise = javaCheck.isJavaInstalled();
+        map.data("Picked up JAVA_TOOL_OPTIONS: -Xmx2254m");
         map.data('java version "1.5.0_22"');
+        map.close(0);
+        await expect(promise).rejects.toEqual(expectedErrMsgSupportedJavaVersion);
+    });
 
+    it("when required version is not supported", async () => {
+        (cp as any).spawn = jest.fn().mockReturnValue({stderr: {on: stderrFn}, on: checkFn});
+        const promise = javaCheck.isJavaInstalled();
+        map.data('java version "1.5.0_22"');
+        map.close(0);
         await expect(promise).rejects.toEqual(expectedErrMsgSupportedJavaVersion);
     });
 

clients/cobol-lsp-vscode-extension/src/services/JavaCheck.ts

@@ -21,12 +21,13 @@ export class JavaCheck {
     }
     public async isJavaInstalled() {
         return new Promise<any>((resolve, reject) => {
+            let resolved = false;
             const ls = cp.spawn("java", ["-version"]);
             ls.stderr.on("data", (data: any) => {
-                if (!JavaCheck.isJavaVersionSupported(data.toString())) {
-                    reject("Minimum expected Java version is 8");
+                if (JavaCheck.isJavaVersionSupported(data.toString())) {
+                    resolved = true;
+                    resolve();
                 }
-                resolve();
             });
             ls.on("error", (code: any) => {
                 if ("Error: spawn java ENOENT" === code.toString()) {
@@ -38,6 +39,9 @@ export class JavaCheck {
                 if (code !== 0) {
                     reject("An error occurred when checking if Java was installed");
                 }
+                if(!resolved) {
+                    reject("Minimum expected Java version is 8");
+                }
             });
         });
     }