Skip to content

Commit b355c4b

Browse files
committed
Fix test after rebase
1 parent 53cc858 commit b355c4b

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

driver/src/test/java/org/neo4j/driver/internal/messaging/v3/BoltProtocolV3Test.java

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,13 @@
6969
import static org.junit.jupiter.api.Assertions.assertTrue;
7070
import static org.mockito.ArgumentMatchers.any;
7171
import static org.mockito.ArgumentMatchers.eq;
72+
import static org.mockito.Mockito.doAnswer;
7273
import static org.mockito.Mockito.mock;
7374
import static org.mockito.Mockito.verify;
75+
import static org.mockito.Mockito.when;
7476
import static org.neo4j.driver.internal.util.ServerVersion.v3_5_0;
7577
import static org.neo4j.driver.v1.Values.value;
78+
import static org.neo4j.driver.v1.util.TestUtil.DEFAULT_TEST_PROTOCOL;
7679
import static org.neo4j.driver.v1.util.TestUtil.await;
7780
import static org.neo4j.driver.v1.util.TestUtil.connectionMock;
7881

@@ -194,12 +197,21 @@ void shouldBeginTransactionWithBookmarksAndConfig()
194197
@Test
195198
void shouldCommitTransaction()
196199
{
197-
Connection connection = connectionMock();
200+
String bookmarkString = "neo4j:bookmark:v1:tx4242";
198201

199-
CompletionStage<Void> stage = protocol.commitTransaction( connection, mock( ExplicitTransaction.class ) );
202+
Connection connection = mock( Connection.class );
203+
when( connection.protocol() ).thenReturn( DEFAULT_TEST_PROTOCOL );
204+
doAnswer( invocation ->
205+
{
206+
ResponseHandler commitHandler = invocation.getArgument( 1 );
207+
commitHandler.onSuccess( singletonMap( "bookmark", value( bookmarkString ) ) );
208+
return null;
209+
} ).when( connection ).writeAndFlush( eq( CommitMessage.COMMIT ), any() );
210+
211+
CompletionStage<Bookmarks> stage = protocol.commitTransaction( connection );
200212

201213
verify( connection ).writeAndFlush( eq( CommitMessage.COMMIT ), any( CommitTxResponseHandler.class ) );
202-
assertNull( await( stage ) );
214+
assertEquals( Bookmarks.from( bookmarkString ), await( stage ) );
203215
}
204216

205217
@Test

0 commit comments

Comments
 (0)