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 2015/05/16 01:14:15 UTC
[08/10] incubator-tinkerpop git commit: TINKERPOP3-670: Avoid ID's in
unit tests, since they're not vendor agnostic
TINKERPOP3-670: Avoid ID's in unit tests, since they're not vendor agnostic
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/d75567e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/d75567e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/d75567e3
Branch: refs/heads/master
Commit: d75567e3f1ad40ee634569b13672a175ce0b1f37
Parents: 45c8c76
Author: mhfrantz <mf...@redsealnetworks.com>
Authored: Fri May 8 06:30:43 2015 -0700
Committer: mhfrantz <mf...@redsealnetworks.com>
Committed: Fri May 15 14:14:45 2015 -0700
----------------------------------------------------------------------
.../traversal/step/filter/GroovyTailTest.groovy | 26 ++---
.../process/traversal/step/filter/TailTest.java | 116 +++++++++----------
2 files changed, 71 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/d75567e3/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyTailTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyTailTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyTailTest.groovy
index a9fde91..e20286a 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyTailTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyTailTest.groovy
@@ -38,42 +38,42 @@ public abstract class GroovyTailTest {
public static class Traversals extends TailTest {
@Override
- public Traversal<Vertex, Object> get_g_V_id_order_tailXglobal_2X() {
- g.V.id.order.tail(global, 2)
+ public Traversal<Vertex, String> get_g_V_valuesXnameX_order_tailXglobal_2X() {
+ g.V.values('name').order.tail(global, 2)
}
@Override
- public Traversal<Vertex, Object> get_g_V_id_order_tailX2X() {
- g.V.id.order.tail(2)
+ public Traversal<Vertex, String> get_g_V_valuesXnameX_order_tailX2X() {
+ g.V.values('name').order.tail(2)
}
@Override
- public Traversal<Vertex, Object> get_g_V_id_order_tailX7X() {
- g.V.id.order.tail(7)
+ public Traversal<Vertex, String> get_g_V_valuesXnameX_order_tailX7X() {
+ g.V.values('name').order.tail(7)
}
@Override
- public Traversal<Vertex, List<Object>> get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_id_foldX_tailXlocal_2X() {
- g.V.as('a').out.as('a').out.as('a').select('a').by(unfold().id.fold).tail(local, 2)
+ public Traversal<Vertex, List<String>> get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_valuesXnameX_foldX_tailXlocal_2X() {
+ g.V.as('a').out.as('a').out.as('a').select('a').by(unfold().values('name').fold).tail(local, 2)
}
@Override
- public Traversal<Vertex, Object> get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_id_foldX_tailXlocal_1X() {
- g.V.as('a').out.as('a').out.as('a').select('a').by(unfold().id.fold).tail(local, 1)
+ public Traversal<Vertex, String> get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_valuesXnameX_foldX_tailXlocal_1X() {
+ g.V.as('a').out.as('a').out.as('a').select('a').by(unfold().values('name').fold).tail(local, 1)
}
@Override
- public Traversal<Vertex, Object> get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXlimitXlocal_0XX_tailXlocal_1X() {
+ public Traversal<Vertex, String> get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXlimitXlocal_0XX_tailXlocal_1X() {
g.V.as('a').out.as('a').out.as('a').select('a').by(limit(local, 0)).tail(local, 1)
}
@Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_asXaX_out_asXbX_out_asXcX_select_byXT_idX_tailXlocal_2X() {
+ public Traversal<Vertex, Map<String, String>> get_g_V_asXaX_out_asXbX_out_asXcX_select_byXnameX_tailXlocal_2X() {
g.V.as('a').out.as('b').out.as('c').select.by(T.id).tail(local, 2)
}
@Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_asXaX_out_asXbX_out_asXcX_select_byXT_idX_tailXlocal_1X() {
+ public Traversal<Vertex, Map<String, String>> get_g_V_asXaX_out_asXbX_out_asXcX_select_byXnameX_tailXlocal_1X() {
g.V.as('a').out.as('b').out.as('c').select.by(T.id).tail(local, 1)
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/d75567e3/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TailTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TailTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TailTest.java
index 26ed69d..f023d58 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TailTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TailTest.java
@@ -48,71 +48,71 @@ import java.util.Set;
@RunWith(GremlinProcessRunner.class)
public abstract class TailTest extends AbstractGremlinProcessTest {
- public abstract Traversal<Vertex, Object> get_g_V_id_order_tailXglobal_2X();
+ public abstract Traversal<Vertex, String> get_g_V_valuesXnameX_order_tailXglobal_2X();
- public abstract Traversal<Vertex, Object> get_g_V_id_order_tailX2X();
+ public abstract Traversal<Vertex, String> get_g_V_valuesXnameX_order_tailX2X();
- public abstract Traversal<Vertex, Object> get_g_V_id_order_tailX7X();
+ public abstract Traversal<Vertex, String> get_g_V_valuesXnameX_order_tailX7X();
- public abstract Traversal<Vertex, List<Object>> get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_id_foldX_tailXlocal_2X();
+ public abstract Traversal<Vertex, List<String>> get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_valuesXnameX_foldX_tailXlocal_2X();
- public abstract Traversal<Vertex, Object> get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_id_foldX_tailXlocal_1X();
+ public abstract Traversal<Vertex, String> get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_valuesXnameX_foldX_tailXlocal_1X();
- public abstract Traversal<Vertex, Object> get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXlimitXlocal_0XX_tailXlocal_1X();
+ public abstract Traversal<Vertex, String> get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXlimitXlocal_0XX_tailXlocal_1X();
- public abstract Traversal<Vertex, Map<String, Object>> get_g_V_asXaX_out_asXbX_out_asXcX_select_byXT_idX_tailXlocal_2X();
+ public abstract Traversal<Vertex, Map<String, String>> get_g_V_asXaX_out_asXbX_out_asXcX_select_byXnameX_tailXlocal_2X();
- public abstract Traversal<Vertex, Map<String, Object>> get_g_V_asXaX_out_asXbX_out_asXcX_select_byXT_idX_tailXlocal_1X();
+ public abstract Traversal<Vertex, Map<String, String>> get_g_V_asXaX_out_asXbX_out_asXcX_select_byXnameX_tailXlocal_1X();
/** Scenario: Global scope */
@Test
@LoadGraphWith(MODERN)
- public void g_V_id_order_tailXglobal_2X() {
- final Traversal<Vertex, Object> traversal = get_g_V_id_order_tailXglobal_2X();
+ public void g_V_valuesXnameX_order_tailXglobal_2X() {
+ final Traversal<Vertex, String> traversal = get_g_V_valuesXnameX_order_tailXglobal_2X();
printTraversalForm(traversal);
- assertEquals(Arrays.asList(5, 6), traversal.toList());
+ assertEquals(Arrays.asList("ripple", "vadas"), traversal.toList());
}
/** Scenario: Default scope is global */
@Test
@LoadGraphWith(MODERN)
- public void g_V_id_order_tailX2X() {
- final Traversal<Vertex, Object> traversal = get_g_V_id_order_tailX2X();
+ public void g_V_valuesXnameX_order_tailX2X() {
+ final Traversal<Vertex, String> traversal = get_g_V_valuesXnameX_order_tailX2X();
printTraversalForm(traversal);
- assertEquals(Arrays.asList(5, 6), traversal.toList());
+ assertEquals(Arrays.asList("ripple", "vadas"), traversal.toList());
}
/** Scenario: Global scope, not enough elements */
@Test
@LoadGraphWith(MODERN)
- public void g_V_id_order_tailX7X() {
- final Traversal<Vertex, Object> traversal = get_g_V_id_order_tailX7X();
+ public void g_V_valuesXnameX_order_tailX7X() {
+ final Traversal<Vertex, String> traversal = get_g_V_valuesXnameX_order_tailX7X();
printTraversalForm(traversal);
- assertEquals(Arrays.asList(1, 2, 3, 4, 5, 6), traversal.toList());
+ assertEquals(Arrays.asList("josh", "lop", "marko", "peter", "ripple", "vadas"), traversal.toList());
}
/** Scenario: Local scope, List input, N>1 */
@Test
@LoadGraphWith(MODERN)
- public void g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_id_foldX_tailXlocal_2X() {
- final Traversal<Vertex, List<Object>> traversal = get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_id_foldX_tailXlocal_2X();
+ public void g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_valuesXnameX_foldX_tailXlocal_2X() {
+ final Traversal<Vertex, List<String>> traversal = get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_valuesXnameX_foldX_tailXlocal_2X();
printTraversalForm(traversal);
- final Set<List<Object>> expected =
+ final Set<List<String>> expected =
new HashSet(Arrays.asList(
- Arrays.asList(4, 5),
- Arrays.asList(4, 3)));
- final Set<List<Object>> actual = new HashSet(traversal.toList());
+ Arrays.asList("josh", "ripple"),
+ Arrays.asList("josh", "lop")));
+ final Set<List<String>> actual = new HashSet(traversal.toList());
assertEquals(expected, actual);
}
/** Scenario: Local scope, List input, N=1 */
@Test
@LoadGraphWith(MODERN)
- public void g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_id_foldX_tailXlocal_1X() {
- final Traversal<Vertex, Object> traversal = get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_id_foldX_tailXlocal_1X();
+ public void g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_valuesXnameX_foldX_tailXlocal_1X() {
+ final Traversal<Vertex, String> traversal = get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_valuesXnameX_foldX_tailXlocal_1X();
printTraversalForm(traversal);
- final Set<Object> expected = new HashSet(Arrays.asList(5, 3));
- final Set<Object> actual = new HashSet(traversal.toList());
+ final Set<String> expected = new HashSet(Arrays.asList("ripple", "lop"));
+ final Set<String> actual = new HashSet(traversal.toList());
assertEquals(expected, actual);
}
@@ -120,79 +120,79 @@ public abstract class TailTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXlimitXlocal_0XX_tailXlocal_1X() {
- final Traversal<Vertex, Object> traversal = get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXlimitXlocal_0XX_tailXlocal_1X();
+ final Traversal<Vertex, String> traversal = get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXlimitXlocal_0XX_tailXlocal_1X();
printTraversalForm(traversal);
- final Set<Object> expected = new HashSet();
- final Set<Object> actual = new HashSet(traversal.toList());
+ final Set<String> expected = new HashSet();
+ final Set<String> actual = new HashSet(traversal.toList());
assertEquals(expected, actual);
}
/** Scenario: Local scope, Map input, N>1 */
@Test
@LoadGraphWith(MODERN)
- public void g_V_asXaX_out_asXbX_out_asXcX_select_byXT_idX_tailXlocal_2X() {
- final Traversal<Vertex, Map<String, Object>> traversal = get_g_V_asXaX_out_asXbX_out_asXcX_select_byXT_idX_tailXlocal_2X();
+ public void g_V_asXaX_out_asXbX_out_asXcX_select_byXnameX_tailXlocal_2X() {
+ final Traversal<Vertex, Map<String, String>> traversal = get_g_V_asXaX_out_asXbX_out_asXcX_select_byXnameX_tailXlocal_2X();
printTraversalForm(traversal);
- final Set<Map<String, Object>> expected = new HashSet(makeMapList(2,
- "b", 4, "c", 5,
- "b", 4, "c", 3));
- final Set<Map<String, Object>> actual = new HashSet(traversal.toList());
+ final Set<Map<String, String>> expected = new HashSet(makeMapList(2,
+ "b", "josh", "c", "ripple",
+ "b", "josh", "c", "lop"));
+ final Set<Map<String, String>> actual = new HashSet(traversal.toList());
assertEquals(expected, actual);
}
/** Scenario: Local scope, Map input, N=1 */
@Test
@LoadGraphWith(MODERN)
- public void g_V_asXaX_out_asXbX_out_asXcX_select_byXT_idX_tailXlocal_1X() {
- final Traversal<Vertex, Map<String, Object>> traversal = get_g_V_asXaX_out_asXbX_out_asXcX_select_byXT_idX_tailXlocal_1X();
+ public void g_V_asXaX_out_asXbX_out_asXcX_select_byXnameX_tailXlocal_1X() {
+ final Traversal<Vertex, Map<String, String>> traversal = get_g_V_asXaX_out_asXbX_out_asXcX_select_byXnameX_tailXlocal_1X();
printTraversalForm(traversal);
- final Set<Map<String, Object>> expected = new HashSet(makeMapList(1,
- "c", 5,
- "c", 3));
- final Set<Map<String, Object>> actual = new HashSet(traversal.toList());
+ final Set<Map<String, String>> expected = new HashSet(makeMapList(1,
+ "c", "ripple",
+ "c", "lop"));
+ final Set<Map<String, String>> actual = new HashSet(traversal.toList());
assertEquals(expected, actual);
}
public static class Traversals extends TailTest {
@Override
- public Traversal<Vertex, Object> get_g_V_id_order_tailXglobal_2X() {
- return g.V().id().order().tail(global, 2);
+ public Traversal<Vertex, String> get_g_V_valuesXnameX_order_tailXglobal_2X() {
+ return g.V().<String>values("name").order().tail(global, 2);
}
@Override
- public Traversal<Vertex, Object> get_g_V_id_order_tailX2X() {
- return g.V().id().order().tail(2);
+ public Traversal<Vertex, String> get_g_V_valuesXnameX_order_tailX2X() {
+ return g.V().<String>values("name").order().tail(2);
}
@Override
- public Traversal<Vertex, Object> get_g_V_id_order_tailX7X() {
- return g.V().id().order().tail(7);
+ public Traversal<Vertex, String> get_g_V_valuesXnameX_order_tailX7X() {
+ return g.V().<String>values("name").order().tail(7);
}
@Override
- public Traversal<Vertex, List<Object>> get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_id_foldX_tailXlocal_2X() {
- return g.V().as("a").out().as("a").out().as("a").<List<Object>>select("a").by(unfold().id().fold()).tail(local, 2);
+ public Traversal<Vertex, List<String>> get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_valuesXnameX_foldX_tailXlocal_2X() {
+ return g.V().as("a").out().as("a").out().as("a").<List<String>>select("a").by(unfold().values("name").fold()).tail(local, 2);
}
@Override
- public Traversal<Vertex, Object> get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_id_foldX_tailXlocal_1X() {
- return g.V().as("a").out().as("a").out().as("a").<Object>select("a").by(unfold().id().fold()).tail(local, 1);
+ public Traversal<Vertex, String> get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_valuesXnameX_foldX_tailXlocal_1X() {
+ return g.V().as("a").out().as("a").out().as("a").<String>select("a").by(unfold().values("name").fold()).tail(local, 1);
}
@Override
- public Traversal<Vertex, Object> get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXlimitXlocal_0XX_tailXlocal_1X() {
- return g.V().as("a").out().as("a").out().as("a").<Object>select("a").by(limit(local, 0)).tail(local, 1);
+ public Traversal<Vertex, String> get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXlimitXlocal_0XX_tailXlocal_1X() {
+ return g.V().as("a").out().as("a").out().as("a").<String>select("a").by(limit(local, 0)).tail(local, 1);
}
@Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_asXaX_out_asXbX_out_asXcX_select_byXT_idX_tailXlocal_2X() {
- return g.V().as("a").out().as("b").out().as("c").<Object>select().by(T.id).tail(local, 2);
+ public Traversal<Vertex, Map<String, String>> get_g_V_asXaX_out_asXbX_out_asXcX_select_byXnameX_tailXlocal_2X() {
+ return g.V().as("a").out().as("b").out().as("c").<String>select().by("name").tail(local, 2);
}
@Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_asXaX_out_asXbX_out_asXcX_select_byXT_idX_tailXlocal_1X() {
- return g.V().as("a").out().as("b").out().as("c").<Object>select().by(T.id).tail(local, 1);
+ public Traversal<Vertex, Map<String, String>> get_g_V_asXaX_out_asXbX_out_asXcX_select_byXnameX_tailXlocal_1X() {
+ return g.V().as("a").out().as("b").out().as("c").<String>select().by("name").tail(local, 1);
}
}
}