Unit tests for InternalStatementResultCursor

Also removed naming differentiation between async cursor and blocking
result. It was an unnecessary complication and did not make error
messages any better.

Author: lutovich

driver/src/main/java/org/neo4j/driver/internal/InternalStatementResultCursor.java

@@ -34,37 +34,17 @@
 import org.neo4j.driver.v1.util.Function;
 import org.neo4j.driver.v1.util.Functions;
 
-// todo: unit tests
 public class InternalStatementResultCursor implements StatementResultCursor
 {
-    // todo: maybe smth better than these two string constants?
-    private static final String BLOCKING_NAME = "result";
-    private static final String ASYNC_NAME = "cursor";
-
-    private final String name;
     private final RunResponseHandler runResponseHandler;
     private final PullAllResponseHandler pullAllHandler;
 
-    private InternalStatementResultCursor( String name, RunResponseHandler runResponseHandler,
-            PullAllResponseHandler pullAllHandler )
+    public InternalStatementResultCursor( RunResponseHandler runResponseHandler, PullAllResponseHandler pullAllHandler )
     {
-        this.name = name;
         this.runResponseHandler = runResponseHandler;
         this.pullAllHandler = pullAllHandler;
     }
 
-    public static InternalStatementResultCursor forBlockingRun( RunResponseHandler runResponseHandler,
-            PullAllResponseHandler pullAllHandler )
-    {
-        return new InternalStatementResultCursor( BLOCKING_NAME, runResponseHandler, pullAllHandler );
-    }
-
-    public static InternalStatementResultCursor forAsyncRun( RunResponseHandler runResponseHandler,
-            PullAllResponseHandler pullAllHandler )
-    {
-        return new InternalStatementResultCursor( ASYNC_NAME, runResponseHandler, pullAllHandler );
-    }
-
     @Override
     public List<String> keys()
     {
@@ -97,14 +77,14 @@ public CompletionStage<Record> singleAsync()
             if ( firstRecord == null )
             {
                 throw new NoSuchRecordException(
-                        "Cannot retrieve a single record, because this " + name + " is empty." );
+                        "Cannot retrieve a single record, because this result is empty." );
             }
             return nextAsync().thenApply( secondRecord ->
             {
                 if ( secondRecord != null )
                 {
                     throw new NoSuchRecordException(
-                            "Expected a " + name + " with a single record, but this " + name + " " +
+                            "Expected a result with a single record, but this result " +
                             "contains at least one more. Ensure your query returns only " +
                             "one record." );
                 }

driver/src/main/java/org/neo4j/driver/internal/async/QueryRunner.java

@@ -97,11 +97,11 @@ private static CompletionStage<InternalStatementResultCursor> run( Connection co
         {
             // wait for response of RUN before proceeding
             return runCompletedFuture.thenApply( ignore ->
-                    InternalStatementResultCursor.forAsyncRun( runHandler, pullAllHandler ) );
+                    new InternalStatementResultCursor( runHandler, pullAllHandler ) );
         }
         else
         {
-            return completedFuture( InternalStatementResultCursor.forBlockingRun( runHandler, pullAllHandler ) );
+            return completedFuture( new InternalStatementResultCursor( runHandler, pullAllHandler ) );
         }
     }