Merge pull request #506 from lutovich/1.7-simple-tests-to-junit5

Migrate simple unit tests to JUnit 5

Author: ali-ince

driver/src/test/java/org/neo4j/driver/internal/BookmarkTest.java

@@ -18,7 +18,7 @@
  */
 package org.neo4j.driver.internal;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -29,73 +29,73 @@
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyMap;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.neo4j.driver.v1.Values.value;
 
-public class BookmarkTest
+class BookmarkTest
 {
     @Test
-    public void isEmptyForEmptyBookmark()
+    void isEmptyForEmptyBookmark()
     {
         Bookmark bookmark = Bookmark.empty();
         assertTrue( bookmark.isEmpty() );
     }
 
     @Test
-    public void maxBookmarkAsStringForEmptyBookmark()
+    void maxBookmarkAsStringForEmptyBookmark()
     {
         Bookmark bookmark = Bookmark.empty();
         assertNull( bookmark.maxBookmarkAsString() );
     }
 
     @Test
-    public void asBeginTransactionParametersForEmptyBookmark()
+    void asBeginTransactionParametersForEmptyBookmark()
     {
         Bookmark bookmark = Bookmark.empty();
         assertEquals( emptyMap(), bookmark.asBeginTransactionParameters() );
     }
 
     @Test
-    public void isEmptyForNonEmptyBookmark()
+    void isEmptyForNonEmptyBookmark()
     {
         Bookmark bookmark = Bookmark.from( "SomeBookmark" );
         assertFalse( bookmark.isEmpty() );
     }
 
     @Test
-    public void maxBookmarkAsStringForNonEmptyBookmark()
+    void maxBookmarkAsStringForNonEmptyBookmark()
     {
         Bookmark bookmark = Bookmark.from( "SomeBookmark" );
         assertEquals( "SomeBookmark", bookmark.maxBookmarkAsString() );
     }
 
     @Test
-    public void asBeginTransactionParametersForNonEmptyBookmark()
+    void asBeginTransactionParametersForNonEmptyBookmark()
     {
         Bookmark bookmark = Bookmark.from( "SomeBookmark" );
         verifyParameters( bookmark, "SomeBookmark", "SomeBookmark" );
     }
 
     @Test
-    public void bookmarkFromString()
+    void bookmarkFromString()
     {
         Bookmark bookmark = Bookmark.from( "Cat" );
         assertEquals( "Cat", bookmark.maxBookmarkAsString() );
         verifyParameters( bookmark, "Cat", "Cat" );
     }
 
     @Test
-    public void bookmarkFromNullString()
+    void bookmarkFromNullString()
     {
         Bookmark bookmark = Bookmark.from( (String) null );
         assertTrue( bookmark.isEmpty() );
     }
 
     @Test
-    public void bookmarkFromIterable()
+    void bookmarkFromIterable()
     {
         Bookmark bookmark = Bookmark.from( asList(
                 "neo4j:bookmark:v1:tx42", "neo4j:bookmark:v1:tx10", "neo4j:bookmark:v1:tx12" ) );
@@ -106,21 +106,21 @@ public void bookmarkFromIterable()
     }
 
     @Test
-    public void bookmarkFromNullIterable()
+    void bookmarkFromNullIterable()
     {
         Bookmark bookmark = Bookmark.from( (Iterable<String>) null );
         assertTrue( bookmark.isEmpty() );
     }
 
     @Test
-    public void bookmarkFromEmptyIterable()
+    void bookmarkFromEmptyIterable()
     {
         Bookmark bookmark = Bookmark.from( Collections.<String>emptyList() );
         assertTrue( bookmark.isEmpty() );
     }
 
     @Test
-    public void asBeginTransactionParametersForBookmarkWithInvalidValue()
+    void asBeginTransactionParametersForBookmarkWithInvalidValue()
     {
         Bookmark bookmark = Bookmark.from( asList(
                 "neo4j:bookmark:v1:tx1", "neo4j:bookmark:v1:txcat", "neo4j:bookmark:v1:tx3" ) );
@@ -131,7 +131,7 @@ public void asBeginTransactionParametersForBookmarkWithInvalidValue()
     }
 
     @Test
-    public void asBeginTransactionParametersForBookmarkWithEmptyStringValue()
+    void asBeginTransactionParametersForBookmarkWithEmptyStringValue()
     {
         Bookmark bookmark = Bookmark.from( asList( "neo4j:bookmark:v1:tx9", "", "neo4j:bookmark:v1:tx3" ) );
         assertEquals( "neo4j:bookmark:v1:tx9", bookmark.maxBookmarkAsString() );
@@ -141,7 +141,7 @@ public void asBeginTransactionParametersForBookmarkWithEmptyStringValue()
     }
 
     @Test
-    public void asBeginTransactionParametersForBookmarkWithNullValue()
+    void asBeginTransactionParametersForBookmarkWithNullValue()
     {
         Bookmark bookmark = Bookmark.from( asList( "neo4j:bookmark:v1:tx41", null, "neo4j:bookmark:v1:tx42" ) );
         assertEquals( "neo4j:bookmark:v1:tx42", bookmark.maxBookmarkAsString() );

driver/src/test/java/org/neo4j/driver/internal/DirectConnectionProviderTest.java

@@ -18,7 +18,7 @@
  */
 package org.neo4j.driver.internal;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
@@ -27,19 +27,19 @@
 import org.neo4j.driver.internal.spi.ConnectionPool;
 
 import static java.util.concurrent.CompletableFuture.completedFuture;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.neo4j.driver.v1.AccessMode.READ;
 import static org.neo4j.driver.v1.AccessMode.WRITE;
 import static org.neo4j.driver.v1.util.TestUtil.await;
 
-public class DirectConnectionProviderTest
+class DirectConnectionProviderTest
 {
     @Test
-    public void acquiresConnectionsFromThePool()
+    void acquiresConnectionsFromThePool()
     {
         BoltServerAddress address = BoltServerAddress.LOCAL_DEFAULT;
         Connection connection1 = mock( Connection.class );
@@ -53,7 +53,7 @@ public void acquiresConnectionsFromThePool()
     }
 
     @Test
-    public void closesPool()
+    void closesPool()
     {
         BoltServerAddress address = BoltServerAddress.LOCAL_DEFAULT;
         ConnectionPool pool = poolMock( address, mock( Connection.class ) );
@@ -65,7 +65,7 @@ public void closesPool()
     }
 
     @Test
-    public void returnsCorrectAddress()
+    void returnsCorrectAddress()
     {
         BoltServerAddress address = new BoltServerAddress( "server-1", 25000 );