Migrate JFace viewers and label providers tests to JUnit 5

Author: vogella

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