Updated tests

Author: nbhoski

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

@@ -0,0 +1,37 @@
+package com.mathworks.ci;
+
+/**
+ * Copyright 2019-2020 The MathWorks, Inc.
+ * 
+ * This is Utility class which provides commonly used methods for form validations across builders
+ * 
+ */
+import java.util.List;
+import java.util.function.Function;
+import com.mathworks.ci.UseMatlabVersionBuildWrapper.UseMatlabVersionDescriptor;
+import hudson.util.FormValidation;
+import hudson.util.FormValidation.Kind;
+import jenkins.model.Jenkins;
+
+public class FormValidationUtil {
+
+    public static FormValidation getFirstErrorOrWarning(
+            List<Function<String, FormValidation>> validations) {
+        if (validations == null || validations.isEmpty())
+            return FormValidation.ok();
+        try {
+            String matlabRoot = Jenkins.getInstance()
+                    .getDescriptorByType(UseMatlabVersionDescriptor.class).getMatlabRootFolder();
+            for (Function<String, FormValidation> val : validations) {
+                FormValidation validationResult = val.apply(matlabRoot);
+                if (validationResult.kind.compareTo(Kind.ERROR) == 0
+                        || validationResult.kind.compareTo(Kind.WARNING) == 0) {
+                    return validationResult;
+                }
+            }
+        } catch (Exception e) {
+            return FormValidation.warning(Message.getValue("Builder.invalid.matlab.root.warning"));
+        }
+        return FormValidation.ok();
+    }
+}

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

@@ -225,19 +225,12 @@ public void verifyCommandSupportsEnvVar() throws Exception {
      * Test to verify if appropriate MATALB runner file is copied in workspace.
      */
     @Test
-    public void verifyMATLABrunnerFileGeneratedForAutomaticOption() throws Exception {
+    public void verifyMATLABrunnerFileGenerated() throws Exception {
         this.buildWrapper.setMatlabRootFolder(getMatlabroot("R2018b"));
         project.getBuildWrappersList().add(this.buildWrapper);
         scriptBuilder.setMatlabCommand("pwd");
         project.getBuildersList().add(scriptBuilder);
-        project.scheduleBuild2(0).get();
-        String runnerFile;
-        if (!System.getProperty("os.name").startsWith("Win")) {
-            runnerFile = "run_matlab_command.sh";
-        }else {
-            runnerFile = "run_matlab_command.bat";
-        }
-        File matlabRunner = new File(System.getProperty("java.io.tmpdir") + File.separator + runnerFile);
-        Assert.assertTrue(matlabRunner.exists());
+        FreeStyleBuild build = project.scheduleBuild2(0).get();
+        jenkins.assertLogContains("MATLAB_ROOT", build);
     }
 }

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

@@ -249,17 +249,10 @@ public void verifyMATLABscratchFileGeneratedForAutomaticOption() throws Exceptio
     public void verifyMATLABrunnerFileGeneratedForAutomaticOption() throws Exception {
         this.buildWrapper.setMatlabRootFolder(getMatlabroot("R2018b"));
         project.getBuildWrappersList().add(this.buildWrapper);
-        
+        setAllTestArtifacts(false, testBuilder);
         project.getBuildersList().add(testBuilder);
-        project.scheduleBuild2(0).get();
-        String runnerFile;
-        if (!System.getProperty("os.name").startsWith("Win")) {
-            runnerFile = "run_matlab_command.sh";
-        }else {
-            runnerFile = "run_matlab_command.bat";
-        }
-        File matlabRunner = new File(System.getProperty("java.io.tmpdir") + File.separator + runnerFile);
-        Assert.assertTrue(matlabRunner.exists());
+        FreeStyleBuild build = project.scheduleBuild2(0).get();
+        jenkins.assertLogContains("MATLAB_ROOT", build);
     }
 
     /*