@@ -68,15 +68,15 @@ public void iterationShouldWorksAsExpected()
68
68
69
69
// WHEN
70
70
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" ) ) ) );
72
72
73
73
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" ) ) ) );
75
75
76
76
assertTrue ( result .hasNext () ); //1 -> 2
77
77
78
78
// 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" ) ) ) );
80
80
assertFalse ( result .hasNext () );
81
81
82
82
expectedException .expect ( NoSuchRecordException .class );
@@ -92,7 +92,7 @@ public void firstOfFieldNameShouldWorkAsExpected()
92
92
StatementResult result = createResult ( 3 );
93
93
94
94
// THEN
95
- assertThat ( result .next ().get ("k1" ), equalTo ( value ("v1-1" ) ) );
95
+ assertThat ( result .next ().get ( "k1" ), equalTo ( value ( "v1-1" ) ) );
96
96
assertTrue ( result .hasNext () );
97
97
}
98
98
@@ -103,7 +103,7 @@ public void firstOfFieldIndexShouldWorkAsExpected()
103
103
StatementResult result = createResult ( 3 );
104
104
105
105
// THEN
106
- assertThat ( result .next ().get (0 ), equalTo ( value ("v1-1" ) ) );
106
+ assertThat ( result .next ().get ( 0 ), equalTo ( value ( "v1-1" ) ) );
107
107
assertTrue ( result .hasNext () );
108
108
}
109
109
@@ -158,7 +158,7 @@ public void singleOfFieldNameShouldWorkAsExpected()
158
158
StatementResult result = createResult ( 1 );
159
159
160
160
// THEN
161
- assertThat ( result .single ().get ("k1" ), equalTo ( value ("v1-1" ) ) );
161
+ assertThat ( result .single ().get ( "k1" ), equalTo ( value ( "v1-1" ) ) );
162
162
assertFalse ( result .hasNext () );
163
163
}
164
164
@@ -169,7 +169,7 @@ public void singleOfFieldIndexShouldWorkAsExpected()
169
169
StatementResult result = createResult ( 1 );
170
170
171
171
// THEN
172
- assertThat ( result .single ().get (0 ), equalTo ( value ("v1-1" ) ) );
172
+ assertThat ( result .single ().get ( 0 ), equalTo ( value ( "v1-1" ) ) );
173
173
assertFalse ( result .hasNext () );
174
174
}
175
175
@@ -287,8 +287,8 @@ public void retainShouldWorkAsExpected()
287
287
List <Record > records = result .list ();
288
288
289
289
// THEN
290
- assertFalse (result .hasNext ());
291
- assertThat (records , hasSize ( 3 ) );
290
+ assertFalse ( result .hasNext () );
291
+ assertThat ( records , hasSize ( 3 ) );
292
292
}
293
293
294
294
@ Test
@@ -301,8 +301,8 @@ public void retainAndMapByKeyShouldWorkAsExpected()
301
301
List <Value > records = result .list ( column ( "k1" ) );
302
302
303
303
// THEN
304
- assertFalse (result .hasNext ());
305
- assertThat (records , hasSize ( 3 ) );
304
+ assertFalse ( result .hasNext () );
305
+ assertThat ( records , hasSize ( 3 ) );
306
306
}
307
307
308
308
@ Test
@@ -315,8 +315,8 @@ public void retainAndMapByIndexShouldWorkAsExpected()
315
315
List <Value > records = result .list ( column ( 0 ) );
316
316
317
317
// THEN
318
- assertFalse (result .hasNext ());
319
- assertThat (records , hasSize ( 3 ) );
318
+ assertFalse ( result .hasNext () );
319
+ assertThat ( records , hasSize ( 3 ) );
320
320
}
321
321
322
322
@ Test
@@ -446,6 +446,20 @@ public void shouldNotifyResourcesHandlerWhenConsumed()
446
446
verify ( resourcesHandler ).onResultConsumed ();
447
447
}
448
448
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
+
449
463
private StatementResult createResult ( int numberOfRecords )
450
464
{
451
465
return createResult ( numberOfRecords , SessionResourcesHandler .NO_OP );
@@ -478,7 +492,7 @@ public Object answer( InvocationOnMock invocationOnMock ) throws Throwable
478
492
inboundMessages .poll ().run ();
479
493
return null ;
480
494
}
481
- }).when ( connection ).receiveOne ();
495
+ } ).when ( connection ).receiveOne ();
482
496
483
497
return result ;
484
498
}
@@ -523,7 +537,7 @@ public void run()
523
537
private List <Value > values ( Record record )
524
538
{
525
539
List <Value > result = new ArrayList <>( record .keys ().size () );
526
- for ( Pair <String , Value > property : record .fields () )
540
+ for ( Pair <String ,Value > property : record .fields () )
527
541
{
528
542
result .add ( property .value () );
529
543
}
0 commit comments