Re-enable test cases and move ignore from test suites to test classes

HeikoKlare · HeikoKlare · commit c055ac55b38e · 2025-09-06T10:24:53.000+02:00
Some test suite of org.eclipse.ui.tests are currently disabled/ignored.
This will be impossible when migrating to JUnit 5. This change pushes
down the ignore to either the included test classes or just some of the
test methods of other methods of those test classes work fine. Thus,
this also re-enables some tests that actually run fine.
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/AcceleratorConfigurationsExtensionDynamicTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/AcceleratorConfigurationsExtensionDynamicTest.java
@@ -20,6 +20,7 @@
 import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
 import org.eclipse.ui.keys.IBindingService;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -28,6 +29,7 @@
  *
  * @since 3.1.1
  */
+@Ignore("Bug 405296")
 public final class AcceleratorConfigurationsExtensionDynamicTest extends
 		DynamicTestCase {
 
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/AcceleratorScopesExtensionDynamicTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/AcceleratorScopesExtensionDynamicTest.java
@@ -20,6 +20,7 @@
 import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.ui.contexts.IContextService;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -28,6 +29,7 @@
  *
  * @since 3.1.1
  */
+@Ignore("Bug 405296")
 public final class AcceleratorScopesExtensionDynamicTest extends
 		DynamicTestCase {
 
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/ActionDefinitionsExtensionDynamicTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/ActionDefinitionsExtensionDynamicTest.java
@@ -20,6 +20,7 @@
 import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.ui.commands.ICommandService;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -28,6 +29,7 @@
  *
  * @since 3.1.1
  */
+@Ignore("Bug 405296")
 public final class ActionDefinitionsExtensionDynamicTest extends
 		DynamicTestCase {
 
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/ActionSetTests.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/ActionSetTests.java
@@ -37,12 +37,13 @@
 import org.eclipse.ui.internal.registry.ActionSetRegistry;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
 import org.eclipse.ui.tests.leaks.LeakTests;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * Tests to ensure the addition of new action sets with dynamic plug-ins.
  */
-
+@Ignore("Bug 405296")
 public class ActionSetTests extends DynamicTestCase {
 
 	private static final String ACTION_SET_ID = "org.eclipse.newActionSet1.newActionSet1";
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/ActivitySupportTests.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/ActivitySupportTests.java
@@ -23,6 +23,7 @@
 import org.eclipse.ui.activities.ICategory;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
 import org.eclipse.ui.tests.harness.util.ImageTests;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class ActivitySupportTests extends DynamicTestCase {
@@ -43,6 +44,7 @@ protected String getInstallLocation() {
 	}
 
 	@Test
+	@Ignore("Bug 405296")
 	public void testActivityImages() {
 		IActivity baselineActivity = getWorkbench().getActivitySupport()
 				.getActivityManager().getActivity("someBogusActivityId");
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/BindingsExtensionDynamicTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/BindingsExtensionDynamicTest.java
@@ -26,6 +26,7 @@
 import org.eclipse.ui.IWorkbenchCommandConstants;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
 import org.eclipse.ui.keys.IBindingService;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -34,6 +35,7 @@
  *
  * @since 3.1.1
  */
+@Ignore("Bug 405296")
 public final class BindingsExtensionDynamicTest extends DynamicTestCase {
 
 	/**
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/CommandsExtensionDynamicTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/CommandsExtensionDynamicTest.java
@@ -33,6 +33,7 @@
 import org.eclipse.ui.handlers.IHandlerService;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
 import org.eclipse.ui.keys.IBindingService;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -41,6 +42,7 @@
  *
  * @since 3.1.1
  */
+@Ignore("Bug 405296")
 public final class CommandsExtensionDynamicTest extends DynamicTestCase {
 
 	/**
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/ContextsExtensionDynamicTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/ContextsExtensionDynamicTest.java
@@ -20,6 +20,7 @@
 import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.ui.contexts.IContextService;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -28,6 +29,7 @@
  *
  * @since 3.1.1
  */
+@Ignore("Bug 405296")
 public final class ContextsExtensionDynamicTest extends DynamicTestCase {
 
 	/**
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/DynamicContributionTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/DynamicContributionTest.java
@@ -24,11 +24,13 @@
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
 import org.eclipse.ui.internal.util.BundleUtility;
 import org.eclipse.ui.menus.IMenuService;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * @since 3.5
  */
+@Ignore("Bug 405296")
 public class DynamicContributionTest extends DynamicTestCase {
 
 	@Test
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/DynamicInvalidContributionTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/DynamicInvalidContributionTest.java
@@ -18,11 +18,13 @@
 
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * @since 3.5
  */
+@Ignore("Bug 405296")
 public class DynamicInvalidContributionTest extends DynamicTestCase {
 
 	@Test
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/DynamicInvalidControlContributionTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/DynamicInvalidControlContributionTest.java
@@ -18,11 +18,13 @@
 
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * @since 3.8
  */
+ @Ignore("Bug 405296")
 public class DynamicInvalidControlContributionTest extends DynamicTestCase {
 
 	@Test
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/DynamicPluginsTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/DynamicPluginsTestSuite.java
@@ -13,46 +13,44 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.dynamicplugins;
 
-import org.junit.Ignore;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
 
 /**
  * Test suite for dynamic plug-in support.
  */
 @RunWith(Suite.class)
-@Ignore("Bug 405296")
-@Suite.SuiteClasses({
-	StatusHandlerTests.class,
-	AcceleratorConfigurationsExtensionDynamicTest.class,
-	AcceleratorScopesExtensionDynamicTest.class,
-	ActionDefinitionsExtensionDynamicTest.class,
-	ActionSetTests.class,
-	ActivitySupportTests.class,
-	BindingsExtensionDynamicTest.class,
-	BrowserTests.class,
-	CommandsExtensionDynamicTest.class,
-	ContextsExtensionDynamicTest.class,
-	HandlersExtensionDynamicTest.class,
-	PreferencePageTests.class,
-	KeywordTests.class,
-	PropertyPageTests.class,
-	HelpSupportTests.class,
-	EncodingTests.class,
-	DecoratorTests.class,
-	StartupTests.class,
-	EditorTests.class,
-	IntroTests.class,
-	PerspectiveTests.class,
-	ViewTests.class,
-	NewWizardTests.class,
-	ObjectContributionTests.class,
-	WorkingSetTests.class,
-	DynamicSupportTests.class,
-	DynamicContributionTest.class,
-	DynamicInvalidContributionTest.class,
-	DynamicInvalidControlContributionTest.class,
+@SuiteClasses({ //
+		StatusHandlerTests.class, //
+		AcceleratorConfigurationsExtensionDynamicTest.class, //
+		AcceleratorScopesExtensionDynamicTest.class, //
+		ActionDefinitionsExtensionDynamicTest.class, //
+		ActionSetTests.class, //
+		ActivitySupportTests.class, //
+		BindingsExtensionDynamicTest.class, //
+		BrowserTests.class, //
+		CommandsExtensionDynamicTest.class, //
+		ContextsExtensionDynamicTest.class, //
+		HandlersExtensionDynamicTest.class, //
+		PreferencePageTests.class, //
+		KeywordTests.class, //
+		PropertyPageTests.class, //
+		HelpSupportTests.class, //
+		EncodingTests.class, //
+		DecoratorTests.class, //
+		StartupTests.class, //
+		EditorTests.class, //
+		IntroTests.class, //
+		PerspectiveTests.class, //
+		ViewTests.class, //
+		NewWizardTests.class, //
+		ObjectContributionTests.class, //
+		WorkingSetTests.class, //
+		DynamicSupportTests.class, //
+		DynamicContributionTest.class, //
+		DynamicInvalidContributionTest.class, //
+		DynamicInvalidControlContributionTest.class, //
 })
-
 public class DynamicPluginsTestSuite {
 }
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/EditorTests.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/EditorTests.java
@@ -38,6 +38,7 @@
 import org.eclipse.ui.internal.WorkbenchPlugin;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
 import org.eclipse.ui.tests.leaks.LeakTests;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;
@@ -68,6 +69,7 @@ protected String getInstallLocation() {
 	}
 
 	@Test
+	@Ignore("Bug 405296")
 	public void testEditorClosure() throws CoreException, IllegalArgumentException, InterruptedException {
 		IWorkbenchWindow window = openTestWindow(IDE.RESOURCE_PERSPECTIVE_ID);
 		IFile file = getFile();
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/HandlersExtensionDynamicTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/HandlersExtensionDynamicTest.java
@@ -21,6 +21,7 @@
 import org.eclipse.core.commands.NotHandledException;
 import org.eclipse.ui.commands.ICommandService;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -29,6 +30,7 @@
  *
  * @since 3.1.1
  */
+@Ignore("Bug 405296")
 public final class HandlersExtensionDynamicTest extends DynamicTestCase {
 
 
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/IntroTests.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/IntroTests.java
@@ -33,11 +33,13 @@
 import org.eclipse.ui.tests.leaks.LeakTests;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * @since 3.1
  */
+@Ignore("Bug 405296")
 public class IntroTests extends DynamicTestCase {
 
 	private static final String PRODUCT_ID = "org.eclipse.ui.tests.someProduct";
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/NewWizardTests.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/NewWizardTests.java
@@ -17,6 +17,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThrows;
 
+import org.eclipse.core.runtime.InvalidRegistryObjectException;
 import org.eclipse.ui.internal.WorkbenchPlugin;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
 import org.eclipse.ui.wizards.IWizardDescriptor;
@@ -39,7 +40,7 @@ public void testNewWizardProperties() {
 		assertNotNull(wizard);
 		testNewWizardProperties(wizard);
 		removeBundle();
-		assertNull(registry.findWizard(WIZARD_ID));
+		assertThrows(InvalidRegistryObjectException.class, () -> registry.findWizard(WIZARD_ID));
 		assertThrows(RuntimeException.class, () -> testNewWizardProperties(wizard));
 	}
 
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/ObjectContributionTests.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/ObjectContributionTests.java
@@ -35,11 +35,13 @@
 import org.eclipse.ui.internal.PartSite;
 import org.eclipse.ui.internal.PopupMenuExtender;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * @since 3.1
  */
+@Ignore("Bug 405296")
 public class ObjectContributionTests extends DynamicTestCase {
 
 	private static final String GROUP_ID = "#OC";
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/PerspectiveTests.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/PerspectiveTests.java
@@ -28,12 +28,14 @@
 import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.internal.WorkbenchWindow;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * Tests to check the addition of a new perspective once the perspective
  * registry is loaded.
  */
+@Ignore("Bug 405296")
 public class PerspectiveTests extends DynamicTestCase {
 
 	private static final String PERSPECTIVE_ID = "org.eclipse.newPerspective1.newPerspective1";
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/StatusHandlerTests.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/StatusHandlerTests.java
@@ -30,12 +30,14 @@
 import org.eclipse.ui.statushandlers.StatusAdapter;
 import org.eclipse.ui.statushandlers.StatusManager;
 import org.eclipse.ui.tests.leaks.LeakTests;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * Tests to ensure the addition and removal of new status handlers with dynamic
  * plug-ins.
  */
+@Ignore("Bug 405296")
 public class StatusHandlerTests extends DynamicTestCase {
 
 	private static final String STATUS_HANDLER_ID1 = "org.eclipse.newStatusHandler1.newStatusHandler1";
@@ -145,6 +147,7 @@ public void testStatusHandlerRemoval2() throws CoreException, IllegalArgumentExc
 	 * @throws IllegalArgumentException
 	 */
 	@Test
+	@Ignore("Bug 405296")
 	public void testProductBindingRemoval() throws CoreException, IllegalArgumentException, InterruptedException {
 		getBundle();
 
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/ViewTests.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/ViewTests.java
@@ -38,11 +38,13 @@
 import org.eclipse.ui.views.IViewCategory;
 import org.eclipse.ui.views.IViewDescriptor;
 import org.eclipse.ui.views.IViewRegistry;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * Tests to ensure the addition of new views with dynamic plug-ins.
  */
+@Ignore("Bug 405296")
 public class ViewTests extends DynamicTestCase {
 
 	private static final String VIEW_ID1 = "org.eclipse.newView1.newView1";
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/intro/IntroTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/intro/IntroTest.java
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/intro/IntroTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/intro/IntroTestSuite.java
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/multieditor/MultiEditorTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/multieditor/MultiEditorTest.java
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/multieditor/MultiEditorTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/multieditor/MultiEditorTestSuite.java
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/zoom/ZoomTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/zoom/ZoomTestSuite.java
