Skip to content

Commit 27ab027

Browse files
committed
Removed inaccurate list test and added more tests for single method
1 parent 0af0fc6 commit 27ab027

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

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

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,13 @@
3232

3333
import org.neo4j.driver.internal.spi.Connection;
3434
import org.neo4j.driver.internal.value.NullValue;
35-
import org.neo4j.driver.v1.Statement;
36-
import org.neo4j.driver.v1.StatementResult;
37-
import org.neo4j.driver.v1.util.Pair;
3835
import org.neo4j.driver.v1.Record;
3936
import org.neo4j.driver.v1.Records;
37+
import org.neo4j.driver.v1.Statement;
38+
import org.neo4j.driver.v1.StatementResult;
4039
import org.neo4j.driver.v1.Value;
41-
import org.neo4j.driver.v1.exceptions.ClientException;
4240
import org.neo4j.driver.v1.exceptions.NoSuchRecordException;
41+
import org.neo4j.driver.v1.util.Pair;
4342

4443
import static org.hamcrest.CoreMatchers.equalTo;
4544
import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
@@ -101,11 +100,25 @@ public void firstOfFieldIndexShouldWorkAsExpected()
101100
}
102101

103102
@Test
104-
public void singlePastFirstShouldFail()
103+
public void singlePastFirstTwoResultsShouldFail()
105104
{
106105
// GIVEN
107106
StatementResult result = createResult( 2 );
108107
result.next();
108+
109+
110+
// THEN
111+
expectedException.expect( NoSuchRecordException.class );
112+
113+
// THEN
114+
result.single();
115+
}
116+
117+
@Test
118+
public void singlePastFirstShouldFail()
119+
{
120+
// GIVEN
121+
StatementResult result = createResult( 2 );
109122
result.next();
110123

111124

@@ -234,16 +247,6 @@ public void retainAndMapByIndexShouldWorkAsExpected()
234247
assertThat(records, hasSize( 3 ) );
235248
}
236249

237-
@Test
238-
public void retainFailsIfItCannotRetainEntireResult()
239-
{
240-
StatementResult result = createResult( 17 );
241-
result.next();
242-
243-
expectedException.expect( ClientException.class );
244-
result.list();
245-
}
246-
247250
@Test
248251
public void accessingOutOfBoundsShouldBeNull()
249252
{

0 commit comments

Comments
 (0)