Updated as per review comment

Author: Nikhil Bhoski

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

@@ -23,10 +23,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 USE_PARALLEL = "UseParallel";
-    static final String STRICT = "Strict";
-    static final String LOGGING_LEVEL = "LoggingLevel";
-    static final String OUTPUT_DETAIL = "OutputDetail";
+
 
     // Matlab Runner files 
     static final String BAT_RUNNER_SCRIPT = "run_matlab_command.bat";

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

@@ -419,21 +419,21 @@ private String getInputArguments() {
 
         // Add Logging level
         if (!getLoggingLevel().equalsIgnoreCase("default")) {
-            inputArgsList.add("'" + MatlabBuilderConstants.LOGGING_LEVEL + "'" + "," + "'"
+            inputArgsList.add("'LoggingLevel'" + "," + "'"
                     + getLoggingLevel() + "'");
         }
 
-        // Add Logging level
-        if (!getLoggingLevel().equalsIgnoreCase("default")) {
-            inputArgsList.add("'" + MatlabBuilderConstants.OUTPUT_DETAIL + "'" + "," + "'"
+        // Add Output Detail
+        if (!getOutputDetail().equalsIgnoreCase("default")) {
+            inputArgsList.add("'OutputDetail'" + "," + "'"
                     + getOutputDetail() + "'");
         }
 
         // Add UseParallel
-        inputArgsList.add("'" + MatlabBuilderConstants.USE_PARALLEL + "'" + "," + getUseParallel());
+        inputArgsList.add("'UseParallel'" + "," + getUseParallel());
 
         // Add Strict
-        inputArgsList.add("'" + MatlabBuilderConstants.STRICT + "'" + "," + getStrict());
+        inputArgsList.add("'Strict'" + "," + getStrict());
 
         return String.join(",", inputArgsList);
     }

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

@@ -196,8 +196,8 @@ private String getInputArgs() {
 
         args.forEach((key, val) -> {
             if (key.equals("SourceFolder") || key.equals("SelectByFolder")
-                    || key.equals(MatlabBuilderConstants.USE_PARALLEL)
-                    || key.equals(MatlabBuilderConstants.STRICT) && val != null) {
+                    || key.equals("UseParallel")
+                    || key.equals("Strict") && val != null) {
                 inputArgs.add("'" + key + "'" + "," + val);
             } else if (val != null) {
                 inputArgs.add("'" + key + "'" + "," + "'" + val.replaceAll("'", "''") + "'");
@@ -216,10 +216,10 @@ private Map<String, String> getGenscriptArgs() {
         args.put("CoberturaCodeCoverage", getCodeCoverageCobertura());
         args.put("CoberturaModelCoverage", getModelCoverageCobertura());
         args.put("SelectByTag", getSelectByTag());
-        args.put(MatlabBuilderConstants.USE_PARALLEL, String.valueOf(getUseParallel()));
-        args.put(MatlabBuilderConstants.STRICT, String.valueOf(getStrict()));
-        args.put(MatlabBuilderConstants.LOGGING_LEVEL, getLoggingLevel());
-        args.put(MatlabBuilderConstants.OUTPUT_DETAIL, getOutputDetail());
+        args.put("UseParallel", String.valueOf(getUseParallel()));
+        args.put("Strict", String.valueOf(getStrict()));
+        args.put("LoggingLevel", getLoggingLevel());
+        args.put("OutputDetail", getOutputDetail());
         addFolderArgs("SourceFolder",getSourceFolder(),args);
         addFolderArgs("SelectByFolder",getSelectByFolder(),args);
         return args;

src/main/resources/com/mathworks/ci/RunMatlabTestsBuilder/help-outputDetail.html

@@ -1,3 +1,3 @@
 <div>
-    <p>Select verbosity level of output details for test results in the log</p>  
+    <p>Display level for event details output by the test run.</p>  
 </div>

src/main/resources/com/mathworks/ci/RunMatlabTestsBuilder/help-strict.html

@@ -1,3 +1,3 @@
 <div>
-    <p>Select to fail the test suite on warnnings</p>  
+    <p>Select to fail the test suite on warnings</p>  
 </div>

src/main/resources/com/mathworks/ci/RunMatlabTestsBuilder/help-useParallel.html

@@ -1,3 +1,4 @@
 <div>
-    <p>Select to run the tests in parallel</p>  
+    <p>Whether to run tests in parallel. This feature requires a Parallel Computing Toolbox license, and might not be 
+      compatible with other options. If incompatible, testing occurs in serial regardless of the value of this feature.</p>  
 </div>

src/main/resources/com/mathworks/ci/RunMatlabTestsStep/help-outputDetail.html

@@ -1,3 +1,3 @@
 <div>
-    <p>Select verbosity level of output details for test results in the log</p>  
+    <p>Display level for event details output by the test run.</p>  
 </div>

src/main/resources/com/mathworks/ci/RunMatlabTestsStep/help-strict.html

@@ -1,3 +1,3 @@
 <div>
-    <p>Select to fail the test suite on warnnings</p>  
+    <p>Whether to apply strict checks when running the tests. For example, the framework generates a qualification failure if a test issues a warning.</p> 
 </div>

src/main/resources/com/mathworks/ci/RunMatlabTestsStep/help-useParallel.html

@@ -1,3 +1,4 @@
 <div>
-    <p>Select to run the tests in parallel</p>  
+    <p>Whether to run tests in parallel. This feature requires a Parallel Computing Toolbox license, and might not be 
+      compatible with other options. If incompatible, testing occurs in serial regardless of the value of this feature.</p> 
 </div>

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

@@ -21,8 +21,11 @@
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 import com.gargoylesoftware.htmlunit.WebAssert;
+import com.gargoylesoftware.htmlunit.html.DomElement;
 import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlSelect;
+import com.gargoylesoftware.htmlunit.javascript.host.html.HTMLSelectElement;
 import com.mathworks.ci.RunMatlabTestsBuilder.CoberturaArtifact;
 import com.mathworks.ci.RunMatlabTestsBuilder.JunitArtifact;
 import com.mathworks.ci.RunMatlabTestsBuilder.ModelCovArtifact;
@@ -87,6 +90,8 @@ public static void classSetup() throws URISyntaxException, IOException {
     public void testSetup() throws IOException {
         this.project = jenkins.createFreeStyleProject();
         this.testBuilder = new RunMatlabTestsBuilder();
+        testBuilder.setLoggingLevel("default");
+        testBuilder.setOutputDetail("default");
         this.buildWrapper = new UseMatlabVersionBuildWrapper();
     }
 
@@ -525,23 +530,106 @@ public void verifySystemTempDirDeleted() throws Exception {
         jenkins.assertLogContains("rmdir(tmpDir,'s')", build);
     }
 
+    
     /*
+     * Test to verify Use Parallel check box present.
+     */
+
+     @Test
+     public void verifyUseParallelPresent() throws Exception {
+         this.buildWrapper.setMatlabBuildWrapperContent(new MatlabBuildWrapperContent(Message.getValue("matlab.custom.location"), getMatlabroot("R2018b")));
+         project.getBuildWrappersList().add(this.buildWrapper);
+         project.getBuildersList().add(this.testBuilder);
+         HtmlPage page = jenkins.createWebClient().goTo("job/test0/configure");
+         WebAssert.assertElementPresentByXPath(page, "//input[@name=\"_.useParallel\"]");
+     }
+     
+     /*
+      * Test to verify Strict check box present.
+      */
+
+      @Test
+      public void verifyStrictPresent() throws Exception {
+          this.buildWrapper.setMatlabBuildWrapperContent(new MatlabBuildWrapperContent(Message.getValue("matlab.custom.location"), getMatlabroot("R2018b")));
+          project.getBuildWrappersList().add(this.buildWrapper);
+          project.getBuildersList().add(this.testBuilder);
+          HtmlPage page = jenkins.createWebClient().goTo("job/test0/configure");
+          WebAssert.assertElementPresentByXPath(page, "//input[@name=\"_.strict\"]");
+      }
+      
+      /*
+       * Test to verify Logging Level is present.
+       */
+
+       @Test
+       public void verifyLoggingLevelPresent() throws Exception {
+           this.buildWrapper.setMatlabBuildWrapperContent(new MatlabBuildWrapperContent(Message.getValue("matlab.custom.location"), getMatlabroot("R2018b")));
+           project.getBuildWrappersList().add(this.buildWrapper);
+           project.getBuildersList().add(this.testBuilder);
+           HtmlPage page = jenkins.createWebClient().goTo("job/test0/configure");
+           WebAssert.assertElementPresentByXPath(page, "//select[@name=\"_.loggingLevel\"]");
+       }
+       
+       /*
+        * Test to verify Output Detail is present.
+        */
+
+        @Test
+        public void verifyOutputDetailPresent() throws Exception {
+            this.buildWrapper.setMatlabBuildWrapperContent(new MatlabBuildWrapperContent(Message.getValue("matlab.custom.location"), getMatlabroot("R2018b")));
+            project.getBuildWrappersList().add(this.buildWrapper);
+            project.getBuildersList().add(this.testBuilder);
+            HtmlPage page = jenkins.createWebClient().goTo("job/test0/configure");
+            WebAssert.assertElementPresentByXPath(page, "//select[@name=\"_.outputDetail\"]");
+        }
+        
+        /*
+         * Test to verify Logging Level set to default
+         */
+
+         @Test
+         public void verifyLoggingLevelSetToDefault() throws Exception {
+             this.buildWrapper.setMatlabBuildWrapperContent(new MatlabBuildWrapperContent(Message.getValue("matlab.custom.location"), getMatlabroot("R2018b")));
+             project.getBuildWrappersList().add(this.buildWrapper);
+             project.getBuildersList().add(this.testBuilder);
+             HtmlPage page = jenkins.createWebClient().goTo("job/test0/configure");
+             HtmlSelect loggingLevel = page.getElementByName("_.loggingLevel");
+             assertEquals("default", loggingLevel.getAttribute("value"));
+         }
+         
+         /*
+          * Test to verify Output Detail set to default
+          */
+
+          @Test
+          public void verifyOutputDetailSetToDefault() throws Exception {
+              this.buildWrapper.setMatlabBuildWrapperContent(new MatlabBuildWrapperContent(Message.getValue("matlab.custom.location"), getMatlabroot("R2018b")));
+              project.getBuildWrappersList().add(this.buildWrapper);
+              project.getBuildersList().add(this.testBuilder);
+              HtmlPage page = jenkins.createWebClient().goTo("job/test0/configure");
+              HtmlSelect outputDetail = page.getElementByName("_.outputDetail");
+              assertEquals("default", outputDetail.getAttribute("value"));
+          }
+     
+    
+    /*
+     * @Integ
      * Test To verify if Logging level is set correctly 
      * 
      */
 
-    @Test
+    
     public void verifyLoggingLevelSet() throws Exception {
         this.buildWrapper.setMatlabBuildWrapperContent(new MatlabBuildWrapperContent(
                 Message.getValue("matlab.custom.location"), getMatlabroot("R2018b")));
         project.getBuildWrappersList().add(this.buildWrapper);
-        Map<String, String> logginggLevel = new HashMap<String, String>();
-        logginggLevel.put("None", "'LoggingLevel', 0");
-        logginggLevel.put("Terse", "'LoggingLevel', 1");
-        logginggLevel.put("Concise", "'LoggingLevel', 2");
-        logginggLevel.put("Detailed", "'LoggingLevel', 3");
-        logginggLevel.put("Verbose", "'LoggingLevel', 4");
-        logginggLevel.forEach((key, val) -> {
+        Map<String, String> loggingLevel = new HashMap<String, String>();
+        loggingLevel.put("None", "'LoggingLevel', 0");
+        loggingLevel.put("Terse", "'LoggingLevel', 1");
+        loggingLevel.put("Concise", "'LoggingLevel', 2");
+        loggingLevel.put("Detailed", "'LoggingLevel', 3");
+        loggingLevel.put("Verbose", "'LoggingLevel', 4");
+        loggingLevel.forEach((key, val) -> {
             testBuilder.setLoggingLevel(key);
             project.getBuildersList().add(this.testBuilder);
             FreeStyleBuild build;
@@ -555,12 +643,12 @@ public void verifyLoggingLevelSet() throws Exception {
         });
     }
 
-    /*
+    /*@Integ
      * Test To verify if Output Detail  is set correctly 
      * 
      */
 
-    @Test
+    
     public void verifyOutputDetailSet() throws Exception {
         this.buildWrapper.setMatlabBuildWrapperContent(new MatlabBuildWrapperContent(
                 Message.getValue("matlab.custom.location"), getMatlabroot("R2018b")));
@@ -586,12 +674,12 @@ public void verifyOutputDetailSet() throws Exception {
         });
     }
 
-    /*
+    /*@Integ
      * Test To verify when Strict option set
      * 
      */
 
-    @Test
+    
     public void verifyStrictSet() throws Exception {
         this.buildWrapper.setMatlabBuildWrapperContent(new MatlabBuildWrapperContent(
                 Message.getValue("matlab.custom.location"), getMatlabroot("R2018b")));
@@ -604,12 +692,12 @@ public void verifyStrictSet() throws Exception {
 
     }
 
-    /*
+    /*@Integ
      * Test To verify when Strict option not set
      * 
      */
 
-    @Test
+    
     public void verifyStrictNotSet() throws Exception {
         this.buildWrapper.setMatlabBuildWrapperContent(new MatlabBuildWrapperContent(
                 Message.getValue("matlab.custom.location"), getMatlabroot("R2018b")));
@@ -622,12 +710,12 @@ public void verifyStrictNotSet() throws Exception {
 
     }
 
-    /*
+    /*@Integ
      * Test To verify when Run in Parallel option is set 
      * 
      */
 
-    @Test
+    
     public void verifyRunParallelSet() throws Exception {
         this.buildWrapper.setMatlabBuildWrapperContent(new MatlabBuildWrapperContent(
                 Message.getValue("matlab.custom.location"), getMatlabroot("R2018b")));
@@ -639,12 +727,12 @@ public void verifyRunParallelSet() throws Exception {
         jenkins.assertLogContains("runInParallel", build);
     }
 
-    /*
+    /*@Integ
      * Test To verify when Run in Parallel option is set 
      * 
      */
 
-    @Test
+    
     public void verifyRunParallelNotSet() throws Exception {
         this.buildWrapper.setMatlabBuildWrapperContent(new MatlabBuildWrapperContent(
                 Message.getValue("matlab.custom.location"), getMatlabroot("R2018b")));