Updated tests.

Author: Nikhil Bhoski

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

@@ -24,13 +24,7 @@ public class MatlabBuilderConstants {
     static final String STM_RESULTS = "'SimulinkTestResults'";
     static final String COBERTURA_CODE_COVERAGE = "'CoberturaCodeCoverage'";
     static final String COBERTURA_MODEL_COVERAGE = "'CoberturaModelCoverage'";
-    static final String PDF_REPORT_PATH = "'PDFReportPath'";
-    static final String TAP_RESULTS_PATH ="'TAPResultsPath'";
-    static final String JUNIT_RESULTS_PATH = "'JUnitResultsPath'";
-    static final String STM_RESULTS_PATH = "'SimulinkTestResultsPath'";
-    static final String COBERTURA_CODE_COVERAGE_PATH = "'CoberturaCodeCoveragePath'";
-    static final String COBERTURA_MODEL_COVERAGE_PATH = "'CoberturaModelCoveragePath'";
-    
+
     // Matlab Runner files 
     static final String BAT_RUNNER_SCRIPT = "run_matlab_command.bat";
     static final String SHELL_RUNNER_SCRIPT = "run_matlab_command.sh";

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

@@ -11,8 +11,11 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import javax.annotation.Nonnull;
+import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.io.FilenameUtils;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -222,17 +225,21 @@ public String constructCommandForTest(String inputArguments) {
     // Concatenate the input arguments
     private String getInputArguments() {
 
-        final List<String> inputArgs = new ArrayList<String>();
+        final List<String> inputArgsList = new ArrayList<String>();
+        final Map<String,String> args = new HashMap<String,String>();
+        
         final List<Artifact> artifactList =
                 new ArrayList<Artifact>(Arrays.asList(getPdfReportArtifact(), getTapArtifact(),
                         getJunitArtifact(), getStmResultsArtifact(), getCoberturaArtifact(),
                         getModelCoverageArtifact()));
 
         for (Artifact artifact : artifactList) {
-            artifact.addFilePathArgTo(inputArgs);
+            artifact.addFilePathArgTo(args);
         }
 
-        return String.join(",", inputArgs);
+        args.forEach((key, val) -> inputArgsList.add("'" + key + "'" + "," + "'" + val + "'"));
+
+        return String.join(",", inputArgsList);
     }
 
 
@@ -247,149 +254,141 @@ private String getInputArguments() {
      * 
      */
     public static class PdfArtifact extends AbstractArtifactImpl {
-        
+
+        static final String PDF_REPORT_PATH = "PDFReportPath";
+
         @DataBoundConstructor
         public PdfArtifact(String pdfReportFilePath) {
-           super(pdfReportFilePath);
+            super(pdfReportFilePath);
         }
-       
+
         @Override
-        public void addFilePathArgTo(List<String> inputArgs) {
-            inputArgs.add(MatlabBuilderConstants.PDF_REPORT_PATH + "," + "'"
-                    + getFilePath() + "'");
+        public void addFilePathArgTo(Map<String, String> inputArgs) {
+            inputArgs.put(PDF_REPORT_PATH, getFilePath());
         }
     }
 
     public static class TapArtifact extends AbstractArtifactImpl {
 
+        static final String TAP_RESULTS_PATH = "TAPResultsPath";
+
         @DataBoundConstructor
         public TapArtifact(String tapReportFilePath) {
             super(tapReportFilePath);
-         }
-
+        }
 
         @Override
-        public void addFilePathArgTo(List<String> inputArgs) {
-            inputArgs.add(MatlabBuilderConstants.TAP_RESULTS_PATH + "," + "'"
-                    + getFilePath() + "'");
+        public void addFilePathArgTo(Map<String, String> inputArgs) {
+            inputArgs.put(TAP_RESULTS_PATH, getFilePath());
         }
-
     }
 
     public static class JunitArtifact extends AbstractArtifactImpl {
 
+        static final String JUNIT_RESULTS_PATH = "JUnitResultsPath";
+
         @DataBoundConstructor
         public JunitArtifact(String junitReportFilePath) {
             super(junitReportFilePath);
-         }
+        }
 
         @Override
-        public void addFilePathArgTo(List<String> inputArgs) {
-            inputArgs.add(MatlabBuilderConstants.JUNIT_RESULTS_PATH + "," + "'"
-                    + getFilePath() + "'");
+        public void addFilePathArgTo(Map<String, String> inputArgs) {
+            inputArgs.put(JUNIT_RESULTS_PATH, getFilePath());
         }
-
     }
 
     public static class CoberturaArtifact extends AbstractArtifactImpl {
 
+        static final String COBERTURA_CODE_COVERAGE_PATH = "CoberturaCodeCoveragePath";
+
         @DataBoundConstructor
         public CoberturaArtifact(String coberturaReportFilePath) {
             super(coberturaReportFilePath);
-         }
-
+        }
 
         @Override
-        public void addFilePathArgTo(List<String> inputArgs) {
-            inputArgs.add(MatlabBuilderConstants.COBERTURA_CODE_COVERAGE_PATH + "," + "'"
-                    + getFilePath() + "'");
+        public void addFilePathArgTo(Map<String, String> inputArgs) {
+            inputArgs.put(COBERTURA_CODE_COVERAGE_PATH, getFilePath());
         }
-
     }
 
     public static class StmResultsArtifact extends AbstractArtifactImpl {
 
+        static final String STM_RESULTS_PATH = "SimulinkTestResultsPath";
+
         @DataBoundConstructor
         public StmResultsArtifact(String stmResultsFilePath) {
             super(stmResultsFilePath);
-         }
-
-
+        }
 
         @Override
-        public void addFilePathArgTo(List<String> inputArgs) {
-            inputArgs.add(MatlabBuilderConstants.STM_RESULTS_PATH + "," + "'"
-                    + getFilePath() + "'");
+        public void addFilePathArgTo(Map<String, String> inputArgs) {
+            inputArgs.put(STM_RESULTS_PATH, getFilePath());
         }
- 
     }
 
     public static class ModelCovArtifact extends AbstractArtifactImpl {
 
+        static final String COBERTURA_MODEL_COVERAGE_PATH = "CoberturaModelCoveragePath";
+
         @DataBoundConstructor
         public ModelCovArtifact(String modelCoverageFilePath) {
             super(modelCoverageFilePath);
-         }
-
+        }
 
         @Override
-        public void addFilePathArgTo(List<String> inputArgs) {
-            inputArgs.add(MatlabBuilderConstants.COBERTURA_MODEL_COVERAGE_PATH + "," + "'"
-                    + getFilePath() + "'");
+        public void addFilePathArgTo(Map<String, String> inputArgs) {
+            inputArgs.put(COBERTURA_MODEL_COVERAGE_PATH, getFilePath());
         }
-
     }
-    
-    public static class NullArtifact implements  Artifact {
+
+    public static class NullArtifact implements Artifact {
 
         @Override
-        public void addFilePathArgTo(List<String> inputArgs) {
+        public void addFilePathArgTo(Map<String, String> inputArgs) {
 
         }
 
         @Override
         public boolean getDefault() {
-            
             return false;
         }
 
         @Override
         public String getFilePath() {
-            
             return null;
         }
 
     }
-    
-    //Andys code 
+
     public static abstract class AbstractArtifactImpl implements Artifact {
 
         private String filePath;
 
-        protected AbstractArtifactImpl(String path){
+        protected AbstractArtifactImpl(String path) {
             this.filePath = path;
         }
 
-        
-        public boolean getDefault(){
+        public boolean getDefault() {
             return true;
         }
 
-        public void setFilePath(String path){
+        public void setFilePath(String path) {
             this.filePath = path;
         }
-        public String getFilePath(){
+
+        public String getFilePath() {
             return this.filePath;
         }
     }
 
-    
+
     public interface Artifact {
-        public void addFilePathArgTo(List<String> inputArgs);
+        public void addFilePathArgTo(Map<String, String> inputArgs);
 
         public String getFilePath();
 
         public boolean getDefault();
-        //public List<String> getNameAndValue();
     }
 }

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

@@ -229,11 +229,9 @@ public void verifyVerlessThan() throws Exception {
     public void verifySpecificTestArtifactsParameters() throws Exception {
         this.buildWrapper.setMatlabRootFolder(getMatlabroot("R2018b"));
         project.getBuildWrappersList().add(this.buildWrapper);
-        RunMatlabTestsBuilder.TapArtifact tap = new TapArtifact();
-        tap.setTapReportFilePath("mytap/report.tap");
+        RunMatlabTestsBuilder.TapArtifact tap = new TapArtifact("mytap/report.tap");
 
-        RunMatlabTestsBuilder.StmResultsArtifact stmResults = new StmResultsArtifact();
-        stmResults.setStmResultsFilePath("mystm/results.mldatx");
+        RunMatlabTestsBuilder.StmResultsArtifact stmResults = new StmResultsArtifact("mystm/results.mldatx");
 
         testBuilder.setTapArtifact(tap);
         testBuilder.setStmResultsArtifact(stmResults);
@@ -287,23 +285,17 @@ public void verifyDefaultArtifactLocation() throws Exception {
     public void verifyAllTestArtifactsParameters() throws Exception {
         this.buildWrapper.setMatlabRootFolder(getMatlabroot("R2018b"));
         project.getBuildWrappersList().add(this.buildWrapper);
-        RunMatlabTestsBuilder.TapArtifact tap = new TapArtifact();
-        tap.setTapReportFilePath("mytap/report.tap");
+        RunMatlabTestsBuilder.TapArtifact tap = new TapArtifact("mytap/report.tap");
 
-        RunMatlabTestsBuilder.PdfArtifact pdf = new PdfArtifact();
-        pdf.setPdfReportFilePath("mypdf/report.pdf");
+        RunMatlabTestsBuilder.PdfArtifact pdf = new PdfArtifact("mypdf/report.pdf");
+       
+        RunMatlabTestsBuilder.JunitArtifact junit = new JunitArtifact("myjunit/report.xml");
 
-        RunMatlabTestsBuilder.JunitArtifact junit = new JunitArtifact();
-        junit.setJunitReportFilePath("myjunit/report.xml");
+        RunMatlabTestsBuilder.CoberturaArtifact cobertura = new CoberturaArtifact("mycobertura/report.xml");
 
-        RunMatlabTestsBuilder.CoberturaArtifact cobertura = new CoberturaArtifact();
-        cobertura.setCoberturaReportFilePath("mycobertura/report.xml");
+        RunMatlabTestsBuilder.ModelCovArtifact modelCov = new ModelCovArtifact("mymodel/report.xml");
 
-        RunMatlabTestsBuilder.ModelCovArtifact modelCov = new ModelCovArtifact();
-        modelCov.setModelCoverageFilePath("mymodel/report.xml");
-        
-        RunMatlabTestsBuilder.StmResultsArtifact stmResults = new StmResultsArtifact();
-        stmResults.setStmResultsFilePath("mystm/results.mldatx");
+        RunMatlabTestsBuilder.StmResultsArtifact stmResults = new StmResultsArtifact("mystm/results.mldatx");
 
         testBuilder.setTapArtifact(tap);
         testBuilder.setPdfReportArtifact(pdf);
@@ -316,12 +308,13 @@ public void verifyAllTestArtifactsParameters() throws Exception {
         project.getBuildersList().add(this.testBuilder);
         FreeStyleBuild build = project.scheduleBuild2(0).get();
         jenkins.assertLogContains("run_matlab_command", build);
-        jenkins.assertLogContains("\'PDFReportPath\',\'mypdf/report.pdf\',"
-                + "\'TAPResultsPath\',\'mytap/report.tap\',"
-                + "\'JUnitResultsPath\',\'myjunit/report.xml\',"
-                + "\'SimulinkTestResultsPath\',\'mystm/results.mldatx\',"
-                + "\'CoberturaCodeCoveragePath\',\'mycobertura/report.xml\',"
-                + "\'CoberturaModelCoveragePath\',\'mymodel/report.xml\'", build);
+        jenkins.assertLogContains("\'PDFReportPath\',\'mypdf/report.pdf\'",build);
+        jenkins.assertLogContains("\'TAPResultsPath\',\'mytap/report.tap\'",build);
+        jenkins.assertLogContains("\'JUnitResultsPath\',\'myjunit/report.xml\'",build);
+        jenkins.assertLogContains("\'SimulinkTestResultsPath\',\'mystm/results.mldatx\'",build);
+        jenkins.assertLogContains("\'CoberturaCodeCoveragePath\',\'mycobertura/report.xml\'",build);
+        jenkins.assertLogContains("\'CoberturaModelCoveragePath\',\'mymodel/report.xml\'",build);
+  
     }
 
     /*