JBDS-4196 MSI installed OpenJDK detection does not work

Fix removes extra parameter from Util.writeFile call and changes
the tests to fail if Util.writeFile called with wrong parameters.

Author: dgolovin

browser/model/jdk-install.js

@@ -79,6 +79,8 @@ class JdkInstall extends InstallableItem {
       }
       done();
     }).catch((error) => {
+      Logger.info(JdkInstall.KEY + ' - Detection failed with error');
+      Logger.info(JdkInstall.KEY + ' - ' + error);
       if(Platform.OS !== 'darwin' ) {
         this.selectedOption = 'install';
       } else {
@@ -88,23 +90,35 @@ class JdkInstall extends InstallableItem {
     });
   }
 
-  findMsiInstalledJava() {
-    let msiSearchScript = path.join(this.installerDataSvc.tempDir(), 'search-openjdk-msi.ps1');
-    let data = [
+  getMsiSearchScriptLocation() {
+    return path.join(this.installerDataSvc.tempDir(), 'search-openjdk-msi.ps1');
+  }
+
+  getMsiSearchScriptData() {
+    return [
       '$vbox = Get-WmiObject Win32_Product | where {$_.Name -like \'*OpenJDK*\'};',
       'echo $vbox.IdentifyingNumber;',
       '[Environment]::Exit(0);'
     ].join('\r\n');
-    let args = [
+  }
+
+  getMsiSearchScriptPowershellArgs(msiSearchScript) {
+    return [
       '-NonInteractive',
       '-ExecutionPolicy',
       'ByPass',
       '-File',
       msiSearchScript
     ];
+  }
+
+  findMsiInstalledJava() {
+    let msiSearchScript = this.getMsiSearchScriptLocation();
+    let data = this.getMsiSearchScriptData();
+    let args = this.getMsiSearchScriptPowershellArgs(msiSearchScript);
     let result = Promise.resolve('');
     if (Platform.OS !== 'darwin') {
-      result = Util.writeFile(JdkInstall.KEY, msiSearchScript, data).then(()=>{
+      result = Util.writeFile(msiSearchScript, data).then(()=>{
         return Util.executeFile('powershell', args);
       });
     }

test/unit/model/jdk-install-test.js

@@ -142,8 +142,6 @@ describe('JDK installer', function() {
       jdk.validateVersion();
     });
 
-
-
     describe('on windows', function(){
       it('should select openjdk for installation if no java detected', function(done) {
         sandbox.stub(Platform,'getOS').returns('win32');
@@ -194,8 +192,10 @@ describe('JDK installer', function() {
         let jdk = new JdkInstall(installerDataSvc, 'url', 'file');
         jdk.findMsiInstalledJava.restore();
         return jdk.detectExistingInstall(function() {
-          expect(Util.executeFile).to.have.been.calledOnce;
-          expect(Util.writeFile).to.have.been.calledOnce;
+          expect(Util.writeFile).to.have.been.calledWith(
+            jdk.getMsiSearchScriptLocation(),jdk.getMsiSearchScriptData());
+          expect(Util.executeFile).to.have.been.calledWith(
+            'powershell', jdk.getMsiSearchScriptPowershellArgs(jdk.getMsiSearchScriptLocation()));
           done();
         });
       });