Migrate JFace viewers and label providers tests to JUnit 5

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/ColorAndFontLabelProviderTest.java

@@ -29,7 +29,7 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableItem;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * ColorAndFontProviderTest is a test of a color and font provider but not an

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/ColorAndFontViewerLabelProviderTest.java

@@ -31,7 +31,7 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableItem;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * ColorAndFontProviderTest is a test of a color and font provider that is an

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/CompositeLabelProviderTableTest.java

@@ -28,7 +28,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableItem;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * CompositeLabelProviderTableTest tests a table that is a

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/DecoratingLabelProviderTreePathTest.java

@@ -29,7 +29,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * DecoratingLabelProviderTreePathTest is the tree path version of the

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/DecoratingLabelProviderTreeTest.java

@@ -27,7 +27,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @since 3.3

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/DecoratingStyledCellLabelProviderTest.java

@@ -53,8 +53,8 @@
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Most of the setup has been taken from
@@ -141,7 +141,7 @@ public Color decorateForeground(Object element) {
 	protected String changeMe = "OLD";
 	private static int COLUMN_COUNT = 3;
 
-	@Before
+	@BeforeEach
 	@Override
 	public void setUp() {
 		entries = new CountryEntry[3];

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/AbstractTreeViewerTest.java

@@ -29,8 +29,8 @@
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.Widget;
 import org.eclipse.ui.tests.harness.util.DisplayHelper;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 public abstract class AbstractTreeViewerTest extends StructuredItemViewerTest {
 
@@ -483,7 +483,7 @@ public void testContains() {
 				fTreeViewer.contains(fRootElement.getFirstChild(), fRootElement.getFirstChild().getFirstChild()));
 	}
 
-	@After
+	@AfterEach
 	@Override
 	public void tearDown() {
 		super.tearDown();

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug138608Test.java

@@ -24,8 +24,8 @@
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.widgets.Composite;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Description of the bug: Initially tree is populated by way shown below and is
@@ -98,7 +98,7 @@ public void testBug138608() {
 
 	}
 
-	@After
+	@AfterEach
 	@Override
 	public void tearDown() {
 		contentProvider = null;

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug180504TableViewerTest.java

@@ -24,7 +24,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.TableColumn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @since 3.3

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug180504TreeViewerTest.java

@@ -27,7 +27,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.TreeColumn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @since 3.3

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug200337TableViewerTest.java

@@ -23,7 +23,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.TableColumn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @since 3.3

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug200558Test.java

@@ -27,7 +27,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.swt.widgets.TreeColumn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @since 3.3

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug201002TableViewerTest.java

@@ -27,7 +27,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.ui.tests.harness.util.DisplayHelper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @since 3.3

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug201002TreeViewerTest.java

@@ -28,7 +28,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.TreeColumn;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @since 3.3

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug242231Test.java

@@ -24,7 +24,7 @@
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * This testcase for Bug 242231 checks that applyEditorValue(), which has been

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug256889TableViewerTest.java

@@ -24,8 +24,8 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class Bug256889TableViewerTest extends ViewerTestCase {
 
@@ -111,7 +111,7 @@ protected void setInput() {
 		fShell.setSize(300, 1000);
 	}
 
-	@Before
+	@BeforeEach
 	public void initModel() {
 		this.rowcounter = 0;
 		getModel().clear();

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug553483ViewerDropAdapterTest.java

@@ -14,7 +14,6 @@
 package org.eclipse.jface.tests.viewers;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.eclipse.jface.util.LocalSelectionTransfer;
 import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -50,7 +49,10 @@ public class Bug553483ViewerDropAdapterTest {
 
 	@BeforeEach
 	public void setUp() throws Exception {
-		display = new Display();
+		display = Display.getCurrent();
+		if (display == null) {
+			display = new Display();
+		}
 		shell = new Shell(display);
 
 		shell.setLayout(new RowLayout(SWT.HORIZONTAL));
@@ -109,9 +111,9 @@ public void setUp() throws Exception {
 
 	@AfterEach
 	public void tearDown() throws Exception {
-		assertTrue(shell.isDisposed());
-
-		display.dispose();
+		if (shell != null && !shell.isDisposed()) {
+			shell.dispose();
+		}
 	}
 
 	@Test
@@ -150,6 +152,8 @@ private void postDragAndDropCopyEvents() {
 		// ctrl + drag & drop => copy
 
 		shell.forceActive();
+		while (display.readAndDispatch()) {
+		}
 
 		Event keyEvent = new Event();
 		Event mouseEvent = new Event();
@@ -188,12 +192,17 @@ private void postDragAndDropCopyEvents() {
 		keyEvent.stateMask = SWT.CTRL;
 		keyEvent.type = SWT.KeyUp;
 		display.post(keyEvent);
+
+		while (display.readAndDispatch()) {
+		}
 	}
 
 	private void postDragAndDropMoveEvents() {
 		// this time w/o ctrl => move
 
 		shell.forceActive();
+		while (display.readAndDispatch()) {
+		}
 
 		Event mouseEvent = new Event();
 
@@ -214,6 +223,9 @@ private void postDragAndDropMoveEvents() {
 
 		mouseEvent.type = SWT.MouseUp;
 		display.post(mouseEvent);
+
+		while (display.readAndDispatch()) {
+		}
 	}
 
 	private static class ViewerDragSource implements DragSourceListener {

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/CComboViewerTest.java

@@ -18,7 +18,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
 import org.eclipse.swt.widgets.Composite;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
 
 /**
  * @since 3.0
@@ -47,7 +47,7 @@ protected String getItemText(int at) {
 	}
 
 	@Override
-	@Ignore("TODO: Determine if this test is applicable to ComboViewer")
+	@Disabled("TODO: Determine if this test is applicable to ComboViewer")
 	public void testInsertChild() {
 
 	}

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/CheckboxTableViewerTest.java

@@ -38,7 +38,7 @@
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CheckboxTableViewerTest extends TableViewerTest {
 	public static class CheckboxTableTestLabelProvider extends TestLabelProvider implements ITableLabelProvider {

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/CheckboxTreeViewerMissingTest.java

@@ -19,8 +19,8 @@
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.swt.graphics.Image;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 public class CheckboxTreeViewerMissingTest extends CheckboxTreeViewerTest {
 	private static Image testImage;
@@ -44,10 +44,12 @@ public Image getImage(Object element) {
 
 	@Override
 	public IBaseLabelProvider getTestLabelProvider() {
-		return new CheckboxMissingTableTestLabelProvider();
+		CheckboxMissingTableTestLabelProvider provider = new CheckboxMissingTableTestLabelProvider();
+		provider.fExtended = true;
+		return provider;
 	}
 
-	@After
+	@AfterEach
 	@Override
 	public void tearDown() {
 		super.tearDown();

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/CheckboxTreeViewerTest.java

@@ -31,7 +31,7 @@
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.TreeItem;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CheckboxTreeViewerTest extends TreeViewerTest {
 	public static class CheckboxTableTestLabelProvider extends TestLabelProvider implements ITableLabelProvider {
@@ -41,7 +41,7 @@ public static class CheckboxTableTestLabelProvider extends TestLabelProvider imp
 		@Override
 		public String getText(Object element) {
 			if (fExtended) {
-				return providedString((String) element);
+				return providedString((TestElement) element);
 			}
 			return element.toString();
 		}

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ComboViewerTest.java

@@ -17,7 +17,7 @@
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
 
 /**
  * @since 3.0
@@ -44,7 +44,7 @@ protected String getItemText(int at) {
 		return list.getItem(at);
 	}
 
-	@Ignore("TODO: Determine if this test is applicable to ComboViewer")
+	@Disabled("TODO: Determine if this test is applicable to ComboViewer")
 	@Override
 	public void testInsertChild() {
 

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ListViewerComparatorTest.java

@@ -21,7 +21,7 @@
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.swt.widgets.Composite;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @since 3.2

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ListViewerTest.java

@@ -33,7 +33,7 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.List;
 import org.eclipse.ui.tests.harness.util.DisplayHelper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ListViewerTest extends StructuredViewerTest {
 

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/MultipleEqualElementsTreeViewerTest.java

@@ -30,7 +30,7 @@
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.swt.widgets.Widget;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests TreeViewer's support for multiple equal elements ().

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/SimpleTableViewerTest.java

@@ -30,7 +30,7 @@
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.ui.tests.harness.util.Mocks;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @since 3.2

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/SimpleTreeViewerTest.java

@@ -34,7 +34,7 @@
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @since 3.2