You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/09/03 17:33:48 UTC
[28/31] incubator-tinkerpop git commit: OrderTest updated to not do
an iffy situation where there is no solid defined contract on the behavior of
in Map serialized vertices.
OrderTest updated to not do an iffy situation where there is no solid defined contract on the behavior of in Map serialized vertices.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/bce3e8bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/bce3e8bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/bce3e8bd
Branch: refs/heads/master
Commit: bce3e8bd54cb7b7f27a2cfe11a4878d5bbcb473e
Parents: 04ba481
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Sep 2 15:49:40 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Sep 2 15:49:40 2015 -0600
----------------------------------------------------------------------
.../traversal/step/map/GroovyOrderTest.groovy | 4 ++--
.../process/traversal/step/map/OrderTest.java | 22 ++++++++++----------
2 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/bce3e8bd/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 69e354d..50eef57 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
@@ -83,8 +83,8 @@ public abstract class GroovyOrderTest {
}
@Override
- public Traversal<Vertex, Map<String, List<Vertex>>> get_g_V_group_byXlabelX_by_byXorderXlocalX_byXname_decrXX() {
- TraversalScriptHelper.compute("g.V.group.by(label).by.by(order(local).by('name', decr))", g)
+ public Traversal<Vertex, Map<String, List<Vertex>>> get_g_V_group_byXlabelX_byXnameX_byXorderXlocalX_byXdecrXX() {
+ TraversalScriptHelper.compute("g.V.group.by(label).by('name').by(order(local).by(decr))", g)
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/bce3e8bd/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 cd893fc..1da9969 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
@@ -68,7 +68,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Vertex> get_g_V_order_byXoutE_count__decrX();
- public abstract Traversal<Vertex, Map<String, List<Vertex>>> get_g_V_group_byXlabelX_by_byXorderXlocalX_byXname_decrXX();
+ public abstract Traversal<Vertex, Map<String, List<Vertex>>> get_g_V_group_byXlabelX_byXnameX_byXorderXlocalX_byXdecrXX();
@Test
@LoadGraphWith(MODERN)
@@ -224,22 +224,22 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_group_byXlabelX_by_byXorderXlocalX_byXname_decrXX() {
- final Traversal<Vertex, Map<String, List<Vertex>>> traversal = get_g_V_group_byXlabelX_by_byXorderXlocalX_byXname_decrXX();
+ public void g_V_group_byXlabelX_byXnameX_byXorderXlocalX_byXdecrXX() {
+ final Traversal<Vertex, Map<String, List<Vertex>>> traversal = get_g_V_group_byXlabelX_byXnameX_byXorderXlocalX_byXdecrXX();
printTraversalForm(traversal);
final Map<String, List<Vertex>> map = traversal.next();
assertFalse(traversal.hasNext());
assertEquals(2, map.size());
List list = map.get("software");
assertEquals(2, list.size());
- assertEquals(convertToVertex(graph, "lop"), list.get(1));
- assertEquals(convertToVertex(graph, "ripple"), list.get(0));
+ assertEquals("lop", list.get(1));
+ assertEquals("ripple", list.get(0));
list = map.get("person");
assertEquals(4, list.size());
- assertEquals(convertToVertex(graph, "josh"), list.get(3));
- assertEquals(convertToVertex(graph, "marko"), list.get(2));
- assertEquals(convertToVertex(graph, "peter"), list.get(1));
- assertEquals(convertToVertex(graph, "vadas"), list.get(0));
+ assertEquals("josh", list.get(3));
+ assertEquals("marko", list.get(2));
+ assertEquals("peter", list.get(1));
+ assertEquals("vadas", list.get(0));
}
public static class Traversals extends OrderTest {
@@ -299,8 +299,8 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map<String, List<Vertex>>> get_g_V_group_byXlabelX_by_byXorderXlocalX_byXname_decrXX() {
- return g.V().<String, List<Vertex>>group().by(T.label).by().by(__.order(Scope.local).by("name", Order.decr));
+ public Traversal<Vertex, Map<String, List<Vertex>>> get_g_V_group_byXlabelX_byXnameX_byXorderXlocalX_byXdecrXX() {
+ return g.V().<String, List<Vertex>>group().by(T.label).by("name").by(__.order(Scope.local).by(Order.decr));
}
}