Replace property sheet tests hierarchy to UITestCase with test rule

HeikoKlare · HeikoKlare · commit 740b945feb2e · 2025-08-19T11:04:45.000+02:00
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/AbstractPropertySheetTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/AbstractPropertySheetTest.java
@@ -25,36 +25,28 @@
 import org.eclipse.ui.IViewReference;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.tests.harness.util.UITestCase;
+import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule;
 import org.eclipse.ui.views.properties.PropertySheet;
+import org.junit.Before;
+import org.junit.Rule;
 
 /**
  * @since 3.4
  */
-public abstract class AbstractPropertySheetTest extends UITestCase {
+public abstract class AbstractPropertySheetTest {
+
+	@Rule
+	public final CloseTestWindowsRule closeTestWindowsRule = new CloseTestWindowsRule();
 
 	private static final String PIN_PROPERTY_SHEET_ACTION_ID_PREFIX = "org.eclipse.ui.views.properties.PinPropertySheetAction";
 	protected IWorkbenchPage activePage;
-	protected PropertySheet propertySheet;
-
-	public AbstractPropertySheetTest(String testName) {
-		super(testName);
-	}
 
-	@Override
-	protected void doSetUp() throws Exception {
-		super.doSetUp();
+	@Before
+	public final void initializeActivePage() throws Exception {
 		IWorkbenchWindow workbenchWindow = openTestWindow();
 		activePage = workbenchWindow.getActivePage();
 	}
 
-	@Override
-	protected void doTearDown() throws Exception {
-		super.doTearDown();
-		activePage = null;
-		propertySheet = null;
-	}
-
 	/**
 	 * @return the count of PropertySheets
 	 */
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/DirtyStatePropertySheetTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/DirtyStatePropertySheetTest.java
@@ -15,6 +15,9 @@
 package org.eclipse.ui.tests.propertysheet;
 
 import static org.eclipse.ui.internal.SaveableHelper.isDirtyStateSupported;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -26,16 +29,15 @@
 import org.eclipse.ui.ISecondarySaveableSource;
 import org.eclipse.ui.views.properties.PropertySheet;
 import org.eclipse.ui.views.properties.PropertySheetPage;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * @since 3.5
  */
-@RunWith(JUnit4.class)
 public class DirtyStatePropertySheetTest extends AbstractPropertySheetTest {
-
+	private PropertySheet propertySheet;
 	private AdaptingSaveableView saveableView;
 	private ISecondarySaveableSource dirtyDisallowed;
 	private ISecondarySaveableSource dirtyAllowed;
@@ -64,13 +66,8 @@ public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
 		}
 	}
 
-	public DirtyStatePropertySheetTest() {
-		super(DirtyStatePropertySheetTest.class.getName());
-	}
-
-	@Override
-	protected void doSetUp() throws Exception {
-		super.doSetUp();
+	@Before
+	public void setUp() throws Exception {
 		PropertySheetPerspectiveFactory.applyPerspective(activePage);
 		dirtyDisallowed = new ISecondarySaveableSource() {
 		};
@@ -92,11 +89,10 @@ public boolean isDirtyStateSupported() {
 		assertFalse(propertySheet.isDirtyStateSupported());
 	}
 
-	@Override
-	protected void doTearDown() throws Exception {
+	@After
+	public final void tearDown() throws Exception {
 		Platform.getAdapterManager().unregisterAdapters(adapterFactory);
 		activePage.resetPerspective();
-		super.doTearDown();
 	}
 
 	@Test
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/MultiInstancePropertySheetTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/MultiInstancePropertySheetTest.java
@@ -15,6 +15,12 @@
 package org.eclipse.ui.tests.propertysheet;
 
 import static org.eclipse.ui.tests.harness.util.UITestUtil.processEvents;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.lang.reflect.Field;
 
@@ -48,17 +54,18 @@
 import org.eclipse.ui.views.properties.PropertySheetEntry;
 import org.eclipse.ui.views.properties.PropertySheetPage;
 import org.eclipse.ui.views.properties.PropertyShowInContext;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 import org.osgi.framework.Bundle;
 
 /**
  * @since 3.4
  */
-@RunWith(JUnit4.class)
 public class MultiInstancePropertySheetTest extends AbstractPropertySheetTest {
 
+	private PropertySheet propertySheet;
+
 	/**
 	 * TestPropertySheetPage exposes certain members for testability
 	 */
@@ -90,13 +97,8 @@ public class MultiInstancePropertySheetTest extends AbstractPropertySheetTest {
 
 	private IProject project;
 
-	public MultiInstancePropertySheetTest() {
-		super(MultiInstancePropertySheetTest.class.getSimpleName());
-	}
-
-	@Override
-	protected void doSetUp() throws Exception {
-		super.doSetUp();
+	@Before
+	public void setUp() throws Exception {
 		testPropertySheetPage = new TestPropertySheetPage();
 		// open the property sheet with the TestPropertySheetPage
 		Platform.getAdapterManager().registerAdapters(testPropertySheetPage,
@@ -113,10 +115,9 @@ protected void doSetUp() throws Exception {
 
 
 
-	@Override
-	protected void doTearDown() throws Exception {
+	@After
+	public final void tearDown() throws Exception {
 		activePage.resetPerspective();
-		super.doTearDown();
 		// reset the exception to null
 		e = null;
 		// remove our log listener
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/NewPropertySheetHandlerTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/NewPropertySheetHandlerTest.java
@@ -16,7 +16,13 @@
 
 import static org.eclipse.ui.PlatformUI.getWorkbench;
 import static org.eclipse.ui.tests.harness.util.UITestUtil.processEvents;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
 
 import java.util.HashMap;
 
@@ -41,25 +47,18 @@
 import org.eclipse.ui.tests.SelectionProviderView;
 import org.eclipse.ui.views.properties.PropertySheet;
 import org.eclipse.ui.views.properties.PropertyShowInContext;
+import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * @since 3.5
  */
-@RunWith(JUnit4.class)
 public class NewPropertySheetHandlerTest extends AbstractPropertySheetTest {
 
 	private TestNewPropertySheetHandler testNewPropertySheetHandler;
 
-	public NewPropertySheetHandlerTest() {
-		super(NewPropertySheetHandlerTest.class.getSimpleName());
-	}
-
-	@Override
-	protected void doSetUp() throws Exception {
-		super.doSetUp();
+	@Before
+	public void setUp() throws Exception {
 		testNewPropertySheetHandler = new TestNewPropertySheetHandler();
 	}
 
@@ -207,7 +206,7 @@ public final void testFindPropertySheetWithoutActivePart() {
 	@Test
 	public final void testFindPropertySheetWithOtherSheetActive()
 			throws PartInitException, ExecutionException {
-		propertySheet = (PropertySheet) activePage
+		PropertySheet propertySheet = (PropertySheet) activePage
 				.showView(IPageLayout.ID_PROP_SHEET);
 		assertTrue(countPropertySheetViews() == 1);
 
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/PropertyShowInContextTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/PropertyShowInContextTest.java
@@ -14,6 +14,10 @@
 
 package org.eclipse.ui.tests.propertysheet;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.ui.IPageLayout;
@@ -22,19 +26,12 @@
 import org.eclipse.ui.part.ShowInContext;
 import org.eclipse.ui.views.properties.PropertyShowInContext;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * @since 3.5
  */
-@RunWith(JUnit4.class)
 public class PropertyShowInContextTest extends AbstractPropertySheetTest {
 
-	public PropertyShowInContextTest() {
-		super(PropertyShowInContextTest.class.getSimpleName());
-	}
-
 	/**
 	 * Test method for
 	 * {@link org.eclipse.ui.views.properties.PropertyShowInContext#hashCode()}.
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/ShowInPropertySheetTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/ShowInPropertySheetTest.java
@@ -14,37 +14,29 @@
 
 package org.eclipse.ui.tests.propertysheet;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.part.IShowInTarget;
 import org.eclipse.ui.part.ShowInContext;
 import org.eclipse.ui.views.properties.PropertySheet;
 import org.eclipse.ui.views.properties.PropertyShowInContext;
+import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /**
  * @since 3.4
  */
-@RunWith(JUnit4.class)
 public class ShowInPropertySheetTest extends AbstractPropertySheetTest {
 
-	public ShowInPropertySheetTest() {
-		super(ShowInPropertySheetTest.class.getSimpleName());
-	}
-
-	@Override
-	protected void doSetUp() throws Exception {
-		super.doSetUp();
-
-		propertySheet = (PropertySheet) activePage
-				.showView(IPageLayout.ID_PROP_SHEET);
-	}
+	private PropertySheet propertySheet;
 
-	@Override
-	protected void doTearDown() throws Exception {
-		super.doTearDown();
+	@Before
+	public final void setUp() throws Exception {
+		propertySheet = (PropertySheet) activePage.showView(IPageLayout.ID_PROP_SHEET);
 	}
 
 	/**
