Merge pull request #221 from mathworks/genscript_new_changes

Genscript new changes

Author: nbhoski

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

@@ -24,6 +24,7 @@ public class MatlabBuilderConstants {
     static final String COBERTURA_CODE_COVERAGE = "'CoberturaCodeCoverage'";
     static final String COBERTURA_MODEL_COVERAGE = "'CoberturaModelCoverage'";
 
+
     // Matlab Runner files 
     static final String BAT_RUNNER_SCRIPT = "run_matlab_command.bat";
     static final String SHELL_RUNNER_SCRIPT = "run_matlab_command.sh";

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

@@ -35,6 +35,7 @@
 import hudson.Launcher.ProcStarter;
 import hudson.tasks.BuildStepDescriptor;
 import hudson.tasks.Builder;
+import hudson.util.ListBoxModel;
 import jenkins.tasks.SimpleBuildStep;
 import net.sf.json.JSONObject;
 
@@ -60,6 +61,10 @@ public class RunMatlabTestsBuilder extends Builder implements SimpleBuildStep, M
     private SourceFolder sourceFolder;
     private SelectByFolder selectByFolder;
     private SelectByTag selectByTag;
+    private String loggingLevel;
+    private String outputDetail;
+    private boolean useParallel;
+    private boolean strict;
 
 
     @DataBoundConstructor
@@ -113,6 +118,27 @@ public void setSourceFolder(SourceFolder sourceFolder) {
     public void setSelectByFolder(SelectByFolder selectByFolder) {
     	this.selectByFolder = selectByFolder;
     }
+    
+
+    @DataBoundSetter
+    public void setLoggingLevel(String loggingLevel) {
+        this.loggingLevel = loggingLevel;
+    }
+
+    @DataBoundSetter
+    public void setOutputDetail(String outputDetail) {
+        this.outputDetail = outputDetail;
+    }
+
+    @DataBoundSetter
+    public void setUseParallel(boolean useParallel) {
+        this.useParallel = useParallel;
+    }
+
+    @DataBoundSetter
+    public void setStrict(boolean strict) {
+        this.strict = strict;
+    }
 
 
     public String getTapReportFilePath() {
@@ -178,6 +204,24 @@ private Artifact getArtifactObject(boolean isChecked, Artifact returnVal)  {
         return (isChecked) ? returnVal : new NullArtifact();
     }
 
+    // Verbosity level
+
+    public String getLoggingLevel() {
+        return loggingLevel;
+    }
+
+    public String getOutputDetail() {
+        return outputDetail;
+    }
+
+    public boolean getStrict() {
+        return strict;
+    }
+
+    public boolean getUseParallel() {
+        return useParallel;
+    }
+    
 
     // To retain Backward compatibility
     protected Object readResolve() {
@@ -229,6 +273,31 @@ public boolean configure(StaplerRequest req, JSONObject formData) throws FormExc
             save();
             return super.configure(req, formData);
         }
+        
+        // Verbosity lists
+        public ListBoxModel doFillLoggingLevelItems() {
+            ListBoxModel items = new ListBoxModel();
+
+            items.add("Default", "default");
+            items.add("None", "none");
+            items.add("Terse", "terse");
+            items.add("Concise", "concise");
+            items.add("Detailed", "detailed");
+            items.add("Verbose", "verbose");
+            return items;
+        }
+
+        public ListBoxModel doFillOutputDetailItems() {
+            ListBoxModel items = new ListBoxModel();
+
+            items.add("Default", "default");
+            items.add("None", "none");
+            items.add("Terse", "terse");
+            items.add("Concise", "concise");
+            items.add("Detailed", "detailed");
+            items.add("Verbose", "verbose");
+            return items;
+        }
 
         /*
          * This is to identify which project type in jenkins this should be applicable.(non-Javadoc)
@@ -347,6 +416,24 @@ private String getInputArguments() {
         if (getSelectByTag() != null && !getSelectByTag().getTestTag().isEmpty()) {
             getSelectByTag().addTagToInputArgs(inputArgsList);
         }
+        
+        // Add Logging level
+        if (!getLoggingLevel().equalsIgnoreCase("default")) {
+            inputArgsList.add("'LoggingLevel'" + "," + "'"
+                    + getLoggingLevel() + "'");
+        }
+
+        // Add Output Detail
+        if (!getOutputDetail().equalsIgnoreCase("default")) {
+            inputArgsList.add("'OutputDetail'" + "," + "'"
+                    + getOutputDetail() + "'");
+        }
+
+        // Add UseParallel
+        inputArgsList.add("'UseParallel'" + "," + getUseParallel());
+
+        // Add Strict
+        inputArgsList.add("'Strict'" + "," + getStrict());
 
         return String.join(",", inputArgsList);
     }

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

@@ -33,6 +33,10 @@ public class RunMatlabTestsStep extends Step {
     private String testResultsSimulinkTest;
     private String modelCoverageCobertura;
     private String selectByTag;
+    private String loggingLevel;
+    private String outputDetail;
+    private boolean useParallel;
+    private boolean strict;
     private List<String> sourceFolder = new ArrayList<>();
     private List<String> selectByFolder = new ArrayList<>();
 
@@ -122,6 +126,42 @@ public List<String> getSelectByFolder() {
     public void setSelectByFolder(List<String> selectByFolder) {
         this.selectByFolder = selectByFolder;
     }
+    
+    public String getLoggingLevel() {
+        return loggingLevel;
+    }
+    
+    @DataBoundSetter
+    public void setLoggingLevel(String loggingLevel) {
+        this.loggingLevel = loggingLevel;
+    }
+
+    public String getOutputDetail() {
+        return outputDetail;
+    }
+    
+    @DataBoundSetter
+    public void setOutputDetail(String outputDetail) {
+        this.outputDetail = outputDetail;
+    }
+
+    public boolean getUseParallel() {
+        return useParallel;
+    }
+    
+    @DataBoundSetter
+    public void setUseParallel(boolean useParallel) {
+        this.useParallel = useParallel;
+    }
+
+    public boolean getStrict() {
+        return strict;
+    }
+    
+    @DataBoundSetter
+    public void setStrict(boolean strict) {
+        this.strict = strict;
+    }
 
     @Override
     public StepExecution start(StepContext context) throws Exception {
@@ -155,10 +195,14 @@ private String getInputArgs() {
         inputArgs.add("'Test'");
 
         args.forEach((key, val) -> {
-            if(key.equals("SourceFolder") || key.equals("SelectByFolder") && val != null){
-                inputArgs.add("'" + key + "'" + "," + val);
-            }else if(val != null){
-                inputArgs.add("'" + key + "'" + "," + "'" + val.replaceAll("'", "''") + "'");
+            if (val != null) {
+                if (key.equals("SourceFolder") || key.equals("SelectByFolder")
+                        || key.equals("UseParallel")
+                        || key.equals("Strict")) {
+                    inputArgs.add("'" + key + "'" + "," + val);             
+                } else {
+                    inputArgs.add("'" + key + "'" + "," + "'" + val.replaceAll("'", "''") + "'");
+                }
             }
         });
 
@@ -174,6 +218,10 @@ private Map<String, String> getGenscriptArgs() {
         args.put("CoberturaCodeCoverage", getCodeCoverageCobertura());
         args.put("CoberturaModelCoverage", getModelCoverageCobertura());
         args.put("SelectByTag", getSelectByTag());
+        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/config.jelly

@@ -1,22 +1,45 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 
-<f:block>
+<f:block> 
     <br></br>
     <f:optionalProperty field="sourceFolder" title="Source folder" />
 </f:block>
 
+<f:section title="Run Customization">
 <f:block>
-    <br></br>
-   <b>Filter Tests</b>
-   <f:optionalProperty field="selectByFolder" title="By folder name" />  
+	<f:entry field="useParallel" title="Use parallel " checked="${instance.useParallel}">
+	    <f:checkbox/>
+	</f:entry>
+
+	<f:entry field="strict" title="Strict " checked="${instance.strict}">
+	    <f:checkbox/> 
+	</f:entry> 
+
+	<!-- Verbosity fields --> 
+	<f:entry name="loggingLevel " title="Logging level" field="loggingLevel" default="Default">
+	    <f:select/>
+	</f:entry>
+	
+	<f:entry name="outputDetail" title="Output detail " field="outputDetail" default="Default">
+	    <f:select/>
+	</f:entry>
+</f:block>
+</f:section>
+<br></br>
+
+<f:section title="Filter Tests">
+<f:block>
+   <f:optionalProperty field="selectByFolder" title="By folder name" />
    <br></br>
-   <f:optionalProperty field="selectByTag" title="By tag" />  
+   <f:optionalProperty field="selectByTag" title="By tag" /> 
 </f:block>
+</f:section>
+<br></br>
+
 
+<f:section title="Generate Test Artifacts">
 <f:block>
-    <br></br>
-    <b>Generate Test Artifacts</b>
     <f:optionalBlock name="pdfReportArtifact" field="pdfReportArtifact" title="PDF test report" checked="${instance.pdfReportArtifact.selected}">
   	 <f:entry field="pdfReportFilePath" title="File path: ">	
     	<f:textbox default="matlabTestArtifacts/testreport.pdf"/>
@@ -40,12 +63,12 @@
     	<f:textbox default="matlabTestArtifacts/simulinktestresults.mldatx"/>
      </f:entry>   
    </f:optionalBlock>
-  
 </f:block>
+</f:section>
+<br></br>
 
+<f:section title="Generate Coverage Artifacts">
 <f:block>
-    <br></br>
-    <b>Generate Coverage Artifacts</b>
    <f:optionalBlock name="coberturaArtifact" field="coberturaArtifact" title="Cobertura code coverage" checked="${instance.coberturaArtifact.selected}">
 	 <f:entry field="coberturaReportFilePath" title="File path: ">
     	<f:textbox default="matlabTestArtifacts/cobertura.xml"/>
@@ -58,4 +81,5 @@
   	  </f:entry>
    </f:optionalBlock>
 </f:block>
+</f:section>
 </j:jelly>

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

@@ -0,0 +1,3 @@
+<div>
+    <p>Maximum verbosity level for logged diagnostics included for the test run.</p>  
+</div>

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

@@ -0,0 +1,3 @@
+<div>
+    <p>Display level for event details output by the test run.</p>  
+</div>

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

@@ -0,0 +1,3 @@
+<div>
+    <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/RunMatlabTestsBuilder/help-useParallel.html

@@ -0,0 +1,4 @@
+<div>
+    <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/config.jelly

@@ -33,9 +33,25 @@
 	  <f:entry field="selectByTag" title="selectByTag: ">
 		<f:textbox/>
 	  </f:entry>
-
-	<f:entry field="sourceFolder" title="sourceFolder: ">
+	  
+	  <f:entry field="loggingLevel" title="loggingLevel: ">
 		<f:textbox/>
-	</f:entry>
+	  </f:entry>
+	  
+	  <f:entry field="outputDetail" title="outputDetail: ">
+		<f:textbox/>
+	  </f:entry>
+	  
+	  <f:entry field="sourceFolder" title="sourceFolder: ">
+		<f:textbox/>
+	  </f:entry>
+	  
+	  <f:entry field="useParallel" title="useParallel: ">
+	    <f:checkbox/>
+	  </f:entry>
+	  
+	  <f:entry field="strict" title="strict: ">
+	    <f:checkbox/>
+	  </f:entry> 
 
 </j:jelly>

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

@@ -0,0 +1,3 @@
+<div>
+    <p>Maximum verbosity level for logged diagnostics included for the test run.</p>  
+</div>