From 468e5b8f3cadba1917130cea8db7ed5fedee8d97 Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Fri, 7 Jun 2024 21:44:23 +0200 Subject: [PATCH] Fix PMD warnings. --- .../plugins/coverage/CoverageReport.java | 1 + .../plugins/coverage/CoverageSummary.java | 1 + .../plugins/coverage/publisher/Adapter.java | 4 ++-- .../plugins/coverage/CoverageReportTest.java | 18 +++++++++--------- .../plugins/coverage/MainPanelTest.java | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/ui-tests/src/main/java/io/jenkins/plugins/coverage/CoverageReport.java b/ui-tests/src/main/java/io/jenkins/plugins/coverage/CoverageReport.java index ef40e876..463a4881 100644 --- a/ui-tests/src/main/java/io/jenkins/plugins/coverage/CoverageReport.java +++ b/ui-tests/src/main/java/io/jenkins/plugins/coverage/CoverageReport.java @@ -219,6 +219,7 @@ public enum Tab { * @return the tab * @throws NoSuchElementException if the tab could not be found */ + @SuppressWarnings("PMD.UnnecessaryFullyQualifiedName") static Tab valueWithHref(final String href) { for (Tab tab : Tab.values()) { if (tab.id.equals(href.substring(1))) { diff --git a/ui-tests/src/main/java/io/jenkins/plugins/coverage/CoverageSummary.java b/ui-tests/src/main/java/io/jenkins/plugins/coverage/CoverageSummary.java index 8de23b72..26bec190 100644 --- a/ui-tests/src/main/java/io/jenkins/plugins/coverage/CoverageSummary.java +++ b/ui-tests/src/main/java/io/jenkins/plugins/coverage/CoverageSummary.java @@ -31,6 +31,7 @@ public class CoverageSummary extends PageObject { * @param id * the type of the result page (e.g. simian, checkstyle, cpd, etc.) */ + @SuppressWarnings("PMD.ConstructorCallsOverridableMethod") public CoverageSummary(final Build parent, final String id) { super(parent, parent.url(id)); diff --git a/ui-tests/src/main/java/io/jenkins/plugins/coverage/publisher/Adapter.java b/ui-tests/src/main/java/io/jenkins/plugins/coverage/publisher/Adapter.java index 38ef1b9d..505aedec 100644 --- a/ui-tests/src/main/java/io/jenkins/plugins/coverage/publisher/Adapter.java +++ b/ui-tests/src/main/java/io/jenkins/plugins/coverage/publisher/Adapter.java @@ -57,7 +57,7 @@ public void setMergeToOneReport(final boolean mergeReports) { */ public AdapterThreshold createThresholdsPageArea() { ensureAdvancedOptionsIsActivated(); - String path = createPageArea("thresholds", () -> this.threshold.click()); + String path = createPageArea("thresholds", this.threshold::click); return new AdapterThreshold(this, path); } @@ -72,7 +72,7 @@ public AdapterThreshold createThresholdsPageArea() { public AdapterThreshold createThresholdsPageArea(final AdapterThresholdTarget thresholdTarget, final double unhealthyThreshold, final double unstableThreshold, final boolean failUnhealthy) { ensureAdvancedOptionsIsActivated(); - String path = createPageArea("thresholds", () -> this.threshold.click()); + String path = createPageArea("thresholds", this.threshold::click); AdapterThreshold adapterThreshold = new AdapterThreshold(this, path); adapterThreshold.setThresholdTarget(thresholdTarget); adapterThreshold.setUnhealthyThreshold(unhealthyThreshold); diff --git a/ui-tests/src/test/java/io/jenkins/plugins/coverage/CoverageReportTest.java b/ui-tests/src/test/java/io/jenkins/plugins/coverage/CoverageReportTest.java index 2db63339..99fe32aa 100644 --- a/ui-tests/src/test/java/io/jenkins/plugins/coverage/CoverageReportTest.java +++ b/ui-tests/src/test/java/io/jenkins/plugins/coverage/CoverageReportTest.java @@ -55,17 +55,17 @@ public void testCoverageReportAfterSomeBuildsWithReports() { report.open(); FileCoverageTable coverageTable = report.getCoverageTable(); - CoverageReportTest.verifyFileCoverageTableContent(coverageTable, + verifyFileCoverageTableContent(coverageTable, 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"}); String coverageTree = report.getCoverageTree(); - CoverageReportTest.verifyCoverageTreeAfterSomeBuildsWithReports(coverageTree); + verifyCoverageTreeAfterSomeBuildsWithReports(coverageTree); String coverageOverview = report.getCoverageOverview(); - CoverageReportTest.verifyCoverageOverviewAfterSomeBuildsWithReports(coverageOverview); + verifyCoverageOverviewAfterSomeBuildsWithReports(coverageOverview); } /** @@ -80,13 +80,13 @@ public void testCoverageReportAfterOneBuildWithReport() { report.open(); FileCoverageTable coverageTable = report.getCoverageTable(); - CoverageReportTest.verifyFileCoverageTableNumberOfMaxEntries(coverageTable, 307); + verifyFileCoverageTableNumberOfMaxEntries(coverageTable, 307); String coverageTree = report.getCoverageTree(); - CoverageReportTest.verifyCoverageTreeAfterOneBuildWithReport(coverageTree); + verifyCoverageTreeAfterOneBuildWithReport(coverageTree); String coverageOverview = report.getCoverageOverview(); - CoverageReportTest.verifyCoverageOverviewAfterOneBuildWithReport(coverageOverview); + verifyCoverageOverviewAfterOneBuildWithReport(coverageOverview); } /** @@ -101,19 +101,19 @@ public void testCoverageTableWithMultiplePages() { report.open(); FileCoverageTable table = report.openFileCoverageTable(); - CoverageReportTest.verifyFileCoverageTableContent(table, + verifyFileCoverageTableContent(table, new String[] {"edu.hm.hafner.analysis", "edu.hm.hafner.analysis", "edu.hm.hafner.analysis"}, new String[] {"AbstractPackageDetector.java", "CSharpNamespaceDetector.java", "Categories.java"}, new String[] {"88.24%", "100.00%", "100.00%"}, new String[] {"50.00%", "n/a", "100.00%"}); table.openTablePage(2); - CoverageReportTest.verifyFileCoverageTableContent(table, + verifyFileCoverageTableContent(table, new String[] {"edu.hm.hafner.analysis", "edu.hm.hafner.analysis", "edu.hm.hafner.analysis"}, new String[] {"IssueBuilder.java", "IssueDifference.java", "IssueParser.java"}, new String[] {"100.00%", "100.00%", "83.33%"}, new String[] {"100.00%", "92.86%", "n/a"}); table.openTablePage(3); - CoverageReportTest.verifyFileCoverageTableContent(table, + verifyFileCoverageTableContent(table, new String[] {"edu.hm.hafner.analysis", "edu.hm.hafner.analysis", "edu.hm.hafner.analysis"}, new String[] {"PackageDetectors.java", "PackageNameResolver.java", "ParsingCanceledException.java"}, new String[] {"92.31%", "100.00%", "0.00%"}, diff --git a/ui-tests/src/test/java/io/jenkins/plugins/coverage/MainPanelTest.java b/ui-tests/src/test/java/io/jenkins/plugins/coverage/MainPanelTest.java index 33178424..37c045a1 100644 --- a/ui-tests/src/test/java/io/jenkins/plugins/coverage/MainPanelTest.java +++ b/ui-tests/src/test/java/io/jenkins/plugins/coverage/MainPanelTest.java @@ -22,7 +22,7 @@ public void testTrendChartAfterSomeBuildsWithReports() { FreeStyleJob job = getJobWithFirstBuildAndDifferentReports(InCaseCoverageDecreasedConfiguration.DONT_FAIL); buildSuccessfully(job); MainPanel mainPanel = new MainPanel(job); - MainPanelTest.verifyTrendChartWithTwoReports(mainPanel, 1, 2); + verifyTrendChartWithTwoReports(mainPanel, 1, 2); } /**