Skip to content

Commit

Permalink
[SUREFIRE-2052] Handles internal exceptions do not have suppressed ex…
Browse files Browse the repository at this point in the history
…ceptions in ThreadedStreamConsumer
  • Loading branch information
Tibor17 committed Mar 29, 2022
1 parent 32f7dd3 commit 25425c3
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
@@ -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();
}
}

0 comments on commit 25425c3

Please sign in to comment.