Merge pull request #51 from NativeScript/vladimirov/fix-javac-detection

fix: javac detection does not work as required by Gradle

Author: rosen-vladimirov

lib/sys-info.ts

@@ -61,7 +61,7 @@ export class SysInfo implements NativeScriptDoctor.ISysInfo {
 
 	public getJavaCompilerVersion(): Promise<string> {
 		return this.getValueForProperty(() => this.javaCompilerVerCache, async (): Promise<string> => {
-			const javacVersion = (await this.getVersionOfJavaExecutableFromJavaHome(Constants.JAVAC_EXECUTABLE_NAME, SysInfo.JAVA_COMPILER_VERSION_REGEXP)) ||
+			const javacVersion = process.env["JAVA_HOME"] ? (await this.getVersionOfJavaExecutableFromJavaHome(Constants.JAVAC_EXECUTABLE_NAME, SysInfo.JAVA_COMPILER_VERSION_REGEXP)) :
 				(await this.getVersionOfJavaExecutableFromPath(Constants.JAVAC_EXECUTABLE_NAME, SysInfo.JAVA_COMPILER_VERSION_REGEXP));
 
 			return javacVersion;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-doctor",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "Library that helps identifying if the environment can be used for development of {N} apps.",
   "main": "lib/index.js",
   "types": "./typings/nativescript-doctor.d.ts",

test/sys-info.ts

@@ -241,6 +241,31 @@ describe("SysInfo unit tests", () => {
 			assert.deepEqual(execCommands, ['which javac', '"javac" -version']);
 		});
 
+		it("null when there is incorrect JAVA_HOME on non-Windows OS", async () => {
+			const originalJavaHome = process.env[JavaHomeName];
+			process.env[JavaHomeName] = "/some/invalid/dir/name/where/java/does/not/exist";
+
+			const result = await sysInfo.getJavaCompilerVersion();
+
+			process.env[JavaHomeName] = originalJavaHome;
+
+			assert.deepEqual(result, null);
+			assert.deepEqual(execCommands, []);
+		});
+
+		it("null when there is incorrect JAVA_HOME on Window OS", async () => {
+			const originalJavaHome = process.env[JavaHomeName];
+			hostInfo.isWindows = true;
+			process.env[JavaHomeName] = "C:\\Program Files\\Not existing dir";
+
+			const result = await sysInfo.getJavaCompilerVersion();
+
+			process.env[JavaHomeName] = originalJavaHome;
+
+			assert.deepEqual(result, null);
+			assert.deepEqual(execCommands, []);
+		});
+
 		it("java compiler version when there is no JAVA_HOME on Window OS", async () => {
 			const originalJavaHome = process.env[JavaHomeName];
 			hostInfo.isWindows = true;