Removed src folder and addpath

Author: Nikhil Bhoski

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

@@ -61,7 +61,7 @@ private synchronized int execMatlabCommand(FilePath workspace, Launcher launcher
             FilePath genScriptLocation =
                     getFilePathForUniqueFolder(launcher, uniqueTmpFldrName, workspace);
             final String cmdPrefix =
-                    "addpath('" + genScriptLocation.getRemote().replaceAll("'", "''") + "'); ";
+                    "cd('" + genScriptLocation.getRemote().replaceAll("'", "''") + "'); ";
             final String matlabFunctionName = MatlabBuilderConstants.MATLAB_TEST_RUNNER_FILE_PREFIX
                     + genScriptLocation.getBaseName().replaceAll("-", "_");
 

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

@@ -262,8 +262,8 @@ private synchronized int execMatlabCommand(FilePath workspace, Launcher launcher
     public String constructCommandForTest(String inputArguments, FilePath scriptPath) {
         final String matlabFunctionName = MatlabBuilderConstants.MATLAB_TEST_RUNNER_FILE_PREFIX
                 + scriptPath.getBaseName().replaceAll("-", "_");
-        final String runCommand = "addpath('" + scriptPath.getRemote().replaceAll("'", "''")
-                + "'); " + matlabFunctionName + "(" + inputArguments + ")";
+        final String runCommand = "cd('" + scriptPath.getRemote().replaceAll("'", "''") + "'); "
+                + matlabFunctionName + "(" + inputArguments + ")";
         return runCommand;
     }
 

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

@@ -2,6 +2,13 @@
 
 function runMatlabTests(varargin)
 
+addpath(pwd);
+
+%Back to the workspace folder
+workspace = getenv('WORKSPACE');
+cd(workspace);
+
+
 p = inputParser;
 validationFcn = @(c)ischar(c) && (isempty(c) || isrow(c));
 
@@ -21,16 +28,13 @@ function runMatlabTests(varargin)
 coberturaReportPath      = p.Results.CoberturaCodeCoveragePath;
 modelCoveragePath        = p.Results.CoberturaModelCoveragePath;
 
-srcFldr = getenv('WORKSPACE');
-
 testScript = genscript('Test',...
    'PDFTestReport',pdfReportPath,...
    'TAPTestResults',tapReportPath,...
    'JUnitTestResults',junitReportPath,...
    'SimulinkTestResults',stmReportPath,...
    'CoberturaCodeCoverage',coberturaReportPath,...
-   'CoberturaModelCoverage',modelCoveragePath,...
-   'SourceFolder',srcFldr);
+   'CoberturaModelCoverage',modelCoveragePath);
 
 disp('Running MATLAB script with content:\n');
 disp(strtrim(testScript.writeToText()));

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

@@ -141,7 +141,7 @@ public void verifyMATLABlaunchedWithDefaultArgumentsBatch() throws Exception {
         FreeStyleBuild build = project.scheduleBuild2(0).get();
         jenkins.assertLogContains("run_matlab_command", build);
         jenkins.assertLogContains("test_runner", build);
-        jenkins.assertLogContains("addpath(", build);
+        jenkins.assertLogContains("cd(", build);
     }
 
     /*

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

@@ -87,7 +87,7 @@ public void verifyCmdOptions() throws Exception {
        project.setDefinition(new CpsFlowDefinition(
                "node {runMATLABTests(testResultsPDF:'myresult/result.pdf')}", true));
        WorkflowRun build = project.scheduleBuild2(0).get();
-       j.assertLogContains("addpath(", build);
+       j.assertLogContains("cd(", build);
        j.assertLogContains("test_runner", build);
    }