Remove junit4 support (#383)

Co-authored-by: Valentin Böhm <valentin.boehm@tum.de>

Author: krusche

pom.xml

@@ -80,13 +80,6 @@
 			<artifactId>junit-jupiter-params</artifactId>
 			<version>${junit-jupiter-version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.junit.vintage</groupId>
-			<artifactId>junit-vintage-engine</artifactId>
-			<version>${junit-jupiter-version}</version>
-			<scope>provided</scope>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest</artifactId>

src/main/java/de/tum/in/test/api/internal/sanitization/MultipleFailuresErrorSanitizer.java

@@ -1,7 +1,6 @@
 package de.tum.in.test.api.internal.sanitization;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 import org.assertj.core.error.AssertJMultipleFailuresError;
 import org.opentest4j.MultipleFailuresError;
@@ -22,8 +21,7 @@ public Throwable sanitize(Throwable t, MessageTransformer messageTransformer) {
 		MultipleFailuresError mfe = (MultipleFailuresError) t;
 		ThrowableInfo info = ThrowableInfo.getEssentialInfosSafeFrom(mfe).sanitize();
 		// list is safe here because of defensive copying in MultipleFailuresError
-		List<Throwable> failures = mfe.getFailures().stream().map(ThrowableSanitizer::sanitize)
-				.collect(Collectors.toUnmodifiableList());
+		List<Throwable> failures = mfe.getFailures().stream().map(ThrowableSanitizer::sanitize).toList();
 		/*
 		 * Message already contains the failures and separating both is more difficult.
 		 * So we just pass the message constructed be the old object, as the new object

src/main/java/de/tum/in/test/api/internal/sanitization/SafeTypeThrowableSanitizer.java

@@ -7,11 +7,8 @@
 import java.util.*;
 import java.util.function.Supplier;
 
-import org.junit.experimental.theories.internal.ParameterizedAssertionError;
 import org.slf4j.*;
 
-import junit.framework.*;
-
 import de.tum.in.test.api.internal.sanitization.ThrowableInfo.PropertyKey;
 import de.tum.in.test.api.util.LruCache;
 
@@ -38,11 +35,7 @@ enum SafeTypeThrowableSanitizer implements SpecificThrowableSanitizer {
 			entry("java.net.HttpRetryException", new HttpRetryExceptionCreator()), //$NON-NLS-1$
 			entry("java.time.format.DateTimeParseException", new DateTimeParseExceptionCreator()), //$NON-NLS-1$
 			entry("java.util.IllformedLocaleException", new IllformedLocaleExceptionCreator()), //$NON-NLS-1$
-			entry("java.util.MissingResourceException", new MissingResourceExceptionCreator()), //$NON-NLS-1$
-			entry("junit.framework.ComparisonFailure", new ThrowableCreatorWrapper(ComparisonFailureCreator::new)), //$NON-NLS-1$
-			entry("org.junit.ComparisonFailure", new ThrowableCreatorWrapper(ComparisonFailureCreator::new)), //$NON-NLS-1$
-			entry("org.junit.experimental.theories.internal.ParameterizedAssertionError", //$NON-NLS-1$
-					new ThrowableCreatorWrapper(ParameterizedAssertionErrorCreator::new)) //
+			entry("java.util.MissingResourceException", new MissingResourceExceptionCreator()) //$NON-NLS-1$
 	);
 
 	final Map<Class<? extends Throwable>, ThrowableCreator> cachedThrowableCreators = Collections
@@ -146,47 +139,4 @@ public Throwable create(ThrowableInfo info) {
 			return new MissingResourceException(message, className, key);
 		}
 	}
-
-	private static class ComparisonFailureCreator implements ThrowableCreator {
-
-		private static final int MAX_CONTEXT_LENGTH = 20;
-
-		private static final PropertyKey<String> EXPECTED = new PropertyKey<>(String.class, "expected"); //$NON-NLS-1$
-		private static final PropertyKey<String> ACTUAL = new PropertyKey<>(String.class, "actual"); //$NON-NLS-1$
-
-		@Override
-		public Throwable create(ThrowableInfo info) {
-			var message = info.getMessage();
-			var expected = info.getProperty(EXPECTED);
-			var actual = info.getProperty(ACTUAL);
-			String withoutMessage = new ComparisonCompactor(MAX_CONTEXT_LENGTH, expected, actual).compact(""); //$NON-NLS-1$
-			var start = SanitizationUtils.removeSuffixMatching(message, withoutMessage);
-			if (start == null)
-				message = ""; //$NON-NLS-1$
-			else
-				message = start.trim();
-			if (ComparisonFailure.class.isAssignableFrom(info.getType()))
-				return new ComparisonFailure(message, expected, actual);
-			return new org.junit.ComparisonFailure(message, expected, actual);
-		}
-	}
-
-	private static class ParameterizedAssertionErrorCreator implements ThrowableCreator {
-
-		@Override
-		public Throwable create(ThrowableInfo info) {
-			var targetException = info.getCause();
-			var message = info.getMessage();
-			var methodName = message;
-			var params = new Object[0];
-			try {
-				var parts = message.substring(0, message.length() - 1).split("\\(", 2); //$NON-NLS-1$
-				methodName = parts[0];
-				params = parts[1].split(","); //$NON-NLS-1$
-			} catch (@SuppressWarnings("unused") RuntimeException e) {
-				// ignore
-			}
-			return new ParameterizedAssertionError(targetException, methodName, params);
-		}
-	}
 }

src/main/java/de/tum/in/test/api/internal/sanitization/ThrowableInfo.java

@@ -8,6 +8,8 @@
 
 import org.apiguardian.api.API;
 import org.apiguardian.api.API.Status;
+import org.assertj.core.error.AssertJMultipleFailuresError;
+import org.assertj.core.util.Throwables;
 
 /**
  * Contains information about a Throwable without the Throwable instance itself.
@@ -172,13 +174,44 @@ public static ThrowableInfo of(Class<? extends Throwable> type, Map<String, Obje
 	}
 
 	public static ThrowableInfo getEssentialInfosSafeFrom(Throwable source) {
-		String message = invoke(source::getMessage);
+		String message = (source instanceof AssertJMultipleFailuresError)
+				? saveAssertJMultipleFailuresMessage((AssertJMultipleFailuresError) source)
+				: invoke(source::getMessage);
 		Throwable cause = invoke(source::getCause);
 		StackTraceElement[] stackTrace = invoke(source::getStackTrace);
 		Throwable[] suppressed = source.getSuppressed(); // OK: final method
 		return ThrowableInfo.of(source.getClass(), message, cause, stackTrace, suppressed, Map.of());
 	}
 
+	/**
+	 * Custom reconstruction of {@link AssertJMultipleFailuresError#getMessage()}.
+	 * <p>
+	 * AssertJ's own getMessage() implementation introspects nested failures and can
+	 * trigger reflection, which breaks when using
+	 * {@link de.tum.in.test.api.internal.BlacklistedInvoker}. To avoid that, we
+	 * extract the failures, their messages, and the first user-relevant stack frame
+	 * ourselves without reflections.
+	 */
+	private static String saveAssertJMultipleFailuresMessage(AssertJMultipleFailuresError e) {
+		return invoke(() -> {
+			List<Throwable> failures = e.getFailures();
+			StringBuilder sb = new StringBuilder();
+			sb.append("Multiple Failures (").append(failures.size()).append(" failures)");
+			for (int i = 0; i < failures.size(); i++) {
+				Throwable failure = failures.get(i);
+				sb.append("\n-- failure ").append(i + 1).append(" --");
+				sb.append(failure.getMessage());
+
+				StackTraceElement[] stackTrace = failure.getStackTrace();
+				StackTraceElement firstUserFrame = Throwables.getFirstStackTraceElementFromTest(stackTrace);
+				if (firstUserFrame != null) {
+					sb.append("\n").append(formatStackTraceElement(firstUserFrame));
+				}
+			}
+			return sb.toString();
+		});
+	}
+
 	public static class PropertyKey<T> {
 
 		private final Class<T> type;

src/main/java/de/tum/in/test/api/internal/sanitization/ThrowableSets.java

@@ -26,7 +26,6 @@ final class ThrowableSets {
 
 	private static final Logger LOG = LoggerFactory.getLogger(ThrowableSets.class);
 
-	private static final String JUNIT4_CHECK_CLASS = "junit.framework.AssertionFailedError"; //$NON-NLS-1$
 	private static final String JUNIT5_CHECK_CLASS = "org.junit.platform.commons.JUnitException"; //$NON-NLS-1$
 	private static final String JQWIK_CHECK_CLASS = "net.jqwik.api.JqwikException"; //$NON-NLS-1$
 	private static final String ASSERTJ_CHECK_CLASS = "org.assertj.core.api.Assertions"; //$NON-NLS-1$
@@ -35,8 +34,6 @@ final class ThrowableSets {
 	static {
 		HashSet<Class<? extends Throwable>> safeTypesJoin = new HashSet<>(Java.SAFE_TYPES);
 		safeTypesJoin.addAll(Own.SAFE_TYPES);
-		if (classCanBeFound(JUNIT4_CHECK_CLASS))
-			safeTypesJoin.addAll(JUnit4.SAFE_TYPES);
 		if (classCanBeFound(JUNIT5_CHECK_CLASS))
 			safeTypesJoin.addAll(JUnit5.SAFE_TYPES);
 		if (classCanBeFound(JQWIK_CHECK_CLASS))
@@ -206,25 +203,6 @@ private Java() {
 				java.util.zip.ZipException.class);
 	}
 
-	static final class JUnit4 {
-
-		private JUnit4() {
-		}
-
-		static final Set<Class<? extends Throwable>> SAFE_TYPES = Set.of(junit.framework.AssertionFailedError.class,
-				junit.framework.ComparisonFailure.class, org.junit.ComparisonFailure.class, org.junit.Test.None.class,
-				org.junit.TestCouldNotBeSkippedException.class,
-				org.junit.experimental.max.CouldNotReadCoreException.class,
-				org.junit.experimental.theories.PotentialAssignment.CouldNotGenerateValueException.class,
-				org.junit.experimental.theories.internal.ParameterizedAssertionError.class,
-				org.junit.internal.ArrayComparisonFailure.class,
-				org.junit.runner.FilterFactory.FilterNotCreatedException.class,
-				org.junit.runner.manipulation.InvalidOrderingException.class,
-				org.junit.runner.manipulation.NoTestsRemainException.class,
-				org.junit.runner.notification.StoppedByUserException.class,
-				org.junit.runners.model.TestTimedOutException.class);
-	}
-
 	static final class JUnit5 {
 
 		private JUnit5() {

src/main/java/de/tum/in/test/api/internal/sanitization/ThrowableUtils.java

@@ -149,4 +149,11 @@ static Object[] provideArguments(Constructor<?> constructor, Map<Class<?>, List<
 			return null;
 		}).toArray();
 	}
+
+	static String formatStackTraceElement(StackTraceElement ste) {
+		String className = ste.getClassName();
+		String simpleName = className.substring(className.lastIndexOf('.') + 1);
+		return "at " + simpleName + "." + ste.getMethodName() + "(" + ste.getFileName() + ":" + ste.getLineNumber()
+				+ ")";
+	}
 }

src/test/java/de/tum/in/test/api/util/ClassMemberAccessorTest.java

@@ -1,7 +1,7 @@
 package de.tum.in.test.api.util;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.lang.reflect.*;
 

src/test/java/de/tum/in/test/integration/ExceptionFailureTest.java

@@ -18,19 +18,19 @@ class ExceptionFailureTest {
 	@UserTestResults
 	private static Events tests;
 
-	private final String assertJMultipleFailures = "assertJMultipleFailures";
-	private final String assertionFailOnly = "assertionFailOnly";
-	private final String assertionFailed = "assertionFailed";
-	private final String customException = "customException";
-	private final String exceptionInInitializer = "exceptionInInitializer";
-	private final String faultyGetCauseException = "faultyGetCauseException";
-	private final String faultyToStringException = "faultyToStringException";
-	private final String multipleAssertions = "multipleAssertions";
-	private final String multipleFailures = "multipleFailures";
-	private final String nullPointer = "nullPointer";
-	private final String softAssertion = "softAssertion";
-	private final String throwExceptionInInitializerError = "throwExceptionInInitializerError";
-	private final String throwNullPointerException = "throwNullPointerException";
+	private static final String assertJMultipleFailures = "assertJMultipleFailures";
+	private static final String assertionFailOnly = "assertionFailOnly";
+	private static final String assertionFailed = "assertionFailed";
+	private static final String customException = "customException";
+	private static final String exceptionInInitializer = "exceptionInInitializer";
+	private static final String faultyGetCauseException = "faultyGetCauseException";
+	private static final String faultyToStringException = "faultyToStringException";
+	private static final String multipleAssertions = "multipleAssertions";
+	private static final String multipleFailures = "multipleFailures";
+	private static final String nullPointer = "nullPointer";
+	private static final String softAssertion = "softAssertion";
+	private static final String throwExceptionInInitializerError = "throwExceptionInInitializerError";
+	private static final String throwNullPointerException = "throwNullPointerException";
 
 	@TestTest
 	void test_assertJMultipleFailures() {
@@ -120,8 +120,8 @@ void test_multipleAssertions() {
 	void test_multipleFailures() {
 		tests.assertThatEvents().haveExactly(1, testFailedWith(multipleFailures, MultipleFailuresError.class, //
 				"Multiple Failures (2 failures)\n" + //
-						"\tjava.lang.AssertionError: A\n" + //
-						"\tjava.lang.AssertionError: B", //
+						"\torg.opentest4j.AssertionFailedError: A\n" + //
+						"\torg.opentest4j.AssertionFailedError: B", //
 				new Condition<>(t -> t.getSuppressed().length == 2, "two suppressed exceptions"),
 				Option.MESSAGE_NORMALIZE_NEWLINE));
 	}

src/test/java/de/tum/in/test/integration/InputOutputTest.java

@@ -4,9 +4,9 @@
 
 import java.lang.annotation.AnnotationFormatError;
 
-import org.junit.ComparisonFailure;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.platform.testkit.engine.Events;
+import org.opentest4j.AssertionFailedError;
 
 import de.tum.in.test.integration.testuser.InputOutputUser;
 import de.tum.in.test.testutilities.*;
@@ -58,7 +58,7 @@ void test_testPenguin1() {
 
 	@TestTest
 	void test_testPenguin2() {
-		tests.assertThatEvents().haveExactly(1, testFailedWith(testPenguin2, ComparisonFailure.class));
+		tests.assertThatEvents().haveExactly(1, testFailedWith(testPenguin2, AssertionFailedError.class));
 	}
 
 	@TestTest

src/test/java/de/tum/in/test/integration/SecurityTest.java

@@ -5,7 +5,6 @@
 
 import java.nio.file.Path;
 
-import org.junit.ComparisonFailure;
 import org.junit.platform.testkit.engine.Events;
 import org.opentest4j.AssertionFailedError;
 
@@ -53,7 +52,7 @@ void test_doSystemExit() {
 
 	@TestTest
 	void test_longOutputJUnit4() {
-		tests.assertThatEvents().haveExactly(1, testFailedWith(longOutputJUnit4, ComparisonFailure.class));
+		tests.assertThatEvents().haveExactly(1, testFailedWith(longOutputJUnit4, AssertionFailedError.class));
 	}
 
 	@TestTest