Skip to content

Commit 449ef4a

Browse files
vogellaclaude
vogella
and
claude
committed
Fix JUnit 5 assertion parameter order in org.eclipse.text.tests
This commit fixes compilation errors from the JUnit 5 migration by correcting the assertion parameter order across multiple test files. In JUnit 5, the message parameter must be last, not first. Changes: - Fixed assertEquals/assertTrue/assertNull/assertNotNull parameter order where message parameter was incorrectly placed first instead of last - Updated 9 test files with assertion fixes: - AbstractGapTextTest.java: Fixed assertTrue parameter order - AbstractLineTrackerTest.java: Fixed assertEquals parameter order - ChildDocumentTest.java: Fixed assertEquals parameter order in multiple methods - LineTrackerTest3.java: Fixed assertEquals parameter order (multiple occurrences) - LineTrackerTest4.java: Fixed assertTrue parameter order - MultiStringMatcherTest.java: Fixed assertEquals, assertNull, and assertNotNull parameter order across multiple test methods - PositionUpdatingCornerCasesTest.java: Fixed assertEquals parameter order - TextEditTests.java: Fixed assertEquals parameter order in multiple methods - TextStoreTest.java: Fixed assertEquals parameter order (multiple occurrences) JUnit 4 format (old): assertEquals("message", expected, actual) JUnit 5 format (new): assertEquals(expected, actual, "message") All tests now compile successfully with 0 errors. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
1 parent c78298e commit 449ef4a

File tree

9 files changed

+79
-79
lines changed

9 files changed

+79
-79
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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/ChildDocumentTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected void checkPositions(Position[] positions) throws BadPositionCategoryEx
4343
assertTrue(v.length == positions.length, "invalid number of positions");
4444

4545
for (int i = 0; i < positions.length; i++) {
46-
assertEquals(print(v[i]) + " != " + print(positions[i]), positions[i], v[i]);
46+
assertEquals(positions[i], v[i], print(v[i]) + " != " + print(positions[i]));
4747
}
4848

