Simplify suppressed exception assertions

See assertj/assertj#3858

Author: sbrannen

spring-core/src/test/java/org/springframework/core/retry/RetryTemplateTests.java

@@ -21,7 +21,9 @@
 import java.time.Duration;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
 
+import org.assertj.core.api.ThrowingConsumer;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -32,7 +34,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.InstanceOfAssertFactories.array;
 import static org.junit.jupiter.params.provider.Arguments.argumentSet;
 
 /**
@@ -176,11 +177,10 @@ public String getName() {
 				.isThrownBy(() -> retryTemplate.execute(retryable))
 				.withMessage("Retry policy for operation 'test' exhausted; aborting execution")
 				.withCauseExactlyInstanceOf(IllegalStateException.class)
-				.extracting(Throwable::getSuppressed, array(Throwable[].class))
-				.satisfiesExactly(
+				.satisfies(hasSuppressedExceptionsSatisfyingExactly(
 					suppressed1 -> assertThat(suppressed1).isExactlyInstanceOf(IOException.class),
 					suppressed2 -> assertThat(suppressed2).isExactlyInstanceOf(FileNotFoundException.class)
-				);
+				));
 		// 3 = 1 initial invocation + 2 retry attempts
 		assertThat(invocationCount).hasValue(3);
 	}
@@ -228,16 +228,22 @@ public String getName() {
 				.isThrownBy(() -> retryTemplate.execute(retryable))
 				.withMessage("Retry policy for operation 'test' exhausted; aborting execution")
 				.withCauseExactlyInstanceOf(CustomFileNotFoundException.class)
-				.extracting(Throwable::getSuppressed, array(Throwable[].class))
-				.satisfiesExactly(
+				.satisfies(hasSuppressedExceptionsSatisfyingExactly(
 					suppressed1 -> assertThat(suppressed1).isExactlyInstanceOf(IOException.class),
 					suppressed2 -> assertThat(suppressed2).isExactlyInstanceOf(IOException.class)
-				);
+				));
 		// 3 = 1 initial invocation + 2 retry attempts
 		assertThat(invocationCount).hasValue(3);
 	}
 
 
+	@SafeVarargs
+	private static final Consumer<Throwable> hasSuppressedExceptionsSatisfyingExactly(
+			ThrowingConsumer<? super Throwable>... requirements) {
+		return throwable -> assertThat(throwable.getSuppressed()).satisfiesExactly(requirements);
+	}
+
+
 	@SuppressWarnings("serial")
 	private static class CustomFileNotFoundException extends FileNotFoundException {
 	}