Fix tests after forward merge

Author: lutovich

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

@@ -151,15 +151,15 @@ public void shouldSyncWhenBookmarkGiven()
     @Test
     public void shouldBeOpenAfterConstruction()
     {
-        Transaction tx = new ExplicitTransaction( openConnectionMock(), mock( Runnable.class ) );
+        Transaction tx = new ExplicitTransaction( openConnectionMock(), mock( SessionResourcesHandler.class ) );
 
         assertTrue( tx.isOpen() );
     }
 
     @Test
     public void shouldBeOpenWhenMarkedForSuccess()
     {
-        Transaction tx = new ExplicitTransaction( openConnectionMock(), mock( Runnable.class ) );
+        Transaction tx = new ExplicitTransaction( openConnectionMock(), mock( SessionResourcesHandler.class ) );
 
         tx.success();
 
@@ -169,7 +169,7 @@ public void shouldBeOpenWhenMarkedForSuccess()
     @Test
     public void shouldBeOpenWhenMarkedForFailure()
     {
-        Transaction tx = new ExplicitTransaction( openConnectionMock(), mock( Runnable.class ) );
+        Transaction tx = new ExplicitTransaction( openConnectionMock(), mock( SessionResourcesHandler.class ) );
 
         tx.failure();
 
@@ -179,7 +179,7 @@ public void shouldBeOpenWhenMarkedForFailure()
     @Test
     public void shouldBeOpenWhenMarkedToClose()
     {
-        ExplicitTransaction tx = new ExplicitTransaction( openConnectionMock(), mock( Runnable.class ) );
+        ExplicitTransaction tx = new ExplicitTransaction( openConnectionMock(), mock( SessionResourcesHandler.class ) );
 
         tx.markToClose();
 
@@ -189,7 +189,7 @@ public void shouldBeOpenWhenMarkedToClose()
     @Test
     public void shouldBeClosedAfterCommit()
     {
-        Transaction tx = new ExplicitTransaction( openConnectionMock(), mock( Runnable.class ) );
+        Transaction tx = new ExplicitTransaction( openConnectionMock(), mock( SessionResourcesHandler.class ) );
 
         tx.success();
         tx.close();
@@ -200,7 +200,7 @@ public void shouldBeClosedAfterCommit()
     @Test
     public void shouldBeClosedAfterRollback()
     {
-        Transaction tx = new ExplicitTransaction( openConnectionMock(), mock( Runnable.class ) );
+        Transaction tx = new ExplicitTransaction( openConnectionMock(), mock( SessionResourcesHandler.class ) );
 
         tx.failure();
         tx.close();
@@ -211,7 +211,7 @@ public void shouldBeClosedAfterRollback()
     @Test
     public void shouldBeClosedWhenMarkedToCloseAndClosed()
     {
-        ExplicitTransaction tx = new ExplicitTransaction( openConnectionMock(), mock( Runnable.class ) );
+        ExplicitTransaction tx = new ExplicitTransaction( openConnectionMock(), mock( SessionResourcesHandler.class ) );
 
         tx.markToClose();
         tx.close();

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

@@ -479,7 +479,7 @@ public void markTxAsFailedOnRecoverableConnectionError()
 
         session.onConnectionError( true );
 
-        assertFalse( tx.isOpen() );
+        assertTrue( tx.isOpen() );
     }
 
     @Test
@@ -495,7 +495,7 @@ public void markTxToCloseOnUnrecoverableConnectionError()
 
         session.onConnectionError( false );
 
-        assertFalse( tx.isOpen() );
+        assertTrue( tx.isOpen() );
     }
 
     @Test
@@ -738,7 +738,8 @@ public void writeTxRetriedUntilFailureWhenTxCloseThrows()
     public void transactionShouldBeOpenAfterSessionReset()
     {
         ConnectionProvider connectionProvider = mock( ConnectionProvider.class );
-        when( connectionProvider.acquireConnection( READ ) ).thenReturn( openConnectionMock() );
+        PooledConnection connection = openConnectionMock();
+        when( connectionProvider.acquireConnection( READ ) ).thenReturn( connection );
         NetworkSession session = newSession( connectionProvider, READ );
         Transaction tx = session.beginTransaction();
 
@@ -752,7 +753,8 @@ public void transactionShouldBeOpenAfterSessionReset()
     public void transactionShouldBeClosedAfterSessionResetAndClose()
     {
         ConnectionProvider connectionProvider = mock( ConnectionProvider.class );
-        when( connectionProvider.acquireConnection( READ ) ).thenReturn( openConnectionMock() );
+        PooledConnection connection = openConnectionMock();
+        when( connectionProvider.acquireConnection( READ ) ).thenReturn( connection );
         NetworkSession session = newSession( connectionProvider, READ );
         Transaction tx = session.beginTransaction();