Merge pull request #321 from mathworks/2.13.2-SNAPSHOT-Qualification

2.13.2 snapshot qualification

Author: nbhoski

pom.xml

@@ -100,6 +100,13 @@
 			<artifactId>workflow-job</artifactId>
 			<scope>test</scope>
 		</dependency>
+        <!-- Mockito -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>3.1.0</version>
+            <scope>test</scope>
+        </dependency>
 	</dependencies>
 	<build>
 		<plugins>

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

@@ -136,7 +136,7 @@ public FilePath getWorkspace() {
 
     private void setCounts() throws InterruptedException, ParseException {
         List<BuildArtifactData> artifactData = new ArrayList<BuildArtifactData>();
-        FilePath fl = new FilePath(new File(build.getRootDir().getAbsolutePath() + "/" + BUILD_ARTIFACT_FILE));
+        FilePath fl = new FilePath(new File(build.getRootDir(), BUILD_ARTIFACT_FILE));
         try (InputStreamReader reader = new InputStreamReader(new FileInputStream(new File(fl.toURI())), "UTF-8")) {
             Object obj = new JSONParser().parse(reader);
             JSONObject jo = (JSONObject) obj;

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

@@ -38,7 +38,6 @@ private static byte[][] createBuildNotes() {
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
-
     }
 
     @Override
@@ -80,4 +79,4 @@ public OutputStream decorateLogger(Run build, OutputStream logger) throws IOExce
             return new BuildConsoleAnnotator(logger, Charsets.UTF_8, buildNotes);
         }
     }
-}
+}

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

@@ -4,47 +4,43 @@
  */
 
 public class MatlabBuilderConstants {
-    static final double BASE_MATLAB_VERSION_RUNTESTS_SUPPORT = 8.1;
-    static final double BASE_MATLAB_VERSION_NO_APP_ICON_SUPPORT = 8.6;
-    static final double BASE_MATLAB_VERSION_BATCH_SUPPORT = 9.5;
-    static final double BASE_MATLAB_VERSION_COBERTURA_SUPPORT = 9.3;
-    static final double BASE_MATLAB_VERSION_MODELCOVERAGE_SUPPORT = 9.5;
-    static final double BASE_MATLAB_VERSION_EXPORTSTMRESULTS_SUPPORT = 9.6;
+    public static final double BASE_MATLAB_VERSION_RUNTESTS_SUPPORT = 8.1;
+    public static final double BASE_MATLAB_VERSION_NO_APP_ICON_SUPPORT = 8.6;
+    public static final double BASE_MATLAB_VERSION_BATCH_SUPPORT = 9.5;
+    public static final double BASE_MATLAB_VERSION_COBERTURA_SUPPORT = 9.3;
+    public static final double BASE_MATLAB_VERSION_MODELCOVERAGE_SUPPORT = 9.5;
+    public static final double BASE_MATLAB_VERSION_EXPORTSTMRESULTS_SUPPORT = 9.6;
 
-    static final String MATLAB_RUNNER_TARGET_FILE = "Builder.matlab.runner.target.file.name";
-    static final String MATLAB_TESTS_RUNNER_TARGET_FILE = "runMatlabTests.m";
-    static final String MATLAB_RUNNER_RESOURCE = "com/mathworks/ci/MatlabBuilder/runMatlabTests.m";
-    static final String AUTOMATIC_OPTION = "RunTestsAutomaticallyOption";
+    public static final String MATLAB_RUNNER_TARGET_FILE = "Builder.matlab.runner.target.file.name";
+    public static final String MATLAB_TESTS_RUNNER_TARGET_FILE = "runMatlabTests.m";
+    public static final String MATLAB_RUNNER_RESOURCE = "com/mathworks/ci/MatlabBuilder/runMatlabTests.m";
+    public static final String AUTOMATIC_OPTION = "RunTestsAutomaticallyOption";
 
     // Input parameter names (Passed to runMatlabTests.m as name-value pair arguments)
-    static final String PDF_REPORT = "'PDFReport'";
-    static final String TAP_RESULTS = "'TAPResults'";
-    static final String JUNIT_RESULTS = "'JUnitResults'";
-    static final String STM_RESULTS = "'SimulinkTestResults'";
-    static final String COBERTURA_CODE_COVERAGE = "'CoberturaCodeCoverage'";
-    static final String COBERTURA_MODEL_COVERAGE = "'CoberturaModelCoverage'";
+    public static final String PDF_REPORT = "'PDFReport'";
+    public static final String TAP_RESULTS = "'TAPResults'";
+    public static final String JUNIT_RESULTS = "'JUnitResults'";
+    public static final String STM_RESULTS = "'SimulinkTestResults'";
+    public static final String COBERTURA_CODE_COVERAGE = "'CoberturaCodeCoverage'";
+    public static final String COBERTURA_MODEL_COVERAGE = "'CoberturaModelCoverage'";
 
     //Matlab Script generator package 
-    static final String MATLAB_SCRIPT_GENERATOR = "matlab-script-generator.zip";
+    public static final String MATLAB_SCRIPT_GENERATOR = "matlab-script-generator.zip";
 
     //Test runner file prefix 
-    static final String MATLAB_TEST_RUNNER_FILE_PREFIX = "runner_";
+    public static final String MATLAB_TEST_RUNNER_FILE_PREFIX = "runner_";
 
     //Temporary MATLAB folder name in workspace 
-    static final String TEMP_MATLAB_FOLDER_NAME = ".matlab";
+    public static final String TEMP_MATLAB_FOLDER_NAME = ".matlab";
 
-    static final String NEW_LINE = System.getProperty("line.separator");
+    public static final String NEW_LINE = System.getProperty("line.separator");
 
     //MATLAB Runner Script
-    static final String TEST_RUNNER_SCRIPT = String.join(NEW_LINE,
-    	"tmpDir=tempname;",
-        "mkdir(tmpDir);",
-        "addpath(tmpDir);",
-        "zipURL='${ZIP_FILE}';",
-    	"unzip(zipURL,tmpDir);",
+    public static final String TEST_RUNNER_SCRIPT = String.join(NEW_LINE,
+        "addpath('${TEMP_FOLDER}');",
     	"testScript = genscript(${PARAMS});",
         "disp('Running MATLAB script with content:');",
         "disp(testScript.Contents);",
-        "testScript.writeToFile(fullfile(tmpDir,'runnerScript.m'));",
-    	"fprintf('___________________________________\\n\\n');");
+    	"fprintf('___________________________________\\n\\n');",
+        "run(testScript);");
 }