final changes for both Step execution

Author: Nikhil Bhoski

src/main/java/com/mathworks/ci/MatlabCommandStepExecution.java renamed to src/main/java/com/mathworks/ci/MatlabStepExecution.java

@@ -10,14 +10,14 @@
 import hudson.model.Result;
 import hudson.model.TaskListener;
 
-public class MatlabCommandStepExecution extends StepExecution implements MatlabBuild {
+public class MatlabStepExecution extends StepExecution implements MatlabBuild {
     private static final long serialVersionUID = 1L;
     private String command;
     private EnvVars env;
     private boolean copyScratchFile;
 
 
-    public MatlabCommandStepExecution(StepContext context, String command, boolean copyScratchFile) {
+    public MatlabStepExecution(StepContext context, String command, boolean copyScratchFile) {
         super(context);
         this.command = command;
         this.copyScratchFile = copyScratchFile;
@@ -72,11 +72,13 @@ private synchronized int execMatlabCommand(FilePath workspace, Launcher launcher
             matlabLauncher = getProcessToRunMatlabCommand(workspace, launcher, listener, envVars,
                     getCommand(), uniqueTmpFldrName);
 
-            // Copy MATLAB scratch file into the workspace.
-            FilePath targetWorkspace = new FilePath(launcher.getChannel(), workspace.getRemote());
-            copyFileInWorkspace(MatlabBuilderConstants.MATLAB_TESTS_RUNNER_RESOURCE,
-                    MatlabBuilderConstants.MATLAB_TESTS_RUNNER_TARGET_FILE, targetWorkspace);
-            
+            // Copy MATLAB scratch file into the workspace if required.
+            if(this.copyScratchFile) {
+                FilePath targetWorkspace = new FilePath(launcher.getChannel(), workspace.getRemote());
+                copyFileInWorkspace(MatlabBuilderConstants.MATLAB_TESTS_RUNNER_RESOURCE,
+                        MatlabBuilderConstants.MATLAB_TESTS_RUNNER_TARGET_FILE, targetWorkspace);
+            }
+                     
             return matlabLauncher.join();
         } catch (Exception e) {
             listener.getLogger().println(e.getMessage());

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

@@ -18,6 +18,7 @@ public class RunMatlabCommandStep extends Step {
 
     private EnvVars env;
     private String matlabCommand;
+    private static boolean COPY_SCRATCH_FILE = false;
 
     @DataBoundConstructor
     public RunMatlabCommandStep(String command) {
@@ -44,7 +45,7 @@ public EnvVars getEnv() {
 
     @Override
     public StepExecution start(StepContext context) throws Exception {
-        return new MatlabCommandStepExecution(context, getCommand(), true);
+        return new MatlabStepExecution(context, getCommand(), COPY_SCRATCH_FILE);
     }
 
     @Extension

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

@@ -4,13 +4,15 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import org.apache.commons.io.FilenameUtils;
 import org.jenkinsci.plugins.workflow.steps.Step;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
 import org.jenkinsci.plugins.workflow.steps.StepDescriptor;
 import org.jenkinsci.plugins.workflow.steps.StepExecution;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 import com.google.common.collect.ImmutableSet;
+import com.mathworks.ci.RunMatlabTestsBuilder.PdfArtifact;
 import hudson.EnvVars;
 import hudson.Extension;
 import hudson.FilePath;
@@ -26,7 +28,14 @@ public class RunMatlabTestsStep extends Step {
     private String codeCoverageCobertura;
     private String testResultsSimulinkTest;
     private String modelCoverageCobertura;
-    
+    private static final String PDF_REPORT_PATH = "'PDFReportPath'";
+    private static final String TAP_RESULTS_PATH = "'TAPResultsPath'";
+    private static final String JUNIT_RESULTS_PATH = "'JUnitResultsPath'";
+    private static final String COBERTURA_CODE_COVERAGE_PATH = "'CoberturaCodeCoveragePath'";
+    private static final String STM_RESULTS_PATH = "'SimulinkTestResultsPath'";
+    private static final String COBERTURA_MODEL_COVERAGE_PATH = "'CoberturaModelCoveragePath'";
+    private static boolean COPY_SCRATCH_FILE = true;
+
     @DataBoundConstructor
     public RunMatlabTestsStep() {
 
@@ -91,7 +100,7 @@ public void setModelCoverageCobertura(String modelCoverageCobertura) {
     @Override
     public StepExecution start(StepContext context) throws Exception {
 
-        return new MatlabCommandStepExecution(context,getInputArgs(), true);
+        return new MatlabStepExecution(context,constructCommandForTest(getInputArgs()), COPY_SCRATCH_FILE);
     }
 
     @Extension
@@ -109,21 +118,29 @@ public String getFunctionName() {
         }
     }
 
+    public String constructCommandForTest(String inputArguments) {
+        final String matlabFunctionName =
+                FilenameUtils.removeExtension(MatlabBuilderConstants.MATLAB_TESTS_RUNNER_TARGET_FILE);
+        final String runCommand = "exit(" + matlabFunctionName + "(" + inputArguments + "))";
+        return runCommand;
+    }
+
+    
     private String getInputArgs() {
         List<String> inputArgs = new ArrayList<>();    
-        addInputArgs(MatlabBuilderConstants.PDF_REPORT_PATH, getTestResultsPdf(),inputArgs);  
-        addInputArgs(MatlabBuilderConstants.TAP_RESULTS_PATH, getTestResultsTAP(), inputArgs);          
-        addInputArgs(MatlabBuilderConstants.JUNIT_RESULTS_PATH, getTestResultsJUnit(), inputArgs);              
-        addInputArgs(MatlabBuilderConstants.STM_RESULTS_PATH, getTestResultsSimulinkTest(), inputArgs);         
-        addInputArgs(MatlabBuilderConstants.COBERTURA_CODE_COVERAGE_PATH,   
+        addInputArgs(PDF_REPORT_PATH, getTestResultsPdf(),inputArgs);  
+        addInputArgs(TAP_RESULTS_PATH, getTestResultsTAP(), inputArgs);          
+        addInputArgs(JUNIT_RESULTS_PATH, getTestResultsJUnit(), inputArgs);              
+        addInputArgs(STM_RESULTS_PATH, getTestResultsSimulinkTest(), inputArgs);         
+        addInputArgs(COBERTURA_CODE_COVERAGE_PATH,   
                 getCodeCoverageCobertura(), inputArgs);          
-        addInputArgs(MatlabBuilderConstants.COBERTURA_MODEL_COVERAGE_PATH,              
+        addInputArgs(COBERTURA_MODEL_COVERAGE_PATH,              
                 getModelCoverageCobertura(), inputArgs);
 
         if (inputArgs.isEmpty()) {
             return "";              
-        }           
-
+        }   
+        
         return String.join(",", inputArgs);       
     }
 
@@ -132,5 +149,4 @@ private void addInputArgs(String reportName, String reportPath, List<String> inp
             inputArgs.add(reportName + "," + "'" + reportPath + "'");   
         }   
     }
-
 }