Skip to content

Commit 53e6a62

Browse files
committed
Fix tests after forward merge
1 parent 6fd51f1 commit 53e6a62

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,15 +151,15 @@ public void shouldSyncWhenBookmarkGiven()
151151
@Test
152152
public void shouldBeOpenAfterConstruction()
153153
{
154-
Transaction tx = new ExplicitTransaction( openConnectionMock(), mock( Runnable.class ) );
154+
Transaction tx = new ExplicitTransaction( openConnectionMock(), mock( SessionResourcesHandler.class ) );
155155

156156
assertTrue( tx.isOpen() );
157157
}
158158

159159
@Test
160160
public void shouldBeOpenWhenMarkedForSuccess()
161161
{
162-
Transaction tx = new ExplicitTransaction( openConnectionMock(), mock( Runnable.class ) );
162+
Transaction tx = new ExplicitTransaction( openConnectionMock(), mock( SessionResourcesHandler.class ) );
163163

164164
tx.success();
165165

@@ -169,7 +169,7 @@ public void shouldBeOpenWhenMarkedForSuccess()
169169
@Test
170170
public void shouldBeOpenWhenMarkedForFailure()
171171
{
172-
Transaction tx = new ExplicitTransaction( openConnectionMock(), mock( Runnable.class ) );
172+
Transaction tx = new ExplicitTransaction( openConnectionMock(), mock( SessionResourcesHandler.class ) );
173173

174174
tx.failure();
175175

@@ -179,7 +179,7 @@ public void shouldBeOpenWhenMarkedForFailure()
179179
@Test
180180
public void shouldBeOpenWhenMarkedToClose()
181181
{
182-
ExplicitTransaction tx = new ExplicitTransaction( openConnectionMock(), mock( Runnable.class ) );
182+
ExplicitTransaction tx = new ExplicitTransaction( openConnectionMock(), mock( SessionResourcesHandler.class ) );
183183

184184
tx.markToClose();
185185

@@ -189,7 +189,7 @@ public void shouldBeOpenWhenMarkedToClose()
189189
@Test
190190
public void shouldBeClosedAfterCommit()
191191
{
192-
Transaction tx = new ExplicitTransaction( openConnectionMock(), mock( Runnable.class ) );
192+
Transaction tx = new ExplicitTransaction( openConnectionMock(), mock( SessionResourcesHandler.class ) );
193193

194194
tx.success();
195195
tx.close();
@@ -200,7 +200,7 @@ public void shouldBeClosedAfterCommit()
200200
@Test
201201
public void shouldBeClosedAfterRollback()
202202
{
203-
Transaction tx = new ExplicitTransaction( openConnectionMock(), mock( Runnable.class ) );
203+
Transaction tx = new ExplicitTransaction( openConnectionMock(), mock( SessionResourcesHandler.class ) );
204204

205205
tx.failure();
206206
tx.close();
@@ -211,7 +211,7 @@ public void shouldBeClosedAfterRollback()
211211
@Test
212212
public void shouldBeClosedWhenMarkedToCloseAndClosed()
213213
{
214-
ExplicitTransaction tx = new ExplicitTransaction( openConnectionMock(), mock( Runnable.class ) );
214+
ExplicitTransaction tx = new ExplicitTransaction( openConnectionMock(), mock( SessionResourcesHandler.class ) );
215215

216216
tx.markToClose();
217217
tx.close();

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ public void markTxAsFailedOnRecoverableConnectionError()
479479

480480
session.onConnectionError( true );
481481

482-
assertFalse( tx.isOpen() );
482+
assertTrue( tx.isOpen() );
483483
}
484484

485485
@Test
@@ -495,7 +495,7 @@ public void markTxToCloseOnUnrecoverableConnectionError()
495495

496496
session.onConnectionError( false );
497497

498-
assertFalse( tx.isOpen() );
498+
assertTrue( tx.isOpen() );
499499
}
500500

501501
@Test
@@ -738,7 +738,8 @@ public void writeTxRetriedUntilFailureWhenTxCloseThrows()
738738
public void transactionShouldBeOpenAfterSessionReset()
739739
{
740740
ConnectionProvider connectionProvider = mock( ConnectionProvider.class );
741-
when( connectionProvider.acquireConnection( READ ) ).thenReturn( openConnectionMock() );
741+
PooledConnection connection = openConnectionMock();
742+
when( connectionProvider.acquireConnection( READ ) ).thenReturn( connection );
742743
NetworkSession session = newSession( connectionProvider, READ );
743744
Transaction tx = session.beginTransaction();
744745

@@ -752,7 +753,8 @@ public void transactionShouldBeOpenAfterSessionReset()
752753
public void transactionShouldBeClosedAfterSessionResetAndClose()
753754
{
754755
ConnectionProvider connectionProvider = mock( ConnectionProvider.class );
755-
when( connectionProvider.acquireConnection( READ ) ).thenReturn( openConnectionMock() );
756+
PooledConnection connection = openConnectionMock();
757+
when( connectionProvider.acquireConnection( READ ) ).thenReturn( connection );
756758
NetworkSession session = newSession( connectionProvider, READ );
757759
Transaction tx = session.beginTransaction();
758760

0 commit comments

Comments
 (0)