You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/05/10 13:33:47 UTC

[08/13] incubator-tinkerpop git commit: Minor fixes to OrderTest inconsistencies.

Minor fixes to OrderTest inconsistencies.

Two tests had a "name" that did not exactly match the traversal being executed. Altered the traversals to match the name. The "bugs" were such that there was really no difference in the results. CTR


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

Branch: refs/heads/TINKERPOP-1293
Commit: c8901f37fd9fd8a5012abd10bd603569909dbd99
Parents: ea4a988
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 9 12:40:32 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 9 12:40:32 2016 -0400

----------------------------------------------------------------------
 .../gremlin/process/traversal/step/map/GroovyOrderTest.groovy    | 4 ++--
 .../tinkerpop/gremlin/process/traversal/step/map/OrderTest.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c8901f37/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
index d5a71e1..5b7ccea 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
@@ -46,7 +46,7 @@ public abstract class GroovyOrderTest {
 
         @Override
         public Traversal<Vertex, String> get_g_V_order_byXnameX_name() {
-            TraversalScriptHelper.compute("g.V.order.by('name', incr).name", g)
+            TraversalScriptHelper.compute("g.V.order.by('name').name", g)
         }
 
         @Override
@@ -67,7 +67,7 @@ public abstract class GroovyOrderTest {
         @Override
         public Traversal<Vertex, Map<Integer, Integer>> get_g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalues_decrX_byXkeys_incrX(
                 final Object v1Id) {
-            TraversalScriptHelper.compute("""g.V(v1Id).map {
+            TraversalScriptHelper.compute("""g.V(v1Id).hasLabel("person").map {
                 final Map map = [:];
                 map[1] = it.age;
                 map[2] = it.age * 2;

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c8901f37/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
----------------------------------------------------------------------
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 43fa5b7..ea7ffe1 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
@@ -362,7 +362,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
 
         @Override
         public Traversal<Vertex, String> get_g_V_order_byXnameX_name() {
-            return g.V().order().by("name", Order.incr).values("name");
+            return g.V().order().by("name").values("name");
         }
 
         @Override
@@ -384,7 +384,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
 
         @Override
         public Traversal<Vertex, Map<Integer, Integer>> get_g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalues_decrX_byXkeys_incrX(final Object v1Id) {
-            return g.V(v1Id).map(v -> {
+            return g.V(v1Id).hasLabel("person").map(v -> {
                 final Map<Integer, Integer> map = new HashMap<>();
                 map.put(1, (int) v.get().value("age"));
                 map.put(2, (int) v.get().value("age") * 2);