Skip to content

Commit 75bc04c

Browse files
vogellavogella
committed
Migrate JUnit 4 tests to JUnit 5 in org.eclipse.text.tests
1 parent c127f94 commit 75bc04c

25 files changed

+453
-425
lines changed

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +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;
26+
import org.junit.jupiter.api.AfterEach;
2727
import org.junit.Assert;
28-
import org.junit.Before;
29-
import org.junit.Test;
28+
import org.junit.jupiter.api.BeforeEach;
29+
import org.junit.jupiter.api.Test;
3030

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

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

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

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

255255
for (int i= 0; i < expected.length; i++) {
256256
Segment segment= (Segment) segmentation[i];
257257
Fragment actual= segment.fragment;
258-
Assert.assertEquals(print(actual) + " != " + print(expected[i]), expected[i], actual);
258+
Assertions.assertEquals(print(actual) + " != " + print(expected[i]), expected[i], actual);
259259
}
260260

261261
}
@@ -266,15 +266,15 @@ private void assertLineInformationConsistency(IDocument document) {
266266

267267
int textLines= textTracker.getNumberOfLines();
268268
int trackerLines= document.getNumberOfLines();
269-
Assert.assertEquals(trackerLines, textLines);
269+
Assertions.assertEquals(trackerLines, textLines);
270270

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

276-
Assert.assertEquals(trackerLine.getOffset(), textLine.getOffset());
277-
Assert.assertEquals(trackerLine.getLength(), textLine.getLength());
276+
Assertions.assertEquals(trackerLine.getOffset(), textLine.getOffset());
277+
Assertions.assertEquals(trackerLine.getLength(), textLine.getLength());
278278

279279
} catch (BadLocationException e) {
280280
assertTrue(false);
@@ -285,7 +285,7 @@ private void assertLineInformationConsistency(IDocument document) {
285285
private void assertContents(String expected, IDocument document) {
286286
assertWellFormedSegmentation();
287287
assertWellFormedFragmentation();
288-
Assert.assertEquals(expected, document.get());
288+
Assertions.assertEquals(expected, document.get());
289289
assertLineInformationConsistency(document);
290290
}
291291

@@ -681,9 +681,9 @@ public void test9_7() {
681681

682682
try {
683683
int startOffset= fMasterDocument.getLineOffset(4);
684-
Assert.assertEquals(80, startOffset);
684+
Assertions.assertEquals(80, startOffset);
685685
int endOffset= fMasterDocument.getLineOffset(7);
686-
Assert.assertEquals(140, endOffset);
686+
Assertions.assertEquals(140, endOffset);
687687
fSlaveDocument.addMasterDocumentRange(startOffset, endOffset - startOffset);
688688

689689
assertSlaveContents(getOriginalMasterContents().substring(80, 140));
@@ -1628,12 +1628,12 @@ public void test21_a() {
16281628

16291629
private void assertEquals(DocumentEvent expected, DocumentEvent received) {
16301630
assertSame(expected.getDocument(), received.getDocument());
1631-
Assert.assertEquals(expected.getOffset(), received.getOffset());
1632-
Assert.assertEquals(expected.getLength(), received.getLength());
1631+
Assertions.assertEquals(expected.getOffset(), received.getOffset());
1632+
Assertions.assertEquals(expected.getLength(), received.getLength());
16331633
if (expected.getText() == null || expected.getText().isEmpty())
16341634
assertTrue(received.getText() == null || received.getText().isEmpty());
16351635
else
1636-
Assert.assertEquals(expected.getText(), received.getText());
1636+
Assertions.assertEquals(expected.getText(), received.getText());
16371637
}
16381638

16391639
private void assertSlaveEvents(DocumentEvent[] expected, DocumentEvent[] received) {
@@ -2119,9 +2119,9 @@ private void assertRegions(IRegion[] expected, IRegion[] actual) {
21192119
assertNull(expected);
21202120
}
21212121

2122-
assertTrue("invalid number of regions", expected.length == actual.length);
2122+
assertTrue(expected.length == actual.length, "invalid number of regions");
21232123
for (int i= 0; i < expected.length; i++)
2124-
Assert.assertEquals(print(actual[i]) + " != " + print(expected[i]), expected[i], actual[i]);
2124+
Assertions.assertEquals(print(actual[i]) + " != " + print(expected[i]), expected[i], actual[i]);
21252125
}
21262126

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

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

Lines changed: 7 additions & 7 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;

‎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
}

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

Lines changed: 7 additions & 7 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;
@@ -81,7 +81,7 @@ protected void checkLineInformationConsistency() throws BadLocationException {
8181
}
8282
}
8383

84-
@Before
84+
@BeforeEach
8585
public void setUp() throws BadLocationException {
8686

8787
fParent= new Document();
@@ -117,7 +117,7 @@ public void setUp() throws BadLocationException {
117117

118118
}
119119

120-
@After
120+
@AfterEach
121121
public void tearDown () {
122122
fDocument= null;
123123
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414

1515
package org.eclipse.text.tests;
1616

17-
import static org.junit.Assert.*;
17+
import static org.junit.jupiter.api.Assertions.*;
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.CopyOnWriteTextStore;
2424
import org.eclipse.jface.text.GapTextStore;
@@ -47,14 +47,14 @@ String get() {
4747

4848
private COWTextStore fText;
4949

50-
@Before
50+
@BeforeEach
5151
public void setUp() {
5252

5353
fText= new COWTextStore();
5454
fText.set(INITIAL_CONTENT);
5555
}
5656

57-
@After
57+
@AfterEach
5858
public void tearDown () {
5959
fText= null;
6060
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
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

18-
import org.junit.Test;
18+
import org.junit.jupiter.api.Test;
1919

2020
import org.eclipse.jface.text.BadLocationException;
2121
import org.eclipse.jface.text.Document;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
package org.eclipse.text.tests;
1515

1616

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

1919
import java.util.ArrayList;
2020
import java.util.List;
2121

22-
import org.junit.Test;
22+
import org.junit.jupiter.api.Test;
2323

2424
import org.eclipse.jface.text.BadLocationException;
2525
import org.eclipse.jface.text.Document;

0 commit comments

Comments
 (0)