Updated final changes for test artifacts

Author: Nikhil Bhoski

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

@@ -1,27 +1,14 @@
 package com.mathworks.ci;
 
-/**
- * Copyright 2019-2020 The MathWorks, Inc.
- * 
- * MATLAB test run builder used to run all MATLAB & Simulink tests automatically and generate
- * selected test artifacts.
- * 
- */
-
-
-import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Function;
 import javax.annotation.Nonnull;
 import org.apache.commons.io.FilenameUtils;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
-import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
-import com.mathworks.ci.UseMatlabVersionBuildWrapper.UseMatlabVersionDescriptor;
 import hudson.EnvVars;
 import hudson.Extension;
 import hudson.FilePath;
@@ -33,8 +20,6 @@
 import hudson.model.TaskListener;
 import hudson.tasks.BuildStepDescriptor;
 import hudson.tasks.Builder;
-import hudson.util.FormValidation;
-import jenkins.model.Jenkins;
 import jenkins.tasks.SimpleBuildStep;
 import net.sf.json.JSONObject;
 
@@ -202,8 +187,6 @@ private EnvVars getEnv() {
     @Extension
     public static class RunMatlabTestsDescriptor extends BuildStepDescriptor<Builder> {
 
-        MatlabReleaseInfo rel;
-
         // Overridden Method used to show the text under build dropdown
         @Override
         public String getDisplayName() {
@@ -228,116 +211,6 @@ public boolean isApplicable(
                 @SuppressWarnings("rawtypes") Class<? extends AbstractProject> jobtype) {
             return true;
         }
-
-
-        /*
-         * Validation for Test artifact generator checkBoxes
-         */
-
-        // Get the MATLAB root entered in build wrapper descriptor
-
-
-
-        public FormValidation doCheckCoberturaChkBxFilePath(@QueryParameter String coberturaChkBxFilePath) {
-            List<Function<String, FormValidation>> listOfCheckMethods =
-                    new ArrayList<Function<String, FormValidation>>();
-            if(!coberturaChkBxFilePath.isEmpty()) {
-                listOfCheckMethods.add(chkCoberturaSupport);
-            }
-            return FormValidationUtil.getFirstErrorOrWarning(listOfCheckMethods, getMatlabRoot());
-        }
-
-        Function<String, FormValidation> chkCoberturaSupport = (String matlabRoot) -> {
-            FilePath matlabRootPath = new FilePath(new File(matlabRoot));
-            rel = new MatlabReleaseInfo(matlabRootPath);
-            final MatrixPatternResolver resolver = new MatrixPatternResolver(matlabRoot);
-            if (!resolver.hasVariablePattern()) {
-                try {
-                    if (rel.verLessThan(
-                            MatlabBuilderConstants.BASE_MATLAB_VERSION_COBERTURA_SUPPORT)) {
-                        return FormValidation.warning(
-                                Message.getValue("Builder.matlab.cobertura.support.warning"));
-                    }
-                } catch (MatlabVersionNotFoundException e) {
-                    return FormValidation
-                            .warning(Message.getValue("Builder.invalid.matlab.root.warning"));
-                }
-            }
-
-
-            return FormValidation.ok();
-        };
-                
-        public FormValidation doCheckModelCoverageChkBxFilePath(
-                @QueryParameter String modelCoverageChkBxFilePath) {
-            List<Function<String, FormValidation>> listOfCheckMethods =
-                    new ArrayList<Function<String, FormValidation>>();
-            if (!modelCoverageChkBxFilePath.isEmpty()) {
-                listOfCheckMethods.add(chkModelCoverageSupport);
-            }
-            return FormValidationUtil.getFirstErrorOrWarning(listOfCheckMethods, getMatlabRoot());
-        }
-
-        Function<String, FormValidation> chkModelCoverageSupport = (String matlabRoot) -> {
-            FilePath matlabRootPath = new FilePath(new File(matlabRoot));
-            rel = new MatlabReleaseInfo(matlabRootPath);
-            final MatrixPatternResolver resolver = new MatrixPatternResolver(matlabRoot);
-            if (!resolver.hasVariablePattern()) {
-                try {
-                    if (rel.verLessThan(
-                            MatlabBuilderConstants.BASE_MATLAB_VERSION_MODELCOVERAGE_SUPPORT)) {
-                        return FormValidation.warning(
-                                Message.getValue("Builder.matlab.modelcoverage.support.warning"));
-                    }
-                } catch (MatlabVersionNotFoundException e) {
-                    return FormValidation
-                            .warning(Message.getValue("Builder.invalid.matlab.root.warning"));
-                }
-            }
-
-
-            return FormValidation.ok();
-        };
-
-        public FormValidation doCheckStmResultsChkBxFilePath(@QueryParameter String stmResultsChkBxFilePath) {
-            List<Function<String, FormValidation>> listOfCheckMethods =
-                    new ArrayList<Function<String, FormValidation>>();
-            if (!stmResultsChkBxFilePath.isEmpty()) {
-                listOfCheckMethods.add(chkSTMResultsSupport);
-            }
-            return FormValidationUtil.getFirstErrorOrWarning(listOfCheckMethods, getMatlabRoot());
-        }
-
-        Function<String, FormValidation> chkSTMResultsSupport = (String matlabRoot) -> {
-            FilePath matlabRootPath = new FilePath(new File(matlabRoot));
-            rel = new MatlabReleaseInfo(matlabRootPath);
-            final MatrixPatternResolver resolver = new MatrixPatternResolver(matlabRoot);
-            if (!resolver.hasVariablePattern()) {
-                try {
-                    if (rel.verLessThan(
-                            MatlabBuilderConstants.BASE_MATLAB_VERSION_EXPORTSTMRESULTS_SUPPORT)) {
-                        return FormValidation.warning(Message
-                                .getValue("Builder.matlab.exportstmresults.support.warning"));
-                    }
-                } catch (MatlabVersionNotFoundException e) {
-                    return FormValidation
-                            .warning(Message.getValue("Builder.invalid.matlab.root.warning"));
-                }
-            }
-            return FormValidation.ok();
-        };
-
-        // Method to get the MatlabRoot value from Build wrapper class.
-        public static String getMatlabRoot() {
-            try {
-                return Jenkins.getInstance().getDescriptorByType(UseMatlabVersionDescriptor.class)
-                        .getMatlabRootFolder();
-            } catch (Exception e) {
-                // For any exception during getMatlabRootFolder() operation, return matlabRoot as
-                // NULL.
-                return null;
-            }
-        }
     }
 
     @Override
@@ -425,8 +298,8 @@ private void addInputArgs(String reportName, String reportPath) {
      * 7Csort:date/jenkinsci-dev/AFYHSG3NUEI/UsVJIKoE4B8J
      * 
      */
-    public class PdfChkBx {
-        String pdfReportFilePath;
+    public static class PdfChkBx {
+        private String pdfReportFilePath;
 
         @DataBoundConstructor
         public PdfChkBx() {
@@ -443,8 +316,8 @@ public String getPdfReportFilePath() {
         }
     }
 
-    public class TapChkBx {
-        String tapReportFilePath;
+    public static class TapChkBx {
+        private String tapReportFilePath;
 
         @DataBoundConstructor
         public TapChkBx() {
@@ -461,8 +334,8 @@ public String getTapReportFilePath() {
         }
     }
 
-    public class JunitChkBx {
-        String junitReportFilePath;
+    public static class JunitChkBx {
+        private String junitReportFilePath;
 
         @DataBoundConstructor
         public JunitChkBx() {
@@ -479,8 +352,8 @@ public String getJunitReportFilePath() {
         }
     }
 
-    public class CoberturaChkBx {
-        String coberturaReportFilePath;
+    public static class CoberturaChkBx {
+        private String coberturaReportFilePath;
 
         @DataBoundConstructor
         public CoberturaChkBx() {
@@ -497,8 +370,8 @@ public String getCoberturaReportFilePath() {
         }
     }
 
-    public class StmResultsChkBx {
-        String stmResultsFilePath;
+    public static class StmResultsChkBx {
+        private String stmResultsFilePath;
 
         @DataBoundConstructor
         public StmResultsChkBx() {
@@ -515,8 +388,8 @@ public String getStmResultsFilePath() {
         }
     }
 
-    public class ModelCovChkBx {
-        String modelCoverageFilePath;
+    public static class ModelCovChkBx {
+        private String modelCoverageFilePath;
 
         @DataBoundConstructor
         public ModelCovChkBx() {

src/main/resources/com/mathworks/ci/RunMatlabTestsBuilder/config.jelly

@@ -3,25 +3,25 @@
 
 <f:section title="Generate Test Artifacts">
     <f:optionalBlock name="pdfReportChkBx" field="pdfReportChkBx" title="PDF test report" checked="${instance.isPdfChecked}">
-  	 <f:entry field="pdfReportFilePath" title="Save PDF report at">	
+  	 <f:entry field="pdfReportFilePath" title="File location ">	
     	<f:textbox default="matlabTestArtifacts/testreport.pdf"/>
      </f:entry>
     </f:optionalBlock>
 
     <f:optionalBlock name="tapChkBx" field="tapChkBx" title="TAP test results" checked="${instance.isTapChecked}">   	
-     <f:entry field="tapChkBxFilePath" title="Save TAP report at">	
+     <f:entry field="tapReportFilePath" title="File location ">	
     	<f:textbox default="matlabTestArtifacts/taptestresults.tap"/>
      </f:entry>
     </f:optionalBlock>
 
     <f:optionalBlock name="junitChkBx" field="junitChkBx" title="JUnit-style test results" checked="${instance.isJunitChecked}"> 	
-  	  <f:entry field="junitChkBxFilePath" title="Save JUnit-style report at">
+  	  <f:entry field="junitReportFilePath" title="File location ">
     	<f:textbox default="matlabTestArtifacts/junittestresults.xml"/>
   	  </f:entry>      
     </f:optionalBlock>
 
    <f:optionalBlock name="stmResultsChkBx" field="stmResultsChkBx" title="Simulink Test Manager results" checked="${instance.isStmChecked}">  
-  	 <f:entry field="stmResultsChkBxFilePath" title="Save Simulink Test Manager results at">
+  	 <f:entry field="stmResultsFilePath" title="File location ">
     	<f:textbox default="matlabTestArtifacts/simulinktestresults.mldatx"/>
      </f:entry>   
    </f:optionalBlock>
@@ -30,13 +30,13 @@
 
 <f:section title="Generate Coverage Artifacts">
    <f:optionalBlock name="coberturaChkBx" field="coberturaChkBx" title="Cobertura code coverage" checked="${instance.isCoberturaChecked}">
-	 <f:entry field="coberturaChkBxFilePath" title="Save Cobertura code coverage at">
+	 <f:entry field="coberturaReportFilePath" title="File location ">
     	<f:textbox default="matlabTestArtifacts/cobertura.xml"/>
      </f:entry>
    </f:optionalBlock>
 
    <f:optionalBlock name="modelCoverageChkBx" field="modelCoverageChkBx" title="Cobertura model coverage" checked="${instance.isModelCovChecked}">
-  	  <f:entry field="modelCoverageChkBxFilePath" title="Save Cobertura mode">
+  	  <f:entry field="modelCoverageFilePath" title="File location ">
   	  <f:textbox default="matlabTestArtifacts/modelcoverage.xml"/>
   	  </f:entry>
    </f:optionalBlock>