Updated review comments.

Author: Nikhil Bhoski

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

@@ -16,7 +16,9 @@
 import hudson.model.TaskListener;
 
 public class MatlabStepExecution extends StepExecution implements MatlabBuild {
-    private static final long serialVersionUID = 1L;
+
+    private static final long serialVersionUID = 6704588180717665100L;
+    
     private String command;
 
 
@@ -31,18 +33,15 @@ private String getCommand() {
 
     @Override
     public boolean start() throws Exception {
-        Launcher launcher = getContext().get(Launcher.class);
-        FilePath workspace = getContext().get(FilePath.class);
-        TaskListener listener = getContext().get(TaskListener.class);
-        EnvVars env = getContext().get(EnvVars.class);
+        final Launcher launcher = getContext().get(Launcher.class);
+        final FilePath workspace = getContext().get(FilePath.class);
+        final TaskListener listener = getContext().get(TaskListener.class);
+        final EnvVars env = getContext().get(EnvVars.class);
 
-
         int res = execMatlabCommand(workspace, launcher, listener, env);
-        if (res == 0) {
-            getContext().setResult(Result.SUCCESS);
-        } else {
-            getContext().setResult(Result.FAILURE);
-        }
+
+        getContext().setResult((res == 0) ? Result.SUCCESS : Result.FAILURE);
+        
         getContext().onSuccess(true);
 
         //return false represents the asynchronous run. 
@@ -56,10 +55,9 @@ public void stop(Throwable cause) throws Exception {
 
     private synchronized int execMatlabCommand(FilePath workspace, Launcher launcher,
             TaskListener listener, EnvVars envVars) throws IOException, InterruptedException {
-        final String uniqueTmpFldrName = getUniqueNameForRunnerFile();
-        ProcStarter matlabLauncher;
+        final String uniqueTmpFldrName = getUniqueNameForRunnerFile();  
         try {
-            matlabLauncher = getProcessToRunMatlabCommand(workspace, launcher, listener, envVars,
+            ProcStarter matlabLauncher = getProcessToRunMatlabCommand(workspace, launcher, listener, envVars,
                     envVars.expand(getCommand()), uniqueTmpFldrName);
 
 
@@ -69,7 +67,7 @@ private synchronized int execMatlabCommand(FilePath workspace, Launcher launcher
             return 1;
         } finally {
             // Cleanup the runner File from tmp directory
-            FilePath matlabRunnerScript =
+            final FilePath matlabRunnerScript =
                     getFilePathForUniqueFolder(launcher, uniqueTmpFldrName, workspace);
             if (matlabRunnerScript.exists()) {
                 matlabRunnerScript.deleteRecursive();

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

@@ -21,13 +21,12 @@
 
 public class RunMatlabCommandStep extends Step {
 
-    private EnvVars env;
+    
     private String command;
 
     @DataBoundConstructor
     public RunMatlabCommandStep(String command) {
         this.command = command;
-
     }
 
 

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

@@ -39,12 +39,7 @@ 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";
+  
 
     @DataBoundConstructor
     public RunMatlabTestsStep() {
@@ -120,7 +115,7 @@ public StepExecution start(StepContext context) throws Exception {
     }
 
     @Extension
-    public static class CommandStepDescriptor extends StepDescriptor {
+    public static class RunTestsStepDescriptor extends StepDescriptor {
 
         @Override
         public Set<? extends Class<?>> getRequiredContext() {
@@ -161,12 +156,12 @@ private String getInputArgs() {
 
     private Map<String, String> getMatlabArgs() {
         final Map<String, String> args = new HashMap<String, String>();
-        args.put(PDF_REPORT_PATH,getTestResultsPDF());
-        args.put(TAP_RESULTS_PATH,getTestResultsTAP());
-        args.put(JUNIT_RESULTS_PATH,getTestResultsJUnit());
-        args.put(STM_RESULTS_PATH, getTestResultsSimulinkTest());
-        args.put(COBERTURA_CODE_COVERAGE_PATH, getCodeCoverageCobertura());
-        args.put(COBERTURA_MODEL_COVERAGE_PATH, getModelCoverageCobertura());
+        args.put("PDFReportPath", getTestResultsPDF());
+        args.put("TAPResultsPath", getTestResultsTAP());
+        args.put("JUnitResultsPath", getTestResultsJUnit());
+        args.put("SimulinkTestResultsPath", getTestResultsSimulinkTest());
+        args.put("CoberturaCodeCoveragePath", getCodeCoverageCobertura());
+        args.put("CoberturaModelCoveragePath", getModelCoverageCobertura());
         return args;
     }
 

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

@@ -2,23 +2,14 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-
-/**
- * Copyright 2020 The MathWorks, Inc.
- *  
- */
-
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 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 com.google.common.collect.ImmutableSet;
-import com.kenai.jffi.Array;
 import hudson.EnvVars;
 import hudson.Extension;
 import hudson.FilePath;
@@ -27,25 +18,35 @@
 import hudson.model.TaskListener;
 
 public class RunMatlabTestsStepTester extends RunMatlabTestsStep {
-    
-    
+
+
     @DataBoundConstructor
     public RunMatlabTestsStepTester() {
-        
+
     }
-    
+
     @Override
     public StepExecution start(StepContext context) throws Exception {
         Launcher launcher = context.get(Launcher.class);
         FilePath workspace = context.get(FilePath.class);
-        
-        //Copy Scratch file needed to run MATLAB tests in workspace
+
+        // Copy Scratch file needed to run MATLAB tests in workspace
         FilePath targetWorkspace = new FilePath(launcher.getChannel(), workspace.getRemote());
         copyScratchFileInWorkspace(MatlabBuilderConstants.MATLAB_TESTS_RUNNER_RESOURCE,
                 MatlabBuilderConstants.MATLAB_TESTS_RUNNER_TARGET_FILE, targetWorkspace);
-        return new TestStepExecution(context,constructCommandForTest(getInputArgs()));
+        return new TestStepExecution(context, constructCommandForTest(getInputArgs()));
     }
-    
+
+    private void copyScratchFileInWorkspace(String sourceFile, String targetFile,
+            FilePath targetWorkspace) throws IOException, InterruptedException {
+        final ClassLoader classLoader = getClass().getClassLoader();
+        FilePath targetFilePath = new FilePath(targetWorkspace, targetFile);
+        InputStream in = classLoader.getResourceAsStream(sourceFile);
+        targetFilePath.copyFrom(in);
+        // set executable permission
+        targetFilePath.chmod(0755);
+    }
+
     @Extension
     public static class CommandStepTestDescriptor extends StepDescriptor {
 
@@ -60,23 +61,12 @@ public String getFunctionName() {
             return "testMATLABTests";
         }
     }
-    
+
     public String getInputArgs() {
         List<String> args = Arrays.asList(getTestResultsPDF(), getTestResultsTAP(),
                 getTestResultsJUnit(), getTestResultsSimulinkTest(), getCodeCoverageCobertura(),
                 getModelCoverageCobertura());
 
         return String.join(",", args);
     }
-    
-    private void copyScratchFileInWorkspace(String sourceFile, String targetFile, FilePath targetWorkspace)
-            throws IOException, InterruptedException {
-        final ClassLoader classLoader = getClass().getClassLoader();
-        FilePath targetFilePath = new FilePath(targetWorkspace, targetFile);
-        InputStream in = classLoader.getResourceAsStream(sourceFile);
-        targetFilePath.copyFrom(in);
-        // set executable permission
-        targetFilePath.chmod(0755);
-    }
-
 }