Updated review commentsUpdated review comments

Author: nbhoski

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

@@ -55,7 +55,6 @@ public class MatlabBuilder extends Builder implements SimpleBuildStep {
     private TestRunTypeList testRunTypeList;
     private String matlabRoot;
     private EnvVars env;
-    private FilePath workspace;
     private static final String MATLAB_RUNNER_TARGET_FILE =
             "Builder.matlab.runner.target.file.name";
     private static final String MATLAB_RUNNER_RESOURCE =
@@ -101,9 +100,6 @@ private String getCustomMatlabCommand() {
     private void setEnv(EnvVars env) {
         this.env = env;
     }
-    private void setWorkspace(FilePath workspace) {
-        this.workspace = workspace;
-    }
 
     @Extension
     public static class MatlabDescriptor extends BuildStepDescriptor<Builder> {
@@ -412,7 +408,14 @@ private synchronized int execMatlabCommand(Run<?, ?> build, FilePath workspace,
             TaskListener listener, boolean isLinuxLauncher)
             throws IOException, InterruptedException {
         setEnv(build.getEnvironment(listener));
-        setWorkspace(workspace);
+        final String testRunMode = this.getTestRunTypeList().getDescriptor().getDisplayName();
+        
+        // Copy MATLAB scratch file into the workspace only if Automatic option is selected.
+        if (!testRunMode.equalsIgnoreCase(
+                Message.getValue("builder.matlab.customcommandoption.display.name"))) {
+            copyMatlabScratchFileInWorkspace(MATLAB_RUNNER_RESOURCE, MATLAB_RUNNER_TARGET_FILE,
+                    workspace, getClass().getClassLoader());
+        }
         ProcStarter matlabLauncher;
         try {
             MatlabReleaseInfo rel = new MatlabReleaseInfo(getLocalMatlab());
@@ -430,16 +433,12 @@ private synchronized int execMatlabCommand(Run<?, ?> build, FilePath workspace,
         return matlabLauncher.join();
     }
 
-    public List<String> constructMatlabCommandWithBatch() throws IOException, InterruptedException {
+    public List<String> constructMatlabCommandWithBatch() {
         final String testRunMode = this.getTestRunTypeList().getDescriptor().getDisplayName();
         final String runCommand;
         final List<String> matlabDefaultArgs;
         if (!testRunMode.equalsIgnoreCase(
                 Message.getValue("builder.matlab.customcommandoption.display.name"))) {
-            
-            //Copy MATLAB scratch file into the workspace only if Automatic option is selected.
-            copyMatlabScratchFileInWorkspace(MATLAB_RUNNER_RESOURCE, MATLAB_RUNNER_TARGET_FILE,
-                    this.workspace, getClass().getClassLoader());
             String matlabFunctionName =
                     FilenameUtils.removeExtension(Message.getValue(MATLAB_RUNNER_TARGET_FILE));
             runCommand = "exit(" + matlabFunctionName + "("
@@ -458,7 +457,7 @@ public List<String> constructMatlabCommandWithBatch() throws IOException, Interr
         return matlabDefaultArgs;
     }
 
-    public List<String> constructDefaultMatlabCommand(boolean isLinuxLauncher) throws IOException, InterruptedException {
+    public List<String> constructDefaultMatlabCommand(boolean isLinuxLauncher) {
         final List<String> matlabDefaultArgs = new ArrayList<String>();
         Collections.addAll(matlabDefaultArgs, getPreRunnerSwitches());
         if (!isLinuxLauncher) {
@@ -485,15 +484,11 @@ private String[] getPostRunnerSwitches() {
         return postRunnerSwitch;
     }
 
-    private String[] getRunnerSwitch() throws IOException, InterruptedException {
+    private String[] getRunnerSwitch() {
         final String runCommand;
         final String testRunMode = this.getTestRunTypeList().getDescriptor().getDisplayName();
         if (!testRunMode.equalsIgnoreCase(
                 Message.getValue("builder.matlab.customcommandoption.display.name"))) {
-            
-            //Copy MATLAB scratch file into the workspace only if Automatic option is selected.
-            copyMatlabScratchFileInWorkspace(MATLAB_RUNNER_RESOURCE, MATLAB_RUNNER_TARGET_FILE,
-                    this.workspace, getClass().getClassLoader());
             String matlabFunctionName =
                     FilenameUtils.removeExtension(Message.getValue(MATLAB_RUNNER_TARGET_FILE));
             runCommand = "try,exit(" + matlabFunctionName + "("

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

@@ -187,9 +187,8 @@ public void verifyBuilderFailsForInvalidMATLABPath() throws Exception {
     public void verifyBuildFailureWhenMatlabException() throws Exception {
         MatlabBuilderTester tester = new MatlabBuilderTester(getMatlabroot("R2018b"),
                 matlabExecutorAbsolutePath, "-positiveFail");
-        // tester.setFailBuildIfTestFailureCheckBox(false);
+        tester.setTestRunTypeList(new RunTestsAutomaticallyOption());
         project.getBuildersList().add(tester);
-
         FreeStyleBuild build = project.scheduleBuild2(0).get();
         jenkins.assertBuildStatus(Result.FAILURE, build);
     }
@@ -202,6 +201,7 @@ public void verifyBuildFailureWhenMatlabException() throws Exception {
     public void verifyMatlabInvokedWithValidExecutable() throws Exception {
         MatlabBuilderTester tester = new MatlabBuilderTester(getMatlabroot("R2018b"),
                 matlabExecutorAbsolutePath, "-positive");
+        tester.setTestRunTypeList(new RunTestsAutomaticallyOption());
         project.getBuildersList().add(tester);
         FreeStyleBuild build = project.scheduleBuild2(0).get();
         jenkins.assertBuildStatus(Result.SUCCESS, build);
@@ -218,7 +218,7 @@ public void verifyMatlabPointsToValidExecutable() throws Exception {
         MatlabBuilderTester tester = new MatlabBuilderTester(getMatlabroot("R2018b"),
                 matlabExecutorAbsolutePath, "-positive");
         project.getBuildersList().add(tester);
-
+        tester.setTestRunTypeList(new RunTestsAutomaticallyOption());
         FreeStyleBuild build = project.scheduleBuild2(0).get();
         jenkins.assertBuildStatus(Result.SUCCESS, build);
         jenkins.assertLogContains(matlabExecutorAbsolutePath, build);
@@ -301,6 +301,32 @@ public void verifyRunTestAutomaticallyIsDefault() throws Exception {
         jenkins.assertLogContains("true,true,true", build);
     }
 
+    /*
+     * Test to verify if MATALB scratch file is generated in workspace for Automatic option.
+     */
+    @Test
+    public void verifyMATLABscratchFileGeneratedForAutomaticOption() throws Exception {
+        this.matlabBuilder.setMatlabRoot(getMatlabroot("R2018b"));
+        this.matlabBuilder.setTestRunTypeList(new RunTestsAutomaticallyOption());
+        project.getBuildersList().add(this.matlabBuilder);
+        FreeStyleBuild build = project.scheduleBuild2(0).get();
+        File matlabRunner = new File(build.getWorkspace() + File.separator + "runMatlabTests.m");
+        Assert.assertTrue(matlabRunner.exists());
+    }
+    
+    /*
+     * Test to verify if MATALB scratch file is not generated in workspace for Custom option.
+     */
+    @Test
+    public void verifyMATLABscratchFileGeneratedForCustomOption() throws Exception {
+        this.matlabBuilder.setMatlabRoot(getMatlabroot("R2018b"));
+        this.matlabBuilder.setTestRunTypeList(new RunTestsWithCustomCommandOption());
+        project.getBuildersList().add(this.matlabBuilder);
+        FreeStyleBuild build = project.scheduleBuild2(0).get();
+        File matlabRunner = new File(build.getWorkspace() + File.separator + "runMatlabTests.m");
+        Assert.assertFalse(matlabRunner.exists());
+    }
+    
     /*
      * Test to verify default value of getStringByName() when Automatic test mode. 
      */