Introduce AssertionFailureBuilder

junit-team · Jul 10, 2022 · 17d4144 · 17d4144
1 parent ad77580
commit 17d4144
Show file tree

Hide file tree

Showing 21 changed files with 346 additions and 241 deletions.
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertArrayEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertArrayEquals.java
@@ -10,11 +10,8 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
-import static org.junit.jupiter.api.AssertionUtils.fail;
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 import static org.junit.jupiter.api.AssertionUtils.formatIndexes;
-import static org.junit.jupiter.api.AssertionUtils.formatValues;
-import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
 import static org.junit.platform.commons.util.ReflectionUtils.isArray;
 
 import java.util.ArrayDeque;
@@ -406,30 +403,41 @@ private static void assertArraysNotNull(Object expected, Object actual, Deque<In
 	}
 
 	private static void failExpectedArrayIsNull(Deque<Integer> indexes, Object messageOrSupplier) {
-		fail(buildPrefix(nullSafeGet(messageOrSupplier)) + "expected array was <null>" + formatIndexes(indexes));
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.reason("expected array was <null>" + formatIndexes(indexes)) //
+				.buildAndThrow();
 	}
 
 	private static void failActualArrayIsNull(Deque<Integer> indexes, Object messageOrSupplier) {
-		fail(buildPrefix(nullSafeGet(messageOrSupplier)) + "actual array was <null>" + formatIndexes(indexes));
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.reason("actual array was <null>" + formatIndexes(indexes)) //
+				.buildAndThrow();
 	}
 
 	private static void assertArraysHaveSameLength(int expected, int actual, Deque<Integer> indexes,
 			Object messageOrSupplier) {
 
 		if (expected != actual) {
-			String prefix = buildPrefix(nullSafeGet(messageOrSupplier));
-			String message = "array lengths differ" + formatIndexes(indexes) + ", expected: <" + expected
-					+ "> but was: <" + actual + ">";
-			fail(prefix + message);
+			assertionFailure() //
+					.message(messageOrSupplier) //
+					.reason("array lengths differ" + formatIndexes(indexes)) //
+					.expected(expected) //
+					.actual(actual) //
+					.buildAndThrow();
 		}
 	}
 
 	private static void failArraysNotEqual(Object expected, Object actual, Deque<Integer> indexes,
 			Object messageOrSupplier) {
 
-		String prefix = buildPrefix(nullSafeGet(messageOrSupplier));
-		String message = "array contents differ" + formatIndexes(indexes) + ", " + formatValues(expected, actual);
-		fail(prefix + message);
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.reason("array contents differ" + formatIndexes(indexes)) //
+				.expected(expected) //
+				.actual(actual) //
+				.buildAndThrow();
 	}
 
 	private static Deque<Integer> nullSafeIndexes(Deque<Integer> indexes, int newIndex) {

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertDoesNotThrow.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertDoesNotThrow.java
@@ -10,8 +10,7 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
-import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 
 import java.util.function.Supplier;
 
@@ -78,9 +77,11 @@ private static <T> T assertDoesNotThrow(ThrowingSupplier<T> supplier, Object mes
 	}
 
 	private static AssertionFailedError createAssertionFailedError(Object messageOrSupplier, Throwable t) {
-		String message = buildPrefix(nullSafeGet(messageOrSupplier)) + "Unexpected exception thrown: "
-				+ t.getClass().getName() + buildSuffix(t.getMessage());
-		return new AssertionFailedError(message, t);
+		return assertionFailure() //
+				.message(messageOrSupplier) //
+				.reason("Unexpected exception thrown: " + t.getClass().getName() + buildSuffix(t.getMessage())) //
+				.cause(t) //
+				.build();
 	}
 
 	private static String buildSuffix(String message) {

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertEquals.java
@@ -10,8 +10,8 @@
 
 package org.junit.jupiter.api;
 
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 import static org.junit.jupiter.api.AssertionUtils.doublesAreEqual;
-import static org.junit.jupiter.api.AssertionUtils.failNotEqual;
 import static org.junit.jupiter.api.AssertionUtils.floatsAreEqual;
 import static org.junit.jupiter.api.AssertionUtils.objectsAreEqual;
 
@@ -189,4 +189,11 @@ static void assertEquals(Object expected, Object actual, Supplier<String> messag
 		}
 	}
 
+	private static void failNotEqual(Object expected, Object actual, Object messageOrSupplier) {
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.expected(expected) //
+				.actual(actual) //
+				.buildAndThrow();
+	}
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertFalse.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertFalse.java
@@ -10,9 +10,7 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
-import static org.junit.jupiter.api.AssertionUtils.fail;
-import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 
 import java.util.function.BooleanSupplier;
 import java.util.function.Supplier;
@@ -25,8 +23,6 @@
  */
 class AssertFalse {
 
-	private static final String EXPECTED_FALSE = "expected: <false> but was: <true>";
-
 	private AssertFalse() {
 		/* no-op */
 	}
@@ -37,13 +33,13 @@ static void assertFalse(boolean condition) {
 
 	static void assertFalse(boolean condition, String message) {
 		if (condition) {
-			fail(buildPrefix(message) + EXPECTED_FALSE, false, true);
+			failNotFalse(message);
 		}
 	}
 
 	static void assertFalse(boolean condition, Supplier<String> messageSupplier) {
 		if (condition) {
-			fail(buildPrefix(nullSafeGet(messageSupplier)) + EXPECTED_FALSE, false, true);
+			failNotFalse(messageSupplier);
 		}
 	}
 
@@ -59,4 +55,12 @@ static void assertFalse(BooleanSupplier booleanSupplier, Supplier<String> messag
 		assertFalse(booleanSupplier.getAsBoolean(), messageSupplier);
 	}
 
+	private static void failNotFalse(Object messageOrSupplier) {
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.expected(false) //
+				.actual(true) //
+				.buildAndThrow();
+	}
+
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertInstanceOf.java
@@ -10,14 +10,10 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
-import static org.junit.jupiter.api.AssertionUtils.format;
-import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 
 import java.util.function.Supplier;
 
-import org.opentest4j.AssertionFailedError;
-
 /**
  * {@code AssertInstanceOf} is a collection of utility methods that support
  * asserting that an object is of an expected type &mdash; in other words, if it
@@ -45,10 +41,12 @@ static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue, Supplie
 
 	private static <T> T assertInstanceOf(Class<T> expectedType, Object actualValue, Object messageOrSupplier) {
 		if (!expectedType.isInstance(actualValue)) {
-			String reason = (actualValue == null ? "Unexpected null value" : "Unexpected type");
-			String message = buildPrefix(nullSafeGet(messageOrSupplier))
-					+ format(expectedType, actualValue == null ? null : actualValue.getClass(), reason);
-			throw new AssertionFailedError(message);
+			assertionFailure() //
+					.message(messageOrSupplier) //
+					.reason(actualValue == null ? "Unexpected null value" : "Unexpected type") //
+					.expected(expectedType) //
+					.actual(actualValue == null ? null : actualValue.getClass()) //
+					.buildAndThrow();
 		}
 		return expectedType.cast(actualValue);
 	}

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertIterableEquals.java
@@ -10,11 +10,8 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
-import static org.junit.jupiter.api.AssertionUtils.fail;
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 import static org.junit.jupiter.api.AssertionUtils.formatIndexes;
-import static org.junit.jupiter.api.AssertionUtils.formatValues;
-import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
@@ -139,11 +136,17 @@ private static void assertIterablesNotNull(Object expected, Object actual, Deque
 	}
 
 	private static void failExpectedIterableIsNull(Deque<Integer> indexes, Object messageOrSupplier) {
-		fail(buildPrefix(nullSafeGet(messageOrSupplier)) + "expected iterable was <null>" + formatIndexes(indexes));
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.reason("expected iterable was <null>" + formatIndexes(indexes)) //
+				.buildAndThrow();
 	}
 
 	private static void failActualIterableIsNull(Deque<Integer> indexes, Object messageOrSupplier) {
-		fail(buildPrefix(nullSafeGet(messageOrSupplier)) + "actual iterable was <null>" + formatIndexes(indexes));
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.reason("actual iterable was <null>" + formatIndexes(indexes)) //
+				.buildAndThrow();
 	}
 
 	private static void assertIteratorsAreEmpty(Iterator<?> expected, Iterator<?> actual, int processed,
@@ -156,19 +159,24 @@ private static void assertIteratorsAreEmpty(Iterator<?> expected, Iterator<?> ac
 			AtomicInteger actualCount = new AtomicInteger(processed);
 			actual.forEachRemaining(e -> actualCount.incrementAndGet());
 
-			String prefix = buildPrefix(nullSafeGet(messageOrSupplier));
-			String message = "iterable lengths differ" + formatIndexes(indexes) + ", expected: <" + expectedCount.get()
-					+ "> but was: <" + actualCount.get() + ">";
-			fail(prefix + message);
+			assertionFailure() //
+					.message(messageOrSupplier) //
+					.reason("iterable lengths differ" + formatIndexes(indexes)) //
+					.expected(expectedCount.get()) //
+					.actual(actualCount.get()) //
+					.buildAndThrow();
 		}
 	}
 
 	private static void failIterablesNotEqual(Object expected, Object actual, Deque<Integer> indexes,
 			Object messageOrSupplier) {
 
-		String prefix = buildPrefix(nullSafeGet(messageOrSupplier));
-		String message = "iterable contents differ" + formatIndexes(indexes) + ", " + formatValues(expected, actual);
-		fail(prefix + message);
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.reason("iterable contents differ" + formatIndexes(indexes)) //
+				.expected(expected) //
+				.actual(actual) //
+				.buildAndThrow();
 	}
 
 	private final static class Pair {

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java
@@ -12,8 +12,7 @@
 
 import static java.lang.String.format;
 import static java.lang.String.join;
-import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
-import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 import static org.junit.platform.commons.util.Preconditions.condition;
 import static org.junit.platform.commons.util.Preconditions.notNull;
 
@@ -195,8 +194,13 @@ String snippet(String line) {
 
 		void fail(String format, Object... args) {
 			String newLine = System.lineSeparator();
-			String message = buildPrefix(nullSafeGet(messageOrSupplier)) + format(format, args);
-			AssertionUtils.fail(message, join(newLine, expectedLines), join(newLine, actualLines));
+			assertionFailure() //
+					.message(messageOrSupplier) //
+					.reason(format(format, args)) //
+					.expected(join(newLine, expectedLines)) //
+					.actual(join(newLine, actualLines)) //
+					.includeValuesInMessage(false) //
+					.buildAndThrow();
 		}
 	}
 

diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotEquals.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertNotEquals.java
@@ -10,11 +10,9 @@
 
 package org.junit.jupiter.api;
 
-import static org.junit.jupiter.api.AssertionUtils.buildPrefix;
+import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
 import static org.junit.jupiter.api.AssertionUtils.doublesAreEqual;
-import static org.junit.jupiter.api.AssertionUtils.fail;
 import static org.junit.jupiter.api.AssertionUtils.floatsAreEqual;
-import static org.junit.jupiter.api.AssertionUtils.nullSafeGet;
 import static org.junit.jupiter.api.AssertionUtils.objectsAreEqual;
 
 import java.util.function.Supplier;
@@ -52,7 +50,7 @@ static void assertNotEquals(byte unexpected, byte actual, String message) {
 	 */
 	static void assertNotEquals(byte unexpected, byte actual, Supplier<String> messageSupplier) {
 		if (unexpected == actual) {
-			failEqual(actual, nullSafeGet(messageSupplier));
+			failEqual(actual, messageSupplier);
 		}
 	}
 
@@ -77,7 +75,7 @@ static void assertNotEquals(short unexpected, short actual, String message) {
 	 */
 	static void assertNotEquals(short unexpected, short actual, Supplier<String> messageSupplier) {
 		if (unexpected == actual) {
-			failEqual(actual, nullSafeGet(messageSupplier));
+			failEqual(actual, messageSupplier);
 		}
 	}
 
@@ -102,7 +100,7 @@ static void assertNotEquals(int unexpected, int actual, String message) {
 	 */
 	static void assertNotEquals(int unexpected, int actual, Supplier<String> messageSupplier) {
 		if (unexpected == actual) {
-			failEqual(actual, nullSafeGet(messageSupplier));
+			failEqual(actual, messageSupplier);
 		}
 	}
 
@@ -127,7 +125,7 @@ static void assertNotEquals(long unexpected, long actual, String message) {
 	 */
 	static void assertNotEquals(long unexpected, long actual, Supplier<String> messageSupplier) {
 		if (unexpected == actual) {
-			failEqual(actual, nullSafeGet(messageSupplier));
+			failEqual(actual, messageSupplier);
 		}
 	}
 
@@ -152,7 +150,7 @@ static void assertNotEquals(float unexpected, float actual, String message) {
 	 */
 	static void assertNotEquals(float unexpected, float actual, Supplier<String> messageSupplier) {
 		if (floatsAreEqual(unexpected, actual)) {
-			failEqual(actual, nullSafeGet(messageSupplier));
+			failEqual(actual, messageSupplier);
 		}
 	}
 
@@ -177,7 +175,7 @@ static void assertNotEquals(float unexpected, float actual, float delta, String
 	 */
 	static void assertNotEquals(float unexpected, float actual, float delta, Supplier<String> messageSupplier) {
 		if (floatsAreEqual(unexpected, actual, delta)) {
-			failEqual(actual, nullSafeGet(messageSupplier));
+			failEqual(actual, messageSupplier);
 		}
 	}
 
@@ -202,7 +200,7 @@ static void assertNotEquals(double unexpected, double actual, String message) {
 	 */
 	static void assertNotEquals(double unexpected, double actual, Supplier<String> messageSupplier) {
 		if (doublesAreEqual(unexpected, actual)) {
-			failEqual(actual, nullSafeGet(messageSupplier));
+			failEqual(actual, messageSupplier);
 		}
 	}
 
@@ -227,7 +225,7 @@ static void assertNotEquals(double unexpected, double actual, double delta, Stri
 	 */
 	static void assertNotEquals(double unexpected, double actual, double delta, Supplier<String> messageSupplier) {
 		if (doublesAreEqual(unexpected, actual, delta)) {
-			failEqual(actual, nullSafeGet(messageSupplier));
+			failEqual(actual, messageSupplier);
 		}
 	}
 
@@ -252,7 +250,7 @@ static void assertNotEquals(char unexpected, char actual, String message) {
 	 */
 	static void assertNotEquals(char unexpected, char actual, Supplier<String> messageSupplier) {
 		if (unexpected == actual) {
-			failEqual(actual, nullSafeGet(messageSupplier));
+			failEqual(actual, messageSupplier);
 		}
 	}
 
@@ -268,12 +266,15 @@ static void assertNotEquals(Object unexpected, Object actual, String message) {
 
 	static void assertNotEquals(Object unexpected, Object actual, Supplier<String> messageSupplier) {
 		if (objectsAreEqual(unexpected, actual)) {
-			failEqual(actual, nullSafeGet(messageSupplier));
+			failEqual(actual, messageSupplier);
 		}
 	}
 
-	private static void failEqual(Object actual, String message) {
-		fail(buildPrefix(message) + "expected: not equal but was: <" + actual + ">");
+	private static void failEqual(Object actual, Object messageOrSupplier) {
+		assertionFailure() //
+				.message(messageOrSupplier) //
+				.reason("expected: not equal but was: <" + actual + ">") //
+				.buildAndThrow();
 	}
 
 }