Merge pull request #77 from mathworks/matrix-issue-patch

fixed findbug issue and Scratch file copy issue.

Author: nbhoski

src/main/java/com/mathworks/ci/MatlabBuild.java

@@ -70,29 +70,25 @@ default void copyFileInWorkspace(String sourceFile, String targetFile, FilePath
         targetFilePath.chmod(0755);
     }
 
-    default FilePath getFilePathForUniqueFolder(Launcher launcher, String uniqueName,FilePath workspace)
+    default FilePath getFilePathForUniqueFolder(Launcher launcher, String uniqueName, FilePath workspace)
             throws IOException, InterruptedException {
         /*Use of Computer is not recommended as jenkins hygeine for pipeline support
          * https://javadoc.jenkins-ci.org/jenkins/tasks/SimpleBuildStep.html */
 
-        Computer cmp = workspace.toComputer();
-        String tmpDir = (String) cmp.getSystemProperties().get("java.io.tmpdir");
-        if (launcher.isUnix()) {
-            tmpDir = tmpDir + "/" + uniqueName;
-        } else {
-            tmpDir = tmpDir + "\\" + uniqueName;
-        }
-        return new FilePath(launcher.getChannel(), tmpDir);
+        String tmpDir = getNodeSpecificTmpFolderPath(workspace);
+        return new FilePath(launcher.getChannel(), tmpDir+"/"+uniqueName);
     }
 
     default String getNodeSpecificTmpFolderPath(FilePath workspace) throws IOException, InterruptedException {
         Computer cmp = workspace.toComputer();
+        if (cmp == null) {
+            throw new IOException(Message.getValue("build.workspace.computer.not.found"));
+        }
         String tmpDir = (String) cmp.getSystemProperties().get("java.io.tmpdir");
         return tmpDir;
     }
 
     default String getUniqueNameForRunnerFile() {
         return UUID.randomUUID().toString();
     }
-
 }

src/main/java/com/mathworks/ci/MatlabBuilderConstants.java

@@ -12,6 +12,7 @@ public class MatlabBuilderConstants {
     static final double BASE_MATLAB_VERSION_EXPORTSTMRESULTS_SUPPORT = 9.6;
 
     static final String MATLAB_RUNNER_TARGET_FILE = "Builder.matlab.runner.target.file.name";
+    static final String MATLAB_TESTS_RUNNER_TARGET_FILE = "runMatlabTests.m";
     static final String MATLAB_RUNNER_RESOURCE = "com/mathworks/ci/MatlabBuilder/runMatlabTests.m";
     static final String AUTOMATIC_OPTION = "RunTestsAutomaticallyOption";
 

src/main/java/com/mathworks/ci/RunMatlabTestsBuilder.java

@@ -292,7 +292,7 @@ private synchronized int execMatlabCommand(FilePath workspace, Launcher launcher
             // Copy MATLAB scratch file into the workspace.
             FilePath targetWorkspace = new FilePath(launcher.getChannel(), workspace.getRemote());
             copyFileInWorkspace(MatlabBuilderConstants.MATLAB_RUNNER_RESOURCE,
-                    MatlabBuilderConstants.MATLAB_RUNNER_TARGET_FILE, targetWorkspace);
+                    MatlabBuilderConstants.MATLAB_TESTS_RUNNER_TARGET_FILE, targetWorkspace);
             return matlabLauncher.join();
         } catch (Exception e) {
             listener.getLogger().println(e.getMessage());
@@ -308,8 +308,8 @@ private synchronized int execMatlabCommand(FilePath workspace, Launcher launcher
     }
 
     public String constructCommandForTest(String inputArguments) {
-        final String matlabFunctionName = FilenameUtils.removeExtension(
-                Message.getValue(MatlabBuilderConstants.MATLAB_RUNNER_TARGET_FILE));
+        final String matlabFunctionName =
+                FilenameUtils.removeExtension(MatlabBuilderConstants.MATLAB_TESTS_RUNNER_TARGET_FILE);
         final String runCommand = "exit(" + matlabFunctionName + "(" + inputArguments + "))";
         return runCommand;
     }

src/main/resources/config.properties

@@ -16,4 +16,4 @@ Builder.matlab.modelcoverage.support.warning = To generate a Cobertura model cov
 Builder.matlab.exportstmresults.support.warning = To export Simulink Test Manager results, use MATLAB R2019a or a newer release.
 Builder.matlab.runner.script.target.file.linux.name = run_matlab_command.sh
 Builder.matlab.runner.script.target.file.windows.name = run_matlab_command.bat
-
+build.workspace.computer.not.found = Unable to access the computer for this build.

src/test/java/com/mathworks/ci/RunMatlabTestsBuilderTest.java

@@ -26,6 +26,7 @@
 import com.gargoylesoftware.htmlunit.WebAssert;
 import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.mathworks.ci.MatlabBuilder.RunTestsAutomaticallyOption;
 import hudson.FilePath;
 import hudson.matrix.Axis;
 import hudson.matrix.AxisList;
@@ -307,6 +308,20 @@ public void verifyMatrixBuildPasses() throws Exception {
 		jenkins.assertLogContains("R2018b completed", build);
 		jenkins.assertBuildStatus(Result.SUCCESS, build);
 	}
+	
+	 /*
+     * Test to verify if MATALB scratch file is generated in workspace.
+     */
+    @Test
+    public void verifyMATLABscratchFileGenerated() throws Exception {
+        this.buildWrapper.setMatlabRootFolder(getMatlabroot("R2018b"));  
+        project.getBuildWrappersList().add(this.buildWrapper);
+        setAllTestArtifacts(false, testBuilder);
+        project.getBuildersList().add(testBuilder);
+        FreeStyleBuild build = project.scheduleBuild2(0).get();
+        File matlabRunner = new File(build.getWorkspace() + File.separator + "runMatlabTests.m");
+        Assert.assertTrue(matlabRunner.exists());
+    }
 
 
     /*