4949
}
@@ -53,7 +53,7 @@ protected void checkPositions(Position[] expected, Position[] actual) {
5353
assertTrue(expected.length == actual.length, "invalid number of positions");
5454

5555
for (int i= 0; i < expected.length; i++) {
56-
assertEquals(print(actual[i]) + " != " + print(expected[i]), expected[i], actual[i]);
56+
assertEquals(expected[i], actual[i], print(actual[i]) + " != " + print(expected[i]));
5757
}
5858

5959
}
@@ -74,10 +74,10 @@ protected void checkLineInformationConsistency() throws BadLocationException {
7474
for (int i = 0; i < trackerLines; i++) {
7575
IRegion trackerLine = fDocument.getLineInformation(i);
7676
IRegion textLine = textTracker.getLineInformation(i);
77-
assertEquals("Child document store and child line tracker are inconsistent", trackerLine.getOffset(),
78-
textLine.getOffset());
79-
assertEquals("Child document store and child line tracker are inconsistent", trackerLine.getLength(),
80-
textLine.getLength());
77+
assertEquals(trackerLine.getOffset(),
78+
textLine.getOffset(), "Child document store and child line tracker are inconsistent");
79+
assertEquals(trackerLine.getLength(),
80+
textLine.getLength(), "Child document store and child line tracker are inconsistent");
8181
}
8282
}
8383

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -329,12 +329,12 @@ public void testFunnyLastLineCompatibility() throws Exception {
329329
int[] offsets= { 0, 2 };
330330
int[] lengths= { 1, 0 };
331331

332-
assertEquals("invalid number of lines, ", lengths.length, fTracker.getNumberOfLines());
333-
assertEquals("invalid number of lines, ", lengths.length, fTracker.getNumberOfLines(0, fText.getLength()));
332+
assertEquals(lengths.length, fTracker.getNumberOfLines(), "invalid number of lines, ");
333+
assertEquals(lengths.length, fTracker.getNumberOfLines(0, fText.getLength()), "invalid number of lines, ");
334334
for (int i= 0; i < lengths.length; i++) {
335335
IRegion line= fTracker.getLineInformation(i);
336-
assertEquals("line: " + i, lengths[i], line.getLength());
337-
assertEquals("line: " + i, offsets[i], line.getOffset());
336+
assertEquals(lengths[i], line.getLength(), "line: " + i);
337+
assertEquals(offsets[i], line.getOffset(), "line: " + i);
338338
}
339339
try {
340340
fTracker.getLineInformation(lengths.length);
@@ -353,22 +353,22 @@ public void testFunnyLastLineCompatibility() throws Exception {
353353
set("x\nx");
354354
offsets= new int[] { 0, 2, 3 };
355355
lengths= new int[] {1, 1, 0};
356-
assertEquals("invalid number of lines, ", lengths.length - 1 /* !!!! */, fTracker.getNumberOfLines());
357-
assertEquals("invalid number of lines, ", lengths.length - 1 /* !!!! */, fTracker.getNumberOfLines(0, fText.getLength()));
356+
assertEquals(lengths.length - 1 /* !!!! */, fTracker.getNumberOfLines(), "invalid number of lines, ");
357+
assertEquals(lengths.length - 1 /* !!!! */, fTracker.getNumberOfLines(0, fText.getLength()), "invalid number of lines, ");
358358
for (int i= 0; i < lengths.length; i++) {
359359
IRegion line= fTracker.getLineInformation(i);
360360
int len= lengths[i];
361361
int offset= offsets[i];
362-
assertEquals("length of line: " + i, len, line.getLength());
363-
assertEquals("offset of line: " + i, offset, line.getOffset());
362+
assertEquals(len, line.getLength(), "length of line: " + i);
363+
assertEquals(offset, line.getOffset(), "offset of line: " + i);
364364

365365
line= fTracker.getLineInformationOfOffset(offset);
366366
if ( i == lengths.length - 1) { // phantom line cannot be queried by offset
367367
len= lengths[i - 1];
368368
offset= offsets[i - 1];
369369
}
370-
assertEquals("length of line: " + i, len, line.getLength());
371-
assertEquals("offset of line: " + i, offset, line.getOffset());
370+
assertEquals(len, line.getLength(), "length of line: " + i);
371+
assertEquals(offset, line.getOffset(), "offset of line: " + i);
372372
}
373373

374374
try {
@@ -403,12 +403,12 @@ public void testFunnyLastLineCompatibility2() throws Exception {
403403
int[] offsets= { 0, 2 };
404404
int[] lengths= { 1, 0 };
405405

406-
assertEquals("invalid number of lines, ", lengths.length, fTracker.getNumberOfLines());
407-
assertEquals("invalid number of lines, ", lengths.length, fTracker.getNumberOfLines(0, fText.getLength()));
406+
assertEquals(lengths.length, fTracker.getNumberOfLines(), "invalid number of lines, ");
407+
assertEquals(lengths.length, fTracker.getNumberOfLines(0, fText.getLength()), "invalid number of lines, ");
408408
for (int i= 0; i < lengths.length; i++) {
409409
IRegion line= fTracker.getLineInformation(i);
410-
assertEquals("line: " + i, lengths[i], line.getLength());
411-
assertEquals("line: " + i, offsets[i], line.getOffset());
410+
assertEquals(lengths[i], line.getLength(), "line: " + i);
411+
assertEquals(offsets[i], line.getOffset(), "line: " + i);
412412
}
413413
try {
414414
fTracker.getLineInformation(lengths.length);
@@ -427,22 +427,22 @@ public void testFunnyLastLineCompatibility2() throws Exception {
427427
set("x\nx");
428428
offsets= new int[] { 0, 2, 3 };
429429
lengths= new int[] {1, 1, 0};
430-
assertEquals("invalid number of lines, ", lengths.length - 1 /* !!!! */, fTracker.getNumberOfLines());
431-
assertEquals("invalid number of lines, ", lengths.length - 1 /* !!!! */, fTracker.getNumberOfLines(0, fText.getLength()));
430+
assertEquals(lengths.length - 1 /* !!!! */, fTracker.getNumberOfLines(), "invalid number of lines, ");
431+
assertEquals(lengths.length - 1 /* !!!! */, fTracker.getNumberOfLines(0, fText.getLength()), "invalid number of lines, ");
432432
for (int i= 0; i < lengths.length; i++) {
433433
IRegion line= fTracker.getLineInformation(i);
434434
int len= lengths[i];
435435
int offset= offsets[i];
436-
assertEquals("length of line: " + i, len, line.getLength());
437-
assertEquals("offset of line: " + i, offset, line.getOffset());
436+
assertEquals(len, line.getLength(), "length of line: " + i);
437+
assertEquals(offset, line.getOffset(), "offset of line: " + i);
438438

439439
line= fTracker.getLineInformationOfOffset(offset);
440440
if ( i == lengths.length - 1) { // phantom line cannot be queried by offset
441441
len= lengths[i - 1];
442442
offset= offsets[i - 1];
443443
}
444-
assertEquals("length of line: " + i, len, line.getLength());
445-
assertEquals("offset of line: " + i, offset, line.getOffset());
444+
assertEquals(len, line.getLength(), "length of line: " + i);
445+
assertEquals(offset, line.getOffset(), "offset of line: " + i);
446446
}
447447

448448
try {
@@ -560,8 +560,8 @@ public void testNegativeOffset2() throws Exception {
560560
public void testBug545565_setNull() throws BadLocationException {
561561
int initialContentLength= fText.getLength();
562562
set(null);
563-
assertEquals("Tracker not empty.", 1, fTracker.getNumberOfLines());
564-
assertEquals("Tracker not empty.", 0, fTracker.getLineLength(0));
563+
assertEquals(1, fTracker.getNumberOfLines(), "Tracker not empty.");
564+
assertEquals(0, fTracker.getLineLength(0), "Tracker not empty.");
565565
try {
566566
fTracker.getLineInformationOfOffset(5);
567567
fail("No exception for bad location.");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public void testOffsets() throws Exception {
162162

163163

164164
int offset= fTracker.getLineOffset(lastLine);
165-
assertTrue("invalid last line start offset " + offset, fText.getLength() == offset);
165+
assertTrue(fText.getLength() == offset, "invalid last line start offset " + offset);
166166

167167
int length= fTracker.getLineLength(lastLine);
168168
assertTrue(0 == length, "invalid last line end offset " + (offset + length - 1));

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ private static Match run(String text, int offset, String... needles) {
3535

3636
private static Match run(TestCharSequence text, int offset, String... needles) {
3737
Match result = MultiStringMatcher.indexOf(text, offset, needles);
38-
assertEquals("Algorithm backtracked", 0, text.getBackTrack());
38+
assertEquals(0, text.getBackTrack(), "Algorithm backtracked");
3939
return result;
4040
}
4141

4242
private static void test(Match m, String expected, int index) {
43-
assertNotNull("No match", m);
44-
assertEquals("Unexpected match", expected, m.getText());
45-
assertEquals("Unexpected index", index, m.getOffset());
43+
assertNotNull(m, "No match");
44+
assertEquals(expected, m.getText(), "Unexpected match");
45+
assertEquals(index, m.getOffset(), "Unexpected index");
4646
}
4747

4848
private static void testList(List<Match> matches, String expected) {
@@ -53,7 +53,7 @@ private static void testList(List<Match> matches, String expected) {
5353
}
5454
return Integer.compare(a.getText().length(), b.getText().length());
5555
});
56-
assertEquals("Unexpected results", expected, matches.toString());
56+
assertEquals(expected, matches.toString(), "Unexpected results");
5757
}
5858

5959
@Test
@@ -377,7 +377,7 @@ public void multi011() throws Exception {
377377
public void multi012() throws Exception {
378378
MultiStringMatcher m = MultiStringMatcher.create("she", "his", "hers");
379379
List<Match> matches = m.find("dddhiheddd", 0);
380-
assertEquals("Expected no match", 0, matches.size());
380+
assertEquals(0, matches.size(), "Expected no match");
381381
}
382382

383383
@Test
@@ -397,25 +397,25 @@ public void multi014() throws Exception {
397397
@Test
398398
public void noStrings001() throws Exception {
399399
MultiStringMatcher m = MultiStringMatcher.builder().build();
400-
assertNull("Expected no match", m.indexOf("dhihedd", 0));
400+
assertNull(m.indexOf("dhihedd", 0), "Expected no match");
401401
List<Match> matches = m.find("dddhiheddd", 0);
402-
assertEquals("Expected no match", 0, matches.size());
402+
assertEquals(0, matches.size(), "Expected no match");
403403
}
404404

405405
@Test
406406
public void noStrings002() throws Exception {
407407
MultiStringMatcher m = MultiStringMatcher.builder().add("").build();
408-
assertNull("Expected no match", m.indexOf("dhihedd", 0));
408+
assertNull(m.indexOf("dhihedd", 0), "Expected no match");
409409
List<Match> matches = m.find("dddhiheddd", 0);
410-
assertEquals("Expected no match", 0, matches.size());
410+
assertEquals(0, matches.size(), "Expected no match");
411411
}
412412

413413
@Test
414414
public void noStrings003() throws Exception {
415415
MultiStringMatcher m = MultiStringMatcher.builder().add((String[]) null).build();
416-
assertNull("Expected no match", m.indexOf("dhihedd", 0));
416+
assertNull(m.indexOf("dhihedd", 0), "Expected no match");
417417
List<Match> matches = m.find("dddhiheddd", 0);
418-
assertEquals("Expected no match", 0, matches.size());
418+
assertEquals(0, matches.size(), "Expected no match");
419419
}
420420

421421
@Test
@@ -455,23 +455,23 @@ public void scan001() throws Exception {
455455
TestCharSequence text = new TestCharSequence("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
456456
Match m = run(text, 0, "x", "xx", "xxx", "xxxx");
457457
test(m, "xxxx", 0);
458-
assertEquals("Scanned too far", 3, text.getLastIndex());
458+
assertEquals(3, text.getLastIndex(), "Scanned too far");
459459
}
460460

461461
@Test
462462
public void scan002() throws Exception {
463463
TestCharSequence text = new TestCharSequence("ddcababababababcabxdd");
464464
Match m = run(text, 0, "ca", "cabx", "ababc");
465465
test(m, "ca", 2);
466-
assertEquals("Scanned too far", 5, text.getLastIndex());
466+
assertEquals(5, text.getLastIndex(), "Scanned too far");
467467
}
468468

469469
@Test
470470
public void scan003() throws Exception {
471471
TestCharSequence text = new TestCharSequence("ddcabarbarazz");
472472
Match m = run(text, 0, "a", "cabby", "barbara");
473473
test(m, "a", 3);
474-
assertEquals("Scanned too far", 5, text.getLastIndex());
474+
assertEquals(5, text.getLastIndex(), "Scanned too far");
475475
}
476476

477477
private static class TestCharSequence implements CharSequence {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ protected void checkPositions(Position[] expected) throws BadPositionCategoryExc
3434
assertTrue(actual.length == expected.length, "invalid number of positions");
3535

3636
for (int i= 0; i < expected.length; i++) {
37-
assertEquals(print(actual[i]) + " != " + print(expected[i]), expected[i], actual[i]);
37+
assertEquals(expected[i], actual[i], print(actual[i]) + " != " + print(expected[i]));
3838
}
3939
}
4040

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -324,25 +324,25 @@ private static void flatten(List<TextEdit> result, TextEdit edit) {
324324
}
325325

326326
private static void compare(List<TextEdit> org, List<TextEdit> copy) {
327-
assertTrue("Same length", org.size() == copy.size());
327+
assertTrue(org.size() == copy.size(), "Same length");
328328
for (TextEdit edit : copy) {
329-
assertTrue("Original is part of copy list", !org.contains(edit));
329+
assertTrue(!org.contains(edit), "Original is part of copy list");
330330
if (edit instanceof MoveSourceEdit) {
331331
MoveSourceEdit source= (MoveSourceEdit)edit;
332-
assertTrue("Target edit isn't a copy", copy.contains(source.getTargetEdit()));
333-
assertTrue("Traget edit is a original", !org.contains(source.getTargetEdit()));
332+
assertTrue(copy.contains(source.getTargetEdit()), "Target edit isn't a copy");
333+
assertTrue(!org.contains(source.getTargetEdit()), "Traget edit is a original");
334334
} else if (edit instanceof MoveTargetEdit) {
335335
MoveTargetEdit target= (MoveTargetEdit)edit;
336-
assertTrue("Source edit isn't a copy", copy.contains(target.getSourceEdit()));
337-
assertTrue("Source edit is a original", !org.contains(target.getSourceEdit()));
336+
assertTrue(copy.contains(target.getSourceEdit()), "Source edit isn't a copy");
337+
assertTrue(!org.contains(target.getSourceEdit()), "Source edit is a original");
338338
} else if (edit instanceof CopySourceEdit) {
339339
CopySourceEdit source= (CopySourceEdit)edit;
340-
assertTrue("Target edit isn't a copy", copy.contains(source.getTargetEdit()));
341-
assertTrue("Traget edit is a original", !org.contains(source.getTargetEdit()));
340+
assertTrue(copy.contains(source.getTargetEdit()), "Target edit isn't a copy");
341+
assertTrue(!org.contains(source.getTargetEdit()), "Traget edit is a original");
342342
} else if (edit instanceof CopyTargetEdit) {
343343
CopyTargetEdit target= (CopyTargetEdit)edit;
344-
assertTrue("Source edit isn't a copy", copy.contains(target.getSourceEdit()));
345-
assertTrue("Source edit is a original", !org.contains(target.getSourceEdit()));
344+
assertTrue(copy.contains(target.getSourceEdit()), "Source edit isn't a copy");
345+
assertTrue(!org.contains(target.getSourceEdit()), "Source edit is a original");
346346
}
347347
}
348348
}
@@ -400,10 +400,10 @@ public void testInsert4() throws Exception {
400400
TextEdit e1= new InsertEdit(0, "xx");
401401
fRoot.addChild(e1);
402402
UndoEdit undo= fRoot.apply(fDocument);
403-
Assertions.assertEquals("Buffer length", 12, fDocument.getLength());
403+
Assertions.assertEquals(12, fDocument.getLength(), "Buffer length");
404404
assertEquals(fRoot, 0, 2);
405405
assertEquals(e1, 0, 2);
406-
Assertions.assertEquals("Buffer content", "xx0123456789", fDocument.get());
406+
Assertions.assertEquals("xx0123456789", fDocument.get(), "Buffer content");
407407
doUndoRedo(undo, "xx0123456789");
408408
}
409409

@@ -412,10 +412,10 @@ public void testInsert5() throws Exception {
412412
TextEdit e1= new InsertEdit(10, "xx");
413413
fRoot.addChild(e1);
414414
UndoEdit undo= fRoot.apply(fDocument);
415-
Assertions.assertEquals("Buffer length", 12, fDocument.getLength());
415+
Assertions.assertEquals(12, fDocument.getLength(), "Buffer length");
416416
assertEquals(fRoot, 10, 2);
417417
assertEquals(e1, 10, 2);
418-
Assertions.assertEquals("Buffer content", "0123456789xx", fDocument.get());
418+
Assertions.assertEquals("0123456789xx", fDocument.get(), "Buffer content");
419419
doUndoRedo(undo, "0123456789xx");
420420
}
421421

@@ -1389,23 +1389,23 @@ private void doUndoRedo(UndoEdit undo, String redoResult) throws Exception {
13891389
UndoEdit redo= undo.apply(fDocument);
13901390
assertBufferContent();
13911391
undo= redo.apply(fDocument);
1392-
Assertions.assertEquals("Buffer content redo", redoResult, fDocument.get());
1392+
Assertions.assertEquals(redoResult, fDocument.get(), "Buffer content redo");
13931393
undo.apply(fDocument);
13941394
assertBufferContent();
13951395
}
13961396

13971397
private void assertEquals(TextEdit edit, int offset, int length) {
1398-
Assertions.assertEquals("Offset", offset, edit.getOffset());
1399-
Assertions.assertEquals("Length", length, edit.getLength());
1398+
Assertions.assertEquals(offset, edit.getOffset(), "Offset");
1399+
Assertions.assertEquals(length, edit.getLength(), "Length");
14001400
}
14011401

14021402
private void assertEquals(IRegion region, int offset, int length) {
1403-
Assertions.assertEquals("Offset", offset, region.getOffset());
1404-
Assertions.assertEquals("Length", length, region.getLength());
1403+
Assertions.assertEquals(offset, region.getOffset(), "Offset");
1404+
Assertions.assertEquals(length, region.getLength(), "Length");
14051405
}
14061406

14071407
private void assertBufferContent() {
1408-
Assertions.assertEquals("Buffer content restored", "0123456789", fDocument.get());
1408+
Assertions.assertEquals("0123456789", fDocument.get(), "Buffer content restored");
14091409
}
14101410
}
14111411

0 commit comments

Comments
 (0)