Skip to content

Commit 0ddac3d

Browse files
committed
Test for fetching result multiple times
1 parent 520c65d commit 0ddac3d

File tree

1 file changed

+29
-15
lines changed

1 file changed

+29
-15
lines changed

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

+29-15
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@ public void iterationShouldWorksAsExpected()
6868

6969
// WHEN
7070
assertTrue( result.hasNext() );
71-
assertThat( values( result.next() ), equalTo( asList(value("v1-1"), value( "v2-1" ))));
71+
assertThat( values( result.next() ), equalTo( asList( value( "v1-1" ), value( "v2-1" ) ) ) );
7272

7373
assertTrue( result.hasNext() );
74-
assertThat( values( result.next() ), equalTo( asList(value("v1-2"), value( "v2-2" ))));
74+
assertThat( values( result.next() ), equalTo( asList( value( "v1-2" ), value( "v2-2" ) ) ) );
7575

7676
assertTrue( result.hasNext() ); //1 -> 2
7777

7878
// THEN
79-
assertThat( values( result.next() ), equalTo( asList(value("v1-3"), value( "v2-3" ))));
79+
assertThat( values( result.next() ), equalTo( asList( value( "v1-3" ), value( "v2-3" ) ) ) );
8080
assertFalse( result.hasNext() );
8181

8282
expectedException.expect( NoSuchRecordException.class );
@@ -92,7 +92,7 @@ public void firstOfFieldNameShouldWorkAsExpected()
9292
StatementResult result = createResult( 3 );
9393

9494
// THEN
95-
assertThat( result.next().get("k1"), equalTo( value("v1-1") ) );
95+
assertThat( result.next().get( "k1" ), equalTo( value( "v1-1" ) ) );
9696
assertTrue( result.hasNext() );
9797
}
9898

@@ -103,7 +103,7 @@ public void firstOfFieldIndexShouldWorkAsExpected()
103103
StatementResult result = createResult( 3 );
104104

105105
// THEN
106-
assertThat( result.next().get(0), equalTo( value("v1-1") ) );
106+
assertThat( result.next().get( 0 ), equalTo( value( "v1-1" ) ) );
107107
assertTrue( result.hasNext() );
108108
}
109109

@@ -158,7 +158,7 @@ public void singleOfFieldNameShouldWorkAsExpected()
158158
StatementResult result = createResult( 1 );
159159

160160
// THEN
161-
assertThat( result.single().get("k1"), equalTo( value("v1-1") ) );
161+
assertThat( result.single().get( "k1" ), equalTo( value( "v1-1" ) ) );
162162
assertFalse( result.hasNext() );
163163
}
164164

@@ -169,7 +169,7 @@ public void singleOfFieldIndexShouldWorkAsExpected()
169169
StatementResult result = createResult( 1 );
170170

171171
// THEN
172-
assertThat( result.single().get(0), equalTo( value("v1-1") ) );
172+
assertThat( result.single().get( 0 ), equalTo( value( "v1-1" ) ) );
173173
assertFalse( result.hasNext() );
174174
}
175175

@@ -287,8 +287,8 @@ public void retainShouldWorkAsExpected()
287287
List<Record> records = result.list();
288288

289289
// THEN
290-
assertFalse(result.hasNext());
291-
assertThat(records, hasSize( 3 ) );
290+
assertFalse( result.hasNext() );
291+
assertThat( records, hasSize( 3 ) );
292292
}
293293

294294
@Test
@@ -301,8 +301,8 @@ public void retainAndMapByKeyShouldWorkAsExpected()
301301
List<Value> records = result.list( column( "k1" ) );
302302

303303
// THEN
304-
assertFalse(result.hasNext());
305-
assertThat(records, hasSize( 3 ) );
304+
assertFalse( result.hasNext() );
305+
assertThat( records, hasSize( 3 ) );
306306
}
307307

308308
@Test
@@ -315,8 +315,8 @@ public void retainAndMapByIndexShouldWorkAsExpected()
315315
List<Value> records = result.list( column( 0 ) );
316316

317317
// THEN
318-
assertFalse(result.hasNext());
319-
assertThat(records, hasSize( 3 ) );
318+
assertFalse( result.hasNext() );
319+
assertThat( records, hasSize( 3 ) );
320320
}
321321

322322
@Test
@@ -446,6 +446,20 @@ public void shouldNotifyResourcesHandlerWhenConsumed()
446446
verify( resourcesHandler ).onResultConsumed();
447447
}
448448

449+
@Test
450+
public void shouldNotifyResourcesHandlerOnlyOnceWhenConsumed()
451+
{
452+
SessionResourcesHandler resourcesHandler = mock( SessionResourcesHandler.class );
453+
StatementResult result = createResult( 8, resourcesHandler );
454+
455+
assertEquals( 8, result.list().size() );
456+
assertNotNull( result.summary() );
457+
assertNotNull( result.consume() );
458+
assertNotNull( result.summary() );
459+
460+
verify( resourcesHandler ).onResultConsumed();
461+
}
462+
449463
private StatementResult createResult( int numberOfRecords )
450464
{
451465
return createResult( numberOfRecords, SessionResourcesHandler.NO_OP );
@@ -478,7 +492,7 @@ public Object answer( InvocationOnMock invocationOnMock ) throws Throwable
478492
inboundMessages.poll().run();
479493
return null;
480494
}
481-
}).when( connection ).receiveOne();
495+
} ).when( connection ).receiveOne();
482496

483497
return result;
484498
}
@@ -523,7 +537,7 @@ public void run()
523537
private List<Value> values( Record record )
524538
{
525539
List<Value> result = new ArrayList<>( record.keys().size() );
526-
for ( Pair<String, Value> property : record.fields() )
540+
for ( Pair<String,Value> property : record.fields() )
527541
{
528542
result.add( property.value() );
529543
}

0 commit comments

Comments
 (0)