From 68d2734ab04ad39dda510ef4871f085d0674724f Mon Sep 17 00:00:00 2001 From: "Klare, Heiko" Date: Tue, 30 Dec 2025 17:28:37 +0100 Subject: [PATCH] Replace custom AssertionFailedErrors in test harness based on org.junit The custom AssertionFailedErrors specified in org.eclipse.core.tests.harness are derived from JUnit 3/4's AssertionFailedError coming from org.junit. In order to fully migrate the test harness to JUnit 5, this change adapts those classes to subclass the AssertionFailedError from org.opentest4j as done by JUnit 5 as well. Contributes to https://github.com/eclipse-platform/eclipse.platform/issues/903 --- .../org/eclipse/core/tests/harness/FussyProgressMonitor.java | 2 +- .../eclipse/core/tests/session/RemoteAssertionFailedError.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FussyProgressMonitor.java b/runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FussyProgressMonitor.java index 0eed39172f5..d45eb001173 100644 --- a/runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FussyProgressMonitor.java +++ b/runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FussyProgressMonitor.java @@ -15,8 +15,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import junit.framework.AssertionFailedError; import org.eclipse.core.runtime.jobs.Job; +import org.opentest4j.AssertionFailedError; /** * This class can be used for testing progress monitoring. diff --git a/runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/session/RemoteAssertionFailedError.java b/runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/session/RemoteAssertionFailedError.java index efa9a78dbf7..577023d6fbe 100644 --- a/runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/session/RemoteAssertionFailedError.java +++ b/runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/session/RemoteAssertionFailedError.java @@ -15,7 +15,7 @@ import java.io.PrintStream; import java.io.PrintWriter; -import junit.framework.AssertionFailedError; +import org.opentest4j.AssertionFailedError; public class RemoteAssertionFailedError extends AssertionFailedError { /**