You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2018/11/06 21:58:10 UTC

[tinkerpop] branch TINKERPOP-2059 updated: Got rid of now deprecated `valueMap()` overload in `AddVertexTest`.

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

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


The following commit(s) were added to refs/heads/TINKERPOP-2059 by this push:
     new e4f978d  Got rid of now deprecated `valueMap()` overload in `AddVertexTest`.
e4f978d is described below

commit e4f978d56b8296bd6957ebc4a40f724865192833
Author: Daniel Kuppitz <da...@hotmail.com>
AuthorDate: Tue Nov 6 14:57:30 2018 -0700

    Got rid of now deprecated `valueMap()` overload in `AddVertexTest`.
---
 gremlin-test/features/map/AddVertex.feature        | 25 ----------------------
 .../process/traversal/step/map/AddVertexTest.java  | 22 -------------------
 2 files changed, 47 deletions(-)

diff --git a/gremlin-test/features/map/AddVertex.feature b/gremlin-test/features/map/AddVertex.feature
index 1bb3ce1..a60fefb 100644
--- a/gremlin-test/features/map/AddVertex.feature
+++ b/gremlin-test/features/map/AddVertex.feature
@@ -336,31 +336,6 @@ Feature: Step - addV()
       | marko |
     And the graph should return 2 for count of "g.V().has(\"name\",\"marko\")"
 
-  Scenario: g_V_asXaX_hasXname_markoX_outXcreatedX_asXbX_addVXselectXaX_labelX_propertyXtest_selectXbX_labelX_valueMapXtrueX
-    Given the empty graph
-    And the graph initializer of
-      """
-      g.addV("person").property(T.id, 1).property("name", "marko").property("age", 29).as("marko").
-        addV("person").property(T.id, 2).property("name", "vadas").property("age", 27).as("vadas").
-        addV("software").property(T.id, 3).property("name", "lop").property("lang", "java").as("lop").
-        addV("person").property(T.id, 4).property("name","josh").property("age", 32).as("josh").
-        addV("software").property(T.id, 5).property("name", "ripple").property("lang", "java").as("ripple").
-        addV("person").property(T.id, 6).property("name", "peter").property("age", 35).as('peter').
-        addE("knows").from("marko").to("vadas").property(T.id, 7).property("weight", 0.5).
-        addE("knows").from("marko").to("josh").property(T.id, 8).property("weight", 1.0).
-        addE("created").from("marko").to("lop").property(T.id, 9).property("weight", 0.4).
-        addE("created").from("josh").to("ripple").property(T.id, 10).property("weight", 1.0).
-        addE("created").from("josh").to("lop").property(T.id, 11).property("weight", 0.4).
-        addE("created").from("peter").to("lop").property(T.id, 12).property("weight", 0.2)
-      """
-    And the traversal of
-      """
-      g.V().as("a").has("name", "marko").out("created").as("b").addV(__.select("a").label()).property("test", __.select("b").label()).valueMap(true)
-      """
-    When iterated to list
-    Then the result should have a count of 1
-    And the graph should return 1 for count of "g.V().has(\"person\",\"test\",\"software\")"
-
   Scenario: g_V_asXaX_hasXname_markoX_outXcreatedX_asXbX_addVXselectXaX_labelX_propertyXtest_selectXbX_labelX_valueMap_withXtokensX
     Given the empty graph
     And the graph initializer of
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexTest.java
index 858f979..21fbb8c 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexTest.java
@@ -74,8 +74,6 @@ public abstract class AddVertexTest extends AbstractGremlinTest {
 
     public abstract Traversal<Vertex, String> get_g_withSideEffectXa_nameX_addV_propertyXselectXaX_markoX_name();
 
-    public abstract Traversal<Vertex, Map<Object, Object>> get_g_V_asXaX_hasXname_markoX_outXcreatedX_asXbX_addVXselectXaX_labelX_propertyXtest_selectXbX_labelX_valueMapXtrueX();
-
     public abstract Traversal<Vertex, Map<Object, Object>> get_g_V_asXaX_hasXname_markoX_outXcreatedX_asXbX_addVXselectXaX_labelX_propertyXtest_selectXbX_labelX_valueMap_withXtokensX();
 
     @Test
@@ -288,21 +286,6 @@ public abstract class AddVertexTest extends AbstractGremlinTest {
     @LoadGraphWith(MODERN)
     @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
     @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_PROPERTY)
-    public void g_V_asXaX_hasXname_markoX_outXcreatedX_asXbX_addVXselectXaX_labelX_propertyXtest_selectXbX_labelX_valueMapXtrueX() {
-        final Traversal<Vertex, Map<Object,Object>> traversal = get_g_V_asXaX_hasXname_markoX_outXcreatedX_asXbX_addVXselectXaX_labelX_propertyXtest_selectXbX_labelX_valueMapXtrueX();
-        printTraversalForm(traversal);
-        final Map<Object,Object> map = traversal.next();
-        assertFalse(traversal.hasNext());
-        assertEquals("person",map.get(T.label));
-        assertEquals("software",((List)map.get("test")).get(0));
-        assertEquals(1, ((List)map.get("test")).size());
-        assertEquals(3, map.size());
-    }
-
-    @Test
-    @LoadGraphWith(MODERN)
-    @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
-    @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_PROPERTY)
     public void g_V_asXaX_hasXname_markoX_outXcreatedX_asXbX_addVXselectXaX_labelX_propertyXtest_selectXbX_labelX_valueMap_withXtokensX() {
         final Traversal<Vertex, Map<Object,Object>> traversal = get_g_V_asXaX_hasXname_markoX_outXcreatedX_asXbX_addVXselectXaX_labelX_propertyXtest_selectXbX_labelX_valueMap_withXtokensX();
         printTraversalForm(traversal);
@@ -377,11 +360,6 @@ public abstract class AddVertexTest extends AbstractGremlinTest {
         }
 
         @Override
-        public Traversal<Vertex, Map<Object, Object>> get_g_V_asXaX_hasXname_markoX_outXcreatedX_asXbX_addVXselectXaX_labelX_propertyXtest_selectXbX_labelX_valueMapXtrueX() {
-            return g.V().as("a").has("name", "marko").out("created").as("b").addV(select("a").label()).property("test", select("b").label()).valueMap(true);
-        }
-
-        @Override
         public Traversal<Vertex, Map<Object, Object>> get_g_V_asXaX_hasXname_markoX_outXcreatedX_asXbX_addVXselectXaX_labelX_propertyXtest_selectXbX_labelX_valueMap_withXtokensX() {
             return g.V().as("a").has("name", "marko").out("created").as("b").addV(select("a").label()).property("test", select("b").label()).valueMap().with(WithOptions.tokens);
         }