Migrate JUnit 4 tests to JUnit 5 in org.eclipse.jface.tests

tests/org.eclipse.jface.tests/META-INF/MANIFEST.MF

@@ -13,6 +13,7 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
  org.eclipse.ui.tests.harness
 Import-Package: org.osgi.framework,
  org.junit.jupiter.api;version="[5.14.0,6.0.0)",
+ org.junit.jupiter.api.function;version="[5.14.0,6.0.0)",
  org.junit.platform.suite.api;version="[1.14.0,2.0.0)"
 Export-Package: org.eclipse.jface.tests.fieldassist;x-internal:=true,
  org.eclipse.jface.tests.preferences;x-internal:=true,

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/dialogs/DialogSettingsTest.java

@@ -15,12 +15,12 @@
  *******************************************************************************/
 package org.eclipse.jface.tests.dialogs;
 
-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 static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -29,7 +29,7 @@
 
 import org.eclipse.jface.dialogs.DialogSettings;
 import org.eclipse.jface.dialogs.IDialogSettings;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DialogSettingsTest {
 

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/dialogs/DialogTest.java

@@ -13,7 +13,7 @@
  ******************************************************************************/
 package org.eclipse.jface.tests.dialogs;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
@@ -22,8 +22,8 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 public class DialogTest {
 
@@ -32,7 +32,7 @@ public class DialogTest {
 	 */
 	private Dialog dialog;
 
-	@After
+	@AfterEach
 	public void tearDown() throws Exception {
 		if (dialog != null) {
 			// close the dialog
@@ -69,9 +69,9 @@ public void testButtonAlignmentBug272583() {
 		int cancelX = cancelBtn.getBounds().x;
 
 		if (okBtn.getDisplay().getDismissalAlignment() == SWT.LEFT) {
-			assertTrue("The 'OK' button should be to the left of the 'Cancel' button", okX < cancelX);
+			assertTrue(okX < cancelX, "The 'OK' button should be to the left of the 'Cancel' button");
 		} else {
-			assertTrue("The 'OK' button should be to the right of the 'Cancel' button", cancelX < okX);
+			assertTrue(cancelX < okX, "The 'OK' button should be to the right of the 'Cancel' button");
 		}
 
 		forceLayoutDialog.close();

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/dialogs/InputDialogTest.java

@@ -14,14 +14,14 @@
 package org.eclipse.jface.tests.dialogs;
 
 import org.eclipse.jface.dialogs.InputDialog;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 public class InputDialogTest {
 
 	private InputDialog dialog;
 
-	@After
+	@AfterEach
 	public void tearDown() throws Exception {
 		if (dialog != null) {
 			dialog.close();

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/dialogs/PlainMessageDialogTest.java

@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.jface.tests.dialogs;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Arrays;
 
@@ -24,22 +24,22 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class PlainMessageDialogTest {
 
 	private Builder builder;
 	private PlainMessageDialog dialog;
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		Shell shell = new Shell(Display.getDefault());
 		builder = PlainMessageDialog.getBuilder(shell, "My Dialog");
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		if (dialog != null) {
 			dialog.close();

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/dialogs/ProgressIndicatorStyleTest.java

@@ -14,15 +14,15 @@
 
 package org.eclipse.jface.tests.dialogs;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.lang.reflect.Field;
 
 import org.eclipse.jface.dialogs.ProgressIndicator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.ProgressBar;
 import org.eclipse.swt.widgets.Shell;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test case to assert proper styles have been set for ProgressIndicator.

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/dialogs/ProgressMonitorDialogTest.java

@@ -16,12 +16,12 @@
 
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.swt.widgets.Display;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ProgressMonitorDialogTest {
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 		// ensure we've initialized a display for this thread
 		Display.getDefault();

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/dialogs/SafeRunnableErrorTest.java

@@ -13,11 +13,11 @@
  ******************************************************************************/
 package org.eclipse.jface.tests.dialogs;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.eclipse.core.runtime.ISafeRunnable;
 import org.eclipse.jface.util.SafeRunnable;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * NOTE - these tests are not really very good, in order to really test this you

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/dialogs/StatusDialogTest.java

@@ -13,7 +13,7 @@
  ******************************************************************************/
 package org.eclipse.jface.tests.dialogs;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -22,9 +22,9 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class StatusDialogTest {
 
@@ -41,12 +41,12 @@ public void testEscapeAmpesandInStatusLabelBug395426() {
 		assertEquals("&&", statusLabel.getText());
 	}
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 		shell = new Shell();
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() throws Exception {
 		shell.dispose();
 	}

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/dialogs/TitleAreaDialogTest.java

@@ -18,8 +18,8 @@
 import org.eclipse.jface.resource.ResourceLocator;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Shell;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 public class TitleAreaDialogTest {
 
@@ -28,7 +28,7 @@ public class TitleAreaDialogTest {
 
 	private TitleAreaDialog dialog;
 
-	@After
+	@AfterEach
 	public void tearDown() throws Exception {
 		if (dialog != null) {
 			dialog.close();

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/images/DecorationOverlayIconTest.java

@@ -13,11 +13,11 @@
  *******************************************************************************/
 package org.eclipse.jface.tests.images;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -26,8 +26,8 @@
 import org.eclipse.jface.viewers.DecorationOverlayIcon;
 import org.eclipse.jface.viewers.IDecoration;
 import org.eclipse.swt.graphics.Image;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * @since 3.13
@@ -41,7 +41,7 @@ public class DecorationOverlayIconTest {
 	private ImageDescriptor overlayDescriptor1;
 	private ImageDescriptor overlayDescriptor2;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		ImageRegistry imageRegistry = JFaceResources.getImageRegistry();
 		baseImage1 = imageRegistry.get(Dialog.DLG_IMG_HELP);

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/images/DeferredImageDescriptorTest.java

@@ -15,16 +15,16 @@
 
 package org.eclipse.jface.tests.images;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.net.URL;
 
 import org.eclipse.core.runtime.Adapters;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.ImageData;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test loading ImageDescriptors from a URL calculated on demand.
@@ -57,15 +57,15 @@ public void testAdaptToURL() {
 				() -> DeferredImageDescriptorTest.class.getResource("anything.gif"));
 
 		URL url = Adapters.adapt(descriptor, URL.class);
-		assertNotNull("DeferredImageDescriptor does not adapt to URL", url);
+		assertNotNull(url, "DeferredImageDescriptor does not adapt to URL");
 
 		ImageDescriptor descriptorFromUrl = ImageDescriptor.createFromURL(url);
 
 		ImageData imageDataOrig = descriptor.getImageData(100);
-		assertNotNull("Original URL does not return 100% image data", imageDataOrig);
+		assertNotNull(imageDataOrig, "Original URL does not return 100% image data");
 
 		ImageData imageDataURL = descriptorFromUrl.getImageData(100);
-		assertNotNull("Adapted URL does not return 100% image data", imageDataURL);
+		assertNotNull(imageDataURL, "Adapted URL does not return 100% image data");
 		assertEquals(imageDataOrig.width, imageDataURL.width);
 		assertEquals(imageDataOrig.height, imageDataURL.height);
 	}