Replace UITestCase with test rule in dynamicplugins UI tests

Author: HeikoKlare

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/AcceleratorConfigurationsExtensionDynamicTest.java

@@ -14,33 +14,23 @@
 package org.eclipse.ui.tests.dynamicplugins;
 
 import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
 
 import org.eclipse.core.commands.common.NamedHandleObject;
 import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
 import org.eclipse.ui.keys.IBindingService;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * Tests whether the "org.eclipse.ui.acceleratorConfigurations" extension point
  * can be added and removed dynamically.
  *
  * @since 3.1.1
  */
-@RunWith(JUnit4.class)
 public final class AcceleratorConfigurationsExtensionDynamicTest extends
 		DynamicTestCase {
 
-	/**
-	 * Constructs a new instance of
-	 * <code>AcceleratorConfigurationsExtensionDynamicTest</code>.
-	 */
-	public AcceleratorConfigurationsExtensionDynamicTest() {
-		super(AcceleratorConfigurationsExtensionDynamicTest.class.getSimpleName());
-	}
-
 	/**
 	 * Returns the full-qualified identifier of the extension to be tested.
 	 *

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/AcceleratorScopesExtensionDynamicTest.java

@@ -14,33 +14,23 @@
 package org.eclipse.ui.tests.dynamicplugins;
 
 import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
 
 import org.eclipse.core.commands.common.NamedHandleObject;
 import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.ui.contexts.IContextService;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * Tests whether the "org.eclipse.ui.acceleratorScopes" extension point can be
  * added and removed dynamically.
  *
  * @since 3.1.1
  */
-@RunWith(JUnit4.class)
 public final class AcceleratorScopesExtensionDynamicTest extends
 		DynamicTestCase {
 
-	/**
-	 * Constructs a new instance of
-	 * <code>AcceleratorScopesExtensionDynamicTest</code>.
-	 */
-	public AcceleratorScopesExtensionDynamicTest() {
-		super(AcceleratorScopesExtensionDynamicTest.class.getSimpleName());
-	}
-
 	/**
 	 * Returns the full-qualified identifier of the extension to be tested.
 	 *

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/ActionDefinitionsExtensionDynamicTest.java

@@ -14,33 +14,23 @@
 package org.eclipse.ui.tests.dynamicplugins;
 
 import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
 
 import org.eclipse.core.commands.common.NamedHandleObject;
 import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.ui.commands.ICommandService;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * Tests whether the "org.eclipse.ui.actionDefinitions" extension point can be
  * added and removed dynamically.
  *
  * @since 3.1.1
  */
-@RunWith(JUnit4.class)
 public final class ActionDefinitionsExtensionDynamicTest extends
 		DynamicTestCase {
 
-	/**
-	 * Constructs a new instance of
-	 * <code>ActionDefinitionsExtensionDynamicTest</code>.
-	 */
-	public ActionDefinitionsExtensionDynamicTest() {
-		super(ActionDefinitionsExtensionDynamicTest.class.getSimpleName());
-	}
-
 	/**
 	 * Returns the full-qualified identifier of the extension to be tested.
 	 *

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/ActionSetTests.java

@@ -14,6 +14,11 @@
 package org.eclipse.ui.tests.dynamicplugins;
 
 import static org.eclipse.ui.tests.harness.util.UITestUtil.openTestWindow;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
@@ -33,23 +38,16 @@
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
 import org.eclipse.ui.tests.leaks.LeakTests;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * Tests to ensure the addition of new action sets with dynamic plug-ins.
  */
 
-@RunWith(JUnit4.class)
 public class ActionSetTests extends DynamicTestCase {
 
 	private static final String ACTION_SET_ID = "org.eclipse.newActionSet1.newActionSet1";
 	private static final String PART_ID = "org.eclipse.ui.tests.part1";
 
-	public ActionSetTests() {
-		super(ActionSetTests.class.getSimpleName());
-	}
-
 	@Test
 	public void testActionSets() throws Exception {
 		WorkbenchWindow window = (WorkbenchWindow) openTestWindow();

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/ActivitySupportTests.java

@@ -13,23 +13,20 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.dynamicplugins;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.activities.IActivity;
 import org.eclipse.ui.activities.ICategory;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
 import org.eclipse.ui.tests.harness.util.ImageTests;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
-@RunWith(JUnit4.class)
 public class ActivitySupportTests extends DynamicTestCase {
 
-	public ActivitySupportTests() {
-		super(ActivitySupportTests.class.getSimpleName());
-	}
-
 	@Override
 	protected String getExtensionId() {
 		return "newActivitySupport1.testNewActivitySupportAddition";

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/BindingsExtensionDynamicTest.java

@@ -14,6 +14,7 @@
 package org.eclipse.ui.tests.dynamicplugins;
 
 import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
 
 import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.jface.bindings.Binding;
@@ -26,25 +27,15 @@
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
 import org.eclipse.ui.keys.IBindingService;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * Tests whether the "org.eclipse.ui.bindings" extension point can be added and
  * removed dynamically.
  *
  * @since 3.1.1
  */
-@RunWith(JUnit4.class)
 public final class BindingsExtensionDynamicTest extends DynamicTestCase {
 
-	/**
-	 * Constructs a new instance of <code>BindingsExtensionDynamicTest</code>.
-	 */
-	public BindingsExtensionDynamicTest() {
-		super(BindingsExtensionDynamicTest.class.getSimpleName());
-	}
-
 	/**
 	 * Returns the full-qualified identifier of the extension to be tested.
 	 *

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/BrowserTests.java

@@ -13,6 +13,9 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.dynamicplugins;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import org.eclipse.ui.internal.browser.WorkbenchBrowserSupport;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
 import org.junit.Test;
@@ -22,10 +25,6 @@
  */
 public class BrowserTests extends DynamicTestCase {
 
-	public BrowserTests() {
-		super(BrowserTests.class.getSimpleName());
-	}
-
 	@Test
 	public void testBrowserSupport() {
 		WorkbenchBrowserSupport support = (WorkbenchBrowserSupport) WorkbenchBrowserSupport.getInstance();

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/CommandsExtensionDynamicTest.java

@@ -13,7 +13,9 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.dynamicplugins;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
 
 import org.eclipse.core.commands.Command;
 import org.eclipse.core.commands.ExecutionEvent;
@@ -32,25 +34,15 @@
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
 import org.eclipse.ui.keys.IBindingService;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * Tests whether the "org.eclipse.ui.commands" extension point can be added and
  * removed dynamically.
  *
  * @since 3.1.1
  */
-@RunWith(JUnit4.class)
 public final class CommandsExtensionDynamicTest extends DynamicTestCase {
 
-	/**
-	 * Constructs a new instance of <code>CommandsExtensionDynamicTest</code>.
-	 */
-	public CommandsExtensionDynamicTest() {
-		super(CommandsExtensionDynamicTest.class.getSimpleName());
-	}
-
 	/**
 	 * Returns the full-qualified identifier of the extension to be tested.
 	 *

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/ContextsExtensionDynamicTest.java

@@ -14,31 +14,22 @@
 package org.eclipse.ui.tests.dynamicplugins;
 
 import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
 
 import org.eclipse.core.commands.common.NamedHandleObject;
 import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.ui.contexts.IContextService;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * Tests whether the "org.eclipse.ui.contexts" extension point can be added and
  * removed dynamically.
  *
  * @since 3.1.1
  */
-@RunWith(JUnit4.class)
 public final class ContextsExtensionDynamicTest extends DynamicTestCase {
 
-	/**
-	 * Constructs a new instance of <code>ContextsExtensionDynamicTest</code>.
-	 */
-	public ContextsExtensionDynamicTest() {
-		super(ContextsExtensionDynamicTest.class.getSimpleName());
-	}
-
 	/**
 	 * Returns the full-qualified identifier of the extension to be tested.
 	 *

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/DecoratorTests.java

@@ -13,28 +13,24 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.dynamicplugins;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import org.eclipse.ui.internal.WorkbenchPlugin;
 import org.eclipse.ui.internal.decorators.DecoratorDefinition;
 import org.eclipse.ui.internal.decorators.DecoratorManager;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * @since 3.1
  */
-@RunWith(JUnit4.class)
 public class DecoratorTests extends DynamicTestCase {
 
 	public static final String FULL1 = "fullDecorator1";
 	public static final String LIGHT1 = "lightDecorator1";
 	public static final String LIGHT2 = "lightDecorator2";
 
-	public DecoratorTests() {
-		super(DecoratorTests.class.getSimpleName());
-	}
-
 	@Test
 	public void testDecorators() {
 		assertFalse(hasDecorator(FULL1));