Updated connection handling

injectives · injectives · commit 1d64ca04cf48 · 2021-06-08T10:40:06.000+01:00
diff --git a/driver/src/main/java/org/neo4j/driver/internal/FailableCursor.java b/driver/src/main/java/org/neo4j/driver/internal/FailableCursor.java
@@ -23,12 +23,12 @@
 public interface FailableCursor
 {
     /**
-     * Discarding all unconsumed records and returning failure if there is any to run and/or pulls.
+     * Discarding all unconsumed records and returning failure if there is any pull errors.
      */
     CompletionStage<Throwable> discardAllFailureAsync();
 
     /**
-     * Pulling all unconsumed records into memory and returning failure if there is any to run and/or pulls.
+     * Pulling all unconsumed records into memory and returning failure if there is any pull errors.
      */
     CompletionStage<Throwable> pullAllFailureAsync();
 }
diff --git a/driver/src/main/java/org/neo4j/driver/internal/cursor/AsyncResultCursorImpl.java b/driver/src/main/java/org/neo4j/driver/internal/cursor/AsyncResultCursorImpl.java
@@ -116,38 +116,15 @@ public <T> CompletionStage<List<T>> listAsync( Function<Record,T> mapFunction )
     @Override
     public CompletionStage<Throwable> discardAllFailureAsync()
     {
-        return consumeAsync().handle(
-                ( summary, consumeError ) ->
-                {
-                    if ( runError != null )
-                    {
-                        if ( consumeError != null && runError != consumeError )
-                        {
-                            runError.addSuppressed( consumeError );
-                        }
-                        return runError;
-                    }
-                    return consumeError;
-                } );
+        // let handler process response and ignore error when runError exists as it would already be reported to user
+        return consumeAsync().handle( ( summary, error ) -> runError != null ? null : error );
     }
 
     @Override
     public CompletionStage<Throwable> pullAllFailureAsync()
     {
-        return pullAllHandler.pullAllFailureAsync().handle(
-                ( ignored, pullAllError ) ->
-                {
-                    if ( runError != null )
-                    {
-                        if ( pullAllError != null && runError != pullAllError )
-                        {
-                            runError.addSuppressed( pullAllError );
-                        }
-                        return runError;
-                    }
-                    return pullAllError;
-                }
-        );
+        // let handler process response and ignore error when runError exists as it would already be reported to user
+        return pullAllHandler.pullAllFailureAsync().thenApply( error -> runError != null ? null : error );
     }
 
     private void internalForEachAsync( Consumer<Record> action, CompletableFuture<Void> resultFuture )
diff --git a/driver/src/main/java/org/neo4j/driver/internal/handlers/RunResponseHandler.java b/driver/src/main/java/org/neo4j/driver/internal/handlers/RunResponseHandler.java
@@ -66,16 +66,9 @@ public void onFailure( Throwable error )
         {
             tx.markTerminated( error );
         }
-        else
+        else if ( error instanceof AuthorizationExpiredException )
         {
-            if ( error instanceof AuthorizationExpiredException )
-            {
-                connection.terminateAndRelease( AuthorizationExpiredException.DESCRIPTION );
-            }
-            else
-            {
-                connection.release();
-            }
+            connection.terminateAndRelease( AuthorizationExpiredException.DESCRIPTION );
         }
         runFuture.completeExceptionally( error );
     }
