Skip to content

Commit e952cf2

Browse files
vogellavogella
committed
Migrate JUnit 4 tests to JUnit 5 in org.eclipse.text.tests
1 parent 0ce1430 commit e952cf2

33 files changed

+615
-565
lines changed

‎tests/org.eclipse.text.tests/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ Export-Package:
1212
Require-Bundle:
1313
org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)",
1414
org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
15-
org.eclipse.text;bundle-version="[3.6.3,4.0.0)",
16-
org.junit;bundle-version="4.12.0"
15+
org.eclipse.text;bundle-version="[3.6.3,4.0.0)"
1716
Import-Package: org.junit.jupiter.api;version="[5.14.0,6.0.0)",
17+
org.junit.jupiter.api.function;version="[5.14.0,6.0.0)",
1818
org.junit.platform.suite.api;version="[1.14.0,2.0.0)"
1919
Bundle-RequiredExecutionEnvironment: JavaSE-17
2020
Eclipse-BundleShape: dir

‎tests/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionDocumentTest.java‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,19 @@
1414
*******************************************************************************/
1515
package org.eclipse.text.tests;
1616

17-
import static org.junit.Assert.assertFalse;
18-
import static org.junit.Assert.assertNotNull;
19-
import static org.junit.Assert.assertNull;
20-
import static org.junit.Assert.assertSame;
21-
import static org.junit.Assert.assertTrue;
17+
import static org.junit.jupiter.api.Assertions.assertFalse;
18+
import static org.junit.jupiter.api.Assertions.assertNotNull;
19+
import static org.junit.jupiter.api.Assertions.assertNull;
20+
import static org.junit.jupiter.api.Assertions.assertSame;
21+
import static org.junit.jupiter.api.Assertions.assertTrue;
2222

2323
import java.util.ArrayList;
2424
import java.util.List;
2525

26-
import org.junit.After;
27-
import org.junit.Assert;
28-
import org.junit.Before;
29-
import org.junit.Test;
26+
import org.junit.jupiter.api.AfterEach;
3027
import org.junit.jupiter.api.Assertions;
28+
import org.junit.jupiter.api.BeforeEach;
29+
import org.junit.jupiter.api.Test;
3130

3231
import org.eclipse.jface.text.BadLocationException;
3332
import org.eclipse.jface.text.DefaultLineTracker;
@@ -117,15 +116,15 @@ private String getOriginalMasterContents() {
117116
"99999999999999999999";
118117
}
119118

120-
@Before
119+
@BeforeEach
121120
public void setUp() {
122121
fMasterDocument= new Document();
123122
fMasterDocument.set(getOriginalMasterContents());
124123
fSlaveDocumentManager= new ProjectionDocumentManager();
125124
fSlaveDocument= (ProjectionDocument) fSlaveDocumentManager.createSlaveDocument(fMasterDocument);
126125
}
127126

