migrate some more junit 4 suites to junit 5

eclipse-jdt · Sep 21, 2024 · d3dfb15 · d3dfb15
1 parent fee4f51
commit d3dfb15
Show file tree

Hide file tree

Showing 17 changed files with 82 additions and 79 deletions.
diff --git a/...e.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/PerformanceTestSuite.java b/...e.jdt.ui.tests/performance/org/eclipse/jdt/ui/tests/performance/PerformanceTestSuite.java
@@ -14,13 +14,13 @@
 
 package org.eclipse.jdt.ui.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;
 
 import org.eclipse.jdt.ui.tests.performance.views.TypeHierarchyPerfTest;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
 	TypeHierarchyPerfTest.class
 })
 public class PerformanceTestSuite {

diff --git a/...ests/performance/org/eclipse/jdt/ui/tests/performance/views/ViewPerformanceTestSuite.java b/...ests/performance/org/eclipse/jdt/ui/tests/performance/views/ViewPerformanceTestSuite.java
@@ -13,11 +13,11 @@
  *******************************************************************************/
  package org.eclipse.jdt.ui.tests.performance.views;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+ import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+ @Suite
+ @SelectClasses({
 	PackageExplorerPerfTest.class,
 	PackageExplorerColdPerfTest.class,
 	PackageExplorerEmptyPerfTest.class,

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/launcher/JUnitLauncherTests.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/launcher/JUnitLauncherTests.java
@@ -14,11 +14,11 @@
 
 package org.eclipse.jdt.junit.launcher;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
 AdvancedJUnitLaunchConfigurationDelegateTest.class,
 })
 public class JUnitLauncherTests {

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/JUnitJUnitTests.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/JUnitJUnitTests.java
@@ -15,11 +15,11 @@
 
 package org.eclipse.jdt.junit.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;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
 // TODO disabled unreliable tests driving the event loop:
 //WrappingSystemTest.class,
 //WrappingUnitTest.class,

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/AutomatedSuite.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/AutomatedSuite.java
@@ -14,9 +14,9 @@
  *******************************************************************************/
 package org.eclipse.jdt.ui.tests;
 
-import org.junit.Before;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
 import org.eclipse.jdt.junit.launcher.JUnitLauncherTests;
 import org.eclipse.jdt.junit.tests.JUnitJUnitTests;
@@ -51,8 +51,8 @@
 /**
  * Test all areas of JDT UI.
  */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
 	CoreTests.class,
 	CoreTestSuite.class,
 	QuickFixTestSuite.class,
@@ -87,7 +87,7 @@
 	SmokeViewsTest.class
 })
 public class AutomatedSuite {
-	@Before
+	@BeforeEach
 	protected void setUp() throws Exception {
 		JavaCore.setOptions(TestOptions.getDefaultOptions());
 		TestOptions.initializeCodeGenerationOptions();

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/LeakTestSuite.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/LeakTestSuite.java
@@ -13,20 +13,21 @@
  *******************************************************************************/
 package org.eclipse.jdt.ui.tests;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+
+
+/**
+ * Test for leaks
+ */
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
 import org.eclipse.jdt.ui.tests.leaks.JavaLeakTest;
 import org.eclipse.jdt.ui.tests.leaks.TextViewerUndoManagerLeakTest;
 import org.eclipse.jdt.ui.tests.leaks.UndoManagerLeakTest;
 import org.eclipse.jdt.ui.tests.search.SearchLeakTestWrapper;
 
-
-/**
- * Test for leaks
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
 	JavaLeakTest.class,
 	SearchLeakTestWrapper.class,
 	UndoManagerLeakTest.class,

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/UIInteractiveSuite.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/UIInteractiveSuite.java
@@ -13,18 +13,18 @@
  *******************************************************************************/
 package org.eclipse.jdt.ui.tests;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+/**
+ * Test all areas of the UI.
+ */
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
 import org.eclipse.jdt.ui.tests.dialogs.DialogsTest;
 import org.eclipse.jdt.ui.tests.dialogs.PreferencesTest;
 import org.eclipse.jdt.ui.tests.dialogs.WizardsTest;
 
-/**
- * Test all areas of the UI.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
 	PreferencesTest.class,
 	WizardsTest.class,
 	DialogsTest.class

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/buildpath/BuildpathTestSuite.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/buildpath/BuildpathTestSuite.java
@@ -13,15 +13,11 @@
  *******************************************************************************/
 package org.eclipse.jdt.ui.tests.buildpath;
 
-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.5
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
 	BuildpathModifierActionEnablementTest.class,
 	BuildpathModifierActionTest.class,
 	CPUserLibraryTest.class,

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/CoreTestSuite.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/CoreTestSuite.java
@@ -13,16 +13,16 @@
  *******************************************************************************/
 package org.eclipse.jdt.ui.tests.core;
 
-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.ui.tests.core.source.SourceActionTests;
 
 import org.eclipse.jdt.internal.ui.compare.JavaIgnoreWhitespaceContributorTest;
 import org.eclipse.jdt.internal.ui.compare.JavaTokenComparatorTest;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
 AddImportTest.class,
 SourceActionTests.class,
 ASTNodesInsertTest.class,

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/source/SourceActionTests.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/source/SourceActionTests.java
@@ -14,17 +14,15 @@
  *******************************************************************************/
 package org.eclipse.jdt.ui.tests.core.source;
 
-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 the actions in the source menu
  */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
 AddUnimplementedMethodsTest.class,
 GenerateGettersSettersTest.class,
 GenerateGettersSettersTest16.class,

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/jarexport/FatJarExportTests.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/jarexport/FatJarExportTests.java
@@ -29,6 +29,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
+import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
@@ -78,6 +79,7 @@
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jdt.core.JavaCore;
 
+import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
 import org.eclipse.jdt.internal.junit.util.XmlProcessorFactoryJdtJunit;
 
 import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
@@ -124,6 +126,12 @@ public static void setUpTest() {
 	public void setUp() throws Exception {
 		fProject= pts.getProject();
 
+		Map<String, String> options= fProject.getOptions(false);
+		String compliance= JavaCore.VERSION_1_8;
+		JavaModelUtil.setComplianceOptions(options, compliance);
+		JavaModelUtil.setDefaultClassfileOptions(options, compliance); // complete compliance options
+		fProject.setOptions(options);
+
 		fMainRoot= JavaProjectHelper.addSourceContainer(fProject, "src"); //$NON-NLS-1$
 		IPackageFragment fragment= fMainRoot.createPackageFragment("org.eclipse.jdt.ui.test", true, null); //$NON-NLS-1$
 		String str = """

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/jarexport/JarExportTests.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/jarexport/JarExportTests.java
@@ -14,11 +14,11 @@
  *******************************************************************************/
 package org.eclipse.jdt.ui.tests.jarexport;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
 	PlainJarExportTests.class,
 	FatJarExportTests.class
 })

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/PackageExplorerTests.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/packageview/PackageExplorerTests.java
@@ -14,11 +14,11 @@
 
 package org.eclipse.jdt.ui.tests.packageview;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
 	ContentProviderTests1.class,
 	ContentProviderTests2.class,
 	ContentProviderTests3.class,

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/CleanUpTestCaseSuite.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/CleanUpTestCaseSuite.java
@@ -14,11 +14,11 @@
  *******************************************************************************/
 package org.eclipse.jdt.ui.tests.quickfix;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
 	CleanUpStressTest.class,
 	CleanUpTest.class,
 	CleanUpTest1d4.class,

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTestSuite.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTestSuite.java
@@ -14,11 +14,11 @@
  *******************************************************************************/
 package org.eclipse.jdt.ui.tests.quickfix;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
 	QuickFixTest9.class,
 	QuickFixTest1d8.class,
 	QuickFixTest14.class,

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/refactoring/RefactoringTests.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/refactoring/RefactoringTests.java
@@ -13,11 +13,11 @@
  *******************************************************************************/
 package org.eclipse.jdt.ui.tests.refactoring;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
 	IsCompletelySelectedTest.class,
 	ParentCheckerTest.class
 })

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/SearchTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/SearchTest.java
@@ -14,11 +14,11 @@
 
 package org.eclipse.jdt.ui.tests.search;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
 	WorkspaceReferenceTest.class,
 	TreeContentProviderTestWrapper.class,
 	ParticipantTest.class,