diff --git a/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF index dfe922f1a29..cca59018140 100644 --- a/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF +++ b/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF @@ -60,6 +60,8 @@ Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)", org.hamcrest, org.junit, org.junit.jupiter.api.function;version="5.8.1", + org.junit.jupiter.migrationsupport;version="[5.13.0,6.0.0)", + org.junit.platform.suite.api;version="[1.13.0,2.0.0)", org.junit.rules, org.junit.runner, org.junit.runners, diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/core/tests/internal/AllPDECoreTests.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/core/tests/internal/AllPDECoreTests.java index 75b2508e9c3..0a57392be14 100644 --- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/core/tests/internal/AllPDECoreTests.java +++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/core/tests/internal/AllPDECoreTests.java @@ -1,11 +1,10 @@ package org.eclipse.pde.core.tests.internal; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; -@RunWith(Suite.class) -@SuiteClasses({ // +@Suite +@SelectClasses({ // DependencyManagerTest.class, // WorkspaceModelManagerTest.class, // WorkspaceProductModelManagerTest.class, // diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/AllPDETests.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/AllPDETests.java index 4070f42e720..1593211d3a9 100644 --- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/AllPDETests.java +++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/AllPDETests.java @@ -37,12 +37,11 @@ import org.eclipse.pde.ui.tests.views.log.AllLogViewTests; import org.eclipse.pde.ui.tests.wizards.AllNewProjectTests; import org.eclipse.ui.tests.smartimport.ProjectSmartImportTest; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; -@RunWith(Suite.class) -@SuiteClasses({ // +@Suite +@SelectClasses({ // AllTargetTests.class, // AllNewProjectTests.class, // AllPreferenceTests.class, // diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/launcher/AllLauncherTests.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/launcher/AllLauncherTests.java index 6c13b5d43ea..40735c75b18 100644 --- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/launcher/AllLauncherTests.java +++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/launcher/AllLauncherTests.java @@ -14,15 +14,11 @@ package org.eclipse.pde.ui.tests.launcher; import org.eclipse.pde.ui.tests.launcher.product.ProductEditorLaunchingTest; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; -/** - * @since 3.5 - */ -@RunWith(Suite.class) -@SuiteClasses({ // +@Suite +@SelectClasses({ // FeatureBasedLaunchTest.class, // PluginBasedLaunchTest.class, // LaunchConfigurationHelperTestCase.class, // diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/model/bundle/AllBundleModelTests.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/model/bundle/AllBundleModelTests.java index 38c6cf5d918..57f617be875 100644 --- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/model/bundle/AllBundleModelTests.java +++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/model/bundle/AllBundleModelTests.java @@ -13,13 +13,12 @@ *******************************************************************************/ package org.eclipse.pde.ui.tests.model.bundle; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; -@RunWith(Suite.class) -@SuiteClasses({ ImportPackageTestCase.class, ExportPackageTestCase.class, BundleClasspathTestCase.class, +@Suite +@SelectClasses({ ImportPackageTestCase.class, ExportPackageTestCase.class, BundleClasspathTestCase.class, BundleActivatorTestCase.class, BundleNameTestCase.class, BundleLocalizationTestCase.class, LazyStartTestCase.class, RequireBundleTestCase.class, ExecutionEnvironmentTestCase.class, BundleSymbolicNameTestCase.class, BundleVendorTestCase.class, BundleVersionTestCase.class, diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/model/xml/AllXMLModelTests.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/model/xml/AllXMLModelTests.java index a1dbcd7221c..5caf10e03ad 100644 --- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/model/xml/AllXMLModelTests.java +++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/model/xml/AllXMLModelTests.java @@ -14,12 +14,11 @@ package org.eclipse.pde.ui.tests.model.xml; import org.eclipse.pde.core.tests.internal.feature.FeatureDataTestCase; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; -@RunWith(Suite.class) -@SuiteClasses({ BasicXMLTestCase.class, +@Suite +@SelectClasses({ BasicXMLTestCase.class, /* * Commented out till XMLTextChangeListener#getTextOperations() gets fixed / * updated (see what InputContext does) diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/nls/AllNLSTests.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/nls/AllNLSTests.java index eb5aa086ad0..59e0442a904 100644 --- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/nls/AllNLSTests.java +++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/nls/AllNLSTests.java @@ -14,15 +14,11 @@ *******************************************************************************/ package org.eclipse.pde.ui.tests.nls; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; -/** - * @since 3.4 - */ -@RunWith(Suite.class) -@SuiteClasses({ StringHelperTestCase.class }) +@Suite +@SelectClasses({ StringHelperTestCase.class }) public class AllNLSTests { } diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/preferences/AllPreferenceTests.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/preferences/AllPreferenceTests.java index c907fd76e67..42ce0fcaab5 100644 --- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/preferences/AllPreferenceTests.java +++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/preferences/AllPreferenceTests.java @@ -13,15 +13,11 @@ *******************************************************************************/ package org.eclipse.pde.ui.tests.preferences; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; -/** - * @since 3.5 - */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ PDEPreferencesTestCase.class }) public class AllPreferenceTests { diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/runtime/AllPDERuntimeTests.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/runtime/AllPDERuntimeTests.java index 5c3dc2063eb..6a63088482c 100755 --- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/runtime/AllPDERuntimeTests.java +++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/runtime/AllPDERuntimeTests.java @@ -13,13 +13,11 @@ *******************************************************************************/ package org.eclipse.pde.ui.tests.runtime; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; - -@RunWith(Suite.class) -@SuiteClasses({ LocalModelTest.class }) +@Suite +@SelectClasses({ LocalModelTest.class }) public class AllPDERuntimeTests { } diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/AllTargetTests.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/AllTargetTests.java index 129fa0e4c9a..e7ff597cec6 100644 --- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/AllTargetTests.java +++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/AllTargetTests.java @@ -13,12 +13,11 @@ *******************************************************************************/ package org.eclipse.pde.ui.tests.target; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; -@RunWith(Suite.class) -@SuiteClasses({ TargetEnvironmentTestCase.class, // +@Suite +@SelectClasses({ TargetEnvironmentTestCase.class, // TargetPlatformHelperTests.class, // LocalTargetDefinitionTests.class, // WorkspaceTargetDefinitionTests.class, // diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/views/log/AllLogViewTests.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/views/log/AllLogViewTests.java index dbf86647040..e646b69f428 100644 --- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/views/log/AllLogViewTests.java +++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/views/log/AllLogViewTests.java @@ -14,12 +14,11 @@ *******************************************************************************/ package org.eclipse.pde.ui.tests.views.log; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; -@RunWith(Suite.class) -@SuiteClasses({ LogEntryTest.class }) +@Suite +@SelectClasses({ LogEntryTest.class }) public class AllLogViewTests { } diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/AllNewProjectTests.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/AllNewProjectTests.java index 2d4217cdc1f..ecb8c9b625b 100644 --- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/AllNewProjectTests.java +++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/AllNewProjectTests.java @@ -14,12 +14,11 @@ package org.eclipse.pde.ui.tests.wizards; import org.eclipse.pde.ui.tests.ee.ExecutionEnvironmentTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; -@RunWith(Suite.class) -@SuiteClasses({ NewFeatureProjectTestCase.class, NewSiteProjectTestCase.class, ConvertProjectToPluginTestCase.class, +@Suite +@SelectClasses({ NewFeatureProjectTestCase.class, NewSiteProjectTestCase.class, ConvertProjectToPluginTestCase.class, ExecutionEnvironmentTests.class }) public class AllNewProjectTests { }