Enable UI tests for new recorder

plugin/src/main/resources/coverage/configuration.jelly

@@ -39,6 +39,9 @@
       <f:textbox/>
     </f:entry>
 
+    <f:entry field="ignoreParsingErrors">
+      <f:checkbox title="${%title.ignoreParsingErrors}"/>
+    </f:entry>
     <f:entry field="failOnError">
       <f:checkbox title="${%failOnError.title}"/>
     </f:entry>

plugin/src/main/resources/coverage/configuration.properties

@@ -13,6 +13,7 @@ checksName.title=Checks name
 checksAnnotationScope.title=Select the scope of source code annotations
 failOnError.title=Fail the step if errors have been reported during the execution
 title.enabledForFailure=Enable recording for failed builds
+title.ignoreParsingErrors=Ignore parsing errors during processing of the coverage reports
 title.skipSymbolicLinks=Skip symbolic links when searching for files
 sourceCodeRetention.title=Source Code Retention Strategy
 

plugin/src/main/resources/io/jenkins/plugins/coverage/metrics/steps/CoverageRecorder/help-ignoreParsingErrors.html

@@ -1,7 +1,7 @@
 <div>
     This toggle determines if the coverage plugin should ignore parsing errors during processing of the coverage
-    reports or if it should fail fast with an exception. By default this toggle is disabled and the
+    reports or if it should fail fast with an exception. By default, this toggle is disabled and the
     parsers will fail fast. This helps to identify bugs in the parser or in the coverage tool execution.
-    If you would rather like to ignore parsing errors, please tick this checkbox. Please note, that in this
+    If you would rather like to ignore parsing errors, please tick this checkbox. Please note that in this
     case the parser results might be incomplete or even wrong.
 </div>

plugin/src/main/resources/io/jenkins/plugins/coverage/metrics/steps/CoverageStep/help-ignoreParsingErrors.html

@@ -1,7 +1,7 @@
 <div>
     This toggle determines if the coverage plugin should ignore parsing errors during processing of the coverage
-    reports or if it should fail fast with an exception. By default this toggle is disabled and the
+    reports or if it should fail fast with an exception. By default, this toggle is disabled and the
     parsers will fail fast. This helps to identify bugs in the parser or in the coverage tool execution.
-    If you would rather like to ignore parsing errors, please tick this checkbox. Please note, that in this
+    If you would rather like to ignore parsing errors, please tick this checkbox. Please note that in this
     case the parser results might be incomplete or even wrong.
 </div>

ui-tests/pom.xml

@@ -155,7 +155,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
           <reuseForks>false</reuseForks>
           <trimStackTrace>false</trimStackTrace> <!-- SUREFIRE-1798 -->
           <environmentVariables>

ui-tests/src/main/java/io/jenkins/plugins/coverage/CoveragePublisher/Threshold/AbstractThreshold.java → ui-tests/src/main/java/io/jenkins/plugins/coverage/AbstractThreshold.java

@@ -1,4 +1,4 @@
-package io.jenkins.plugins.coverage.CoveragePublisher.Threshold;
+package io.jenkins.plugins.coverage;
 
 import org.jenkinsci.test.acceptance.po.Control;
 import org.jenkinsci.test.acceptance.po.PageArea;

ui-tests/src/main/java/io/jenkins/plugins/coverage/CoveragePublisher/Adapter.java → ui-tests/src/main/java/io/jenkins/plugins/coverage/Adapter.java

@@ -1,11 +1,10 @@
-package io.jenkins.plugins.coverage.CoveragePublisher;
+package io.jenkins.plugins.coverage;
 
 import org.jenkinsci.test.acceptance.po.Control;
 import org.jenkinsci.test.acceptance.po.PageArea;
 import org.jenkinsci.test.acceptance.po.PageAreaImpl;
 
