Introduce EventConditions.finishedWithFailure() varargs variant

Issue: #1621
junit-team · Dec 14, 2018 · c50a343 · c50a343
1 parent b37b48e
commit c50a343
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/documentation/src/test/java/example/testkit/EngineTestKitFailedMethodDemo.java b/documentation/src/test/java/example/testkit/EngineTestKitFailedMethodDemo.java
@@ -13,7 +13,6 @@
 // @formatter:off
 // tag::user_guide[]
 
-import static org.assertj.core.api.Assertions.allOf;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 import static org.junit.platform.testkit.engine.EventConditions.event;
 import static org.junit.platform.testkit.engine.EventConditions.finishedWithFailure;
@@ -36,8 +35,7 @@ void verifyJupiterMethodFailed() {
 			.tests() // <4>
 			.assertThatEvents().haveExactly(1, // <5>
 				event(test("failingTest"),
-					finishedWithFailure(
-						allOf(isA(ArithmeticException.class), message("/ by zero")))));
+					finishedWithFailure(isA(ArithmeticException.class), message("/ by zero"))));
 	}
 
 }

diff --git a/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java b/junit-platform-testkit/src/main/java/org/junit/platform/testkit/engine/EventConditions.java
@@ -11,6 +11,7 @@
 package org.junit.platform.testkit.engine;
 
 import static java.util.function.Predicate.isEqual;
+import static java.util.stream.Collectors.toCollection;
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.junit.platform.commons.util.FunctionUtils.where;
 import static org.junit.platform.engine.TestExecutionResult.Status.ABORTED;
@@ -24,6 +25,9 @@
 import static org.junit.platform.testkit.engine.EventType.SKIPPED;
 import static org.junit.platform.testkit.engine.EventType.STARTED;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.function.Predicate;
 
 import org.apiguardian.api.API;
@@ -136,6 +140,23 @@ public static Condition<Event> finishedWithFailure(Condition<? super Throwable>
 		return finishedWithCause(FAILED, causeCondition);
 	}
 
+	@SafeVarargs
+	public static Condition<Event> finishedWithFailure(Condition<Throwable>... conditions) {
+		return finishedWithCause(FAILED, conditions);
+	}
+
+	@SuppressWarnings("unchecked")
+	private static Condition<Event> finishedWithCause(Status expectedStatus, Condition<Throwable>... conditions) {
+
+		List<Condition<TestExecutionResult>> list = Arrays.stream(conditions)//
+				.map(TestExecutionResultConditions::throwable)//
+				.collect(toCollection(ArrayList::new));
+
+		list.add(0, TestExecutionResultConditions.status(expectedStatus));
+
+		return finished(Assertions.allOf(list));
+	}
+
 	private static Condition<Event> finishedWithCause(Status expectedStatus,
 			Condition<? super Throwable> causeCondition) {