From cc97ad2d543b5108ca0189834500f700dc20882b Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Thu, 2 Oct 2025 12:16:52 +0200 Subject: [PATCH] Migrate org.eclipse.ui.tests.performance 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 | 2 ++ .../jface/tests/performance/JFacePerformanceSuite.java | 9 ++++----- .../ui/tests/performance/UIPerformanceTestSuite.java | 9 ++++----- .../tests/performance/WorkbenchPerformanceSuite.java | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/org.eclipse.ui.tests.performance/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.performance/META-INF/MANIFEST.MF index c0470bcce28..7de54413d2a 100644 --- a/tests/org.eclipse.ui.tests.performance/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.ui.tests.performance/META-INF/MANIFEST.MF @@ -19,6 +19,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.e4.core.contexts, org.eclipse.ui.navigator, org.eclipse.ui.navigator.resources +Import-Package: org.junit.jupiter.api, + org.junit.platform.suite.api Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: plugin diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/JFacePerformanceSuite.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/JFacePerformanceSuite.java index 66611dbcae0..811b5de1d34 100644 --- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/JFacePerformanceSuite.java +++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/JFacePerformanceSuite.java @@ -13,15 +13,14 @@ *******************************************************************************/ package org.eclipse.jface.tests.performance; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SelectClasses; /** * The JFacePerformanceSuite are the performance tests for JFace. */ -@RunWith(Suite.class) -@SuiteClasses({ // +@Suite +@SelectClasses({ // ListViewerRefreshTest.class, // ComboViewerRefreshTest.class, // FastTableViewerRefreshTest.class, // diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/UIPerformanceTestSuite.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/UIPerformanceTestSuite.java index c0b513300c7..10417aeed1d 100644 --- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/UIPerformanceTestSuite.java +++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/UIPerformanceTestSuite.java @@ -13,15 +13,14 @@ *******************************************************************************/ package org.eclipse.ui.tests.performance; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SelectClasses; /** * Test all areas of the UI API. */ -@RunWith(Suite.class) -@SuiteClasses({ // +@Suite +@SelectClasses({ // GenerateIdentifiersTest.class, // WorkbenchPerformanceSuite.class, // OpenClosePerspectiveTest.class, // diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/WorkbenchPerformanceSuite.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/WorkbenchPerformanceSuite.java index 9fb19622ec9..168944e9b32 100644 --- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/WorkbenchPerformanceSuite.java +++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/WorkbenchPerformanceSuite.java @@ -15,12 +15,12 @@ package org.eclipse.ui.tests.performance; import org.eclipse.ui.tests.performance.layout.ResizeTest; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -@RunWith(Suite.class) -@SuiteClasses({ // +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SelectClasses; + +@Suite +@SelectClasses({ // ResizeTest.class, // }) class WorkbenchPerformanceSuite {