More DISCARD->PULL

Author: technige

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

@@ -92,7 +92,7 @@ private enum State
             parameters = singletonMap( "bookmark", value( bookmark ) );
         }
         conn.run( "BEGIN", parameters, Collector.NO_OP );
-        conn.discardAll( Collector.NO_OP );
+        conn.pullAll( Collector.NO_OP );
     }
 
     @Override

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

@@ -18,13 +18,13 @@
  */
 package org.neo4j.driver.internal;
 
+import java.util.Collections;
+
 import org.junit.Test;
 import org.mockito.InOrder;
 
-import java.util.Collections;
-
-import org.neo4j.driver.internal.spi.Connection;
 import org.neo4j.driver.internal.spi.Collector;
+import org.neo4j.driver.internal.spi.Connection;
 import org.neo4j.driver.v1.Value;
 
 import static org.mockito.Matchers.any;
@@ -50,11 +50,11 @@ public void shouldRollbackOnImplicitFailure() throws Throwable
 
         // Then
         InOrder order = inOrder( conn );
-        order.verify( conn ).run( "BEGIN", Collections.<String, Value>emptyMap(), Collector.NO_OP );
-        order.verify( conn ).discardAll( any( BookmarkCollector.class ) );
+        order.verify( conn ).run( "BEGIN", Collections.<String, Value>emptyMap(),Collector.NO_OP );
+        order.verify( conn ).pullAll( any( Collector.class ) );
         order.verify( conn ).isOpen();
         order.verify( conn ).run( "ROLLBACK", Collections.<String, Value>emptyMap(), Collector.NO_OP );
-        order.verify( conn ).discardAll( any( BookmarkCollector.class ) );
+        order.verify( conn ).pullAll( any( Collector.class ) );
         order.verify( conn ).sync();
         verify( cleanup ).run();
         verifyNoMoreInteractions( conn, cleanup );
@@ -77,10 +77,10 @@ public void shouldRollbackOnExplicitFailure() throws Throwable
         // Then
         InOrder order = inOrder( conn );
         order.verify( conn ).run( "BEGIN", Collections.<String, Value>emptyMap(), Collector.NO_OP );
-        order.verify( conn ).discardAll( any( BookmarkCollector.class ) );
+        order.verify( conn ).pullAll( any( BookmarkCollector.class ) );
         order.verify( conn ).isOpen();
         order.verify( conn ).run( "ROLLBACK", Collections.<String, Value>emptyMap(), Collector.NO_OP );
-        order.verify( conn ).discardAll( any( BookmarkCollector.class ) );
+        order.verify( conn ).pullAll( any( BookmarkCollector.class ) );
         order.verify( conn ).sync();
         verify( cleanup ).run();
         verifyNoMoreInteractions( conn, cleanup );
@@ -103,10 +103,10 @@ public void shouldCommitOnSuccess() throws Throwable
 
         InOrder order = inOrder( conn );
         order.verify( conn ).run( "BEGIN", Collections.<String, Value>emptyMap(), Collector.NO_OP );
-        order.verify( conn ).discardAll( any( BookmarkCollector.class ) );
+        order.verify( conn ).pullAll( any( BookmarkCollector.class ) );
         order.verify( conn ).isOpen();
         order.verify( conn ).run( "COMMIT", Collections.<String, Value>emptyMap(), Collector.NO_OP );
-        order.verify( conn ).discardAll( any( BookmarkCollector.class ) );
+        order.verify( conn ).pullAll( any( BookmarkCollector.class ) );
         order.verify( conn ).sync();
         verify( cleanup ).run();
         verifyNoMoreInteractions( conn, cleanup );