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/04/15 19:47:40 UTC
[18/50] incubator-tinkerpop git commit: Add test of has() around id
for VertexProperty TINKERPOP3-581
Add test of has() around id for VertexProperty TINKERPOP3-581
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/13b936ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/13b936ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/13b936ec
Branch: refs/heads/variables
Commit: 13b936ec24bf68a880e64b8c68e6fcc76e50da12
Parents: cc0b848
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Apr 14 09:08:31 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 14 09:08:31 2015 -0400
----------------------------------------------------------------------
.../step/map/GroovyPropertiesTest.groovy | 19 +++++++++++----
.../tinkerpop/gremlin/AbstractGremlinTest.java | 15 ++++++++++++
.../traversal/step/map/PropertiesTest.java | 25 ++++++++++++++++++++
3 files changed, 55 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/13b936ec/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
index d9b1d9f..dc4c77c 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
@@ -18,6 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map
+import org.apache.tinkerpop.gremlin.process.traversal.T
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
@@ -34,12 +35,17 @@ public abstract class GroovyPropertiesTest {
@Override
public Traversal<Vertex, Object> get_g_V_hasXageX_propertiesXname_ageX_value() {
- g.V.has('age').properties('name', 'age').value;
+ g.V.has('age').properties('name', 'age').value
}
@Override
public Traversal<Vertex, Object> get_g_V_hasXageX_propertiesXage_nameX_value() {
- g.V.has('age').properties('age', 'name').value;
+ g.V.has('age').properties('age', 'name').value
+ }
+
+ @Override
+ public Traversal<Vertex, Object> get_g_V_hasXageX_properties_hasXid_nameIdX_value(final Object nameId) {
+ g.V.has('age').properties().has(T.id, nameId).value()
}
}
@@ -48,12 +54,17 @@ public abstract class GroovyPropertiesTest {
@Override
public Traversal<Vertex, Object> get_g_V_hasXageX_propertiesXname_ageX_value() {
- ComputerTestHelper.compute("g.V.has('age').properties('name', 'age').value", g);
+ ComputerTestHelper.compute("g.V.has('age').properties('name', 'age').value", g)
}
@Override
public Traversal<Vertex, Object> get_g_V_hasXageX_propertiesXage_nameX_value() {
- ComputerTestHelper.compute("g.V.has('age').properties('age', 'name').value", g);
+ ComputerTestHelper.compute("g.V.has('age').properties('age', 'name').value", g)
+ }
+
+ @Override
+ public Traversal<Vertex, Object> get_g_V_hasXageX_properties_hasXid_nameIdX_value(final Object nameId) {
+ ComputerTestHelper.compute("g.V.has('age').properties().has(T.id, $nameId).value()", g)
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/13b936ec/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
index c348a8b..a5f6a10 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
@@ -21,10 +21,12 @@ package org.apache.tinkerpop.gremlin;
import org.apache.commons.configuration.Configuration;
import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.junit.After;
import org.junit.Before;
@@ -159,6 +161,19 @@ public abstract class AbstractGremlinTest {
return graph.traversal().V().has("name", vertexName).next();
}
+ public GraphTraversal<Vertex, Object> convertToVertexPropertyId(final String vertexName, final String vertexPropertyKey) {
+ return convertToVertexPropertyId(graph, vertexName, vertexPropertyKey);
+ }
+
+ public GraphTraversal<Vertex, Object> convertToVertexPropertyId(final Graph g, final String vertexName, final String vertexPropertyKey) {
+ return convertToVertexProperty(g, vertexName, vertexPropertyKey).id();
+ }
+
+ public GraphTraversal<Vertex, VertexProperty<Object>> convertToVertexProperty(final Graph graph, final String vertexName, final String vertexPropertyKey) {
+ // all test graphs have "name" as a unique id which makes it easy to hardcode this...works for now
+ return (GraphTraversal<Vertex, VertexProperty<Object>>) graph.traversal().V().has("name", vertexName).properties(vertexPropertyKey);
+ }
+
public Object convertToEdgeId(final String outVertexName, String edgeLabel, final String inVertexName) {
return convertToEdgeId(graph, outVertexName, edgeLabel, inVertexName);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/13b936ec/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
index cf90191..355fef5 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
+import org.apache.tinkerpop.gremlin.process.traversal.T;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.UseEngine;
@@ -27,6 +28,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
import java.util.Arrays;
+import java.util.Collections;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
@@ -39,6 +41,8 @@ public abstract class PropertiesTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Object> get_g_V_hasXageX_propertiesXage_nameX_value();
+ public abstract Traversal<Vertex, Object> get_g_V_hasXageX_properties_hasXid_nameIdX_value(final Object nameId);
+
@Test
@LoadGraphWith(MODERN)
public void g_V_hasXageX_propertiesXname_ageX_value() {
@@ -48,6 +52,22 @@ public abstract class PropertiesTest extends AbstractGremlinProcessTest {
});
}
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_hasXageX_properties_hasXid_nameIdX_value() {
+ final Traversal<Vertex,Object> traversal = get_g_V_hasXageX_properties_hasXid_nameIdX_value(convertToVertexPropertyId("marko", "name").next());
+ printTraversalForm(traversal);
+ checkResults(Collections.singletonList("marko"), traversal);
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_hasXageX_properties_hasXid_nameIdAsStringX_value() {
+ final Traversal<Vertex,Object> traversal = get_g_V_hasXageX_properties_hasXid_nameIdX_value(convertToVertexPropertyId("marko", "name").next().toString());
+ printTraversalForm(traversal);
+ checkResults(Collections.singletonList("marko"), traversal);
+ }
+
@UseEngine(TraversalEngine.Type.STANDARD)
@UseEngine(TraversalEngine.Type.COMPUTER)
public static class Traversals extends PropertiesTest {
@@ -60,6 +80,11 @@ public abstract class PropertiesTest extends AbstractGremlinProcessTest {
public Traversal<Vertex, Object> get_g_V_hasXageX_propertiesXage_nameX_value() {
return g.V().has("age").properties("age", "name").value();
}
+
+ @Override
+ public Traversal<Vertex, Object> get_g_V_hasXageX_properties_hasXid_nameIdX_value(final Object nameId) {
+ return g.V().has("age").properties().has(T.id, nameId).value();
+ }
}
}