Replace UITestCase with test rule in remaining UI tests

Author: HeikoKlare

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourcePathCopyTest.java

@@ -15,6 +15,10 @@
 package org.eclipse.ui.tests.dialogs;
 
 import static org.eclipse.ui.PlatformUI.getWorkbench;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.awt.HeadlessException;
 import java.awt.Toolkit;
@@ -55,23 +59,20 @@
 import org.eclipse.ui.internal.wizards.datatransfer.WizardProjectsImportPage;
 import org.eclipse.ui.internal.wizards.datatransfer.WizardProjectsImportPage.ProjectRecord;
 import org.eclipse.ui.tests.TestPlugin;
+import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule;
 import org.eclipse.ui.tests.harness.util.DialogCheck;
 import org.eclipse.ui.tests.harness.util.EmptyPerspective;
 import org.eclipse.ui.tests.harness.util.FileUtil;
-import org.eclipse.ui.tests.harness.util.UITestCase;
+import org.junit.Rule;
 import org.junit.Test;
 
-public class ResourcePathCopyTest extends UITestCase {
+public class ResourcePathCopyTest {
 
 	private static final String DATA_PATH_PREFIX = "data/org.eclipse.datatransferArchives/";
 	private static final String ARCHIVE_JAVA_PROJECT = "helloworld";
 
-	/**
-	 * @param testName
-	 */
-	public ResourcePathCopyTest(String testName) {
-		super(testName);
-	}
+	@Rule
+	public final CloseTestWindowsRule closeTestWindows = new CloseTestWindowsRule();
 
 	@Test
 	public void testPathCopy() throws CoreException, IOException, HeadlessException, UnsupportedFlavorException {

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIEditWorkingSetWizardAuto.java

@@ -15,6 +15,12 @@
 
 import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace;
 import static org.eclipse.ui.PlatformUI.getWorkbench;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 
@@ -37,22 +43,17 @@
 import org.eclipse.ui.internal.registry.WorkingSetRegistry;
 import org.eclipse.ui.tests.harness.util.ArrayUtil;
 import org.eclipse.ui.tests.harness.util.DialogCheck;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * Tests the WorkingSetEditWizard
  * Tests input validation, presence of correct edit page and
  * wizard page texts.
  */
-@RunWith(JUnit4.class)
 public class UIEditWorkingSetWizardAuto extends UIWorkingSetWizardsAuto<WorkingSetEditWizard> {
 
-	public UIEditWorkingSetWizardAuto() {
-		super(UIEditWorkingSetWizardAuto.class.getSimpleName());
-	}
-
 	@Override
 	protected WorkingSetEditWizard createWizardToTest() {
 		return new WorkingSetEditWizard(getDefaultEditPage());
@@ -149,15 +150,13 @@ public void testEditPage() throws Throwable {
 		DialogCheck.assertDialogTexts(getWizardDialog());
 	}
 
-	@Override
-	public void doSetUp() throws Exception {
-		super.doSetUp();
+	@Before
+	public final void disableAutoBuild() throws Exception {
 		setAutoBuilding(false);
 	}
 
-	@Override
-	public void doTearDown() throws Exception {
-		super.doTearDown();
+	@After
+	public final void restoreAutoBuild() throws Exception {
 		ResourcesPlugin.getWorkspace().setDescription(Workspace.defaultWorkspaceDescription());
 	}
 

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UINewWorkingSetWizardAuto.java

@@ -14,6 +14,11 @@
 package org.eclipse.ui.tests.dialogs;
 
 import static org.eclipse.ui.PlatformUI.getWorkbench;
+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.util.List;
 
@@ -37,21 +42,14 @@
 import org.eclipse.ui.tests.harness.util.ArrayUtil;
 import org.eclipse.ui.tests.harness.util.DialogCheck;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * Tests the WorkingSetNewWizard.
  * Tests input validation, presence of type page and correct edit page
  * and wizard page texts.
  */
-@RunWith(JUnit4.class)
 public class UINewWorkingSetWizardAuto extends UIWorkingSetWizardsAuto<IWorkingSetNewWizard> {
 
-	public UINewWorkingSetWizardAuto() {
-		super(UINewWorkingSetWizardAuto.class.getSimpleName());
-	}
-
 	@Override
 	protected IWorkingSetNewWizard createWizardToTest() {
 		return getWorkbench().getWorkingSetManager().createWorkingSetNewWizard(null);

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIWorkingSetWizardsAuto.java

@@ -45,14 +45,17 @@
 import org.eclipse.ui.internal.registry.WorkingSetDescriptor;
 import org.eclipse.ui.internal.registry.WorkingSetRegistry;
 import org.eclipse.ui.tests.TestPlugin;
+import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule;
 import org.eclipse.ui.tests.harness.util.DialogCheck;
 import org.eclipse.ui.tests.harness.util.FileUtil;
-import org.eclipse.ui.tests.harness.util.UITestCase;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
 
 /**
  * Abstract test class for the working set wizard tests.
  */
-public abstract class UIWorkingSetWizardsAuto<W extends IWizard> extends UITestCase {
+public abstract class UIWorkingSetWizardsAuto<W extends IWizard> {
 	protected static final String WORKING_SET_NAME_1 = "ws1";
 
 	protected static final String WORKING_SET_NAME_2 = "ws2";
@@ -61,6 +64,9 @@ public abstract class UIWorkingSetWizardsAuto<W extends IWizard> extends UITestC
 
 	private static final int SIZING_WIZARD_HEIGHT_2 = 500;
 
+	@Rule
+	public final CloseTestWindowsRule closeTestWindows = new CloseTestWindowsRule();
+
 	private WizardDialog wizardDialog;
 
 	private W wizardToTest;
@@ -71,10 +77,6 @@ public abstract class UIWorkingSetWizardsAuto<W extends IWizard> extends UITestC
 
 	private IFile fileInProject2;
 
-	public UIWorkingSetWizardsAuto(String name) {
-		super(name);
-	}
-
 	protected WizardDialog getWizardDialog() {
 		return wizardDialog;
 	}
@@ -95,9 +97,8 @@ protected IFile getFileInProject2() {
 		return fileInProject2;
 	}
 
-	@Override
-	protected void doSetUp() throws Exception {
-		super.doSetUp();
+	@Before
+	public final void setUp() throws Exception {
 		wizardToTest = createWizardToTest();
 		wizardDialog = createWizardDialog();
 		initializeTestResources();
@@ -122,12 +123,11 @@ private void initializeTestResources() throws CoreException {
 		fileInProject2 = FileUtil.createFile("f2.txt", project2);
 	}
 
-	@Override
-	protected void doTearDown() throws Exception {
+	@After
+	public final void tearDown() throws Exception {
 		removeAllWorkingSets();
 		cleanupWorkspace();
 		disposeWizardAndDialog();
-		super.doTearDown();
 	}
 
 	private void removeAllWorkingSets() {

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/intro/IntroTest.java

@@ -14,6 +14,10 @@
 package org.eclipse.ui.tests.intro;
 
 import static org.eclipse.ui.tests.harness.util.UITestUtil.openTestWindow;
+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 org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.ui.IPageLayout;
@@ -32,19 +36,21 @@
 import org.eclipse.ui.internal.util.PrefUtil;
 import org.eclipse.ui.intro.IIntroManager;
 import org.eclipse.ui.intro.IIntroPart;
+import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule;
 import org.eclipse.ui.tests.harness.util.EmptyPerspective;
 import org.eclipse.ui.tests.harness.util.PreferenceMementoRule;
-import org.eclipse.ui.tests.harness.util.UITestCase;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * @since 3.0
  */
-@RunWith(JUnit4.class)
-public class IntroTest extends UITestCase {
+public class IntroTest {
+
+	@Rule
+	public final CloseTestWindowsRule closeTestWindows = new CloseTestWindowsRule();
 
 	@Rule
 	public final PreferenceMementoRule preferenceMemento = new PreferenceMementoRule();
@@ -53,10 +59,6 @@ public class IntroTest extends UITestCase {
 
 	private IntroDescriptor oldDesc;
 
-	public IntroTest() {
-		super(IntroTest.class.getSimpleName());
-	}
-
 	@Test
 	public void testCloseInEmptyPerspective() {
 		testClose(EmptyPerspective.PERSP_ID);
@@ -241,10 +243,8 @@ public void testViewClosure() {
 		assertNull(workbench.getIntroManager().getIntro());
 	}
 
-	@Override
-	protected void doSetUp() throws Exception {
-		super.doSetUp();
-
+	@Before
+	public final void setUp() throws Exception {
 		// these tests rely on the 3.2 behavior for sticky views
 		IPreferenceStore preferenceStore = PrefUtil.getAPIPreferenceStore();
 		preferenceStore.putValue(IWorkbenchPreferenceConstants.ENABLE_32_STICKY_CLOSE_BEHAVIOR, "true");
@@ -257,9 +257,8 @@ protected void doSetUp() throws Exception {
 		window = openTestWindow();
 	}
 
-	@Override
-	protected void doTearDown() throws Exception {
-		super.doTearDown();
+	@After
+	public final void tearDown() throws Exception {
 		Workbench.getInstance().setIntroDescriptor(oldDesc);
 	}
 }

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/intro/IntroTest2.java

@@ -14,6 +14,8 @@
 package org.eclipse.ui.tests.intro;
 
 import static org.eclipse.ui.tests.harness.util.UITestUtil.openTestWindow;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.ui.IPerspectiveDescriptor;
@@ -28,25 +30,24 @@
 import org.eclipse.ui.internal.intro.IntroDescriptor;
 import org.eclipse.ui.internal.util.PrefUtil;
 import org.eclipse.ui.intro.IIntroPart;
-import org.eclipse.ui.tests.harness.util.UITestCase;
+import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * @since 3.0
  */
-@RunWith(JUnit4.class)
-public class IntroTest2 extends UITestCase {
+public class IntroTest2 {
+
+	@Rule
+	public final CloseTestWindowsRule closeTestWindows = new CloseTestWindowsRule();
 
 	IWorkbenchWindow window = null;
 
 	private IntroDescriptor oldDesc;
 
-	public IntroTest2() {
-		super(IntroTest2.class.getSimpleName());
-	}
-
 	/**
 	 * Open the intro, change perspective, close the intro
 	 * and ensure that the intro has been closed in the
@@ -80,10 +81,8 @@ public void testPerspectiveChangeWith33StickyBehavior() {
 
 	}
 
-	@Override
-	protected void doSetUp() throws Exception {
-		super.doSetUp();
-
+	@Before
+	public final void setUp() throws Exception {
 		// these tests rely on the 3.3 behavior for sticky views
 		IPreferenceStore preferenceStore = PrefUtil.getAPIPreferenceStore();
 		preferenceStore.putValue(IWorkbenchPreferenceConstants.ENABLE_32_STICKY_CLOSE_BEHAVIOR, "false");
@@ -96,9 +95,8 @@ protected void doSetUp() throws Exception {
 		window = openTestWindow();
 	}
 
-	@Override
-	protected void doTearDown() throws Exception {
-		super.doTearDown();
+	@After
+	public final void tearDown() throws Exception {
 		Workbench.getInstance().setIntroDescriptor(oldDesc);
 	}
 }