You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by mh...@apache.org on 2015/07/23 17:28:43 UTC

[3/3] incubator-tinkerpop git commit: TINKERPOP3-782: Add repro for map(Traversal) not preserving path

TINKERPOP3-782: Add repro for map(Traversal) not preserving path


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/de10f555
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/de10f555
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/de10f555

Branch: refs/heads/tp30
Commit: de10f5555cfdae364ef99c603159f140c73dc13f
Parents: 9f80437
Author: mhfrantz <mf...@redsealnetworks.com>
Authored: Wed Jul 22 20:46:57 2015 -0700
Committer: mhfrantz <mf...@redsealnetworks.com>
Committed: Thu Jul 23 08:27:49 2015 -0700

----------------------------------------------------------------------
 .../traversal/step/map/GroovyMapTest.groovy     |  7 +++++++
 .../process/traversal/step/map/MapTest.java     | 22 ++++++++++++++++++++
 2 files changed, 29 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/de10f555/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMapTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMapTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMapTest.groovy
index e230215..18c03be 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMapTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMapTest.groovy
@@ -22,6 +22,8 @@ import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal
 import org.apache.tinkerpop.gremlin.structure.Vertex
 
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.select;
+
 /**
  * @author Stephen Mallette (http://stephen.genoprime.com)
  */
@@ -53,5 +55,10 @@ public abstract class GroovyMapTest {
         public Traversal<Vertex, String> get_g_withPath_V_asXaX_out_out_mapXa_name_it_nameX() {
             TraversalScriptHelper.compute("g.withPath().V().as('a').out.out().map { v -> v.path('a').name + v.name }", g)
         }
+
+        @Override
+        public Traversal<Vertex, Vertex> get_g_V_mapXselectXaXX() {
+            TraversalScriptHelper.compute("g.V.as('a').map(select('a'))", g);
+        }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/de10f555/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapTest.java
index f257151..5539c86 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapTest.java
@@ -31,6 +31,7 @@ import org.junit.runner.RunWith;
 import java.util.List;
 
 import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.select;
 import static org.junit.Assert.*;
 
 /**
@@ -48,6 +49,8 @@ public abstract class MapTest extends AbstractGremlinProcessTest {
 
     public abstract Traversal<Vertex, String> get_g_withPath_V_asXaX_out_out_mapXa_name_it_nameX();
 
+    public abstract Traversal<Vertex, Vertex> get_g_V_mapXselectXaXX();
+
     @Test
     @LoadGraphWith(MODERN)
     public void g_VX1X_mapXnameX() {
@@ -120,6 +123,20 @@ public abstract class MapTest extends AbstractGremlinProcessTest {
         assertFalse(traversal.hasNext());
     }
 
+    /** TINKERPOP3-782 */
+    @Test
+    @LoadGraphWith(MODERN)
+    public void g_V_mapXselectXaXX() {
+        final Traversal<Vertex, Vertex> traversal = get_g_V_mapXselectXaXX();
+        printTraversalForm(traversal);
+        int counter = 0;
+        while (traversal.hasNext()) {
+            counter++;
+            traversal.next();
+        }
+        assertEquals(6, counter);
+    }
+
     public static class Traversals extends MapTest {
         @Override
         public Traversal<Vertex, String> get_g_VX1X_mapXnameX(final Object v1Id) {
@@ -145,5 +162,10 @@ public abstract class MapTest extends AbstractGremlinProcessTest {
         public Traversal<Vertex, String> get_g_withPath_V_asXaX_out_out_mapXa_name_it_nameX() {
             return g.withPath().V().as("a").out().out().map(v -> v.<Vertex>path("a").<String>value("name") + v.get().<String>value("name"));
         }
+
+        @Override
+        public Traversal<Vertex, Vertex> get_g_V_mapXselectXaXX() {
+            return g.V().as("a").map(select("a"));
+        }
     }
 }