[tinkerpop] 02/03: TINKERPOP-2238 Fixed iterator leaks in BLVP test

[sp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch TINKERPOP-2238
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 8eb734d63b745baf52a3d479d82846ed79bd1a3e
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Jun 17 17:13:27 2019 -0400

    TINKERPOP-2238 Fixed iterator leaks in BLVP test
---
 .../computer/bulkloading/BulkLoaderVertexProgramTest.java        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgramTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgramTest.java
index dca88b7..4bdb386 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgramTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgramTest.java
@@ -21,7 +21,6 @@ package org.apache.tinkerpop.gremlin.process.computer.bulkloading;
 import org.apache.commons.configuration.BaseConfiguration;
 import org.apache.commons.configuration.Configuration;
 import org.apache.tinkerpop.gremlin.LoadGraphWith;
-import org.apache.tinkerpop.gremlin.IgnoreIteratorLeak;
 import org.apache.tinkerpop.gremlin.TestHelper;
 import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
 import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
@@ -33,6 +32,7 @@ import org.apache.tinkerpop.gremlin.structure.Element;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;
 import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
 import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
 import org.junit.After;
@@ -52,7 +52,6 @@ import static org.junit.Assert.assertTrue;
 /**
  * @author Daniel Kuppitz (http://gremlin.guru)
  */
-@IgnoreIteratorLeak
 public class BulkLoaderVertexProgramTest extends AbstractGremlinProcessTest {
 
     final static String TINKERGRAPH_LOCATION = TestHelper.makeTestDataDirectory(BulkLoaderVertexProgramTest.class) + "tinkertest.kryo";
@@ -176,7 +175,7 @@ public class BulkLoaderVertexProgramTest extends AbstractGremlinProcessTest {
     private static void assertGraphEquality(final Graph source, final Graph target, final Function<Vertex, Object> idAccessor) {
         final GraphTraversalSource tg = target.traversal();
         assertEquals(IteratorUtils.count(source.vertices()), IteratorUtils.count(target.vertices()));
-        assertEquals(IteratorUtils.count(target.edges()), IteratorUtils.count(target.edges()));
+        assertEquals(IteratorUtils.count(source.edges()), IteratorUtils.count(target.edges()));
         source.vertices().forEachRemaining(originalVertex -> {
             Vertex tmpVertex = null;
             final Iterator<Vertex> vertexIterator = target.vertices();
@@ -187,6 +186,9 @@ public class BulkLoaderVertexProgramTest extends AbstractGremlinProcessTest {
                     break;
                 }
             }
+
+            CloseableIterator.closeIterator(vertexIterator);
+
             assertNotNull(tmpVertex);
             final Vertex clonedVertex = tmpVertex;
             assertEquals(IteratorUtils.count(originalVertex.edges(Direction.IN)), IteratorUtils.count(clonedVertex.edges(Direction.IN)));
@@ -210,6 +212,7 @@ public class BulkLoaderVertexProgramTest extends AbstractGremlinProcessTest {
                 GraphTraversal t = tg.V(clonedVertex).outE(originalEdge.label());
                 originalEdge.properties().forEachRemaining(p -> t.has(p.key(), p.value()));
                 assertTrue(t.hasNext());
+                CloseableIterator.closeIterator(t);
             });
         });
     }