128-
@After
127+
@AfterEach
129128
public void tearDown () {
130129
fSlaveDocumentManager.freeSlaveDocument(fSlaveDocument);
131130
fSlaveDocument= null;
@@ -251,12 +250,13 @@ private void assertFragmentation(Position[] expected, boolean checkWellFormednes
251250
}
252251

253252
Position[] segmentation= fSlaveDocument.getSegments2();
254-
assertTrue("invalid number of segments", expected.length == segmentation.length);
253+
assertTrue(expected.length == segmentation.length, "invalid number of segments");
255254

256255
for (int i= 0; i < expected.length; i++) {
257256
Segment segment= (Segment) segmentation[i];
258257
Fragment actual= segment.fragment;
259-
Assert.assertEquals(print(actual) + " != " + print(expected[i]), expected[i], actual);
258+
Assertions.assertEquals(expected[i], actual, print(actual) + " != " + print(expected[i]));
259+
260260
}
261261

262262
}
@@ -267,15 +267,15 @@ private void assertLineInformationConsistency(IDocument document) {
267267

268268
int textLines= textTracker.getNumberOfLines();
269269
int trackerLines= document.getNumberOfLines();
270-
Assert.assertEquals(trackerLines, textLines);
270+
Assertions.assertEquals(trackerLines, textLines);
271271

272272
for (int i= 0; i < trackerLines; i++) {
273273
try {
274274
IRegion trackerLine= document.getLineInformation(i);
275275
IRegion textLine= textTracker.getLineInformation(i);
276276

277-
Assert.assertEquals(trackerLine.getOffset(), textLine.getOffset());
278-
Assert.assertEquals(trackerLine.getLength(), textLine.getLength());
277+
Assertions.assertEquals(trackerLine.getOffset(), textLine.getOffset());
278+
Assertions.assertEquals(trackerLine.getLength(), textLine.getLength());
279279

280280
} catch (BadLocationException e) {
281281
assertTrue(false);
@@ -286,7 +286,7 @@ private void assertLineInformationConsistency(IDocument document) {
286286
private void assertContents(String expected, IDocument document) {
287287
assertWellFormedSegmentation();
288288
assertWellFormedFragmentation();
289-
Assert.assertEquals(expected, document.get());
289+
Assertions.assertEquals(expected, document.get());
290290
assertLineInformationConsistency(document);
291291
}
292292

@@ -682,9 +682,9 @@ public void test9_7() {
682682

683683
try {
684684
int startOffset= fMasterDocument.getLineOffset(4);
685-
Assert.assertEquals(80, startOffset);
685+
Assertions.assertEquals(80, startOffset);
686686
int endOffset= fMasterDocument.getLineOffset(7);
687-
Assert.assertEquals(140, endOffset);
687+
Assertions.assertEquals(140, endOffset);
688688
fSlaveDocument.addMasterDocumentRange(startOffset, endOffset - startOffset);
689689

690690
assertSlaveContents(getOriginalMasterContents().substring(80, 140));
@@ -1629,12 +1629,12 @@ public void test21_a() {
16291629

16301630
private void assertEquals(DocumentEvent expected, DocumentEvent received) {
16311631
assertSame(expected.getDocument(), received.getDocument());
1632-
Assert.assertEquals(expected.getOffset(), received.getOffset());
1633-
Assert.assertEquals(expected.getLength(), received.getLength());
1632+
Assertions.assertEquals(expected.getOffset(), received.getOffset());
1633+
Assertions.assertEquals(expected.getLength(), received.getLength());
16341634
if (expected.getText() == null || expected.getText().isEmpty())
16351635
assertTrue(received.getText() == null || received.getText().isEmpty());
16361636
else
1637-
Assert.assertEquals(expected.getText(), received.getText());
1637+
Assertions.assertEquals(expected.getText(), received.getText());
16381638
}
16391639

16401640
private void assertSlaveEvents(DocumentEvent[] expected, DocumentEvent[] received) {
@@ -2120,9 +2120,10 @@ private void assertRegions(IRegion[] expected, IRegion[] actual) {
21202120
assertNull(expected);
21212121
}
21222122

2123-
assertTrue("invalid number of regions", expected.length == actual.length);
2123+
assertTrue(expected.length == actual.length, "invalid number of regions");
21242124
for (int i= 0; i < expected.length; i++)
2125-
Assert.assertEquals(print(actual[i]) + " != " + print(expected[i]), expected[i], actual[i]);
2125+
Assertions.assertEquals(expected[i], actual[i], print(actual[i]) + " != " + print(expected[i]));
2126+
21262127
}
21272128

21282129
private void assertUnprojectedMasterRegions(IRegion[] expected, int offsetInMaster, int lengthInMaster) {

‎tests/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionMappingTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
*******************************************************************************/
1414
package org.eclipse.text.tests;
1515

16-
import static org.junit.Assert.assertEquals;
17-
import static org.junit.Assert.assertTrue;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
17+
import static org.junit.jupiter.api.Assertions.assertTrue;
1818

19-
import org.junit.After;
20-
import org.junit.Before;
21-
import org.junit.Test;
19+
import org.junit.jupiter.api.AfterEach;
20+
import org.junit.jupiter.api.BeforeEach;
21+
import org.junit.jupiter.api.Test;
2222

2323
import org.eclipse.jface.text.BadLocationException;
2424
import org.eclipse.jface.text.BadPositionCategoryException;
@@ -107,7 +107,7 @@ private void createLineWrappingProjection() {
107107
addProjection(70, 30, 10);
108108
}
109109

110-
@Before
110+
@BeforeEach
111111
public void setUp() {
112112
fMasterDocument= new Document();
113113
fSlaveDocument= new Document();
@@ -119,7 +119,7 @@ public void setUp() {
119119
}
120120

121121

122-
@After
122+
@AfterEach
123123
public void tearDown() {
124124
fMasterDocument= null;
125125
fSlaveDocument= null;
@@ -627,7 +627,7 @@ public void test10c() {
627627
}
628628

629629
private void assertRegions(IRegion[] expected, IRegion[] actual) {
630-
assertTrue("invalid number of regions", expected.length == actual.length);
630+
assertTrue(expected.length == actual.length, "invalid number of regions");
631631
for (int i= 0; i < expected.length; i++)
632632
assertEquals(expected[i], actual[i]);
633633
}

‎tests/org.eclipse.text.tests/src/org/eclipse/text/tests/AbstractGapTextTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
*******************************************************************************/
1414
package org.eclipse.text.tests;
1515

16-
import static org.junit.Assert.assertEquals;
17-
import static org.junit.Assert.assertTrue;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
17+
import static org.junit.jupiter.api.Assertions.assertTrue;
1818

1919
import org.eclipse.jface.text.GapTextStore;
2020

@@ -72,7 +72,7 @@ private String printGap(int start, int end) {
7272
}
7373

7474
protected void assertGap(int start, int end) {
75-
assertTrue("Invalid gap. Expected: " + printGap(start, end) + " actual:" + printGap() , fText.getGapStart() == start && fText.getGapEnd() == end);
75+
assertTrue(fText.getGapStart() == start && fText.getGapEnd() == end, "Invalid gap. Expected: " + printGap(start, end) + " actual:" + printGap());
7676
}
7777

7878
protected void assertContents(String expected) {

‎tests/org.eclipse.text.tests/src/org/eclipse/text/tests/AbstractLineTrackerTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*******************************************************************************/
1414
package org.eclipse.text.tests;
1515

16-
import static org.junit.Assert.assertEquals;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
1717

1818
import org.eclipse.jface.text.BadLocationException;
1919
import org.eclipse.jface.text.ILineTracker;
@@ -29,14 +29,14 @@ public abstract class AbstractLineTrackerTest {
2929
protected ILineTracker fTracker;
3030

3131
protected final void checkLines(int[] lines) throws BadLocationException {
32-
assertEquals("number of lines", lines.length, fTracker.getNumberOfLines());
32+
assertEquals(lines.length, fTracker.getNumberOfLines(), "number of lines");
3333

3434
for (int i= 0; i < lines.length; i++) {
3535
IRegion line= fTracker.getLineInformation(i);
3636

37-
assertEquals("line lenght of line " + i, lines[i], line.getLength());
37+
assertEquals(lines[i], line.getLength(), "line lenght of line " + i);
3838

39-
assertEquals("line offset of line " + i, getLineOffset(i, lines), line.getOffset());
39+
assertEquals(getLineOffset(i, lines), line.getOffset(), "line offset of line " + i);
4040
}
4141
}
4242

‎tests/org.eclipse.text.tests/src/org/eclipse/text/tests/AdaptiveGapTextTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@
1313
*******************************************************************************/
1414
package org.eclipse.text.tests;
1515

16-
import org.junit.After;
17-
import org.junit.Before;
18-
import org.junit.Test;
16+
import org.junit.jupiter.api.AfterEach;
17+
import org.junit.jupiter.api.BeforeEach;
18+
import org.junit.jupiter.api.Test;
1919

2020
public class AdaptiveGapTextTest extends AbstractGapTextTest {
2121

22-
@Before
22+
@BeforeEach
2323
public void setUp() {
2424
fText= new GapText(2, 10, 0.5f);
2525
fText.set("xxxxx");
2626
}
2727

28-
@After
28+
@AfterEach
2929
public void tearDown () {
3030
fText= null;
3131
}

‎tests/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelExtension2Test.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313
*******************************************************************************/
1414
package org.eclipse.text.tests;
1515

16-
import static org.junit.Assert.fail;
16+
import static org.junit.jupiter.api.Assertions.fail;
1717

1818
import java.util.ArrayList;
1919
import java.util.Arrays;
2020
import java.util.HashMap;
2121
import java.util.HashSet;
2222
import java.util.Iterator;
2323

24-
import org.junit.After;
25-
import org.junit.Before;
26-
import org.junit.Test;
24+
import org.junit.jupiter.api.AfterEach;
25+
import org.junit.jupiter.api.BeforeEach;
26+
import org.junit.jupiter.api.Test;
2727

2828
import org.eclipse.jface.text.Document;
2929
import org.eclipse.jface.text.IDocument;
@@ -102,7 +102,7 @@ public void removeAllAnnotations() {
102102
private Annotation fAfterIn;
103103
private Annotation fAfterOut;
104104

105-
@Before
105+
@BeforeEach
106106
public void setUp() {
107107
fDocument= new Document("How much wood\nwould a woodchuck chuck\nif a woodchuck\ncould chuck wood?\n42");
108108

@@ -129,7 +129,7 @@ public void setUp() {
129129
fAnnotationModel.connect(fDocument);
130130
}
131131

132-
@After
132+
@AfterEach
133133
public void tearDown() {
134134
fAnnotationModel.disconnect(fDocument);
135135
}

‎tests/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelStressTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313
*******************************************************************************/
1414
package org.eclipse.text.tests;
1515

16-
import static org.junit.Assert.assertEquals;
17-
import static org.junit.Assert.assertNotNull;
18-
import static org.junit.Assert.assertTrue;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
17+
import static org.junit.jupiter.api.Assertions.assertNotNull;
18+
import static org.junit.jupiter.api.Assertions.assertTrue;
1919

2020
import java.util.ArrayList;
2121
import java.util.Iterator;
2222
import java.util.Random;
2323

24-
import org.junit.After;
25-
import org.junit.Before;
26-
import org.junit.Test;
24+
import org.junit.jupiter.api.AfterEach;
25+
import org.junit.jupiter.api.BeforeEach;
26+
import org.junit.jupiter.api.Test;
2727

2828
import org.eclipse.jface.text.Document;
2929
import org.eclipse.jface.text.Position;
@@ -1216,7 +1216,7 @@ public AnnotationData(int offset, int length, int annotationNumber) {
12161216
private AnnotationModel fInnerModel1;
12171217
private AnnotationModel fInnerModel2;
12181218

1219-
@Before
1219+
@BeforeEach
12201220
public void setUp() throws Exception {
12211221
fDocument= new Document(RANDOM_CONTENT);
12221222

@@ -1231,7 +1231,7 @@ public void setUp() throws Exception {
12311231
fAnnotationModel.connect(fDocument);
12321232
}
12331233

1234-
@After
1234+
@AfterEach
12351235
public void tearDown() throws Exception {
12361236
fAnnotationModel.disconnect(fDocument);
12371237

‎tests/org.eclipse.text.tests/src/org/eclipse/text/tests/Bug401391Test.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
*******************************************************************************/
1414
package org.eclipse.text.tests;
1515

16-
import static org.junit.Assert.assertEquals;
17-
import static org.junit.Assert.assertNotNull;
18-
import static org.junit.Assert.assertNull;
19-
import static org.junit.Assert.assertSame;
20-
import static org.junit.Assert.assertTrue;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
17+
import static org.junit.jupiter.api.Assertions.assertNotNull;
18+
import static org.junit.jupiter.api.Assertions.assertNull;
19+
import static org.junit.jupiter.api.Assertions.assertSame;
20+
import static org.junit.jupiter.api.Assertions.assertTrue;
2121

2222
import java.lang.reflect.Field;
2323
import java.util.AbstractMap;
@@ -26,9 +26,9 @@
2626
import java.util.Map;
2727
import java.util.Set;
2828

29-
import org.junit.After;
30-
import org.junit.Before;
31-
import org.junit.Test;
29+
import org.junit.jupiter.api.AfterEach;
30+
import org.junit.jupiter.api.BeforeEach;
31+
import org.junit.jupiter.api.Test;
3232

3333
import org.eclipse.jface.text.Document;
3434
import org.eclipse.jface.text.Position;
@@ -42,7 +42,7 @@ public class Bug401391Test {
4242
private AnnotationModel fFirstInnerModel;
4343
private AnnotationModel fSecondInnerModel;
4444

45-
@Before
45+
@BeforeEach
4646
public void setUp() throws Exception {
4747
fDocument = new Document("123456789");
4848

@@ -112,7 +112,7 @@ public Object put(Object key, Object value) {
112112
fld.set(target, new TrapMap());
113113
}
114114

115-
@After
115+
@AfterEach
116116
public void tearDown() {
117117
fAnnotationModel.disconnect(fDocument);
118118
}

0 commit comments

Comments
 (0)