diff --git a/driver/src/test/java/org/neo4j/driver/integration/ConnectionHandlingIT.java b/driver/src/test/java/org/neo4j/driver/integration/ConnectionHandlingIT.java
@@ -278,7 +278,7 @@ void connectionUsedForTransactionReturnedToThePoolWhenTransactionFailsToCommitte
     void connectionUsedForSessionRunReturnedToThePoolWhenSessionClose()
     {
         Session session = driver.session();
-        Result result = createNodes( 12, session );
+        createNodes( 12, session );
 
         Connection connection1 = connectionPool.lastAcquiredConnectionSpy;
         verify( connection1, never() ).release();
diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v3/BoltProtocolV3Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v3/BoltProtocolV3Test.java
@@ -77,6 +77,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
@@ -389,6 +390,7 @@ protected void testRunInUnmanagedTransactionAndWaitForRunResponse( boolean succe
 
         ResponseHandler runResponseHandler = verifyRunInvoked( connection, false, InternalBookmark.empty(), TransactionConfig.empty(), mode ).runHandler;
         assertFalse( cursorFuture.isDone() );
+        Throwable error = new RuntimeException();
 
         if ( success )
         {
@@ -397,18 +399,18 @@ protected void testRunInUnmanagedTransactionAndWaitForRunResponse( boolean succe
         else
         {
             // When responded with a failure
-            runResponseHandler.onFailure( new RuntimeException() );
+            runResponseHandler.onFailure( error );
         }
 
         // Then
         assertTrue( cursorFuture.isDone() );
         if ( success )
         {
-            assertNotNull( cursorFuture.get() );
+            assertFalse( cursorFuture.get().runError().isPresent() );
         }
         else
         {
-            assertThrows( RuntimeException.class, () -> await( cursorFuture ) );
+            assertSame( error, cursorFuture.get().runError().orElseThrow( () -> new RuntimeException( "Unexpected" ) ) );
         }
     }
 
@@ -474,11 +476,12 @@ protected void testFailedRunInAutoCommitTxWithWaitingForResponse( Bookmark bookm
         assertFalse( cursorFuture.isDone() );
 
         ResponseHandler runResponseHandler = verifyRunInvoked( connection, true, bookmark, config, mode ).runHandler;
-        runResponseHandler.onFailure( new RuntimeException() );
+        Throwable error = new RuntimeException();
+        runResponseHandler.onFailure( error );
         assertEquals( bookmark, bookmarkHolder.getBookmark() );
 
-        assertTrue( cursorFuture.isCompletedExceptionally() );
-        assertThrows( RuntimeException.class, () -> await( cursorFuture ) );
+        assertTrue( cursorFuture.isDone() );
+        assertSame( error, cursorFuture.get().runError().orElseThrow( () -> new RuntimeException( "Unexpected" ) ) );
     }
 
     private static InternalAuthToken dummyAuthToken()
diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v4/BoltProtocolV4Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v4/BoltProtocolV4Test.java
@@ -78,7 +78,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -381,12 +381,13 @@ protected void testFailedRunInAutoCommitTxWithWaitingForResponse( Bookmark bookm
         assertFalse( cursorFuture.isDone() );
 
         // When I response to Run message with a failure
-        runHandler.onFailure( new RuntimeException() );
+        Throwable error = new RuntimeException();
+        runHandler.onFailure( error );
 
         // Then
         assertEquals( bookmark, bookmarkHolder.getBookmark() );
-        assertTrue( cursorFuture.isCompletedExceptionally() );
-        assertThrows( RuntimeException.class, () -> await( cursorFuture ) );
+        assertTrue( cursorFuture.isDone() );
+        assertSame( error, cursorFuture.get().runError().orElseThrow( () -> new RuntimeException( "Unexpected" ) ) );
     }
 
     protected void testSuccessfulRunInAutoCommitTxWithWaitingForResponse( Bookmark bookmark, TransactionConfig config, AccessMode mode ) throws Exception
@@ -424,6 +425,7 @@ protected void testRunInUnmanagedTransactionAndWaitForRunResponse( boolean succe
 
         ResponseHandler runHandler = verifyTxRunInvoked( connection );
         assertFalse( cursorFuture.isDone() );
+        Throwable error = new RuntimeException();
 
         if ( success )
         {
@@ -432,18 +434,18 @@ protected void testRunInUnmanagedTransactionAndWaitForRunResponse( boolean succe
         else
         {
             // When responded with a failure
-            runHandler.onFailure( new RuntimeException() );
+            runHandler.onFailure( error );
         }
 
         // Then
         assertTrue( cursorFuture.isDone() );
         if ( success )
         {
-            assertNotNull( cursorFuture.get() );
+            assertFalse( cursorFuture.get().runError().isPresent() );
         }
         else
         {
-            assertThrows( RuntimeException.class, () -> await( cursorFuture ) );
+            assertSame( error, cursorFuture.get().runError().orElseThrow( () -> new RuntimeException( "Unexpected" ) ) );
         }
     }
 
diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v41/BoltProtocolV41Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v41/BoltProtocolV41Test.java
@@ -79,7 +79,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -376,12 +376,13 @@ private void testFailedRunInAutoCommitTxWithWaitingForResponse( Bookmark bookmar
         assertFalse( cursorFuture.isDone() );
 
         // When I response to Run message with a failure
-        runHandler.onFailure( new RuntimeException() );
+        Throwable error = new RuntimeException();
+        runHandler.onFailure( error );
 
         // Then
         assertEquals( bookmark, bookmarkHolder.getBookmark() );
-        assertTrue( cursorFuture.isCompletedExceptionally() );
-        assertThrows( RuntimeException.class, () -> await( cursorFuture ) );
+        assertTrue( cursorFuture.isDone() );
+        assertSame( error, cursorFuture.get().runError().orElseThrow( () -> new RuntimeException( "Unexpected" ) ) );
     }
 
     private void testSuccessfulRunInAutoCommitTxWithWaitingForResponse( Bookmark bookmark, TransactionConfig config, AccessMode mode ) throws Exception
@@ -419,6 +420,7 @@ private void testRunInUnmanagedTransactionAndWaitForRunResponse( boolean success
 
         ResponseHandler runHandler = verifyTxRunInvoked( connection );
         assertFalse( cursorFuture.isDone() );
+        Throwable error = new RuntimeException();
 
         if ( success )
         {
@@ -427,18 +429,18 @@ private void testRunInUnmanagedTransactionAndWaitForRunResponse( boolean success
         else
         {
             // When responded with a failure
-            runHandler.onFailure( new RuntimeException() );
+            runHandler.onFailure( error );
         }
 
         // Then
         assertTrue( cursorFuture.isDone() );
         if ( success )
         {
-            assertNotNull( cursorFuture.get() );
+            assertFalse( cursorFuture.get().runError().isPresent() );
         }
         else
         {
-            assertThrows( RuntimeException.class, () -> await( cursorFuture ) );
+            assertSame( error, cursorFuture.get().runError().orElseThrow( () -> new RuntimeException( "Unexpected" ) ) );
         }
     }
 
diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v42/BoltProtocolV42Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v42/BoltProtocolV42Test.java
@@ -79,7 +79,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -376,12 +376,13 @@ private void testFailedRunInAutoCommitTxWithWaitingForResponse( Bookmark bookmar
         assertFalse( cursorFuture.isDone() );
 
         // When I response to Run message with a failure
-        runHandler.onFailure( new RuntimeException() );
+        Throwable error = new RuntimeException();
+        runHandler.onFailure( error );
 
         // Then
         assertEquals( bookmark, bookmarkHolder.getBookmark() );
-        assertTrue( cursorFuture.isCompletedExceptionally() );
-        assertThrows( RuntimeException.class, () -> await( cursorFuture ) );
+        assertTrue( cursorFuture.isDone() );
+        assertSame( error, cursorFuture.get().runError().orElseThrow( () -> new RuntimeException( "Unexpected" ) ) );
     }
 
     private void testSuccessfulRunInAutoCommitTxWithWaitingForResponse( Bookmark bookmark, TransactionConfig config, AccessMode mode ) throws Exception
@@ -419,6 +420,7 @@ private void testRunInUnmanagedTransactionAndWaitForRunResponse( boolean success
 
         ResponseHandler runHandler = verifyTxRunInvoked( connection );
         assertFalse( cursorFuture.isDone() );
+        Throwable error = new RuntimeException();
 
         if ( success )
         {
@@ -427,18 +429,18 @@ private void testRunInUnmanagedTransactionAndWaitForRunResponse( boolean success
         else
         {
             // When responded with a failure
-            runHandler.onFailure( new RuntimeException() );
+            runHandler.onFailure( error );
         }
 
         // Then
         assertTrue( cursorFuture.isDone() );
         if ( success )
         {
-            assertNotNull( cursorFuture.get() );
+            assertFalse( cursorFuture.get().runError().isPresent() );
         }
         else
         {
-            assertThrows( RuntimeException.class, () -> await( cursorFuture ) );
+            assertSame( error, cursorFuture.get().runError().orElseThrow( () -> new RuntimeException( "Unexpected" ) ) );
         }
     }
 
diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v43/BoltProtocolV43Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v43/BoltProtocolV43Test.java
@@ -78,7 +78,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -375,12 +375,13 @@ private void testFailedRunInAutoCommitTxWithWaitingForResponse( Bookmark bookmar
         assertFalse( cursorFuture.isDone() );
 
         // When I response to Run message with a failure
-        runHandler.onFailure( new RuntimeException() );
+        Throwable error = new RuntimeException();
+        runHandler.onFailure( error );
 
         // Then
         assertEquals( bookmark, bookmarkHolder.getBookmark() );
-        assertTrue( cursorFuture.isCompletedExceptionally() );
-        assertThrows( RuntimeException.class, () -> await( cursorFuture ) );
+        assertTrue( cursorFuture.isDone() );
+        assertSame( error, cursorFuture.get().runError().orElseThrow( () -> new RuntimeException( "Unexpected" ) ) );
     }
 
     private void testSuccessfulRunInAutoCommitTxWithWaitingForResponse( Bookmark bookmark, TransactionConfig config, AccessMode mode ) throws Exception
@@ -418,6 +419,7 @@ private void testRunInUnmanagedTransactionAndWaitForRunResponse( boolean success
 
         ResponseHandler runHandler = verifyTxRunInvoked( connection );
         assertFalse( cursorFuture.isDone() );
+        Throwable error = new RuntimeException();
 
         if ( success )
         {
@@ -426,18 +428,18 @@ private void testRunInUnmanagedTransactionAndWaitForRunResponse( boolean success
         else
         {
             // When responded with a failure
-            runHandler.onFailure( new RuntimeException() );
+            runHandler.onFailure( error );
         }
 
         // Then
         assertTrue( cursorFuture.isDone() );
         if ( success )
         {
-            assertNotNull( cursorFuture.get() );
+            assertFalse( cursorFuture.get().runError().isPresent() );
         }
         else
         {
-            assertThrows( RuntimeException.class, () -> await( cursorFuture ) );
+            assertSame( error, cursorFuture.get().runError().orElseThrow( () -> new RuntimeException( "Unexpected" ) ) );
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,12 @@`
`23`	`23`	`public interface FailableCursor`
`24`	`24`	`{`
`25`	`25`	`/**`
`26`		`- * Discarding all unconsumed records and returning failure if there is any to run and/or pulls.`
	`26`	`+ * Discarding all unconsumed records and returning failure if there is any pull errors.`
`27`	`27`	`*/`
`28`	`28`	`CompletionStage<Throwable> discardAllFailureAsync();`
`29`	`29`
`30`	`30`	`/**`
`31`		`- * Pulling all unconsumed records into memory and returning failure if there is any to run and/or pulls.`
	`31`	`+ * Pulling all unconsumed records into memory and returning failure if there is any pull errors.`
`32`	`32`	`*/`
`33`	`33`	`CompletionStage<Throwable> pullAllFailureAsync();`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,16 +66,9 @@ public void onFailure( Throwable error )`
`66`	`66`	`{`
`67`	`67`	`tx.markTerminated( error );`
`68`	`68`	`}`
`69`		`- else`
	`69`	`+ else if ( error instanceof AuthorizationExpiredException )`
`70`	`70`	`{`
`71`		`- if ( error instanceof AuthorizationExpiredException )`
`72`		`- {`
`73`		`- connection.terminateAndRelease( AuthorizationExpiredException.DESCRIPTION );`
`74`		`- }`
`75`		`- else`
`76`		`- {`
`77`		`- connection.release();`
`78`		`- }`
	`71`	`+ connection.terminateAndRelease( AuthorizationExpiredException.DESCRIPTION );`
`79`	`72`	`}`
`80`	`73`	`runFuture.completeExceptionally( error );`
`81`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ void connectionUsedForTransactionReturnedToThePoolWhenTransactionFailsToCommitte`
`278`	`278`	`void connectionUsedForSessionRunReturnedToThePoolWhenSessionClose()`
`279`	`279`	`{`
`280`	`280`	`Session session = driver.session();`
`281`		`- Result result = createNodes( 12, session );`
	`281`	`+ createNodes( 12, session );`
`282`	`282`
`283`	`283`	`Connection connection1 = connectionPool.lastAcquiredConnectionSpy;`
`284`	`284`	`verify( connection1, never() ).release();`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@`
`77`	`77`	`import static org.junit.jupiter.api.Assertions.assertFalse;`
`78`	`78`	`import static org.junit.jupiter.api.Assertions.assertNotNull;`
`79`	`79`	`import static org.junit.jupiter.api.Assertions.assertNull;`
	`80`	`+import static org.junit.jupiter.api.Assertions.assertSame;`
`80`	`81`	`import static org.junit.jupiter.api.Assertions.assertThrows;`
`81`	`82`	`import static org.junit.jupiter.api.Assertions.assertTrue;`
`82`	`83`	`import static org.mockito.ArgumentMatchers.any;`
`@@ -389,6 +390,7 @@ protected void testRunInUnmanagedTransactionAndWaitForRunResponse( boolean succe`
`389`	`390`
`390`	`391`	`ResponseHandler runResponseHandler = verifyRunInvoked( connection, false, InternalBookmark.empty(), TransactionConfig.empty(), mode ).runHandler;`
`391`	`392`	`assertFalse( cursorFuture.isDone() );`
	`393`	`+ Throwable error = new RuntimeException();`
`392`	`394`
`393`	`395`	`if ( success )`
`394`	`396`	`{`
`@@ -397,18 +399,18 @@ protected void testRunInUnmanagedTransactionAndWaitForRunResponse( boolean succe`
`397`	`399`	`else`
`398`	`400`	`{`
`399`	`401`	`// When responded with a failure`
`400`		`- runResponseHandler.onFailure( new RuntimeException() );`
	`402`	`+ runResponseHandler.onFailure( error );`
`401`	`403`	`}`
`402`	`404`
`403`	`405`	`// Then`
`404`	`406`	`assertTrue( cursorFuture.isDone() );`
`405`	`407`	`if ( success )`
`406`	`408`	`{`
`407`		`- assertNotNull( cursorFuture.get() );`
	`409`	`+ assertFalse( cursorFuture.get().runError().isPresent() );`
`408`	`410`	`}`
`409`	`411`	`else`
`410`	`412`	`{`
`411`		`- assertThrows( RuntimeException.class, () -> await( cursorFuture ) );`
	`413`	`+ assertSame( error, cursorFuture.get().runError().orElseThrow( () -> new RuntimeException( "Unexpected" ) ) );`
`412`	`414`	`}`
`413`	`415`	`}`
`414`	`416`
`@@ -474,11 +476,12 @@ protected void testFailedRunInAutoCommitTxWithWaitingForResponse( Bookmark bookm`
`474`	`476`	`assertFalse( cursorFuture.isDone() );`
`475`	`477`
`476`	`478`	`ResponseHandler runResponseHandler = verifyRunInvoked( connection, true, bookmark, config, mode ).runHandler;`
`477`		`- runResponseHandler.onFailure( new RuntimeException() );`
	`479`	`+ Throwable error = new RuntimeException();`
	`480`	`+ runResponseHandler.onFailure( error );`
`478`	`481`	`assertEquals( bookmark, bookmarkHolder.getBookmark() );`
`479`	`482`
`480`		`- assertTrue( cursorFuture.isCompletedExceptionally() );`
`481`		`- assertThrows( RuntimeException.class, () -> await( cursorFuture ) );`
	`483`	`+ assertTrue( cursorFuture.isDone() );`
	`484`	`+ assertSame( error, cursorFuture.get().runError().orElseThrow( () -> new RuntimeException( "Unexpected" ) ) );`
`482`	`485`	`}`
`483`	`486`
`484`	`487`	`private static InternalAuthToken dummyAuthToken()`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@`
`78`	`78`	`import static org.junit.jupiter.api.Assertions.assertFalse;`
`79`	`79`	`import static org.junit.jupiter.api.Assertions.assertNotNull;`
`80`	`80`	`import static org.junit.jupiter.api.Assertions.assertNull;`
`81`		`-import static org.junit.jupiter.api.Assertions.assertThrows;`
	`81`	`+import static org.junit.jupiter.api.Assertions.assertSame;`
`82`	`82`	`import static org.junit.jupiter.api.Assertions.assertTrue;`
`83`	`83`	`import static org.mockito.ArgumentMatchers.any;`
`84`	`84`	`import static org.mockito.ArgumentMatchers.eq;`
`@@ -381,12 +381,13 @@ protected void testFailedRunInAutoCommitTxWithWaitingForResponse( Bookmark bookm`
`381`	`381`	`assertFalse( cursorFuture.isDone() );`
`382`	`382`
`383`	`383`	`// When I response to Run message with a failure`
`384`		`- runHandler.onFailure( new RuntimeException() );`
	`384`	`+ Throwable error = new RuntimeException();`
	`385`	`+ runHandler.onFailure( error );`
`385`	`386`
`386`	`387`	`// Then`
`387`	`388`	`assertEquals( bookmark, bookmarkHolder.getBookmark() );`
`388`		`- assertTrue( cursorFuture.isCompletedExceptionally() );`
`389`		`- assertThrows( RuntimeException.class, () -> await( cursorFuture ) );`
	`389`	`+ assertTrue( cursorFuture.isDone() );`
	`390`	`+ assertSame( error, cursorFuture.get().runError().orElseThrow( () -> new RuntimeException( "Unexpected" ) ) );`
`390`	`391`	`}`
`391`	`392`
`392`	`393`	`protected void testSuccessfulRunInAutoCommitTxWithWaitingForResponse( Bookmark bookmark, TransactionConfig config, AccessMode mode ) throws Exception`
`@@ -424,6 +425,7 @@ protected void testRunInUnmanagedTransactionAndWaitForRunResponse( boolean succe`
`424`	`425`
`425`	`426`	`ResponseHandler runHandler = verifyTxRunInvoked( connection );`
`426`	`427`	`assertFalse( cursorFuture.isDone() );`
	`428`	`+ Throwable error = new RuntimeException();`
`427`	`429`
`428`	`430`	`if ( success )`
`429`	`431`	`{`
`@@ -432,18 +434,18 @@ protected void testRunInUnmanagedTransactionAndWaitForRunResponse( boolean succe`
`432`	`434`	`else`
`433`	`435`	`{`
`434`	`436`	`// When responded with a failure`
`435`		`- runHandler.onFailure( new RuntimeException() );`
	`437`	`+ runHandler.onFailure( error );`
`436`	`438`	`}`
`437`	`439`
`438`	`440`	`// Then`
`439`	`441`	`assertTrue( cursorFuture.isDone() );`
`440`	`442`	`if ( success )`
`441`	`443`	`{`
`442`		`- assertNotNull( cursorFuture.get() );`
	`444`	`+ assertFalse( cursorFuture.get().runError().isPresent() );`
`443`	`445`	`}`
`444`	`446`	`else`
`445`	`447`	`{`
`446`		`- assertThrows( RuntimeException.class, () -> await( cursorFuture ) );`
	`448`	`+ assertSame( error, cursorFuture.get().runError().orElseThrow( () -> new RuntimeException( "Unexpected" ) ) );`
`447`	`449`	`}`
`448`	`450`	`}`
`449`	`451`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@`
`79`	`79`	`import static org.junit.jupiter.api.Assertions.assertFalse;`
`80`	`80`	`import static org.junit.jupiter.api.Assertions.assertNotNull;`
`81`	`81`	`import static org.junit.jupiter.api.Assertions.assertNull;`
`82`		`-import static org.junit.jupiter.api.Assertions.assertThrows;`
	`82`	`+import static org.junit.jupiter.api.Assertions.assertSame;`
`83`	`83`	`import static org.junit.jupiter.api.Assertions.assertTrue;`
`84`	`84`	`import static org.mockito.ArgumentMatchers.any;`
`85`	`85`	`import static org.mockito.ArgumentMatchers.eq;`
`@@ -376,12 +376,13 @@ private void testFailedRunInAutoCommitTxWithWaitingForResponse( Bookmark bookmar`
`376`	`376`	`assertFalse( cursorFuture.isDone() );`
`377`	`377`
`378`	`378`	`// When I response to Run message with a failure`
`379`		`- runHandler.onFailure( new RuntimeException() );`
	`379`	`+ Throwable error = new RuntimeException();`
	`380`	`+ runHandler.onFailure( error );`
`380`	`381`
`381`	`382`	`// Then`
`382`	`383`	`assertEquals( bookmark, bookmarkHolder.getBookmark() );`
`383`		`- assertTrue( cursorFuture.isCompletedExceptionally() );`
`384`		`- assertThrows( RuntimeException.class, () -> await( cursorFuture ) );`
	`384`	`+ assertTrue( cursorFuture.isDone() );`
	`385`	`+ assertSame( error, cursorFuture.get().runError().orElseThrow( () -> new RuntimeException( "Unexpected" ) ) );`
`385`	`386`	`}`
`386`	`387`
`387`	`388`	`private void testSuccessfulRunInAutoCommitTxWithWaitingForResponse( Bookmark bookmark, TransactionConfig config, AccessMode mode ) throws Exception`
`@@ -419,6 +420,7 @@ private void testRunInUnmanagedTransactionAndWaitForRunResponse( boolean success`
`419`	`420`
`420`	`421`	`ResponseHandler runHandler = verifyTxRunInvoked( connection );`
`421`	`422`	`assertFalse( cursorFuture.isDone() );`
	`423`	`+ Throwable error = new RuntimeException();`
`422`	`424`
`423`	`425`	`if ( success )`
`424`	`426`	`{`
`@@ -427,18 +429,18 @@ private void testRunInUnmanagedTransactionAndWaitForRunResponse( boolean success`
`427`	`429`	`else`
`428`	`430`	`{`
`429`	`431`	`// When responded with a failure`
`430`		`- runHandler.onFailure( new RuntimeException() );`
	`432`	`+ runHandler.onFailure( error );`
`431`	`433`	`}`
`432`	`434`
`433`	`435`	`// Then`
`434`	`436`	`assertTrue( cursorFuture.isDone() );`
`435`	`437`	`if ( success )`
`436`	`438`	`{`
`437`		`- assertNotNull( cursorFuture.get() );`
	`439`	`+ assertFalse( cursorFuture.get().runError().isPresent() );`
`438`	`440`	`}`
`439`	`441`	`else`
`440`	`442`	`{`
`441`		`- assertThrows( RuntimeException.class, () -> await( cursorFuture ) );`
	`443`	`+ assertSame( error, cursorFuture.get().runError().orElseThrow( () -> new RuntimeException( "Unexpected" ) ) );`
`442`	`444`	`}`
`443`	`445`	`}`
`444`	`446`