From fd4a5b8bcdabab0f5e67c936451ade5f4d4236f3 Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Mon, 20 Oct 2025 11:44:31 +0200 Subject: [PATCH] Migrate remaining JUnit 4 tests to JUnit 5 in org.eclipse.jface.text.tests --- .../META-INF/MANIFEST.MF | 7 ++-- .../META-INF/MANIFEST.MF | 2 ++ .../DefaultTextDoubleClickStrategyTest.java | 14 ++++---- ...entAdapterContentProposalProviderTest.java | 10 +++--- .../jface/text/tests/MultiSelectionTest.java | 12 +++---- .../text/tests/ProjectionViewerTest.java | 4 +-- .../tests/TestWhitespaceCharacterPainter.java | 14 ++++---- .../CodeMiningLineHeaderAnnotationTest.java | 16 ++++----- .../CodeMiningProjectionViewerTest.java | 18 +++++----- .../contentassist/AsyncContentAssistTest.java | 24 ++++++------- .../FilteringAsyncContentAssistTests.java | 21 +++++------ .../IncrementalAsyncContentAssistTests.java | 12 +++---- .../text/tests/rules/FastPartitionerTest.java | 8 ++--- .../rules/FastPartitionerZeroLengthTest.java | 8 ++--- .../text/tests/rules/ScannerColumnTest.java | 12 +++---- .../jface/text/tests/rules/WordRuleTest.java | 8 ++--- .../source/AnnotationRulerColumnTest.java | 14 ++++---- .../source/LineNumberRulerColumnTest.java | 10 +++--- .../source/inlined/AnnotationOnTabTest.java | 18 +++++----- .../inlined/LineContentBoundsDrawingTest.java | 35 +++++++------------ .../TemplatePersistenceDataTest.java | 6 ++-- 21 files changed, 134 insertions(+), 139 deletions(-) diff --git a/tests/org.eclipse.jface.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jface.tests/META-INF/MANIFEST.MF index 02953b95126..b8dc172d3e3 100644 --- a/tests/org.eclipse.jface.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.jface.tests/META-INF/MANIFEST.MF @@ -11,10 +11,11 @@ Require-Bundle: org.junit;bundle-version="4.12.0", org.eclipse.core.runtime, org.eclipse.ui, org.eclipse.ui.tests.harness -Import-Package: org.osgi.framework, - org.junit.jupiter.api;version="[5.14.0,6.0.0)", +Import-Package: 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)" + org.junit.platform.commons.function;version="[1.14.0,2.0.0)", + org.junit.platform.suite.api;version="[1.14.0,2.0.0)", + org.osgi.framework Export-Package: org.eclipse.jface.tests.fieldassist;x-internal:=true, org.eclipse.jface.tests.preferences;x-internal:=true, org.eclipse.jface.tests.viewers;x-internal:=true diff --git a/tests/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF index 29cae9bf551..fdef5681ba0 100644 --- a/tests/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF @@ -30,4 +30,6 @@ Import-Package: org.mockito, org.mockito.invocation, org.mockito.stubbing, org.junit.jupiter.api;version="[5.14.0,6.0.0)", + org.junit.jupiter.params;version="[5.14.0,6.0.0)", + org.junit.jupiter.params.provider;version="[5.14.0,6.0.0)", org.junit.platform.suite.api;version="[1.14.0,2.0.0)" diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/DefaultTextDoubleClickStrategyTest.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/DefaultTextDoubleClickStrategyTest.java index 642638401c9..450d94d729b 100644 --- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/DefaultTextDoubleClickStrategyTest.java +++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/DefaultTextDoubleClickStrategyTest.java @@ -13,10 +13,10 @@ *******************************************************************************/ package org.eclipse.jface.text.tests; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.eclipse.jface.text.DefaultTextDoubleClickStrategy; import org.eclipse.jface.text.Document; @@ -48,11 +48,11 @@ public void testClickAtLineEnd() throws Exception { IDocument document= new Document(content); TestSpecificDefaultTextDoubleClickStrategy doubleClickStrategy= new TestSpecificDefaultTextDoubleClickStrategy(); IRegion selection= doubleClickStrategy.findWord(document, 11); - assertNotNull("Should have selected a word", selection); - assertEquals("Unexpected selection", "world", document.get(selection.getOffset(), selection.getLength())); + assertNotNull(selection, "Should have selected a word"); + assertEquals("world", document.get(selection.getOffset(), selection.getLength()), "Unexpected selection"); selection= doubleClickStrategy.findWord(document, document.getLength()); - assertNotNull("Should have selected a word", selection); - assertEquals("Unexpected selection", "you", document.get(selection.getOffset(), selection.getLength())); + assertNotNull(selection, "Should have selected a word"); + assertEquals("you", document.get(selection.getOffset(), selection.getLength()), "Unexpected selection"); } private static final class TestSpecificDefaultTextDoubleClickStrategy extends DefaultTextDoubleClickStrategy { diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/FindReplaceDocumentAdapterContentProposalProviderTest.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/FindReplaceDocumentAdapterContentProposalProviderTest.java index 5830593b884..edbbd6f4d0a 100644 --- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/FindReplaceDocumentAdapterContentProposalProviderTest.java +++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/FindReplaceDocumentAdapterContentProposalProviderTest.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.jface.text.tests; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.eclipse.jface.fieldassist.IContentProposal; @@ -31,8 +31,8 @@ private void assertProposal(IContentProposal[] proposals, String prefix, String break; } } - assertNotNull("No proposal for " + prefix + " found", match); - assertEquals("Unexpected replacement", replacement, match.getContent()); + assertNotNull(match, "No proposal for " + prefix + " found"); + assertEquals(replacement, match.getContent(), "Unexpected replacement"); } @Test diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/MultiSelectionTest.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/MultiSelectionTest.java index 62f89f36101..0136d3b14cc 100644 --- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/MultiSelectionTest.java +++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/MultiSelectionTest.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.jface.text.tests; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Arrays; @@ -20,8 +20,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionListener; @@ -165,7 +165,7 @@ public void testBackspace() throws MalformedTreeException { } @Test - @Ignore(value = "this is currently for manual testing") + @Disabled("this is currently for manual testing") public void testViewer() { Shell shell= new Shell(); Button b = new Button(shell, SWT.PUSH); diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/ProjectionViewerTest.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/ProjectionViewerTest.java index 97bbfdce4b5..e3f2bfe6ca9 100644 --- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/ProjectionViewerTest.java +++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/ProjectionViewerTest.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.jface.text.tests; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.eclipse.swt.SWT; import org.eclipse.swt.dnd.Clipboard; diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TestWhitespaceCharacterPainter.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TestWhitespaceCharacterPainter.java index 62428c482b7..b06a30301be 100644 --- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TestWhitespaceCharacterPainter.java +++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TestWhitespaceCharacterPainter.java @@ -11,8 +11,8 @@ *******************************************************************************/ package org.eclipse.jface.text.tests; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; @@ -26,9 +26,9 @@ import java.util.Arrays; import java.util.List; -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; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -55,14 +55,14 @@ public class TestWhitespaceCharacterPainter { private Shell shell; - @Before + @BeforeEach public void before() { shell= new Shell(); shell.setSize(500, 200); shell.setLayout(new FillLayout()); } - @After + @AfterEach public void after() { shell.dispose(); } diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningLineHeaderAnnotationTest.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningLineHeaderAnnotationTest.java index e5473695362..d8500772b3a 100644 --- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningLineHeaderAnnotationTest.java +++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningLineHeaderAnnotationTest.java @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.jface.text.tests.codemining; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import java.util.Arrays; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StyledText; @@ -46,7 +46,7 @@ public class CodeMiningLineHeaderAnnotationTest { private Document document; - @Before + @BeforeEach public void setUp() { fShell= new Shell(Display.getDefault()); fShell.setSize(500, 200); @@ -58,7 +58,7 @@ public void setUp() { fViewer.setDocument(document, new AnnotationModel()); final Display display= textWidget.getDisplay(); fShell.open(); - Assert.assertTrue(new DisplayHelper() { + Assertions.assertTrue(new DisplayHelper() { @Override protected boolean condition() { return fViewer.getTextWidget().isVisible(); @@ -67,7 +67,7 @@ protected boolean condition() { DisplayHelper.sleep(textWidget.getDisplay(), 1000); } - @After + @AfterEach public void tearDown() { fViewer= null; } diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningProjectionViewerTest.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningProjectionViewerTest.java index 4143057ea5b..8e96d160d85 100644 --- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningProjectionViewerTest.java +++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/codemining/CodeMiningProjectionViewerTest.java @@ -13,7 +13,7 @@ */ package org.eclipse.jface.text.tests.codemining; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Arrays; @@ -22,10 +22,10 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicReference; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.osgi.framework.Bundle; import org.eclipse.swt.SWT; @@ -90,7 +90,7 @@ public void dispose() { private Shell fParent; private ProjectionViewer fViewer; - @Before + @BeforeEach public void setUp() { Shell[] shells= Display.getDefault().getShells(); for (Shell shell : shells) { @@ -112,7 +112,7 @@ public void setUp() { fViewer.doOperation(ProjectionViewer.TOGGLE); } - @After + @AfterEach public void tearDown() { fParent.dispose(); } @@ -137,7 +137,7 @@ protected Shell findNewShell(Collection beforeShells) { DisplayHelper.sleep(fParent.getDisplay(), 1000); } afterShells= findNewShells(beforeShells); - assertTrue("No new shell found, existing: " + beforeShells, afterShells.size() > beforeShells.size()); + assertTrue(afterShells.size() > beforeShells.size(), "No new shell found, existing: " + beforeShells); return afterShells.get(0); } @@ -166,7 +166,7 @@ public void testCollapse() throws Exception { try { // without workbench, next line throws Exception directly DisplayHelper.sleep(fParent.getDisplay(), 1000); - Assert.assertNull(logError.get()); + Assertions.assertNull(logError.get()); } finally { if (log != null) { log.removeLogListener(logListener); diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/contentassist/AsyncContentAssistTest.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/contentassist/AsyncContentAssistTest.java index 63793379930..a9a72e0b112 100644 --- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/contentassist/AsyncContentAssistTest.java +++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/contentassist/AsyncContentAssistTest.java @@ -14,17 +14,17 @@ *******************************************************************************/ package org.eclipse.jface.text.tests.contentassist; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +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.Assume.assumeFalse; import java.util.Arrays; import java.util.Collection; -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; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; @@ -58,7 +58,7 @@ public class AsyncContentAssistTest { private Shell shell; - @Before + @BeforeEach public void setUp() { shell= new Shell(); listener= (status, plugin) -> { @@ -69,7 +69,7 @@ public void setUp() { Platform.addLogListener(listener); } - @After + @AfterEach public void tearDown() { shell.dispose(); Platform.removeLogListener(listener); @@ -123,13 +123,13 @@ public void testCompletePrefix() { final Collection beforeShells= AbstractContentAssistTest.getCurrentShells(); contentAssistant.showPossibleCompletions(); Shell newShell= AbstractContentAssistTest.findNewShell(beforeShells); - assertTrue("Completion item not shown", new DisplayHelper() { + assertTrue(new DisplayHelper() { @Override protected boolean condition() { Table completionTable= findCompletionSelectionControl(newShell); return Arrays.stream(completionTable.getItems()).map(TableItem::getText).anyMatch(item -> item.contains(BarContentAssistProcessor.PROPOSAL.substring(document.getLength()))); } - }.waitForCondition(display, 2000)); + }.waitForCondition(display, 2000), "Completion item not shown"); } @Test @@ -164,13 +164,13 @@ public void testCompleteActivationChar() { final Collection beforeShells= AbstractContentAssistTest.getCurrentShells(); AbstractContentAssistTest.processEvents(); Shell newShell= AbstractContentAssistTest.findNewShell(beforeShells); - assertTrue("Completion item not shown", new DisplayHelper() { + assertTrue(new DisplayHelper() { @Override protected boolean condition() { Table completionTable= findCompletionSelectionControl(newShell); return Arrays.stream(completionTable.getItems()).map(TableItem::getText).anyMatch(item -> item.contains(BarContentAssistProcessor.PROPOSAL.substring(document.getLength()))); } - }.waitForCondition(display, 4000)); + }.waitForCondition(display, 4000), "Completion item not shown"); } private static Table findCompletionSelectionControl(Widget control) { diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/contentassist/FilteringAsyncContentAssistTests.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/contentassist/FilteringAsyncContentAssistTests.java index 7b0de15b10e..cb4d116aa0a 100644 --- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/contentassist/FilteringAsyncContentAssistTests.java +++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/contentassist/FilteringAsyncContentAssistTests.java @@ -11,9 +11,9 @@ package org.eclipse.jface.text.tests.contentassist; import static java.util.Collections.singletonList; -import static org.junit.Assert.assertEquals; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.lang.reflect.Field; import java.util.ArrayList; @@ -22,10 +22,10 @@ import java.util.concurrent.CountDownLatch; import java.util.function.Predicate; -import org.junit.After; -import org.junit.Before; -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; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; @@ -64,7 +64,7 @@ public class FilteringAsyncContentAssistTests { private SourceViewer viewer; private ContentAssistant ca; - @Before + @BeforeEach public void setup() { tearDown(); @@ -79,7 +79,7 @@ public void setup() { ca = new ContentAssistant(true); } - @After + @AfterEach public void tearDown() { if (shell != null) { ca.uninstall(); @@ -288,7 +288,8 @@ public void testCA_WithFirstDelayedThenImmediateProposals() throws Exception { * * @throws Exception exception */ - @Test @Ignore + @Test + @Disabled("Bug: filtering only applied after all CA processors have completed") public void testFastCompletionsNotFilteredUntilLongComplitionsCalculated() throws Exception { IDocument document = viewer.getDocument(); diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/contentassist/IncrementalAsyncContentAssistTests.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/contentassist/IncrementalAsyncContentAssistTests.java index 4bf8a0fd924..aab413f6c3d 100644 --- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/contentassist/IncrementalAsyncContentAssistTests.java +++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/contentassist/IncrementalAsyncContentAssistTests.java @@ -10,15 +10,15 @@ *******************************************************************************/ package org.eclipse.jface.text.tests.contentassist; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; import java.util.Comparator; import java.util.List; -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; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Shell; @@ -39,7 +39,7 @@ public class IncrementalAsyncContentAssistTests { private ContentAssistant ca; - @Before + @BeforeEach public void setup() { tearDown(); @@ -57,7 +57,7 @@ public void setup() { ca.setSorter(comparator::compare); } - @After + @AfterEach public void tearDown() { if (shell != null) { ca.uninstall(); diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/FastPartitionerTest.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/FastPartitionerTest.java index 898857e947d..3a016950139 100644 --- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/FastPartitionerTest.java +++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/FastPartitionerTest.java @@ -13,10 +13,10 @@ *******************************************************************************/ package org.eclipse.jface.text.tests.rules; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.Document; @@ -44,7 +44,7 @@ public class FastPartitionerTest { private IDocument fDoc; private IDocumentPartitioner fPartitioner; - @Before + @BeforeEach public void setUp() { fDoc= new Document(); IPartitionTokenScanner scanner= new RuleBasedPartitionScanner() { diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/FastPartitionerZeroLengthTest.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/FastPartitionerZeroLengthTest.java index e66e3766731..21a734c2638 100644 --- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/FastPartitionerZeroLengthTest.java +++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/FastPartitionerZeroLengthTest.java @@ -14,10 +14,10 @@ package org.eclipse.jface.text.tests.rules; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; @@ -42,7 +42,7 @@ public class FastPartitionerZeroLengthTest { private IDocument fDoc; private FastPartitioner fPartitioner; - @Before + @BeforeEach public void setUp() { fDoc= new Document(); IPartitionTokenScanner scanner= new RuleBasedPartitionScanner() { diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/ScannerColumnTest.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/ScannerColumnTest.java index 15356982023..bde7a4c3490 100644 --- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/ScannerColumnTest.java +++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/ScannerColumnTest.java @@ -13,11 +13,11 @@ *******************************************************************************/ package org.eclipse.jface.text.tests.rules; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -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; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; @@ -32,12 +32,12 @@ public class ScannerColumnTest { private IDocument fDocument; - @Before + @BeforeEach public void setUp() { fDocument= new Document("scanner test"); } - @After + @AfterEach public void tearDown() { fDocument= null; } diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/WordRuleTest.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/WordRuleTest.java index 8e0143f3259..e4a28040643 100644 --- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/WordRuleTest.java +++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/rules/WordRuleTest.java @@ -13,11 +13,11 @@ *******************************************************************************/ package org.eclipse.jface.text.tests.rules; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.eclipse.swt.SWT; diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/AnnotationRulerColumnTest.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/AnnotationRulerColumnTest.java index 1d1867c9287..48d7e8a3853 100644 --- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/AnnotationRulerColumnTest.java +++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/AnnotationRulerColumnTest.java @@ -13,10 +13,10 @@ *******************************************************************************/ package org.eclipse.jface.text.tests.source; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.eclipse.swt.SWT; import org.eclipse.swt.events.PaintEvent; @@ -50,7 +50,7 @@ public class AnnotationRulerColumnTest { private IStatus errorStatus; - @Before + @BeforeEach public void setUp() { shell= new Shell(); listener= (status, plugin) -> { @@ -62,7 +62,7 @@ public void setUp() { Platform.addLogListener(listener); } - @After + @AfterEach public void tearDown() { shell.dispose(); shell= null; @@ -84,7 +84,7 @@ public void testDrawWithEmptyProjection() throws Throwable { shell.open(); - Assert.assertTrue(new DisplayHelper() { + Assertions.assertTrue(new DisplayHelper() { @Override protected boolean condition() { return projectionViewer.getTextWidget().isVisible() && paintListener.wasPainted(); diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/LineNumberRulerColumnTest.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/LineNumberRulerColumnTest.java index 2322149db5a..d17b2899185 100644 --- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/LineNumberRulerColumnTest.java +++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/LineNumberRulerColumnTest.java @@ -13,9 +13,9 @@ *******************************************************************************/ package org.eclipse.jface.text.tests.source; -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; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Shell; @@ -28,12 +28,12 @@ public class LineNumberRulerColumnTest { private Shell fParent; - @Before + @BeforeEach public void setUp() { fParent= new Shell(); } - @After + @AfterEach public void tearDown() { fParent.dispose(); } diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/inlined/AnnotationOnTabTest.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/inlined/AnnotationOnTabTest.java index f5bfeafc0e2..dfaa8cd9e05 100644 --- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/inlined/AnnotationOnTabTest.java +++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/inlined/AnnotationOnTabTest.java @@ -12,10 +12,10 @@ import java.util.Collections; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StyledText; @@ -43,12 +43,12 @@ public class AnnotationOnTabTest { private Shell fParent; - @Before + @BeforeEach public void setUp() { fParent= new Shell(); } - @After + @AfterEach public void tearDown() { fParent.dispose(); fParent = null; @@ -78,7 +78,7 @@ public void testTextBoundsMatchPaintedArea() { annotation.setText("a"); // single char, so overall annotation is 3 chars, less than default 4 chars support.updateAnnotations(Collections.singleton(annotation)); fParent.open(); - Assert.assertTrue(new DisplayHelper() { + Assertions.assertTrue(new DisplayHelper() { @Override protected boolean condition() { return textWidget.isVisible() && painter.wasPainted(); @@ -88,7 +88,7 @@ protected boolean condition() { int referenceIndex = textWidget.getText().indexOf("reference"); Rectangle referenceBounds = textWidget.getTextBounds(referenceIndex, referenceIndex); Rectangle annotatedCharactedBounds = textWidget.getTextBounds(annotationIndex, annotationIndex); - Assert.assertTrue("Annotation didn't shift target character to the right, it most likely replaced the tab instead of expanding it", - referenceBounds.x + referenceBounds.width < annotatedCharactedBounds.x + annotatedCharactedBounds.width); + Assertions.assertTrue(referenceBounds.x + referenceBounds.width < annotatedCharactedBounds.x + annotatedCharactedBounds.width, + "Annotation didn't shift target character to the right, it most likely replaced the tab instead of expanding it"); } } diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/inlined/LineContentBoundsDrawingTest.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/inlined/LineContentBoundsDrawingTest.java index 70ddec1973f..612beb5f76b 100644 --- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/inlined/LineContentBoundsDrawingTest.java +++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/inlined/LineContentBoundsDrawingTest.java @@ -12,13 +12,11 @@ import java.util.Collections; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StyledText; @@ -48,9 +46,7 @@ * This test verify that the bounds of the text as returned by StyledText.getTextBounds() * actually match what's printed on the widget. */ -@RunWith(Parameterized.class) public class LineContentBoundsDrawingTest { - @Parameters(name="{0}") public static String[] contents() { return new String[] { "annotation inside text", @@ -59,12 +55,6 @@ public static String[] contents() { }; } - private final String text; - - public LineContentBoundsDrawingTest(String text) { - this.text = text; - } - public static final class AccessAllAnnoations implements IAnnotationAccess { @Override public Object getType(Annotation annotation) { @@ -102,25 +92,26 @@ public boolean wasPainted() { private Shell fParent; - @Before + @BeforeEach public void setUp() { fParent= new Shell(); } - @After + @AfterEach public void tearDown() { fParent.dispose(); fParent = null; } - @Test - public void testTextBoundsMatchPaintedArea() { + @ParameterizedTest(name = "{0}") + @MethodSource("contents") + public void testTextBoundsMatchPaintedArea(String text) { fParent.setLayout(new FillLayout()); // Create source viewer and initialize the content ISourceViewer sourceViewer = new SourceViewer(fParent,null, SWT.V_SCROLL | SWT.BORDER); - sourceViewer.setDocument(new Document(this.text), new AnnotationModel()); + sourceViewer.setDocument(new Document(text), new AnnotationModel()); // Initialize inlined annotations support InlinedAnnotationSupport support = new InlinedAnnotationSupport(); @@ -135,7 +126,7 @@ public void testTextBoundsMatchPaintedArea() { support.updateAnnotations(Collections.singleton(annotation)); fParent.open(); StyledText textWidget= sourceViewer.getTextWidget(); - Assert.assertTrue(new DisplayHelper() { + Assertions.assertTrue(new DisplayHelper() { @Override protected boolean condition() { return textWidget.isVisible() && painter.wasPainted(); @@ -145,7 +136,7 @@ protected boolean condition() { Rectangle textBounds= textWidget.getTextBounds(0, textWidget.getText().length() - 1); int supposedMostRightPaintedPixel = textBounds.x + textBounds.width - 1; int mostRightPaintedPixel= getMostRightPaintedPixel(textWidget); - Assert.assertEquals(supposedMostRightPaintedPixel, mostRightPaintedPixel, 1.5); // use double comparison with delta to tolerate variation from a system to the other + Assertions.assertEquals(supposedMostRightPaintedPixel, mostRightPaintedPixel, 1.5); // use double comparison with delta to tolerate variation from a system to the other } public int getMostRightPaintedPixel(StyledText widget) { diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/templates/persistence/TemplatePersistenceDataTest.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/templates/persistence/TemplatePersistenceDataTest.java index ff98b80389f..b2b1f9dda7f 100644 --- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/templates/persistence/TemplatePersistenceDataTest.java +++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/templates/persistence/TemplatePersistenceDataTest.java @@ -14,10 +14,10 @@ package org.eclipse.jface.text.tests.templates.persistence; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.eclipse.jface.text.templates.Template; import org.eclipse.jface.text.templates.persistence.TemplatePersistenceData;