[MPMD-412] More specific catch blocks (#642)

* [MPMD-412] More specific catch blocks
* remove debugging stacktrace
* better TODO

Author: elharo

src/main/java/org/apache/maven/plugins/pmd/exec/CpdReportConsumer.java

@@ -64,6 +64,9 @@ public void accept(CPDReport report) {
                 writeFormattedReport(report);
             }
         } catch (IOException | MavenReportException e) {
+            // TODO this should be a more specific subclass; or just have the accept method
+            // build the objects in memory and write them to a stream later after the
+            // accept method returns
             throw new RuntimeException(e);
         }
     }

src/test/java/org/apache/maven/plugins/pmd/CpdReportTest.java

@@ -50,8 +50,6 @@ protected void setUp() throws Exception {
 
     /**
      * Test CPDReport given the default configuration
-     *
-     * @throws Exception
      */
     public void testDefaultConfiguration() throws Exception {
         File generatedReport =
@@ -72,8 +70,6 @@ public void testDefaultConfiguration() throws Exception {
 
     /**
      * Test CPDReport with the text renderer given as "format=txt"
-     *
-     * @throws Exception
      */
     public void testTxtFormat() throws Exception {
         generateReport(getGoal(), "custom-configuration/cpd-txt-format-configuration-plugin-config.xml");
@@ -94,8 +90,6 @@ public void testTxtFormat() throws Exception {
 
     /**
      * Test CpdReport using custom configuration
-     *
-     * @throws Exception
      */
     public void testCustomConfiguration() throws Exception {
         File generatedReport =
@@ -118,8 +112,6 @@ public void testCustomConfiguration() throws Exception {
 
     /**
      * Test CPDReport with invalid format
-     *
-     * @throws Exception
      */
     public void testInvalidFormat() throws Exception {
         try {
@@ -130,8 +122,9 @@ public void testInvalidFormat() throws Exception {
                     mojo, "compileSourceRoots", mojo.getProject().getCompileSourceRoots());
             generateReport(mojo, testPom);
 
-            fail("MavenReportException must be thrown");
-        } catch (Exception e) {
+            // TODO this should be a more specific subclass
+            fail("RuntimeException must be thrown");
+        } catch (RuntimeException e) {
             assertMavenReportException("Can't find CPD custom format xhtml", e);
         }
     }
@@ -259,13 +252,11 @@ public void testWithCpdErrors() throws Exception {
     }
 
     private static void assertMavenReportException(String expectedMessage, Exception exception) {
+        MavenReportException cause = (MavenReportException) exception.getCause();
+        String message = cause.getMessage();
         assertTrue(
-                "Expected MavenReportException, but was: " + exception,
-                exception.getCause() instanceof MavenReportException);
-        exception = (Exception) exception.getCause();
-        assertTrue(
-                "Wrong message: expected: " + expectedMessage + ", but was: " + exception.toString(),
-                exception.toString().contains(expectedMessage));
+                "Wrong message: expected: " + expectedMessage + ", but was: " + message,
+                message.contains(expectedMessage));
     }
 
     private static void assertReportContains(String expectedMessage) throws IOException {