-import io.jenkins.plugins.coverage.CoveragePublisher.Threshold.AdapterThreshold;
-import io.jenkins.plugins.coverage.CoveragePublisher.Threshold.AdapterThreshold.AdapterThresholdTarget;
+import io.jenkins.plugins.coverage.AdapterThreshold.AdapterThresholdTarget;
 
 /**
  * Adapter which can be added in the configuration of the {@link CoveragePublisher} of a FreeStyle Project.
@@ -96,4 +95,4 @@ public void ensureAdvancedOptionsIsActivated() {
     public void deleteAdapter() {
         this.delete.click();
     }
-}
+}

ui-tests/src/main/java/io/jenkins/plugins/coverage/CoveragePublisher/Threshold/AdapterThreshold.java → ui-tests/src/main/java/io/jenkins/plugins/coverage/AdapterThreshold.java

@@ -1,7 +1,4 @@
-package io.jenkins.plugins.coverage.CoveragePublisher.Threshold;
-
-import io.jenkins.plugins.coverage.CoveragePublisher.Adapter;
-import io.jenkins.plugins.coverage.CoveragePublisher.CoveragePublisher;
+package io.jenkins.plugins.coverage;
 
 /**
  * Threshold used in {@link Adapter} in {@link CoveragePublisher}.

ui-tests/src/main/java/io/jenkins/plugins/coverage/util/ChartUtil.java → ui-tests/src/main/java/io/jenkins/plugins/coverage/ChartUtil.java

@@ -1,4 +1,4 @@
-package io.jenkins.plugins.coverage.util;
+package io.jenkins.plugins.coverage;
 
 import java.util.Objects;
 

ui-tests/src/main/java/io/jenkins/plugins/coverage/CoveragePublisher/CoveragePublisher.java → ui-tests/src/main/java/io/jenkins/plugins/coverage/CoveragePublisher.java

@@ -1,4 +1,4 @@
-package io.jenkins.plugins.coverage.CoveragePublisher;
+package io.jenkins.plugins.coverage;
 
 import org.jenkinsci.test.acceptance.po.AbstractStep;
 import org.jenkinsci.test.acceptance.po.Control;
@@ -8,13 +8,13 @@
 import org.jenkinsci.test.acceptance.po.PageAreaImpl;
 import org.jenkinsci.test.acceptance.po.PostBuildStep;
 
-import io.jenkins.plugins.coverage.CoveragePublisher.Threshold.GlobalThreshold;
-import io.jenkins.plugins.coverage.CoveragePublisher.Threshold.GlobalThreshold.GlobalThresholdTarget;
+import io.jenkins.plugins.coverage.GlobalThreshold.GlobalThresholdTarget;
 
 /**
  * Coverage Publisher which can be added in the configuration of a FreeStyle Project.
  */
