More fixes from PR review

apache · Jun 6, 2024 · d5f616e · d5f616e
1 parent 41aa83e
commit d5f616e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/org/apache/maven/plugins/pmd/exec/CpdExecutor.java b/src/main/java/org/apache/maven/plugins/pmd/exec/CpdExecutor.java
@@ -174,7 +174,9 @@ private CpdResult run() throws MavenReportException {
         // in constrast to pmd goal, we don't have a parameter for cpd like "skipPmdError" - if there
         // are any errors during CPD analysis, the maven build fails.
         int cpdErrors = cpdConfiguration.getReporter().numErrors();
-        if (cpdErrors > 0) {
+        if (cpdErrors == 1) {
+            throw new MavenReportException("There was 1 error while executing CPD");
+        } else if (cpdErrors > 1) {
             throw new MavenReportException("There were " + cpdErrors + " errors while executing CPD");
         }
 

diff --git a/src/main/java/org/apache/maven/plugins/pmd/exec/CpdReportConsumer.java b/src/main/java/org/apache/maven/plugins/pmd/exec/CpdReportConsumer.java
@@ -90,7 +90,7 @@ private File writeReport(CPDReport cpd, CPDReportRenderer renderer, String exten
 
         File targetDir = new File(request.getTargetDirectory());
         if (!targetDir.exists() && !targetDir.mkdirs()) {
-            throw new IOException("Could create report output directory " + targetDir);
+            throw new IOException("Couldn't create report output directory: " + targetDir);
         }
 
         File targetFile = new File(targetDir, "cpd." + extension);

diff --git a/src/test/java/org/apache/maven/plugins/pmd/CpdReportTest.java b/src/test/java/org/apache/maven/plugins/pmd/CpdReportTest.java
@@ -130,7 +130,7 @@ public void testInvalidFormat() throws Exception {
 
             fail("MavenReportException must be thrown");
         } catch (Exception e) {
-            assertMavenReportException("There were 1 errors while executing CPD", e);
+            assertMavenReportException("There was 1 error while executing CPD", e);
             assertLogOutputContains("Can't find CPD custom format xhtml");
         }
     }
@@ -247,7 +247,7 @@ public void testWithCpdErrors() throws Exception {
             File generatedReport = generateReport("cpd", "CpdReportTest/with-cpd-errors/pom.xml");
             fail("MavenReportException must be thrown");
         } catch (Exception e) {
-            assertMavenReportException("There were 1 errors while executing CPD", e);
+            assertMavenReportException("There was 1 error while executing CPD", e);
             assertLogOutputContains("Lexical error in file");
             assertLogOutputContains("BadFile.java");
         }