Skip to content

Commit 87660a2

Browse files
committed
Change to use JUnit 5 API instead of JUnit 4 API
1 parent b553e3c commit 87660a2

File tree

1 file changed

+34
-39
lines changed

1 file changed

+34
-39
lines changed

src/test/java/org/apache/ibatis/submitted/cursor_simple/CursorSimpleTest.java

Lines changed: 34 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@
1515
*/
1616
package org.apache.ibatis.submitted.cursor_simple;
1717

18-
import static org.junit.Assert.assertFalse;
19-
import static org.junit.Assert.assertNull;
20-
import static org.junit.Assert.assertTrue;
21-
import static org.junit.jupiter.api.Assertions.assertEquals;
22-
2318
import org.apache.ibatis.BaseDataTest;
2419
import org.apache.ibatis.cursor.Cursor;
2520
import org.apache.ibatis.io.Resources;
@@ -399,45 +394,45 @@ void shouldNullItemNotStopIteration() {
399394
Cursor<User> cursor = mapper.getNullUsers(new RowBounds());
400395
Iterator<User> iterator = cursor.iterator();
401396

402-
assertFalse(cursor.isOpen());
397+
Assertions.assertFalse(cursor.isOpen());
403398

404399
// Cursor is just created, current index is -1
405-
assertEquals(-1, cursor.getCurrentIndex());
400+
Assertions.assertEquals(-1, cursor.getCurrentIndex());
406401

407402
// Check if hasNext, fetching is started
408-
assertTrue(iterator.hasNext());
403+
Assertions.assertTrue(iterator.hasNext());
409404
// Re-invoking hasNext() should not fetch the next row
410-
assertTrue(iterator.hasNext());
411-
assertTrue(cursor.isOpen());
412-
assertFalse(cursor.isConsumed());
405+
Assertions.assertTrue(iterator.hasNext());
406+
Assertions.assertTrue(cursor.isOpen());
407+
Assertions.assertFalse(cursor.isConsumed());
413408

414409
// next() has not been called, index is still -1
415-
assertEquals(-1, cursor.getCurrentIndex());
410+
Assertions.assertEquals(-1, cursor.getCurrentIndex());
416411

417412
User user;
418413
user = iterator.next();
419-
assertNull(user);
420-
assertEquals(0, cursor.getCurrentIndex());
414+
Assertions.assertNull(user);
415+
Assertions.assertEquals(0, cursor.getCurrentIndex());
421416

422-
assertTrue(iterator.hasNext());
417+
Assertions.assertTrue(iterator.hasNext());
423418
user = iterator.next();
424-
assertEquals("Kate", user.getName());
425-
assertEquals(1, cursor.getCurrentIndex());
419+
Assertions.assertEquals("Kate", user.getName());
420+
Assertions.assertEquals(1, cursor.getCurrentIndex());
426421

427-
assertTrue(iterator.hasNext());
422+
Assertions.assertTrue(iterator.hasNext());
428423
user = iterator.next();
429-
assertNull(user);
430-
assertEquals(2, cursor.getCurrentIndex());
424+
Assertions.assertNull(user);
425+
Assertions.assertEquals(2, cursor.getCurrentIndex());
431426

432-
assertTrue(iterator.hasNext());
427+
Assertions.assertTrue(iterator.hasNext());
433428
user = iterator.next();
434-
assertNull(user);
435-
assertEquals(3, cursor.getCurrentIndex());
429+
Assertions.assertNull(user);
430+
Assertions.assertEquals(3, cursor.getCurrentIndex());
436431

437432
// Check no more elements
438-
assertFalse(iterator.hasNext());
439-
assertFalse(cursor.isOpen());
440-
assertTrue(cursor.isConsumed());
433+
Assertions.assertFalse(iterator.hasNext());
434+
Assertions.assertFalse(cursor.isOpen());
435+
Assertions.assertTrue(cursor.isConsumed());
441436
}
442437
}
443438

@@ -448,29 +443,29 @@ void shouldRowBoundsCountNullItem() {
448443
Cursor<User> cursor = mapper.getNullUsers(new RowBounds(1, 2));
449444
Iterator<User> iterator = cursor.iterator();
450445

451-
assertFalse(cursor.isOpen());
446+
Assertions.assertFalse(cursor.isOpen());
452447

453448
// Check if hasNext, fetching is started
454-
assertTrue(iterator.hasNext());
449+
Assertions.assertTrue(iterator.hasNext());
455450
// Re-invoking hasNext() should not fetch the next row
456-
assertTrue(iterator.hasNext());
457-
assertTrue(cursor.isOpen());
458-
assertFalse(cursor.isConsumed());
451+
Assertions.assertTrue(iterator.hasNext());
452+
Assertions.assertTrue(cursor.isOpen());
453+
Assertions.assertFalse(cursor.isConsumed());
459454

460455
User user;
461456
user = iterator.next();
462-
assertEquals("Kate", user.getName());
463-
assertEquals(1, cursor.getCurrentIndex());
457+
Assertions.assertEquals("Kate", user.getName());
458+
Assertions.assertEquals(1, cursor.getCurrentIndex());
464459

465-
assertTrue(iterator.hasNext());
460+
Assertions.assertTrue(iterator.hasNext());
466461
user = iterator.next();
467-
assertNull(user);
468-
assertEquals(2, cursor.getCurrentIndex());
462+
Assertions.assertNull(user);
463+
Assertions.assertEquals(2, cursor.getCurrentIndex());
469464

470465
// Check no more elements
471-
assertFalse(iterator.hasNext());
472-
assertFalse(cursor.isOpen());
473-
assertTrue(cursor.isConsumed());
466+
Assertions.assertFalse(iterator.hasNext());
467+
Assertions.assertFalse(cursor.isOpen());
468+
Assertions.assertTrue(cursor.isConsumed());
474469
}
475470
}
476471
}

0 commit comments

Comments
 (0)