From 4b4fb19bb537e6ae2f819aa94e02dadd6f53c0ba Mon Sep 17 00:00:00 2001 From: Heiko Klare Date: Sat, 3 Jan 2026 11:52:07 +0100 Subject: [PATCH] Migrate debug test suites to JUnit 5 --- .../META-INF/MANIFEST.MF | 4 +- .../Platform Debug Test Suite.launch | 4 +- .../eclipse/debug/tests/AutomatedSuite.java | 96 +++++++++---------- .../org/eclipse/debug/tests/LocalSuite.java | 8 +- .../eclipse/debug/tests/PerformanceSuite.java | 13 +-- 5 files changed, 64 insertions(+), 61 deletions(-) diff --git a/debug/org.eclipse.debug.tests/META-INF/MANIFEST.MF b/debug/org.eclipse.debug.tests/META-INF/MANIFEST.MF index ad77986e16c..9d504e7802c 100644 --- a/debug/org.eclipse.debug.tests/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.debug.tests/META-INF/MANIFEST.MF @@ -30,6 +30,8 @@ Export-Package: org.eclipse.debug.tests, org.eclipse.debug.tests.view.memory, org.eclipse.debug.tests.viewer.model Import-Package: org.assertj.core.api;version="3.24.2", - org.assertj.core.api.iterable + org.assertj.core.api.iterable, + org.junit.jupiter.api;version="[5.14.0,6.0.0)", + org.junit.platform.suite.api;version="[1.14.0,2.0.0)" Eclipse-BundleShape: dir Automatic-Module-Name: org.eclipse.debug.tests diff --git a/debug/org.eclipse.debug.tests/Platform Debug Test Suite.launch b/debug/org.eclipse.debug.tests/Platform Debug Test Suite.launch index b29e6905c94..47af561d934 100644 --- a/debug/org.eclipse.debug.tests/Platform Debug Test Suite.launch +++ b/debug/org.eclipse.debug.tests/Platform Debug Test Suite.launch @@ -22,8 +22,8 @@ - - + + diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/AutomatedSuite.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/AutomatedSuite.java index 2e91df5d59f..df91f40b224 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/AutomatedSuite.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/AutomatedSuite.java @@ -59,83 +59,83 @@ import org.eclipse.debug.tests.viewer.model.VirtualViewerSelectionTests; import org.eclipse.debug.tests.viewer.model.VirtualViewerStateTests; import org.eclipse.debug.tests.viewer.model.VirtualViewerUpdateTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for integration and nightly builds. * * @since 3.6 */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ // Source lookup tests - SourceLookupFacilityTests.class, + SourceLookupFacilityTests.class, // // BP tests - BreakpointOrderingTests.class, - BreakpointTests.class, - SerialExecutorTest.class, + BreakpointOrderingTests.class, // + BreakpointTests.class, // + SerialExecutorTest.class, // // Note: jface viewer tests were moved out of nightly tests // due to frequent problems on nightly build machines. // (Bug 343308). // Virtual viewer tests - VirtualViewerCheckTests.class, - VirtualViewerDeltaTests.class, - VirtualViewerContentTests.class, - VirtualViewerLazyModeTests.class, - VirtualViewerSelectionTests.class, - VirtualViewerStateTests.class, - VirtualViewerUpdateTests.class, - VirtualViewerFilterTests.class, + VirtualViewerCheckTests.class, // + VirtualViewerDeltaTests.class, // + VirtualViewerContentTests.class, // + VirtualViewerLazyModeTests.class, // + VirtualViewerSelectionTests.class, // + VirtualViewerStateTests.class, // + VirtualViewerUpdateTests.class, // + VirtualViewerFilterTests.class, // // Viewer neutral tests - FilterTransformTests.class, - ChildrenUpdateTests.class, - PresentationContextTests.class, - VariableValueEditorManagerTests.class, + FilterTransformTests.class, // + ChildrenUpdateTests.class, // + PresentationContextTests.class, // + VariableValueEditorManagerTests.class, // // Memory view - MemoryRenderingTests.class, - TableRenderingTests.class, + MemoryRenderingTests.class, // + TableRenderingTests.class, // // Launch framework - LaunchConfigurationTests.class, - AcceleratorSubstitutionTests.class, - LaunchHistoryTests.class, - LaunchFavoriteTests.class, - LaunchManagerTests.class, - RefreshTabTests.class, - ArgumentParsingTests.class, - LaunchTests.class, + LaunchConfigurationTests.class, // + AcceleratorSubstitutionTests.class, // + LaunchHistoryTests.class, // + LaunchFavoriteTests.class, // + LaunchManagerTests.class, // + RefreshTabTests.class, // + ArgumentParsingTests.class, // + LaunchTests.class, // // Status handlers - StatusHandlerTests.class, + StatusHandlerTests.class, // // Step filters - StepFiltersTests.class, + StepFiltersTests.class, // // Console view - ConsoleDocumentAdapterTests.class, - ConsoleManagerTests.class, - ConsoleTests.class, - IOConsoleTests.class, - IOConsoleFixedWidthTests.class, - ProcessConsoleManagerTests.class, - ProcessConsoleTests.class, - StreamsProxyTests.class, - TextConsoleViewerTest.class, - RuntimeProcessTests.class, - OutputStreamMonitorTests.class, - InputStreamMonitorTests.class, - FileLinkTests.class, + ConsoleDocumentAdapterTests.class, // + ConsoleManagerTests.class, // + ConsoleTests.class, // + IOConsoleTests.class, // + IOConsoleFixedWidthTests.class, // + ProcessConsoleManagerTests.class, // + ProcessConsoleTests.class, // + StreamsProxyTests.class, // + TextConsoleViewerTest.class, // + RuntimeProcessTests.class, // + OutputStreamMonitorTests.class, // + InputStreamMonitorTests.class, // + FileLinkTests.class, // // Launch Groups - LaunchGroupTests.class, - LaunchConfigurationTabGroupViewerTest.class, + LaunchGroupTests.class, // + LaunchConfigurationTabGroupViewerTest.class, // // Logical structure - LogicalStructureCacheTest.class, + LogicalStructureCacheTest.class, // }) public class AutomatedSuite { } diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/LocalSuite.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/LocalSuite.java index b9f2c9e8327..860e3f5dd77 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/LocalSuite.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/LocalSuite.java @@ -23,8 +23,8 @@ import org.eclipse.debug.tests.viewer.model.JFaceViewerStateTests; import org.eclipse.debug.tests.viewer.model.JFaceViewerTopIndexTests; import org.eclipse.debug.tests.viewer.model.JFaceViewerUpdateTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests to run locally. They require a user terminal to execute correctly @@ -32,8 +32,8 @@ * * @since 3.7 */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ // JFaceViewerCheckTests.class, JFaceViewerContentTests.class, JFaceViewerDeltaTests.class, JFaceViewerSelectionTests.class, JFaceViewerStateTests.class, JFaceViewerUpdateTests.class, diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/PerformanceSuite.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/PerformanceSuite.java index 74eee6e9bdb..36894743f0e 100644 --- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/PerformanceSuite.java +++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/PerformanceSuite.java @@ -15,17 +15,18 @@ import org.eclipse.debug.tests.viewer.model.JFaceViewerPerformanceTests; import org.eclipse.debug.tests.viewer.model.VirtualViewerPerformanceTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Tests for release builds. * * @since 3.6 */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ - JFaceViewerPerformanceTests.class, - VirtualViewerPerformanceTests.class }) +@Suite +@SelectClasses({ // + JFaceViewerPerformanceTests.class, // + VirtualViewerPerformanceTests.class, // +}) public class PerformanceSuite { }