Replace navigator tests hierarchy to UITestCase with test rule

Author: HeikoKlare

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/BadIndexDecoratorTestCase.java

@@ -14,41 +14,16 @@
 
 package org.eclipse.ui.tests.decorators;
 
-import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.eclipse.ui.internal.decorators.DecoratorDefinition;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * @since 3.2
  */
-@RunWith(JUnit4.class)
 public class BadIndexDecoratorTestCase extends DecoratorEnablementTestCase {
 
-	public BadIndexDecoratorTestCase() {
-		super(BadIndexDecoratorTestCase.class.getSimpleName());
-	}
-
-	/**
-	 * Sets up the hierarchy.
-	 */
 	@Override
-	protected void doSetUp() throws Exception {
-		super.doSetUp();
-		createTestFile();
-		showNav();
-
-		WorkbenchPlugin.getDefault().getDecoratorManager().addListener(this);
-
-		DecoratorDefinition[] definitions = WorkbenchPlugin.getDefault()
-				.getDecoratorManager().getAllDecoratorDefinitions();
-		for (DecoratorDefinition definition2 : definitions) {
-			if (definition2.getId().equals(
-					"org.eclipse.ui.tests.decorators.badIndexDecorator")) {
-				definition = definition2;
-			}
-		}
+	protected String getTestDecoratorId() {
+		return "org.eclipse.ui.tests.decorators.badIndexDecorator";
 	}
 
 	/**

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorCacheTest.java

@@ -14,6 +14,8 @@
 
 package org.eclipse.ui.tests.decorators;
 
+import static org.junit.Assert.assertTrue;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.viewers.DecoratingLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
@@ -27,21 +29,14 @@
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.tests.navigator.AbstractNavigatorTest;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * @since 3.4
  */
-@RunWith(JUnit4.class)
 public class DecoratorCacheTest extends AbstractNavigatorTest {
 
 	protected DecoratingLabelProvider dlp;
 
-	public DecoratorCacheTest() {
-		super(DecoratorCacheTest.class.getSimpleName());
-	}
-
 	protected StructuredViewer createViewer(Composite parent) {
 		dlp = new DecoratingLabelProvider(new LabelProvider(), PlatformUI
 				.getWorkbench().getDecoratorManager());

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorEnablementTestCase.java

@@ -13,12 +13,15 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.decorators;
 
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.LabelProviderChangedEvent;
 import org.eclipse.ui.internal.WorkbenchPlugin;
 import org.eclipse.ui.internal.decorators.DecoratorDefinition;
 import org.eclipse.ui.internal.decorators.DecoratorManager;
 import org.eclipse.ui.tests.navigator.AbstractNavigatorTest;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
@@ -31,29 +34,18 @@ public abstract class DecoratorEnablementTestCase extends AbstractNavigatorTest
 
 	protected boolean updated = false;
 
-	/**
-	 * Constructor for DecoratorTestCase.
-	 */
-	public DecoratorEnablementTestCase(String testName) {
-		super(testName);
-	}
+	protected abstract String getTestDecoratorId();
 
-	/**
-	 * Sets up the hierarchy.
-	 */
-	@Override
-	protected void doSetUp() throws Exception {
-		super.doSetUp();
+	@Before
+	public final void setUpHierarchy() throws CoreException {
 		createTestFile();
 		showNav();
 
-		WorkbenchPlugin.getDefault().getDecoratorManager().addListener(this);
+		getDecoratorManager().addListener(this);
 
-		DecoratorDefinition[] definitions = WorkbenchPlugin.getDefault()
-				.getDecoratorManager().getAllDecoratorDefinitions();
+		DecoratorDefinition[] definitions = getDecoratorManager().getAllDecoratorDefinitions();
 		for (DecoratorDefinition definition2 : definitions) {
-			if (definition2.getId().equals(
-					"org.eclipse.ui.tests.decorators.lightweightdecorator")) {
+			if (definition2.getId().equals(getTestDecoratorId())) {
 				definition = definition2;
 			}
 		}
@@ -63,16 +55,11 @@ protected DecoratorManager getDecoratorManager() {
 		return WorkbenchPlugin.getDefault().getDecoratorManager();
 	}
 
-	/**
-	 * Remove the listener.
-	 */
-	@Override
-	protected void doTearDown() throws Exception {
-		super.doTearDown();
+	@After
+	public final void removeListener() throws Exception {
 		getDecoratorManager().removeListener(this);
 	}
 
-
 	/**
 	 * Test enabling the contributor
 	 */

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorTableTest.java

@@ -19,23 +19,13 @@
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 import org.junit.Ignore;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * The DecoratorTableTest is the test for decorating tables.
  */
-@RunWith(JUnit4.class)
 @Ignore("Disabled due to timing issues")
 public class DecoratorTableTest extends DecoratorViewerTest {
 
-	/**
-	 * Create a new instance of the receiver.
-	 */
-	public DecoratorTableTest() {
-		super(DecoratorTableTest.class.getSimpleName());
-	}
-
 	@Override
 	protected void backgroundCheck(IViewPart view) {
 		TableItem first = ((DecoratorTableView) view).viewer.getTable().getItem(0);

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorTestCase.java

@@ -13,40 +13,30 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.decorators;
 
+import static org.junit.Assert.assertTrue;
+
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.LabelProviderChangedEvent;
 import org.eclipse.ui.internal.WorkbenchPlugin;
 import org.eclipse.ui.internal.decorators.DecoratorDefinition;
 import org.eclipse.ui.internal.decorators.DecoratorManager;
 import org.eclipse.ui.tests.navigator.AbstractNavigatorTest;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * @version 1.0
  */
-@RunWith(JUnit4.class)
 public class DecoratorTestCase extends AbstractNavigatorTest implements
 		ILabelProviderListener {
 
 	private DecoratorDefinition definition;
 
 	private boolean updated = false;
 
-	/**
-	 * Constructor for DecoratorTestCase.
-	 */
-	public DecoratorTestCase() {
-		super(DecoratorTestCase.class.getSimpleName());
-	}
-
-	/**
-	 * Sets up the hierarchy.
-	 */
-	@Override
-	protected void doSetUp() throws Exception {
-		super.doSetUp();
+	@Before
+	public final void setUpHierarchy() throws Exception {
 		createTestFile();
 		showNav();
 
@@ -69,9 +59,8 @@ private DecoratorManager getDecoratorManager() {
 	/**
 	 * Remove the listener.
 	 */
-	@Override
-	protected void doTearDown() throws Exception {
-		super.doTearDown();
+	@After
+	public void removeListener() throws Exception {
 		getDecoratorManager().removeListener(this);
 	}
 

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorTreeTest.java

@@ -13,34 +13,21 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.decorators;
 
+import static org.junit.Assert.assertEquals;
+
 import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 import org.junit.Ignore;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * The DecoratorTreeTest tests the font and color support on
  * tree viewers.
  */
-@RunWith(JUnit4.class)
 @Ignore("Disabled due to timing issues")
 public class DecoratorTreeTest extends DecoratorViewerTest {
 
-	public DecoratorTreeTest() {
-		super(DecoratorTreeTest.class.getSimpleName());
-
-	}
-
-	@Override
-	protected void doSetUp() throws Exception {
-		super.doSetUp();
-		createTestFile();
-
-	}
-
 	@Override
 	protected void backgroundCheck(IViewPart view) {
 		TreeItem first = ((DecoratorTreeView) view).viewer.getTree().getItems()[0];

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorViewerTest.java

@@ -25,23 +25,17 @@
 import org.eclipse.ui.internal.WorkbenchPlugin;
 import org.eclipse.ui.internal.decorators.DecoratorManager;
 import org.eclipse.ui.tests.navigator.AbstractNavigatorTest;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
  * DecoratorViewerTest is the abstract class of the tests for the viewers.
  */
 public abstract class DecoratorViewerTest extends AbstractNavigatorTest {
 
-	/**
-	 * Create a new instance of the receiver.
-	 */
-	public DecoratorViewerTest(String testName) {
-		super(testName);
-	}
-
-	@Override
-	protected void doSetUp() throws Exception {
-		super.doSetUp();
+	@Before
+	public final void setUp() throws Exception {
 		createTestFile();
 		ForegroundColorDecorator.setUpColor();
 		BackgroundColorDecorator.setUpColor();
@@ -163,10 +157,8 @@ public void testFont() throws PartInitException, CoreException,
 	 */
 	protected abstract void fontCheck(IViewPart view);
 
-	@Override
-	protected void doTearDown() throws Exception {
-
-		super.doTearDown();
+	@After
+	public final void tearDown() throws Exception {
 		IDecoratorManager manager = WorkbenchPlugin.getDefault()
 				.getDecoratorManager();
 		manager.setEnabled(ForegroundColorDecorator.ID, false);

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/ExceptionDecoratorTestCase.java

@@ -13,39 +13,34 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.decorators;
 
+import static org.junit.Assert.assertFalse;
+
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.ui.internal.WorkbenchPlugin;
 import org.eclipse.ui.internal.decorators.DecoratorDefinition;
 import org.eclipse.ui.internal.decorators.DecoratorManager;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
+import org.junit.After;
+import org.junit.Before;
 
 /**
  * @version 	1.0
  */
-@RunWith(JUnit4.class)
 public class ExceptionDecoratorTestCase extends DecoratorEnablementTestCase {
 	private final Collection<DecoratorDefinition> problemDecorators = new ArrayList<>();
 
 	private DecoratorDefinition light;
 
-	/**
-	 * Constructor for DecoratorTestCase.
-	 */
-	public ExceptionDecoratorTestCase() {
-		super(ExceptionDecoratorTestCase.class.getSimpleName());
+	@Override
+	protected String getTestDecoratorId() {
+		return "org.eclipse.ui.tests.decorators.lightweightdecorator";
 	}
 
-	/**
-	 * Sets up the hierarchy.
-	 */
-	@Override
-	protected void doSetUp() throws Exception {
+	@Before
+	public void setUpAdditionalDecorators() throws Exception {
 		//reset the static fields so that the decorators will fail
 		HeavyNullImageDecorator.fail = true;
 		HeavyNullTextDecorator.fail = true;
@@ -67,12 +62,10 @@ protected void doSetUp() throws Exception {
 				light = definition2;
 			}
 		}
-		super.doSetUp();
 	}
 
-	@Override
-	protected void doTearDown() throws Exception {
-		super.doTearDown();
+	@After
+	public void tearDown() throws Exception {
 
 		//Need to wait for decoration to end to allow for all
 		//errors to occur
@@ -81,11 +74,7 @@ protected void doTearDown() throws Exception {
 		} catch (OperationCanceledException | InterruptedException e) {
 		}
 
-		//Be sure that the decorators were all disabled on errors.
-		Iterator<DecoratorDefinition> problemIterator = problemDecorators.iterator();
-		while (problemIterator.hasNext()) {
-			DecoratorDefinition next = problemIterator
-					.next();
+		for (DecoratorDefinition next : problemDecorators) {
 			assertFalse("Enabled " + next.getName(), next.isEnabled());
 		}