diff --git a/org.eclipse.jdt.text.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.text.tests/META-INF/MANIFEST.MF index e0eb890ce7c..5fa7dbb4710 100644 --- a/org.eclipse.jdt.text.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.text.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.jdt.text.tests Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name Bundle-SymbolicName: org.eclipse.jdt.text.tests;singleton:=true -Bundle-Version: 3.14.550.qualifier +Bundle-Version: 3.14.600.qualifier Bundle-Activator: org.eclipse.jdt.text.tests.JdtTextTestPlugin Bundle-ActivationPolicy: lazy Bundle-Vendor: %Plugin.providerName @@ -36,7 +36,21 @@ Require-Bundle: org.eclipse.jdt.ui.tests, org.eclipse.test.performance, org.eclipse.jdt.core.manipulation, - org.eclipse.core.expressions + org.eclipse.core.expressions, + org.eclipse.core.tests.harness, + junit-jupiter-api Bundle-RequiredExecutionEnvironment: JavaSE-17 Eclipse-BundleShape: dir -Import-Package: org.junit.jupiter.api +Import-Package: org.junit.jupiter.api, + org.junit.jupiter.api.extension, + org.junit.jupiter.migrationsupport, + org.junit.jupiter.migrationsupport.conditions, + org.junit.jupiter.migrationsupport.rules, + org.junit.jupiter.params, + org.junit.jupiter.params.aggregator, + org.junit.jupiter.params.converter, + org.junit.jupiter.params.provider, + org.junit.jupiter.params.support, + org.junit.platform.suite.api, + org.junit.platform.suite.commons;status=INTERNAL, + org.junit.platform.suite.engine;status=INTERNAL diff --git a/org.eclipse.jdt.text.tests/pom.xml b/org.eclipse.jdt.text.tests/pom.xml index d67ef8a73e7..b0fb8632da0 100644 --- a/org.eclipse.jdt.text.tests/pom.xml +++ b/org.eclipse.jdt.text.tests/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jdt org.eclipse.jdt.text.tests - 3.14.550-SNAPSHOT + 3.14.600-SNAPSHOT eclipse-test-plugin diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JdtTextTestSuite.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JdtTextTestSuite.java index 78ae735ecc5..8f02b18f676 100644 --- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JdtTextTestSuite.java +++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JdtTextTestSuite.java @@ -14,8 +14,8 @@ *******************************************************************************/ package org.eclipse.jdt.text.tests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; import org.eclipse.jdt.text.tests.codemining.CodeMiningTriggerTest; import org.eclipse.jdt.text.tests.codemining.ParameterNamesCodeMiningTest; @@ -29,8 +29,8 @@ * * @since 3.0 */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ PluginsNotLoadedTest.class, CompilationUnitDocumentProviderTest.class, JavaHeuristicScannerTest.class, diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/ContentAssistTestSuite.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/ContentAssistTestSuite.java index bb539ae074d..a449d513ec0 100644 --- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/ContentAssistTestSuite.java +++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/ContentAssistTestSuite.java @@ -14,16 +14,16 @@ *******************************************************************************/ package org.eclipse.jdt.text.tests.contentassist; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Content assist test suite. * * @since 3.2 */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ //$JUnit-BEGIN$ CamelCaseCompletionTest.class, JavadocCompletionTest.class, diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/DocumentPerformanceTestSuite.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/DocumentPerformanceTestSuite.java index f3e50a8bf74..c51b41328cc 100644 --- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/DocumentPerformanceTestSuite.java +++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/DocumentPerformanceTestSuite.java @@ -13,15 +13,14 @@ *******************************************************************************/ package org.eclipse.jdt.text.tests.performance; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @since 3.3 */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ DocumentPerformanceTest.class, GapTextStorePerformanceTest.class, LineTrackerPerformanceTest.class diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/WordRulePerformanceTestSuite.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/WordRulePerformanceTestSuite.java index bfe5827d385..2275dee8aca 100644 --- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/WordRulePerformanceTestSuite.java +++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/WordRulePerformanceTestSuite.java @@ -13,14 +13,14 @@ *******************************************************************************/ package org.eclipse.jdt.text.tests.performance; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @since 3.6 */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ WordRulePerformanceTest.class }) public class WordRulePerformanceTestSuite { diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/templates/TemplatesTestSuite.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/templates/TemplatesTestSuite.java index 24f39c07c55..303867d3c85 100644 --- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/templates/TemplatesTestSuite.java +++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/templates/TemplatesTestSuite.java @@ -12,16 +12,16 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.jdt.text.tests.templates; -import org.junit.runner.RunWith; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * Template test suite. * * @since 3.4 */ -import org.junit.runners.Suite; -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ //$JUnit-BEGIN$ TemplateContributionTest.class, TemplateCompletionTests.class diff --git a/org.eclipse.jdt.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.ui.tests/META-INF/MANIFEST.MF index 3d86db7a03d..0bc05b798f5 100644 --- a/org.eclipse.jdt.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.ui.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.jdt.ui.tests Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name Bundle-SymbolicName: org.eclipse.jdt.ui.tests; singleton:=true -Bundle-Version: 3.15.600.qualifier +Bundle-Version: 3.15.700.qualifier Bundle-Activator: org.eclipse.jdt.testplugin.JavaTestPlugin Bundle-Vendor: %Plugin.providerName Bundle-Localization: plugin diff --git a/org.eclipse.jdt.ui.tests/pom.xml b/org.eclipse.jdt.ui.tests/pom.xml index 4d09430d667..5cb5abdc32a 100644 --- a/org.eclipse.jdt.ui.tests/pom.xml +++ b/org.eclipse.jdt.ui.tests/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jdt org.eclipse.jdt.ui.tests - 3.15.600-SNAPSHOT + 3.15.700-SNAPSHOT eclipse-test-plugin true