Merge pull request #627 from zhenlineo/4.0-bookmark-tests

Fixing the failing bookmark test

Author: zhenlineo

driver/src/test/java/org/neo4j/driver/integration/BookmarkIT.java

@@ -18,10 +18,14 @@
  */
 package org.neo4j.driver.integration;
 
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import java.util.UUID;
+
 import org.neo4j.driver.Driver;
 import org.neo4j.driver.Session;
 import org.neo4j.driver.Transaction;
@@ -33,7 +37,6 @@
 import org.neo4j.driver.util.ParallelizableIT;
 import org.neo4j.driver.util.SessionExtension;
 
-import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -84,8 +87,26 @@ void shouldReceiveNewBookmarkOnSuccessfulCommit() throws Throwable
         createNodeInTx( session );
 
         // Then
-        assertBookmarkContainsSingleValue( session.lastBookmark(), startsWith( "neo4j:" ) );
-        assertBookmarkContainsSingleValue( session.lastBookmark(), not( startsWith( "neo4j:bookmark:v1:tx" ) ) );
+        assertBookmarkContainsSingleValue( session.lastBookmark(), new BaseMatcher<String>()
+        {
+            @Override
+            public boolean matches( Object item )
+            {
+                if ( item instanceof String )
+                {
+                    String bookmark = (String) item;
+                    String[] split = bookmark.split( ":" );
+                    return split.length == 2 && isUuid( split[0] ) && isNumeric( split[1] );
+                }
+                return false;
+            }
+
+            @Override
+            public void describeTo( Description description )
+            {
+                description.appendText( "Expecting a bookmark with format 'database_uuid:tx_id'" );
+            }
+        } );
     }
 
     @Test
@@ -212,4 +233,30 @@ private static void createNodeInTx( Session session )
             tx.commit();
         }
     }
+
+    private static boolean isUuid( String string )
+    {
+        try
+        {
+            UUID.fromString( string );
+        }
+        catch ( IllegalArgumentException | NullPointerException e )
+        {
+            return false;
+        }
+        return true;
+    }
+
+    private static boolean isNumeric( String string )
+    {
+        try
+        {
+            Long.parseLong( string );
+        }
+        catch ( NumberFormatException | NullPointerException e )
+        {
+            return false;
+        }
+        return true;
+    }
 }

driver/src/test/java/org/neo4j/driver/util/TestUtil.java

@@ -102,7 +102,7 @@ public final class TestUtil
     public static final int DEFAULT_TEST_PROTOCOL_VERSION = BoltProtocolV4.VERSION;
     public static final BoltProtocol DEFAULT_TEST_PROTOCOL = BoltProtocol.forVersion( DEFAULT_TEST_PROTOCOL_VERSION );
 
-    private static final long DEFAULT_WAIT_TIME_MS = MINUTES.toMillis( 1 );
+    private static final long DEFAULT_WAIT_TIME_MS = MINUTES.toMillis( 2 );
     private static final String ALPHANUMERICS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz123456789";
     public static final Duration TX_TIMEOUT_TEST_TIMEOUT = Duration.ofSeconds( 10 );