Tests modified and copyright added.

Author: Nikhil Bhoski

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

@@ -1,5 +1,10 @@
 package com.mathworks.ci;
 
+/**
+ * Copyright 2019-2020 The MathWorks, Inc.
+ *  
+ */
+
 import java.io.IOException;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
 import org.jenkinsci.plugins.workflow.steps.StepExecution;

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

@@ -1,5 +1,10 @@
 package com.mathworks.ci;
 
+/**
+ * Copyright 2019-2020 The MathWorks, Inc.
+ *  
+ */
+
 import java.util.Set;
 import org.jenkinsci.plugins.workflow.steps.Step;
 import org.jenkinsci.plugins.workflow.steps.StepContext;

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

@@ -1,8 +1,14 @@
 package com.mathworks.ci;
 
+/**
+ * Copyright 2019-2020 The MathWorks, Inc.
+ *  
+ */
+
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import org.apache.commons.io.FilenameUtils;
 import org.jenkinsci.plugins.workflow.steps.Step;
@@ -12,7 +18,6 @@
 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;
@@ -127,26 +132,30 @@ public String constructCommandForTest(String inputArguments) {
 
 
     private String getInputArgs() {
-        List<String> inputArgs = new ArrayList<>();    
-        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(COBERTURA_MODEL_COVERAGE_PATH,              
-                getModelCoverageCobertura(), inputArgs);
-        
+        final List<String> inputArgs = new ArrayList<>();
+        final Map<String, String> args = getMatlabArgs();
+
+        args.forEach((key, val) -> {
+            if (val != null) {
+                inputArgs.add("'" + key + "'" + "," + "'" + val + "'");
+            }
+        });
+
         if (inputArgs.isEmpty()) {
-            return "";              
-        }   
-        
-        return String.join(",", inputArgs);       
+            return "";
+        }
+
+        return String.join(",", inputArgs);
     }
 
-    private void addInputArgs(String reportName, String reportPath, List<String> inputArgs) {   
-        if (reportPath != null) {   
-            inputArgs.add("'" + reportName + "'" + "," + "'" + reportPath + "'");   
-        }   
+    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());
+        return args;
     }
 }

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

@@ -1,4 +1,8 @@
 package com.mathworks.ci;
+/**
+ * Copyright 2019-2020 The MathWorks, Inc.
+ *  
+ */
 
 import java.io.IOException;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;

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

@@ -1,5 +1,10 @@
 package com.mathworks.ci;
 
+/**
+ * Copyright 2019-2020 The MathWorks, Inc.
+ *  
+ */
+
 import java.util.Set;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
 import org.jenkinsci.plugins.workflow.steps.StepDescriptor;

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

@@ -1,5 +1,10 @@
 package com.mathworks.ci;
 
+/**
+ * Copyright 2019-2020 The MathWorks, Inc.
+ *  
+ */
+
 import java.io.IOException;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
@@ -89,4 +94,22 @@ public void verifyArtifactParameters() throws Exception {
         j.assertLogNotContains("SimulinkTestResultsPath", build);
         j.assertLogNotContains("CoberturaModelCoveragePath", build);
     }
+    
+    /*
+     * Verify runMatlabTests runs with empty parameters when nothing no artifact selected 
+     */
+
+    @Test
+    public void verifyEmptyParameter() throws Exception {
+        project.setDefinition(new CpsFlowDefinition(
+                "node {runMATLABTests()}", true));
+        WorkflowRun build = project.scheduleBuild2(0).get();
+        j.assertLogContains("runMatlabTests()", build);
+        j.assertLogNotContains("PDFReportPath", build);
+        j.assertLogNotContains("TAPResultsPath", build);
+        j.assertLogNotContains("JUnitResultsPath", build);
+        j.assertLogNotContains("CoberturaCodeCoveragePath", build);
+        j.assertLogNotContains("SimulinkTestResultsPath", build);
+        j.assertLogNotContains("CoberturaModelCoveragePath", build);
+    }
 }

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

@@ -1,5 +1,10 @@
 package com.mathworks.ci;
 
+/**
+ * Copyright 2019-2020 The MathWorks, Inc.
+ *  
+ */
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;

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

@@ -1,4 +1,8 @@
 package com.mathworks.ci;
+/**
+ * Copyright 2019-2020 The MathWorks, Inc.
+ * 
+ */
 
 import java.io.IOException;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
@@ -8,13 +12,13 @@
 import hudson.Launcher.ProcStarter;
 import hudson.model.TaskListener;
 
-public class TestStepExecution extends MatlabStepExecution{
+public class TestStepExecution extends MatlabStepExecution {
 
     public TestStepExecution(StepContext context, String command, boolean copyScratchFile) {
         super(context, command, copyScratchFile);
-        
+
     }
-    
+
     @Override
     public ProcStarter getProcessToRunMatlabCommand(FilePath workspace, Launcher launcher,
             TaskListener listener, EnvVars envVars, String matlabCommand, String uniqueName)
@@ -29,20 +33,16 @@ public ProcStarter getProcessToRunMatlabCommand(FilePath workspace, Launcher lau
                     .cmds(tmpDir + "/" + runnerScriptName, matlabCommand).stdout(listener);
 
             // Copy runner .sh for linux platform in workspace.
-            copyFileInWorkspace("run_matlab_command_test.sh", runnerScriptName,
-                    targetWorkspace);
+            copyFileInWorkspace("run_matlab_command_test.sh", runnerScriptName, targetWorkspace);
         } else {
             final String runnerScriptName = uniqueName + "\\run_matlab_command_test.bat";
             launcher = launcher.decorateByPrefix("cmd.exe", "/C");
             matlabLauncher = launcher.launch().pwd(workspace).envs(envVars)
                     .cmds(tmpDir + "\\" + runnerScriptName, "\"" + matlabCommand + "\"")
                     .stdout(listener);
             // Copy runner.bat for Windows platform in workspace.
-            copyFileInWorkspace("run_matlab_command_test.bat", runnerScriptName,
-                    targetWorkspace);
+            copyFileInWorkspace("run_matlab_command_test.bat", runnerScriptName, targetWorkspace);
         }
         return matlabLauncher;
     }
-
-    
 }

src/test/resources/run_matlab_command_test.bat

@@ -1,4 +1,4 @@
-rem Copyright 2018 The MathWorks, Inc.
+rem Copyright 2020 The MathWorks, Inc.
 
 echo off
 

src/test/resources/run_matlab_command_test.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#Copyright 2018 The MathWorks, Inc.
+#Copyright 2020 The MathWorks, Inc.
 
 echo "tester_started"
 echo $1