-@Describable("Publish Coverage Report")
+@Describable("Record code coverage results")
+@SuppressWarnings("PMD.TooManyFields")
 public class CoveragePublisher extends AbstractStep implements PostBuildStep {
 
     private final Control adapter = control("hetero-list-add[adapters]");
@@ -25,29 +25,60 @@ public class CoveragePublisher extends AbstractStep implements PostBuildStep {
     private final Control failNoReports = control("failNoReports");
     private final Control failBuildIfCoverageDecreasedInChangeRequest = control(
             "failBuildIfCoverageDecreasedInChangeRequest");
-    private final Control skipPublishingChecks = control("skipPublishingChecks");
     private final Control sourceFileResolver = control("sourceFileResolver/level");
     private final Control globalThreshold = control("repeatable-add");
-    private final Control sourceCodeEncoding = control("sourceCodeEncoding");
     private final Control sourceDirectories = findRepeatableAddButtonFor("sourceDirectories");
+
+    private final Control id = control("id");
+    private final Control name = control("name");
+    private final Control skipPublishingChecks = control("skipPublishingChecks");
     private final Control checksName = control("checksName");
+    private final Control checksAnnotationScope = control("checksAnnotationScope");
+    private final Control ignoreParsingErrors = control("ignoreParsingErrors");
+    private final Control failOnError = control("failOnError");
+    private final Control enabledForFailure = control("enabledForFailure");
+    private final Control skipSymbolicLinks = control("skipSymbolicLinks");
+    private final Control scm = control("scm");
+    private final Control sourceCodeEncoding = control("sourceCodeEncoding");
+    private final Control sourceCodeRetention = control("sourceCodeRetention");
 
     /**
-     * Constructor for CoveragePublisher.
+     * Creates a new page object for the {@link CoveragePublisher}.
      *
      * @param parent
-     *         is the job which uses the CoveragePublisher
+     *         the parent job
      * @param path
-     *         on the parent page
+     *         the path on the configuration page
      */
     public CoveragePublisher(final Job parent, final String path) {
         super(parent, path);
     }
 
+    CoveragePublisher setIgnoreParsingErrors(final boolean ignoreParsingErrors) {
+        ensureAdvancedOptionsIsActivated();
+        this.ignoreParsingErrors.check(ignoreParsingErrors);
+
+        return this;
+    }
+
+    CoveragePublisher setFailOnError(final boolean failOnError) {
+        ensureAdvancedOptionsIsActivated();
+        this.failOnError.check(failOnError);
+
+        return this;
+    }
+
     private Control findRepeatableAddButtonFor(final String propertyName) {
         return control(by.xpath("//div[@id='" + propertyName + "']//button[contains(@path,'-add')]"));
     }
 
+    CoveragePublisher setTool(final String tool, final String pattern) {
+        var tools = new CoverageTool(this, "tools");
+        tools.setTool("COBERTURA").setPattern(pattern);
+
+        return this;
+    }
+
     /**
      * Sets the encoding when reading source code files.
      *
@@ -161,9 +192,9 @@ public void setChecksName(final String checksName) {
     }
 
     /**
-     * Ensures advanced options of CoveragePublisher is activated, so that values like {@link
-     * CoveragePublisher#setFailUnhealthy(boolean)} or {@link CoveragePublisher#setFailNoReports(boolean)} are visible
-     * and can be set.
+     * Ensures advanced options of CoveragePublisher is activated, so that values like
+     * {@link CoveragePublisher#setFailUnhealthy(boolean)} or {@link CoveragePublisher#setFailNoReports(boolean)} are
+     * visible and can be set.
      */
     public void ensureAdvancedOptionsIsActivated() {
         if (advancedOptions.exists()) {
@@ -278,6 +309,45 @@ public void setPath(final String path) {
             this.path.set(path);
         }
     }
+
+    /**
+     * Page area of a coverage tool configuration.
+     */
+    public static class CoverageTool extends PageAreaImpl {
+        private final Control tool = control("");
+        private final Control pattern = control("pattern");
+
+        CoverageTool(final PageArea coverageRecorder, final String path) {
+            super(coverageRecorder, path);
+        }
+
+        /**
+         * Sets the name of the tool.
+         *
+         * @param toolName
+         *         the name of the tool, e.g., PIT, JACOCO, COBERTURA
+         *
+         * @return this
+         */
+        public CoverageTool setTool(final String toolName) {
+            tool.select(toolName);
+            return this;
+        }
+
+        /**
+         * Sets the pattern of the files to parse.
+         *
+         * @param pattern
+         *         the pattern
+         *
+         * @return this
+         */
+        public CoverageTool setPattern(final String pattern) {
+            this.pattern.set(pattern);
+
+            return this;
+        }
+    }
 }
 
 

ui-tests/src/main/java/io/jenkins/plugins/coverage/CoverageReport.java

@@ -11,7 +11,7 @@
 import org.jenkinsci.test.acceptance.po.Build;
 import org.jenkinsci.test.acceptance.po.PageObject;
 
-import static io.jenkins.plugins.coverage.util.ChartUtil.*;
+import static io.jenkins.plugins.coverage.ChartUtil.*;
 
 /**
  * {@link PageObject} representing the Coverage Report.

ui-tests/src/main/java/io/jenkins/plugins/coverage/CoveragePublisher/Threshold/GlobalThreshold.java → ui-tests/src/main/java/io/jenkins/plugins/coverage/GlobalThreshold.java

@@ -1,6 +1,4 @@
-package io.jenkins.plugins.coverage.CoveragePublisher.Threshold;
-
-import io.jenkins.plugins.coverage.CoveragePublisher.CoveragePublisher;
+package io.jenkins.plugins.coverage;
 
 /**
  * Global Threshold used in {@link CoveragePublisher}.

ui-tests/src/main/java/io/jenkins/plugins/coverage/MainPanel.java

@@ -6,8 +6,6 @@
 import org.jenkinsci.test.acceptance.po.Job;
 import org.jenkinsci.test.acceptance.po.PageObject;
 
-import io.jenkins.plugins.coverage.util.ChartUtil;
-
 /**
  * {@link PageObject} representing the Job status on the build page of a job.
  */
@@ -20,7 +18,7 @@ public class MainPanel extends PageObject {
      * @param parent
      *         job of wanted MainPanel.
      */
-    public MainPanel(Job parent) {
+    public MainPanel(final Job parent) {
         super(parent, parent.url);
     }
 

ui-tests/src/test/java/io/jenkins/plugins/coverage/CoveragePublisherTest.java

@@ -1,13 +1,17 @@
 package io.jenkins.plugins.coverage;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
 import org.junit.Ignore;
 import org.junit.Test;
 
 import org.jenkinsci.test.acceptance.junit.WithPlugins;
 import org.jenkinsci.test.acceptance.po.Build;
 import org.jenkinsci.test.acceptance.po.FreeStyleJob;
 
-import io.jenkins.plugins.coverage.CoveragePublisher.CoveragePublisher.SourceFileResolver;
+import io.jenkins.plugins.coverage.CoveragePublisher.SourceFileResolver;
 
 import static org.assertj.core.api.AssertionsForClassTypes.*;
 
@@ -16,6 +20,45 @@
  * results.
  */
 public class CoveragePublisherTest extends UiTest {
+    /**
+     * Creates two successful builds. Tests the reference values in summary, coverage report and main panel.
+     */
+    @Test
+    public void testCodeCoveragePlugin() {
+        FreeStyleJob job = getJobWithFirstBuildAndDifferentReports(InCaseCoverageDecreasedConfiguration.DONT_FAIL);
+        Build secondBuild = buildSuccessfully(job);
+
+        HashMap<String, Double> expectedCoverageFifthBuild = new HashMap<>();
+        expectedCoverageFifthBuild.put("Line", 91.02);
+        expectedCoverageFifthBuild.put("Branch", 93.97);
+        List<Double> expectedReferenceCoverageFifthBuild = new ArrayList<>();
+        expectedReferenceCoverageFifthBuild.add(-4.5);
+        expectedReferenceCoverageFifthBuild.add(5.38);
+
+        CoverageSummaryTest.verifySummaryWithReferenceBuild(secondBuild, expectedCoverageFifthBuild,
+                expectedReferenceCoverageFifthBuild);
+
+        CoverageReport report = new CoverageReport(secondBuild);
+        report.open();
+
+        FileCoverageTable fileCoverageTable = report.openFileCoverageTable();
+        CoverageReportTest.verifyFileCoverageTableContent(fileCoverageTable,
+                new String[] {"edu.hm.hafner.util", "edu.hm.hafner.util", "edu.hm.hafner.util"},
+                new String[] {"Ensure.java", "FilteredLog.java", "Generated.java"},
+                new String[] {"80.00%", "100.00%", "n/a"},
+                new String[] {"86.96%", "100.00%", "n/a"});
+        CoverageReportTest.verifyFileCoverageTableNumberOfMaxEntries(fileCoverageTable, 10);
+
+        String coverageTree = report.getCoverageTree();
+        CoverageReportTest.verifyCoverageTreeAfterSomeBuildsWithReports(coverageTree);
+
+        String coverageOverview = report.getCoverageOverview();
+        CoverageReportTest.verifyCoverageOverviewAfterSomeBuildsWithReports(coverageOverview);
+
+        MainPanel mainPanel = new MainPanel(job);
+        MainPanelTest.verifyTrendChartWithTwoReports(mainPanel, 1, 2);
+    }
+
     /**
      * Verifies that job with no report fails when setFailNoReports(true).
      */

ui-tests/src/test/java/io/jenkins/plugins/coverage/CoverageReportTest.java

@@ -7,8 +7,6 @@
 import org.jenkinsci.test.acceptance.po.Build;
 import org.jenkinsci.test.acceptance.po.FreeStyleJob;
 
-import io.jenkins.plugins.coverage.CoveragePublisher.Adapter;
-import io.jenkins.plugins.coverage.CoveragePublisher.CoveragePublisher;
 import io.jenkins.plugins.coverage.FileCoverageTable.Header;
 
 import static net.javacrumbs.jsonunit.assertj.JsonAssertions.*;

ui-tests/src/test/java/io/jenkins/plugins/coverage/CoverageSummaryTest.java

@@ -10,9 +10,6 @@
 import org.jenkinsci.test.acceptance.po.Build;
 import org.jenkinsci.test.acceptance.po.FreeStyleJob;
 
-import io.jenkins.plugins.coverage.CoveragePublisher.Adapter;
-import io.jenkins.plugins.coverage.CoveragePublisher.CoveragePublisher;
-
 import static org.assertj.core.api.Assertions.*;
 
 /**