[tinkerpop] branch master updated: Changed test to use elementMap() rather than valueMap()

[sp...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new c717b3f  Changed test to use elementMap() rather than valueMap()
     new 4e44431  Merge branch '3.4-dev'
c717b3f is described below

commit c717b3f776e138d987ec6bb502c45cf836f9aab9
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Thu Mar 26 14:12:41 2020 -0400

    Changed test to use elementMap() rather than valueMap()
    
    valueMap(true) is deprecated and from a 3.3.x test. elementMap() is preferred for 3.4.x CTR
---
 gremlin-test/features/map/Order.feature                        |  8 ++++----
 .../gremlin/process/traversal/step/map/OrderTest.java          | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gremlin-test/features/map/Order.feature b/gremlin-test/features/map/Order.feature
index 1315d7d..6a06890 100644
--- a/gremlin-test/features/map/Order.feature
+++ b/gremlin-test/features/map/Order.feature
@@ -368,17 +368,17 @@ Feature: Step - order()
       TODO
       """
 
-  Scenario: g_VX1X_valueMapXtrueX_orderXlocalX_byXkeys_descXunfold
+  Scenario: g_VX1X_elementMap_orderXlocalX_byXkeys_descXunfold
     Given the modern graph
     And using the parameter v1Id defined as "v[marko].id"
     And the traversal of
       """
-      g.V(v1Id).valueMap(true).order(Scope.local).by(Column.keys, Order.desc).unfold()
+      g.V(v1Id).elementMap().order(Scope.local).by(Column.keys, Order.desc).unfold()
       """
     When iterated to list
     Then the result should be ordered
       | result |
-      | m[{"name":["marko"]}] |
+      | m[{"name":"marko"}] |
       | m[{"t[label]":"person"}] |
       | m[{"t[id]":"v[marko].id"}] |
-      | m[{"age":[29]}] |
\ No newline at end of file
+      | m[{"age":29}] |
\ No newline at end of file
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
index 69b63a0..edca31d 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
@@ -108,7 +108,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
 
     public abstract Traversal<Vertex, Map.Entry<String, Number>> get_g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_descX();
 
-    public abstract Traversal<Vertex, Map.Entry<Object, Object>> get_g_VX1X_valueMapXtrueX_orderXlocalX_byXkeys_descXunfold(final Object v1Id);
+    public abstract Traversal<Vertex, Map.Entry<Object, Object>> get_g_VX1X_elementMap_orderXlocalX_byXkeys_descXunfold(final Object v1Id);
 
     @Test
     @LoadGraphWith(MODERN)
@@ -450,8 +450,8 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
 
     @Test
     @LoadGraphWith(MODERN)
-    public void g_VX1X_valueMapXtrueX_orderXlocalX_byXkeys_descXunfold() {
-        final Traversal<Vertex, ?> traversal = get_g_VX1X_valueMapXtrueX_orderXlocalX_byXkeys_descXunfold(convertToVertexId(graph, "marko"));
+    public void g_VX1X_elementMap_orderXlocalX_byXkeys_descXunfold() {
+        final Traversal<Vertex, ?> traversal = get_g_VX1X_elementMap_orderXlocalX_byXkeys_descXunfold(convertToVertexId(graph, "marko"));
         printTraversalForm(traversal);
 
         final Object name = traversal.next();
@@ -608,8 +608,8 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
         }
 
         @Override
-        public Traversal<Vertex, Map.Entry<Object, Object>> get_g_VX1X_valueMapXtrueX_orderXlocalX_byXkeys_descXunfold(final Object v1Id) {
-            return g.V(v1Id).valueMap(true).order(Scope.local).by(keys, desc).unfold();
+        public Traversal<Vertex, Map.Entry<Object, Object>> get_g_VX1X_elementMap_orderXlocalX_byXkeys_descXunfold(final Object v1Id) {
+            return g.V(v1Id).elementMap().order(Scope.local).by(keys, desc).unfold();
         }
     }
 }