[SUREFIRE-2052] Handles internal exceptions do not have suppressed exceptions in ThreadedStreamConsumer

Tibor17 · Tibor17 · commit 25425c379dd2 · 2022-03-29T23:18:55.000+02:00
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/MultipleFailureException.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/MultipleFailureException.java
@@ -20,51 +20,43 @@
  */
 
 import java.io.IOException;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.function.Function;
 
 final class MultipleFailureException
         extends IOException
 {
-    private final Queue<Throwable> exceptions = new ConcurrentLinkedQueue<>();
-
     void addException( Throwable exception )
     {
-        exceptions.add( exception );
+        addSuppressed( exception );
     }
 
     boolean hasNestedExceptions()
     {
-        return !exceptions.isEmpty();
+        return getSuppressed().length != 0;
     }
 
     @Override
     public String getLocalizedMessage()
     {
-        StringBuilder messages = new StringBuilder();
-        for ( Throwable exception : exceptions )
-        {
-            if ( messages.length() != 0 )
-            {
-                messages.append( '\n' );
-            }
-            String message = exception.getLocalizedMessage();
-            messages.append( message == null ? exception.toString() : message );
-        }
-        return messages.toString();
+        return toMessage( Throwable::getLocalizedMessage );
     }
 
     @Override
     public String getMessage()
+    {
+        return toMessage( Throwable::getMessage );
+    }
+
+    private String toMessage( Function<Throwable, String> msg )
     {
         StringBuilder messages = new StringBuilder();
-        for ( Throwable exception : exceptions )
+        for ( Throwable exception : getSuppressed() )
         {
             if ( messages.length() != 0 )
             {
                 messages.append( '\n' );
             }
-            String message = exception.getMessage();
+            String message = msg.apply( exception );
             messages.append( message == null ? exception.toString() : message );
         }
         return messages.toString();
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/output/MultipleFailureExceptionTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/output/MultipleFailureExceptionTest.java
@@ -0,0 +1,59 @@
+package org.apache.maven.plugin.surefire.booterclient.output;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@code MultipleFailureException}.
+ */
+public class MultipleFailureExceptionTest
+{
+    @Test
+    public void test()
+    {
+        MultipleFailureException e = new MultipleFailureException();
+        NullPointerException suppressed1 = new NullPointerException( "field is null" );
+        IOException suppressed2 = new IOException( "read error" );
+        e.addException( suppressed1 );
+        e.addException( suppressed2 );
+
+        assertThat( e.getMessage() )
+            .contains( "field is null" )
+            .contains( "read error" );
+
+        assertThat( e.getLocalizedMessage() )
+            .contains( "field is null" )
+            .contains( "read error" );
+
+        assertThat( e.getSuppressed() )
+            .hasSize( 2 );
+
+        assertThat( e.getSuppressed() )
+            .contains( suppressed1, suppressed2 );
+
+        assertThat( e.hasNestedExceptions() )
+            .isTrue();
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -20,51 +20,43 @@`
`20`	`20`	`*/`
`21`	`21`
`22`	`22`	`import java.io.IOException;`
`23`		`-import java.util.Queue;`
`24`		`-import java.util.concurrent.ConcurrentLinkedQueue;`
	`23`	`+import java.util.function.Function;`
`25`	`24`
`26`	`25`	`final class MultipleFailureException`
`27`	`26`	`extends IOException`
`28`	`27`	`{`
`29`		`- private final Queue<Throwable> exceptions = new ConcurrentLinkedQueue<>();`
`30`		`-`
`31`	`28`	`void addException( Throwable exception )`
`32`	`29`	`{`
`33`		`- exceptions.add( exception );`
	`30`	`+ addSuppressed( exception );`
`34`	`31`	`}`
`35`	`32`
`36`	`33`	`boolean hasNestedExceptions()`
`37`	`34`	`{`
`38`		`- return !exceptions.isEmpty();`
	`35`	`+ return getSuppressed().length != 0;`
`39`	`36`	`}`
`40`	`37`
`41`	`38`	`@Override`
`42`	`39`	`public String getLocalizedMessage()`
`43`	`40`	`{`
`44`		`- StringBuilder messages = new StringBuilder();`
`45`		`- for ( Throwable exception : exceptions )`
`46`		`- {`
`47`		`- if ( messages.length() != 0 )`
`48`		`- {`
`49`		`- messages.append( '\n' );`
`50`		`- }`
`51`		`- String message = exception.getLocalizedMessage();`
`52`		`- messages.append( message == null ? exception.toString() : message );`
`53`		`- }`
`54`		`- return messages.toString();`
	`41`	`+ return toMessage( Throwable::getLocalizedMessage );`
`55`	`42`	`}`
`56`	`43`
`57`	`44`	`@Override`
`58`	`45`	`public String getMessage()`
	`46`	`+ {`
	`47`	`+ return toMessage( Throwable::getMessage );`
	`48`	`+ }`
	`49`	`+`
	`50`	`+ private String toMessage( Function<Throwable, String> msg )`
`59`	`51`	`{`
`60`	`52`	`StringBuilder messages = new StringBuilder();`
`61`		`- for ( Throwable exception : exceptions )`
	`53`	`+ for ( Throwable exception : getSuppressed() )`
`62`	`54`	`{`
`63`	`55`	`if ( messages.length() != 0 )`
`64`	`56`	`{`
`65`	`57`	`messages.append( '\n' );`
`66`	`58`	`}`
`67`		`- String message = exception.getMessage();`
	`59`	`+ String message = msg.apply( exception );`
`68`	`60`	`messages.append( message == null ? exception.toString() : message );`
`69`	`61`	`}`
`70`	`62`	`return messages.toString();`