From d5bc5e61d06808224664d5a9f02f3656533cb664 Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Mon, 19 Jan 2026 11:56:17 +0100 Subject: [PATCH] Migrate JFace viewers and label providers tests to JUnit 5 --- .../ColorAndFontLabelProviderTest.java | 2 +- .../ColorAndFontViewerLabelProviderTest.java | 2 +- .../CompositeLabelProviderTableTest.java | 2 +- .../DecoratingLabelProviderTreePathTest.java | 2 +- .../DecoratingLabelProviderTreeTest.java | 2 +- ...DecoratingStyledCellLabelProviderTest.java | 6 ++-- .../tests/viewers/AbstractTreeViewerTest.java | 6 ++-- .../jface/tests/viewers/Bug138608Test.java | 6 ++-- .../viewers/Bug180504TableViewerTest.java | 2 +- .../viewers/Bug180504TreeViewerTest.java | 2 +- .../viewers/Bug200337TableViewerTest.java | 2 +- .../jface/tests/viewers/Bug200558Test.java | 2 +- .../viewers/Bug201002TableViewerTest.java | 2 +- .../viewers/Bug201002TreeViewerTest.java | 2 +- .../jface/tests/viewers/Bug242231Test.java | 2 +- .../viewers/Bug256889TableViewerTest.java | 6 ++-- .../Bug553483ViewerDropAdapterTest.java | 22 ++++++++++--- .../jface/tests/viewers/CComboViewerTest.java | 4 +-- .../viewers/CheckboxTableViewerTest.java | 2 +- .../CheckboxTreeViewerMissingTest.java | 10 +++--- .../tests/viewers/CheckboxTreeViewerTest.java | 4 +-- .../jface/tests/viewers/ComboViewerTest.java | 4 +-- .../viewers/ListViewerComparatorTest.java | 2 +- .../jface/tests/viewers/ListViewerTest.java | 2 +- .../MultipleEqualElementsTreeViewerTest.java | 2 +- .../tests/viewers/SimpleTableViewerTest.java | 2 +- .../tests/viewers/SimpleTreeViewerTest.java | 2 +- .../SimpleVirtualLazyTreeViewerTest.java | 6 ++-- .../viewers/StructuredItemViewerTest.java | 2 +- .../tests/viewers/StructuredViewerTest.java | 2 +- .../tests/viewers/TableColorProviderTest.java | 6 ++-- .../tests/viewers/TableFontProviderTest.java | 6 ++-- .../viewers/TableViewerComparatorTest.java | 2 +- .../jface/tests/viewers/TableViewerTest.java | 2 +- .../viewers/TableViewerWithLimitTest.java | 2 +- .../tests/viewers/TreeViewerColumnTest.java | 2 +- .../viewers/TreeViewerComparatorTest.java | 2 +- .../jface/tests/viewers/TreeViewerTest.java | 2 +- .../viewers/TreeViewerWithLimitTest.java | 2 +- .../jface/tests/viewers/ViewerTestCase.java | 6 ++++ .../viewers/VirtualLazyTableViewerTest.java | 22 +++++++------ .../viewers/VirtualLazyTreeViewerTest.java | 32 ++++++++++--------- .../tests/viewers/VirtualTableViewerTest.java | 28 ++++++++-------- 43 files changed, 126 insertions(+), 102 deletions(-) diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/ColorAndFontLabelProviderTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/ColorAndFontLabelProviderTest.java index 73c3121a08e3..4bf8e01620b9 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/ColorAndFontLabelProviderTest.java +++ b/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 diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/ColorAndFontViewerLabelProviderTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/ColorAndFontViewerLabelProviderTest.java index f83085e8f0e5..53fa28468874 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/ColorAndFontViewerLabelProviderTest.java +++ b/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 diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/CompositeLabelProviderTableTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/CompositeLabelProviderTableTest.java index 2ae3b5b3bc84..77387fda9d16 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/CompositeLabelProviderTableTest.java +++ b/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 diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/DecoratingLabelProviderTreePathTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/DecoratingLabelProviderTreePathTest.java index 31c8ae7e5443..b393821e0f62 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/DecoratingLabelProviderTreePathTest.java +++ b/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 diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/DecoratingLabelProviderTreeTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/DecoratingLabelProviderTreeTest.java index d6dfa5373515..ac6665ff60bb 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/DecoratingLabelProviderTreeTest.java +++ b/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 diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/DecoratingStyledCellLabelProviderTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/DecoratingStyledCellLabelProviderTest.java index caf7e6767a92..fba50f398037 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/DecoratingStyledCellLabelProviderTest.java +++ b/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]; diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/AbstractTreeViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/AbstractTreeViewerTest.java index 62c76e31a028..83491ff695f5 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/AbstractTreeViewerTest.java +++ b/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(); diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug138608Test.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug138608Test.java index 9aede665a668..ce38c4c68fc5 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug138608Test.java +++ b/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; diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug180504TableViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug180504TableViewerTest.java index b8d9efc5f712..a8efe5066001 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug180504TableViewerTest.java +++ b/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 diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug180504TreeViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug180504TreeViewerTest.java index b380f50fc9b7..160112e27574 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug180504TreeViewerTest.java +++ b/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 diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug200337TableViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug200337TableViewerTest.java index 45610bb8bd33..5c58b78a1e74 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug200337TableViewerTest.java +++ b/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 diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug200558Test.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug200558Test.java index 9c4daa2c5260..65c20b53b02e 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug200558Test.java +++ b/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 diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug201002TableViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug201002TableViewerTest.java index 7fc2df1bb454..51eed784a15e 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug201002TableViewerTest.java +++ b/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 diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug201002TreeViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug201002TreeViewerTest.java index 0e5295c13c32..4520dfbc476e 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug201002TreeViewerTest.java +++ b/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 diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug242231Test.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug242231Test.java index 6b16d5ca99f4..d9435e3e3d77 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug242231Test.java +++ b/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 diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug256889TableViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug256889TableViewerTest.java index bc562210e7e6..6cf8f159d61c 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug256889TableViewerTest.java +++ b/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(); diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug553483ViewerDropAdapterTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug553483ViewerDropAdapterTest.java index f15d1b970d41..748af11a9f9a 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/Bug553483ViewerDropAdapterTest.java +++ b/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 { diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/CComboViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/CComboViewerTest.java index 291615eabc06..460fe709c20b 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/CComboViewerTest.java +++ b/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() { } diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/CheckboxTableViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/CheckboxTableViewerTest.java index c4be083324ca..726e213f06ac 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/CheckboxTableViewerTest.java +++ b/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 { diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/CheckboxTreeViewerMissingTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/CheckboxTreeViewerMissingTest.java index 15431006ef8f..e32215312ce8 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/CheckboxTreeViewerMissingTest.java +++ b/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(); diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/CheckboxTreeViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/CheckboxTreeViewerTest.java index 67334971acac..5768b197a13e 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/CheckboxTreeViewerTest.java +++ b/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(); } diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ComboViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ComboViewerTest.java index b8970cbe431e..21b4ed4ea489 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ComboViewerTest.java +++ b/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() { diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ListViewerComparatorTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ListViewerComparatorTest.java index 62a8917a573c..a6158f6eeffe 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ListViewerComparatorTest.java +++ b/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 diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ListViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ListViewerTest.java index cf9ecb27c02b..59a52ce13bd5 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ListViewerTest.java +++ b/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 { diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/MultipleEqualElementsTreeViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/MultipleEqualElementsTreeViewerTest.java index ac701cfc438d..8ab233df79fb 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/MultipleEqualElementsTreeViewerTest.java +++ b/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 (). diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/SimpleTableViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/SimpleTableViewerTest.java index 784f8e98d630..e1b166f8a23f 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/SimpleTableViewerTest.java +++ b/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 diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/SimpleTreeViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/SimpleTreeViewerTest.java index 5efbd5363f46..87fe8078bf99 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/SimpleTreeViewerTest.java +++ b/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 diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/SimpleVirtualLazyTreeViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/SimpleVirtualLazyTreeViewerTest.java index ed52b0706118..ef0331880d9d 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/SimpleVirtualLazyTreeViewerTest.java +++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/SimpleVirtualLazyTreeViewerTest.java @@ -32,8 +32,8 @@ import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; import org.eclipse.ui.tests.harness.util.DisplayHelper; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests TreeViewer's VIRTUAL support with a lazy content provider. @@ -108,7 +108,7 @@ public TreeViewer getTreeViewer() { */ protected boolean setDataCalled = false; - @Before + @BeforeEach @Override public void setUp() { super.setUp(); diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/StructuredItemViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/StructuredItemViewerTest.java index 99be2e88f00e..55355e682f8d 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/StructuredItemViewerTest.java +++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/StructuredItemViewerTest.java @@ -17,7 +17,7 @@ import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.ICheckable; -import org.junit.Test; +import org.junit.jupiter.api.Test; public abstract class StructuredItemViewerTest extends StructuredViewerTest { diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/StructuredViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/StructuredViewerTest.java index 40ca9fd593d3..0db50cbd0d1e 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/StructuredViewerTest.java +++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/StructuredViewerTest.java @@ -35,7 +35,7 @@ import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.tests.harness.util.DisplayHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; public abstract class StructuredViewerTest extends ViewerTestCase { public static class TestLabelFilter extends ViewerFilter { diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableColorProviderTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableColorProviderTest.java index d2f3d029f69e..3d94f6dcf637 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableColorProviderTest.java +++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableColorProviderTest.java @@ -33,8 +33,8 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * The TableColorProviderTest is a test suite designed to test @@ -122,7 +122,7 @@ public void testTableItemsColorProviderBackground() { } - @Before + @BeforeEach @Override public void setUp() { super.setUp(); diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableFontProviderTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableFontProviderTest.java index 49690eebda64..9a6eca46fcd9 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableFontProviderTest.java +++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableFontProviderTest.java @@ -33,8 +33,8 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * The TableFontProviderTest is a test suite designed to test @@ -85,7 +85,7 @@ public void testTableItemsFontProvider() { } - @Before + @BeforeEach @Override public void setUp() { super.setUp(); diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableViewerComparatorTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableViewerComparatorTest.java index cfd5f5a81277..e3199dfba47e 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableViewerComparatorTest.java +++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableViewerComparatorTest.java @@ -27,7 +27,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @since 3.2 diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableViewerTest.java index e46095a8b88c..8ef3cb4d9152 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableViewerTest.java +++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableViewerTest.java @@ -35,7 +35,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 TableViewerTest extends StructuredItemViewerTest { public static class TableTestLabelProvider extends TestLabelProvider implements ITableLabelProvider { diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableViewerWithLimitTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableViewerWithLimitTest.java index 3932f437c5ac..eaef96f24020 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableViewerWithLimitTest.java +++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TableViewerWithLimitTest.java @@ -38,7 +38,7 @@ import org.eclipse.swt.widgets.Item; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableItem; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TableViewerWithLimitTest extends BaseLimitBasedViewerTest { diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TreeViewerColumnTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TreeViewerColumnTest.java index ae870f1c4d7c..014f616b02d6 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TreeViewerColumnTest.java +++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TreeViewerColumnTest.java @@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeColumn; import org.eclipse.swt.widgets.TreeItem; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TreeViewerColumnTest extends AbstractTreeViewerTest { diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TreeViewerComparatorTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TreeViewerComparatorTest.java index 155b475cdc5a..20d424ce0018 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TreeViewerComparatorTest.java +++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TreeViewerComparatorTest.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; /** * @since 3.2 diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TreeViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TreeViewerTest.java index 17bc582c2da9..3d6d57464f96 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TreeViewerTest.java +++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TreeViewerTest.java @@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; import org.eclipse.swt.widgets.Widget; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TreeViewerTest extends AbstractTreeViewerTest { diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TreeViewerWithLimitTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TreeViewerWithLimitTest.java index 072b1a7ac316..15d34fb2b450 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TreeViewerWithLimitTest.java +++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/TreeViewerWithLimitTest.java @@ -31,7 +31,7 @@ import org.eclipse.jface.viewers.internal.ExpandableNode; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.TreeItem; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TreeViewerWithLimitTest extends BaseLimitBasedViewerTest { diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ViewerTestCase.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ViewerTestCase.java index 1f6ca2a43361..13c82262900d 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ViewerTestCase.java +++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/ViewerTestCase.java @@ -33,6 +33,8 @@ import org.eclipse.swt.widgets.Shell; import org.junit.After; import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; public abstract class ViewerTestCase { @@ -48,6 +50,7 @@ public abstract class ViewerTestCase { private ISafeRunnableRunner oldRunner; @Before + @BeforeEach public void initializeOsDependentStates() { disableTestsBug347491 = Util.isCocoa(); eventLoopAdjustmentBug531048 = Util.isGtk(); @@ -109,7 +112,9 @@ public void processEvents() { } @Before + @BeforeEach public void setUp() { + StructuredViewerTest.TestLabelProvider.fgSuffix = ""; oldLogger = Policy.getLog(); oldRunner = SafeRunnable.getRunner(); Policy.setLog(status -> fail(status.getMessage())); @@ -141,6 +146,7 @@ protected static void sleep(long millis) { } @After + @AfterEach public void tearDown() { Policy.setLog(oldLogger); SafeRunnable.setRunner(oldRunner); diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/VirtualLazyTableViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/VirtualLazyTableViewerTest.java index 9568fd3f1b7c..0e65f3165e71 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/VirtualLazyTableViewerTest.java +++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/VirtualLazyTableViewerTest.java @@ -27,9 +27,10 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.widgets.Table; -import org.junit.After; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * The VirtualLazyTableViewerTest is a test of table viewers with lazy @@ -46,6 +47,7 @@ protected TestModelContentProvider getContentProvider() { return new TestLazyModelContentProvider(this); } + @BeforeEach @Override public void setUp() { updatedElements = new ArrayList<>(); @@ -58,7 +60,7 @@ protected void setUpModel() { fModel = fRootElement.getModel(); } - @After + @AfterEach @Override public void tearDown() { super.tearDown(); @@ -134,32 +136,32 @@ public void testBug160153() { assertNull("last Child should no longer be in the map", fViewer.testFindItem(lastChild)); } - @Ignore("This test is no use here as it is based on the assumption that all items are created.") + @Disabled("This test is no use here as it is based on the assumption that all items are created.") @Override public void testSorter() { } - @Ignore("This test is no use here as it is based on the assumption that all items are created.") + @Disabled("This test is no use here as it is based on the assumption that all items are created.") @Override public void testRenameWithSorter() { } - @Ignore("This test is no use here as it is based on the assumption that all items are created.") + @Disabled("This test is no use here as it is based on the assumption that all items are created.") @Override public void testSetFilters() { } - @Ignore("This test is no use here as it is based on the assumption that all items are created.") + @Disabled("This test is no use here as it is based on the assumption that all items are created.") @Override public void testFilter() { } - @Ignore("This test is no use here as it is based on the assumption that all items are created.") + @Disabled("This test is no use here as it is based on the assumption that all items are created.") @Override public void testRenameWithFilter() { } - @Ignore("This test is no use here as it is based on the assumption that all items are created.") + @Disabled("This test is no use here as it is based on the assumption that all items are created.") @Override public void testContains() { } diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/VirtualLazyTreeViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/VirtualLazyTreeViewerTest.java index 1a178eaea9f0..7c53f8dce230 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/VirtualLazyTreeViewerTest.java +++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/VirtualLazyTreeViewerTest.java @@ -25,8 +25,9 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Tree; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class VirtualLazyTreeViewerTest extends TreeViewerTest { @@ -41,6 +42,7 @@ protected StructuredViewer createViewer(Composite parent) { return fTreeViewer; } + @BeforeEach @Override public void setUp() { super.setUp(); @@ -76,67 +78,67 @@ public void testNodeIsExpandable() { assertTrue(fTreeViewer.isExpandable(nodeElement)); } - @Ignore("Test leads to infinite loop. Duplicate children are a bad idea in virtual trees.") + @Disabled("Test leads to infinite loop. Duplicate children are a bad idea in virtual trees.") @Override public void testRefreshWithDuplicateChild() { } - @Ignore("Test leads to infinite loop. Cycles are a bad idea in virtual trees.") + @Disabled("Test leads to infinite loop. Cycles are a bad idea in virtual trees.") @Override public void testSetExpandedWithCycle() { } - @Ignore("no need to test since virtual trees do not support filtering") + @Disabled("no need to test since virtual trees do not support filtering") @Override public void testFilterExpanded() { } - @Ignore("no need to test since virtual trees do not support filtering") + @Disabled("no need to test since virtual trees do not support filtering") @Override public void testFilter() { } - @Ignore("no need to test since virtual trees do not support filtering") + @Disabled("no need to test since virtual trees do not support filtering") @Override public void testSetFilters() { } - @Ignore("no need to test since virtual trees do not support filtering") + @Disabled("no need to test since virtual trees do not support filtering") @Override public void testInsertSiblingWithFilterFiltered() { } - @Ignore("no need to test since virtual trees do not support filtering") + @Disabled("no need to test since virtual trees do not support filtering") @Override public void testInsertSiblingWithFilterNotFiltered() { } - @Ignore("no need to test since virtual trees do not support sorting") + @Disabled("no need to test since virtual trees do not support sorting") @Override public void testInsertSiblingWithSorter() { } - @Ignore("no need to test since virtual trees do not support filtering") + @Disabled("no need to test since virtual trees do not support filtering") @Override public void testRenameWithFilter() { } - @Ignore("no need to test since virtual trees do not support sorting") + @Disabled("no need to test since virtual trees do not support sorting") @Override public void testRenameWithSorter() { } - @Ignore("no need to test since virtual trees do not support sorting") + @Disabled("no need to test since virtual trees do not support sorting") @Override public void testSorter() { } - @Ignore("test is not relevant for lazy tree viewer") + @Disabled("test is not relevant for lazy tree viewer") @Override public void testChildIsNotDuplicatedWhenCompareEquals() { } - @Ignore("test is not relevant for lazy tree viewer") + @Disabled("test is not relevant for lazy tree viewer") @Override public void testExpandCollapseToLevel() { } diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/VirtualTableViewerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/VirtualTableViewerTest.java index cd58c5b2330e..9f37dc5e6cb4 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/VirtualTableViewerTest.java +++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/VirtualTableViewerTest.java @@ -33,9 +33,9 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableItem; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * The TableViewerTest is a test of the SWT#VIRTUAL support in TableViewers, @@ -57,7 +57,7 @@ public class VirtualTableViewerTest extends TableViewerTest { */ protected volatile boolean setDataCalled = false; - @Before + @BeforeEach @Override public void setUp() { super.setUp(); @@ -162,32 +162,32 @@ public void testSetFilters() { assertEquals("unfiltered count", 10, getItemCount()); } - @Ignore("This test is no use here as it is based on the assumption that all items are created.") + @Disabled("This test is no use here as it is based on the assumption that all items are created.") @Override public void testInsertSibling() { } - @Ignore("This test is no use here as it is based on the assumption that all items are created.") + @Disabled("This test is no use here as it is based on the assumption that all items are created.") @Override public void testInsertSiblingReveal() { } - @Ignore("This test is no use here as it is based on the assumption that all items are created.") + @Disabled("This test is no use here as it is based on the assumption that all items are created.") @Override public void testInsertSiblings() { } - @Ignore("This test is no use here as it is based on the assumption that all items are created.") + @Disabled("This test is no use here as it is based on the assumption that all items are created.") @Override public void testInsertSiblingWithFilterFiltered() { } - @Ignore("This test is no use here as it is based on the assumption that all items are created.") + @Disabled("This test is no use here as it is based on the assumption that all items are created.") @Override public void testInsertSiblingWithFilterNotFiltered() { } - @Ignore("This test is no use here as it is based on the assumption that all items are created.") + @Disabled("This test is no use here as it is based on the assumption that all items are created.") @Override public void testInsertSiblingWithSorter() { } @@ -205,7 +205,7 @@ public void testRenameWithFilter() { assertNotNull("changed sibling is not visible", fViewer.testFindItem(first)); } - @Ignore("This test us based on findItem assuming all items are created so it is not valid.") + @Disabled("This test us based on findItem assuming all items are created so it is not valid.") @Override public void testSetInput() { } @@ -237,17 +237,17 @@ public void testSorter() { assertEquals("unsorted", firstLabel, getItemText(0)); } - @Ignore("This test is no use here as it is based on the assumption that all items are created.") + @Disabled("This test is no use here as it is based on the assumption that all items are created.") @Override public void testInsertSiblingSelectExpanded() { } - @Ignore("This test is no use here as it is based on the assumption that all items are created.") + @Disabled("This test is no use here as it is based on the assumption that all items are created.") @Override public void testSomeChildrenChanged() { } - @Ignore("This test is no use here as it is based on the assumption that all items are created.") + @Disabled("This test is no use here as it is based on the assumption that all items are created.") @Override public void testWorldChanged() { }