Skip to content

Migrate JUnit 4 tests to JUnit 5 in org.eclipse.jface.text.tests #3409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2025
Merged

Migrate JUnit 4 tests to JUnit 5 in org.eclipse.jface.text.tests #3409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/HTML2TextReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*******************************************************************************/
package org.eclipse.jface.text.tests;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;

import java.io.IOException;
import java.io.Reader;
Expand All @@ -27,7 +27,7 @@
import java.util.Iterator;
import java.util.List;

import org.junit.Test;
import org.junit.jupiter.api.Test;

import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyleRange;
Expand Down Expand Up @@ -68,7 +68,7 @@ private void verify(String input, String expectedOutput, int styleRangeCount) th
ranges.add(styleRangeIterator.next());
}

assertEquals("Incorrect number of style ranges", styleRangeCount, ranges.size());
assertEquals(styleRangeCount, ranges.size(), "Incorrect number of style ranges");

Collections.sort(ranges, (r1, r2) -> r1.start - r2.start);

Expand Down
4 changes: 2 additions & 2 deletions ....eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TabsToSpacesConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,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.widgets.Shell;
Expand Down
4 changes: 2 additions & 2 deletions tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextHoverPopupTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,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;

public class TextHoverPopupTest {

Expand Down
40 changes: 20 additions & 20 deletions ...s/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextPresentationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@
*******************************************************************************/
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.Assert.fail;
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 static org.junit.jupiter.api.Assertions.fail;

import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.NoSuchElementException;

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.custom.StyleRange;
Expand Down Expand Up @@ -53,7 +53,7 @@ public class TextPresentationTest {

private Display fDisplay;

@Before
@BeforeEach
public void setUp() {
fDisplay= Display.getDefault();
setUpStyleRanges();
Expand Down Expand Up @@ -86,7 +86,7 @@ private void setUpTextPresentation() {
}
}

@After
@AfterEach
public void tearDown() {
fColors.clear();
if (!fDisplay.isDisposed()) {
Expand Down Expand Up @@ -158,44 +158,44 @@ private void checkRegions(StyleRange[] expectedRanges, Iterator<StyleRange> rang
int lastEnd= defaultRange != null ? defaultRange.start : Integer.MIN_VALUE;
for (int i= 0; i < expectedRanges.length; i++) {
StyleRange expectedRange= expectedRanges[i];
assertTrue("Presentation has less ranges than expected.", rangeIterator.hasNext());
assertTrue(rangeIterator.hasNext(), "Presentation has less ranges than expected.");
StyleRange actualRange= rangeIterator.next();
assertEquals(expectedRange, actualRange);
assertTrue("Unexpected default style.", withDefaults || !actualRange.similarTo(defaultRange));
assertTrue("Overlapping or wrong ordered style.", lastEnd <= actualRange.start);
assertTrue(withDefaults || !actualRange.similarTo(defaultRange), "Unexpected default style.");
assertTrue(lastEnd <= actualRange.start, "Overlapping or wrong ordered style.");
lastEnd= actualRange.start + actualRange.length;

// test first and last range methods
if (i == 0) {
start= actualRange.start;
StyleRange first= fTextPresentation.getFirstStyleRange();
if (withDefaults) {
assertEquals("getFirstStyleRange() failed", expectedRange, first);
assertEquals(expectedRange, first, "getFirstStyleRange() failed");
} else {
assertTrue("getFirstStyleRange() failed", first.equals(expectedRange) || first.similarTo(defaultRange));
assertTrue(first.equals(expectedRange) || first.similarTo(defaultRange), "getFirstStyleRange() failed");
}
} else if (i == expectedRanges.length - 1) {
end= actualRange.start + actualRange.length;
StyleRange last= fTextPresentation.getLastStyleRange();
if (withDefaults) {
assertEquals("getLastStyleRange() failed", expectedRange, last);
assertEquals(expectedRange, last, "getLastStyleRange() failed");
} else {
assertTrue("getLastStyleRange() failed", last.equals(expectedRange) || last.similarTo(defaultRange));
assertTrue(last.equals(expectedRange) || last.similarTo(defaultRange), "getLastStyleRange() failed");
}
}
}
assertTrue("Presentation has more ranges than expected.", !rangeIterator.hasNext());
assertTrue(!rangeIterator.hasNext(), "Presentation has more ranges than expected.");
if (withDefaults) {
assertEquals("getDenumerableRanges() failed", expectedRanges.length, fTextPresentation.getDenumerableRanges());
assertEquals(expectedRanges.length, fTextPresentation.getDenumerableRanges(), "getDenumerableRanges() failed");
}
assertEquals("isEmpty() failed", Boolean.valueOf(expectedRanges.length == 0 && defaultRange == null), Boolean.valueOf(fTextPresentation.isEmpty()));
assertEquals(Boolean.valueOf(expectedRanges.length == 0 && defaultRange == null), Boolean.valueOf(fTextPresentation.isEmpty()), "isEmpty() failed");
IRegion expectedCover;
if (defaultRange == null) {
expectedCover= (start == -1 && end == -1 ? null : new Region(start, end - start));
} else {
expectedCover= new Region(defaultRange.start, defaultRange.length);
}
assertEquals("Wrong coverage", expectedCover, fTextPresentation.getCoverage());
assertEquals(expectedCover, fTextPresentation.getCoverage(), "Wrong coverage");
}

@Test
Expand Down
Loading