Replace UITestCase hierarchy with test rule in internal UI tests

Author: HeikoKlare

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/ActionExpressionTest.java

@@ -22,13 +22,19 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.tests.api.ListElement;
 import org.eclipse.ui.tests.api.ListView;
-import org.eclipse.ui.tests.harness.util.UITestCase;
+import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule;
+import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 /**
  * This class contains tests for popup menu enablement
  */
-public abstract class ActionExpressionTest extends UITestCase {
+public abstract class ActionExpressionTest {
+
+	@Rule
+	public final CloseTestWindowsRule closeTestWindowsRule = new CloseTestWindowsRule();
+
 	protected IWorkbenchWindow fWindow;
 
 	protected IWorkbenchPage fPage;
@@ -41,13 +47,8 @@ public abstract class ActionExpressionTest extends UITestCase {
 
 	ListElement redTrue = new ListElement("red", true);
 
-	public ActionExpressionTest(String testName) {
-		super(testName);
-	}
-
-	@Override
-	protected void doSetUp() throws Exception {
-		super.doSetUp();
+	@Before
+	public final void setUp() throws Exception {
 		fWindow = openTestWindow();
 		fPage = fWindow.getActivePage();
 	}

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/ActionSetExpressionTest.java

@@ -13,25 +13,21 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.internal;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 import org.eclipse.jface.action.IContributionItem;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.SubContributionItem;
 import org.eclipse.ui.internal.WorkbenchWindow;
 import org.eclipse.ui.tests.api.ListView;
 import org.eclipse.ui.tests.harness.util.ActionUtil;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * This class contains tests for action set enablement
  */
-@RunWith(JUnit4.class)
 public class ActionSetExpressionTest extends ActionExpressionTest {
 
-	public ActionSetExpressionTest() {
-		super(ActionSetExpressionTest.class.getSimpleName());
-	}
-
 	/**
 	 * Opens the action set.  Returns the menu manager containing it.
 	 */

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/Bug549139Test.java

@@ -71,10 +71,6 @@ public String getLastValidatedResourceName() {
 
 	private IProject testProject;
 
-	public Bug549139Test() {
-		super();
-	}
-
 	@Before
 	public void setUp2() throws Exception {
 		testProject = createTestProject(getName());

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/Bug99858Test.java

@@ -38,10 +38,6 @@
  */
 public class Bug99858Test extends ResourceActionTest {
 
-	public Bug99858Test() {
-		super();
-	}
-
 	/**
 	 * Create a project with some files, close it, and delete it. With the
 	 * changes in runtime to throw a CoreException from IContainer#members(),

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/EditorActionBarsTest.java

@@ -14,6 +14,9 @@
 package org.eclipse.ui.tests.internal;
 
 import static org.eclipse.ui.tests.harness.util.UITestUtil.openTestWindow;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -37,37 +40,31 @@
 import org.eclipse.ui.tests.api.MockEditorActionBarContributor;
 import org.eclipse.ui.tests.api.MockEditorPart;
 import org.eclipse.ui.tests.api.MockViewPart;
+import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule;
 import org.eclipse.ui.tests.harness.util.FileUtil;
-import org.eclipse.ui.tests.harness.util.UITestCase;
+import org.junit.Before;
 import org.junit.Ignore;
+import org.junit.Rule;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * This class contains tests for the editor action bars
  * implementation.
  */
-@RunWith(JUnit4.class)
 @Ignore
-public class EditorActionBarsTest extends UITestCase {
+public class EditorActionBarsTest {
+
+	@Rule
+	public final CloseTestWindowsRule closeTestWindowsRule = new CloseTestWindowsRule();
 
 	protected IWorkbenchWindow fWindow;
 
 	protected IWorkbenchPage fPage;
 
 	private final String EDITOR_ID = "org.eclipse.ui.tests.internal.EditorActionBarsTest";
 
-	/**
-	 * Constructor for IEditorPartTest
-	 */
-	public EditorActionBarsTest() {
-		super(EditorActionBarsTest.class.getSimpleName());
-	}
-
-	@Override
-	protected void doSetUp() throws Exception {
-		super.doSetUp();
+	@Before
+	public final void setUp() throws Exception {
 		fWindow = openTestWindow();
 		fPage = fWindow.getActivePage();
 	}

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/FileEditorMappingTest.java

@@ -13,34 +13,33 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.internal;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.ui.IEditorDescriptor;
 import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.internal.registry.EditorDescriptor;
 import org.eclipse.ui.internal.registry.FileEditorMapping;
-import org.eclipse.ui.tests.harness.util.UITestCase;
+import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule;
+import org.junit.Before;
 import org.junit.Ignore;
+import org.junit.Rule;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
-@RunWith(JUnit4.class)
 @Ignore
-public class FileEditorMappingTest extends UITestCase {
+public class FileEditorMappingTest {
+
+	@Rule
+	public final CloseTestWindowsRule closeTestWindowsRule = new CloseTestWindowsRule();
 
 	private EditorDescriptor textEditor;
 	private EditorDescriptor pdeEditor;
 
-	public FileEditorMappingTest() {
-		super(FileEditorMappingTest.class.getSimpleName());
-	}
-
-	@Override
-	protected void doSetUp() throws Exception {
-		super.doSetUp();
-
+	@Before
+	public final void setUp() throws Exception {
 		textEditor = (EditorDescriptor) IDE.getEditorDescriptor("test.txt");
 		pdeEditor = (EditorDescriptor) IDE.getEditorDescriptor("plugin.xml");
 	}

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/PerspectiveSwitcherTest.java

@@ -15,28 +15,25 @@
 package org.eclipse.ui.tests.internal;
 
 import static org.eclipse.ui.PlatformUI.getWorkbench;
+import static org.junit.Assert.assertNotNull;
 
 import org.eclipse.e4.ui.workbench.modeling.EModelService;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.ui.IWorkbenchPreferenceConstants;
 import org.eclipse.ui.internal.WorkbenchWindow;
 import org.eclipse.ui.internal.util.PrefUtil;
+import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule;
 import org.eclipse.ui.tests.harness.util.PreferenceMementoRule;
-import org.eclipse.ui.tests.harness.util.UITestCase;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
-@RunWith(JUnit4.class)
-public class PerspectiveSwitcherTest extends UITestCase {
+public class PerspectiveSwitcherTest {
 
 	@Rule
-	public final PreferenceMementoRule preferenceMemento = new PreferenceMementoRule();
+	public final CloseTestWindowsRule closeTestWindowsRule = new CloseTestWindowsRule();
 
-	public PerspectiveSwitcherTest() {
-		super(PerspectiveSwitcherTest.class.getSimpleName());
-	}
+	@Rule
+	public final PreferenceMementoRule preferenceMemento = new PreferenceMementoRule();
 
 	/**
 	 * This test ensures that our workbench window's perspective bar can opened if

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/PopupMenuExpressionTest.java

@@ -13,23 +13,19 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.internal;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.ui.tests.api.ListView;
 import org.eclipse.ui.tests.harness.util.ActionUtil;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * This class contains tests for popup menu visibility
  */
-@RunWith(JUnit4.class)
 public class PopupMenuExpressionTest extends ActionExpressionTest {
 
-	public PopupMenuExpressionTest() {
-		super(PopupMenuExpressionTest.class.getSimpleName());
-	}
-
 	/**
 	 * Returns the menu manager containing the actions.
 	 */

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/ResourceActionTest.java

@@ -14,10 +14,6 @@
  */
 public abstract class ResourceActionTest {
 
-	public ResourceActionTest() {
-		super();
-	}
-
 	@Before
 	public void setUp() throws Exception {
 		AdvancedValidationUserApprover.AUTOMATED_MODE = true;

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/SWTBotWorkbenchResetTest.java

@@ -16,6 +16,9 @@
 
 import static org.eclipse.ui.tests.harness.util.UITestUtil.openTestWindow;
 import static org.eclipse.ui.tests.harness.util.UITestUtil.processEvents;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.swt.widgets.Composite;
@@ -25,23 +28,17 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.WorkbenchException;
 import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.tests.harness.util.UITestCase;
+import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule;
+import org.junit.Rule;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * Test for Bug 511729 — Improve robustness to SWTBot.resetWorkbench()
  */
-@RunWith(JUnit4.class)
-public class SWTBotWorkbenchResetTest extends UITestCase {
+public class SWTBotWorkbenchResetTest {
 
-	/**
-	 * Constructs a new instance of this test case.
-	 */
-	public SWTBotWorkbenchResetTest() {
-		super(SWTBotWorkbenchResetTest.class.getSimpleName());
-	}
+	@Rule
+	public final CloseTestWindowsRule closeTestWindowsRule = new CloseTestWindowsRule();
 
 	/**
 	 * Open a new window, switch to a different perspective such that parts are