Skip to content

Commit f86e59e

Browse files
vogellaakurtakov
vogella
authored and
akurtakov
committed
Migrate org.eclipse.text.tests to JUnit5
1 parent a1eede0 commit f86e59e

37 files changed

+647
-569
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: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@
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+
18+
import static org.junit.jupiter.api.Assertions.assertFalse;
19+
import static org.junit.jupiter.api.Assertions.assertNotNull;
20+
import static org.junit.jupiter.api.Assertions.assertNull;
21+
import static org.junit.jupiter.api.Assertions.assertSame;
22+
import static org.junit.jupiter.api.Assertions.assertTrue;
2223

2324
import java.util.ArrayList;
2425
import java.util.List;
2526

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

3232
import org.eclipse.jface.text.BadLocationException;
3333
import org.eclipse.jface.text.DefaultLineTracker;
@@ -117,15 +117,15 @@ private String getOriginalMasterContents() {
117117
"99999999999999999999";
118118
}
119119

120-
@Before
120+
@BeforeEach
121121
public void setUp() {
122122
fMasterDocument= new Document();
123123
fMasterDocument.set(getOriginalMasterContents());
124124
fSlaveDocumentManager= new ProjectionDocumentManager();
125125
fSlaveDocument= (ProjectionDocument) fSlaveDocumentManager.createSlaveDocument(fMasterDocument);
126126
}
127127

128-
@After
128+
@AfterEach
129129
public void tearDown () {
130130
fSlaveDocumentManager.freeSlaveDocument(fSlaveDocument);
131131
fSlaveDocument= null;
@@ -251,12 +251,12 @@ private void assertFragmentation(Position[] expected, boolean checkWellFormednes
251251
}
252252

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

256256
for (int i= 0; i < expected.length; i++) {
257257
Segment segment= (Segment) segmentation[i];
258258
Fragment actual= segment.fragment;
259-
Assert.assertEquals(print(actual) + " != " + print(expected[i]), expected[i], actual);
259+
Assertions.assertEquals(expected[i], actual, print(actual) + " != " + print(expected[i]));
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,9 @@ 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]));
21262126
}
21272127

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

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

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

16-
import static org.junit.Assert.assertEquals;
17-
import static org.junit.Assert.assertTrue;
1816

19-
import org.junit.After;
20-
import org.junit.Before;
21-
import org.junit.Test;
17+
18+
import static org.junit.jupiter.api.Assertions.assertEquals;
19+
import static org.junit.jupiter.api.Assertions.assertTrue;
20+
21+
import org.junit.jupiter.api.AfterEach;
22+
import org.junit.jupiter.api.BeforeEach;
23+
import org.junit.jupiter.api.Test;
2224

2325
import org.eclipse.jface.text.BadLocationException;
2426
import org.eclipse.jface.text.BadPositionCategoryException;
@@ -107,7 +109,7 @@ private void createLineWrappingProjection() {
107109
addProjection(70, 30, 10);
108110
}
109111

110-
@Before
112+
@BeforeEach
111113
public void setUp() {
112114
fMasterDocument= new Document();
113115
fSlaveDocument= new Document();
@@ -119,7 +121,7 @@ public void setUp() {
119121
}
120122

121123

122-
@After
124+
@AfterEach
123125
public void tearDown() {
124126
fMasterDocument= null;
125127
fSlaveDocument= null;
@@ -627,7 +629,7 @@ public void test10c() {
627629
}
628630

629631
private void assertRegions(IRegion[] expected, IRegion[] actual) {
630-
assertTrue("invalid number of regions", expected.length == actual.length);
632+
assertTrue(expected.length == actual.length, "invalid number of regions");
631633
for (int i= 0; i < expected.length; i++)
632634
assertEquals(expected[i], actual[i]);
633635
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
package org.eclipse.text.tests;
1616

17-
import org.junit.platform.suite.api.Suite;
1817
import org.junit.platform.suite.api.SelectClasses;
18+
import org.junit.platform.suite.api.Suite;
1919

2020
/**
2121
*

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

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

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

1920
import org.eclipse.jface.text.GapTextStore;
2021

@@ -72,7 +73,7 @@ private String printGap(int start, int end) {
7273
}
7374

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

7879
protected void assertContents(String expected) {

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

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

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

1819
import org.eclipse.jface.text.BadLocationException;
1920
import org.eclipse.jface.text.ILineTracker;
@@ -29,14 +30,14 @@ public abstract class AbstractLineTrackerTest {
2930
protected ILineTracker fTracker;
3031

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

3435
for (int i= 0; i < lines.length; i++) {
3536
IRegion line= fTracker.getLineInformation(i);
3637

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

39-
assertEquals("line offset of line " + i, getLineOffset(i, lines), line.getOffset());
40+
assertEquals(getLineOffset(i, lines), line.getOffset(), "line offset of line " + i);
4041
}
4142
}
4243

‎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: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@
1313
*******************************************************************************/
1414
package org.eclipse.text.tests;
1515

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

1819
import java.util.ArrayList;
1920
import java.util.Arrays;
2021
import java.util.HashMap;
2122
import java.util.HashSet;
2223
import java.util.Iterator;
2324

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

2829
import org.eclipse.jface.text.Document;
2930
import org.eclipse.jface.text.IDocument;
@@ -102,7 +103,7 @@ public void removeAllAnnotations() {
102103
private Annotation fAfterIn;
103104
private Annotation fAfterOut;
104105

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

@@ -129,7 +130,7 @@ public void setUp() {
129130
fAnnotationModel.connect(fDocument);
130131
}
131132

132-
@After
133+
@AfterEach
133134
public void tearDown() {
134135
fAnnotationModel.disconnect(fDocument);
135136
}

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@
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+
17+
import static org.junit.jupiter.api.Assertions.assertEquals;
18+
import static org.junit.jupiter.api.Assertions.assertNotNull;
19+
import static org.junit.jupiter.api.Assertions.assertTrue;
1920

2021
import java.util.ArrayList;
2122
import java.util.Iterator;
2223
import java.util.Random;
2324

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

2829
import org.eclipse.jface.text.Document;
2930
import org.eclipse.jface.text.Position;
@@ -1216,7 +1217,7 @@ public AnnotationData(int offset, int length, int annotationNumber) {
12161217
private AnnotationModel fInnerModel1;
12171218
private AnnotationModel fInnerModel2;
12181219

1219-
@Before
1220+
@BeforeEach
12201221
public void setUp() throws Exception {
12211222
fDocument= new Document(RANDOM_CONTENT);
12221223

@@ -1231,7 +1232,7 @@ public void setUp() throws Exception {
12311232
fAnnotationModel.connect(fDocument);
12321233
}
12331234

1234-
@After
1235+
@AfterEach
12351236
public void tearDown() throws Exception {
12361237
fAnnotationModel.disconnect(fDocument);
12371238

0 commit comments

Comments
 (0)