From 463d472d0545dc75c11f273f82cbe86df138f7df Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Thu, 2 Oct 2025 12:16:41 +0200 Subject: [PATCH] Migrate org.eclipse.ui.tests.navigator from JUnit4 to JUnit5 - Convert @RunWith(Suite.class) to @Suite - Convert @Suite.SuiteClasses to @SelectClasses - Update imports from org.junit.runners to org.junit.platform.suite.api - Add org.junit.jupiter.api and org.junit.platform.suite.api to Import-Package --- .../META-INF/MANIFEST.MF | 4 +++- .../eclipse/ui/tests/navigator/NavigatorTestSuite.java | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF index 8b0c5901bba..bd2ab97ecc6 100644 --- a/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %bundlename Bundle-SymbolicName: org.eclipse.ui.tests.navigator;singleton:=true -Bundle-Version: 3.8.200.qualifier +Bundle-Version: 3.8.300.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.core.resources, org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)", @@ -17,6 +17,8 @@ Require-Bundle: org.eclipse.core.resources, org.eclipse.jdt.ui, org.eclipse.ui.genericeditor Bundle-Vendor: Eclipse.org +Import-Package: org.junit.jupiter.api, + org.junit.platform.suite.api Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.eclipse.ui.tests.navigator;x-internal:=true Eclipse-BundleShape: dir diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestSuite.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestSuite.java index e9d59c0c9b2..a67e92eb561 100644 --- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestSuite.java +++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestSuite.java @@ -25,12 +25,12 @@ import org.eclipse.ui.tests.navigator.resources.NestedResourcesTests; import org.eclipse.ui.tests.navigator.resources.PathComparatorTest; import org.eclipse.ui.tests.navigator.resources.ResourceMgmtActionProviderTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -@RunWith(Suite.class) -@SuiteClasses({ InitialActivationTest.class, ActionProviderTest.class, ExtensionsTest.class, FilterTest.class, +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SelectClasses; + +@Suite +@SelectClasses({ InitialActivationTest.class, ActionProviderTest.class, ExtensionsTest.class, FilterTest.class, WorkingSetTest.class, ActivityTest.class, OpenTest.class, INavigatorContentServiceTests.class, ProgrammaticOpenTest.class, PipelineTest.class, PipelineChainTest.class, JstPipelineTest.class, LabelProviderTest.class, SorterTest.class, ViewerTest.class, CdtTest.class, M12Tests.class,