changed runner file name and changed the copy location.

Author: Nikhil Bhoski

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

@@ -99,6 +99,11 @@ default String getUniqueNameForRunnerFile() {
 
     // This method prepares the temp folder by coping all helper files in it.
     default void prepareTmpFldr(FilePath tmpFldr) throws IOException, InterruptedException {
+        // Copy MATLAB scratch file in temp.
+        copyFileInWorkspace(MatlabBuilderConstants.MATLAB_TESTS_RUNNER_RESOURCE,
+                MatlabBuilderConstants.MATLAB_TEST_RUNNER_FILE_PREFIX
+                        + tmpFldr.getBaseName().replaceAll("-", "_") + ".m",
+                tmpFldr);
         // copy genscript package
         copyFileInWorkspace(MatlabBuilderConstants.MATLAB_SCRIPT_GENERATOR,
                 MatlabBuilderConstants.MATLAB_SCRIPT_GENERATOR, tmpFldr);

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

@@ -31,4 +31,7 @@ public class MatlabBuilderConstants {
 
     //Matlab Script generator package 
     static final String MATLAB_SCRIPT_GENERATOR = "matlab-script-generator.zip";
+    
+    //Test runner file prefix 
+    static final String MATLAB_TEST_RUNNER_FILE_PREFIX = "test_runner_";
 }

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

@@ -61,13 +61,11 @@ private synchronized int execMatlabCommand(FilePath workspace, Launcher launcher
             FilePath genScriptLocation =
                     getFilePathForUniqueFolder(launcher, uniqueTmpFldrName, workspace);
             final String cmdPrefix = "addpath(genpath('" + genScriptLocation.getRemote() + "')); ";
+            final String matlabFunctionName = MatlabBuilderConstants.MATLAB_TEST_RUNNER_FILE_PREFIX
+                    + genScriptLocation.getBaseName().replaceAll("-", "_");
 
             ProcStarter matlabLauncher = getProcessToRunMatlabCommand(workspace, launcher, listener,
-                    envVars, cmdPrefix + envVars.expand(getCommand()), uniqueTmpFldrName);
-            
-            //Copy Scratch file needed to run MATLAB tests in workspace
-            copyFileInWorkspace(MatlabBuilderConstants.MATLAB_TESTS_RUNNER_RESOURCE,
-                    MatlabBuilderConstants.MATLAB_TESTS_RUNNER_TARGET_FILE, workspace);
+                    envVars, cmdPrefix + matlabFunctionName+ "("+envVars.expand(getCommand()+")"), uniqueTmpFldrName);
 
             //prepare temp folder by coping genscript package.
             prepareTmpFldr(genScriptLocation);

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

@@ -15,9 +15,6 @@
 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;
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.StaplerRequest;
@@ -242,13 +239,9 @@ private synchronized int execMatlabCommand(FilePath workspace, Launcher launcher
                     getFilePathForUniqueFolder(launcher, uniqueTmpFldrName, workspace);
 
             matlabLauncher = getProcessToRunMatlabCommand(workspace, launcher, listener, envVars,
-                    constructCommandForTest(getInputArguments(), genScriptLocation.getRemote()),
+                    constructCommandForTest(getInputArguments(), genScriptLocation),
                     uniqueTmpFldrName);
 
-            // Copy MATLAB scratch file into the workspace.      
-            copyFileInWorkspace(MatlabBuilderConstants.MATLAB_TESTS_RUNNER_RESOURCE,
-                    MatlabBuilderConstants.MATLAB_TESTS_RUNNER_TARGET_FILE, workspace);
-            
             // copy genscript package in temp folder
             prepareTmpFldr(genScriptLocation);
 
@@ -266,10 +259,11 @@ private synchronized int execMatlabCommand(FilePath workspace, Launcher launcher
         }
     }
 
-    public String constructCommandForTest(String inputArguments, String scriptPath) {
-        final String matlabFunctionName =
-                FilenameUtils.removeExtension(MatlabBuilderConstants.MATLAB_TESTS_RUNNER_TARGET_FILE);
-        final String runCommand = "addpath(genpath('"+scriptPath+"')); " + matlabFunctionName + "(" + inputArguments + ")";
+    public String constructCommandForTest(String inputArguments, FilePath scriptPath) {
+        final String matlabFunctionName = MatlabBuilderConstants.MATLAB_TEST_RUNNER_FILE_PREFIX
+                + scriptPath.getBaseName().replaceAll("-", "_");
+        final String runCommand = "addpath(genpath('" + scriptPath.getRemote() + "')); "
+                + matlabFunctionName + "(" + inputArguments + ")";
         return runCommand;
     }
 

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

@@ -9,7 +9,6 @@
 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;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
 import org.jenkinsci.plugins.workflow.steps.StepDescriptor;
@@ -97,7 +96,7 @@ public void setModelCoverageCobertura(String modelCoverageCobertura) {
 
     @Override
     public StepExecution start(StepContext context) throws Exception {
-        return new MatlabRunTestsStepExecution(context, constructCommandForTest(getInputArgs()));
+        return new MatlabRunTestsStepExecution(context, getInputArgs());
     }
 
     @Extension
@@ -120,14 +119,6 @@ public String getDisplayName() {
         }
     }
 
-    public String constructCommandForTest(String inputArguments) {
-        final String matlabFunctionName =
-                FilenameUtils.removeExtension(MatlabBuilderConstants.MATLAB_TESTS_RUNNER_TARGET_FILE);
-        final String runCommand = matlabFunctionName + "(" + inputArguments + ")";
-        return runCommand;
-    }
-
-    
     private String getInputArgs() {
         final List<String> inputArgs = new ArrayList<>();
         final Map<String, String> args = getMatlabArgs();

src/main/resources/com/mathworks/ci/RunMatlabTestsBuilder/runMatlabTests.m

@@ -21,7 +21,16 @@ function runMatlabTests(varargin)
 coberturaReportPath      = p.Results.CoberturaCodeCoveragePath;
 modelCoveragePath        = p.Results.CoberturaModelCoveragePath;
 
-testScript = genscript('Test','PDFTestReport',pdfReportPath,'TAPTestResults',tapReportPath,'JUnitTestResults',junitReportPath,'SimulinkTestResults',stmReportPath,'CoberturaCodeCoverage',coberturaReportPath,'CoberturaModelCoverage',modelCoveragePath);
+srcFldr = getenv('WORKSPACE');
+
+testScript = genscript('Test',...
+   'PDFTestReport',pdfReportPath,...
+   'TAPTestResults',tapReportPath,...
+   'JUnitTestResults',junitReportPath,...
+   'SimulinkTestResults',stmReportPath,...
+   'CoberturaCodeCoverage',coberturaReportPath,...
+   'CoberturaModelCoverage',modelCoveragePath,...
+   'SourceFolder',srcFldr);
 
 disp('Running MATLAB script with content:\n');
 disp(strtrim(testScript.writeToText()));

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

@@ -15,7 +15,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import org.codehaus.groovy.vmplugin.v5.JUnit4Utils;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -26,7 +25,6 @@
 import com.gargoylesoftware.htmlunit.WebAssert;
 import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.mathworks.ci.MatlabBuilder.RunTestsAutomaticallyOption;
 import com.mathworks.ci.RunMatlabTestsBuilder.CoberturaArtifact;
 import com.mathworks.ci.RunMatlabTestsBuilder.JunitArtifact;
 import com.mathworks.ci.RunMatlabTestsBuilder.ModelCovArtifact;
@@ -142,7 +140,7 @@ public void verifyMATLABlaunchedWithDefaultArgumentsBatch() throws Exception {
         project.getBuildersList().add(this.testBuilder);
         FreeStyleBuild build = project.scheduleBuild2(0).get();
         jenkins.assertLogContains("run_matlab_command", build);
-        jenkins.assertLogContains("runMatlabTests", build);
+        jenkins.assertLogContains("test_runner", build);
         jenkins.assertLogContains("addpath(genpath", build);
     }
 
@@ -158,7 +156,7 @@ public void verifyMATLABlaunchedWithDefaultArgumentsRWindows() throws Exception
         project.getBuildersList().add(testBuilder);
         FreeStyleBuild build = project.scheduleBuild2(0).get();
         jenkins.assertLogContains("run_matlab_command", build);
-        jenkins.assertLogContains("runMatlabTests", build);
+        jenkins.assertLogContains("test_runner", build);
     }
 
     /*
@@ -319,7 +317,7 @@ public void verifyAllTestArtifactsParameters() throws Exception {
     }
 
     /*
-     * Test to verify no parameters are sent in runMatlabTests when no artifacts are selected.
+     * Test to verify no parameters are sent in test_runner when no artifacts are selected.
      */
 
     @Test
@@ -329,7 +327,7 @@ public void veriyEmptyParameters() throws Exception {
         project.getBuildersList().add(this.testBuilder);
         FreeStyleBuild build = project.scheduleBuild2(0).get();
         jenkins.assertLogContains("run_matlab_command", build);
-        jenkins.assertLogContains("runMatlabTests()", build);
+        jenkins.assertLogContains("test_runner", build);
     }
 
 
@@ -407,7 +405,7 @@ public void verifyMatrixBuildPasses() throws Exception {
 	}
 
 	 /*
-     * Test to verify if MATALB scratch file is generated in workspace.
+     * Test to verify if MATALB scratch file is not in workspace.
      */
     @Test
     public void verifyMATLABscratchFileGenerated() throws Exception {
@@ -416,6 +414,6 @@ public void verifyMATLABscratchFileGenerated() throws Exception {
         project.getBuildersList().add(testBuilder);
         FreeStyleBuild build = project.scheduleBuild2(0).get();
         File matlabRunner = new File(build.getWorkspace() + File.separator + "runMatlabTests.m");
-        Assert.assertTrue(matlabRunner.exists());
+        Assert.assertFalse(matlabRunner.exists());
     }
 }

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

@@ -88,7 +88,7 @@ public void verifyCmdOptions() throws Exception {
                "node {runMATLABTests(testResultsPDF:'myresult/result.pdf')}", true));
        WorkflowRun build = project.scheduleBuild2(0).get();
        j.assertLogContains("addpath(genpath", build);
-       j.assertLogContains("runMatlabTests", build);
+       j.assertLogContains("test_runner", build);
    }
 
     /*
@@ -117,7 +117,7 @@ public void verifyEmptyParameter() throws Exception {
         project.setDefinition(new CpsFlowDefinition(
                 "node {runMATLABTests()}", true));
         WorkflowRun build = project.scheduleBuild2(0).get();
-        j.assertLogContains("runMatlabTests()", build);
+        j.assertLogContains("test_runner", build);
         j.assertLogNotContains("PDFReportPath", build);
         j.assertLogNotContains("TAPResultsPath", build);
         j.assertLogNotContains("JUnitResultsPath", build);

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

@@ -34,7 +34,7 @@ public StepExecution start(StepContext context) throws Exception {
         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, getInputArgs());
     }
 
     private void copyScratchFileInWorkspace(String sourceFile, String targetFile,