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/03/11 19:26:34 UTC
[18/50] [abbrv] incubator-tinkerpop git commit: yet more.
yet more.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/94cc1de2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/94cc1de2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/94cc1de2
Branch: refs/heads/master
Commit: 94cc1de2380e5690824ef9d391edbba42cccfdf6
Parents: 43ae572
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Mar 9 15:24:15 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Mar 9 15:26:34 2015 -0600
----------------------------------------------------------------------
.../ranking/PageRankVertexProgramTest.java | 5 ++---
.../computer/util/ComputerDataStrategyTest.java | 6 +++---
.../util/detached/DetachedVertexTest.java | 18 +++++++++---------
3 files changed, 14 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/94cc1de2/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/PageRankVertexProgramTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/PageRankVertexProgramTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/PageRankVertexProgramTest.java
index 49264d7..c5cb3d1 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/PageRankVertexProgramTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/PageRankVertexProgramTest.java
@@ -38,9 +38,8 @@ public class PageRankVertexProgramTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void shouldExecutePageRank() throws Exception {
- final ComputerResult result = g.compute().program(PageRankVertexProgram.build().create()).submit().get();
- //result.graph().engine(StandardTraversalEngine.standard);
- result.graph().V().forEachRemaining(v -> {
+ final ComputerResult result = graph.compute().program(PageRankVertexProgram.build().create()).submit().get();
+ result.graph().traversal().V().forEachRemaining(v -> {
assertTrue(v.keys().contains("name"));
assertFalse(v.keys().contains(PageRankVertexProgram.PAGE_RANK));
final String name = v.value("name");
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/94cc1de2/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ComputerDataStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ComputerDataStrategyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ComputerDataStrategyTest.java
index 582d6bf..c9e95b6 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ComputerDataStrategyTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ComputerDataStrategyTest.java
@@ -44,7 +44,7 @@ public class ComputerDataStrategyTest extends AbstractGremlinTest {
@Test
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
public void shouldFilterHiddenProperties() {
- final StrategyGraph sg = g.strategy(new ComputerDataStrategy(new HashSet<>(Arrays.asList("***hidden-guy"))));
+ final StrategyGraph sg = graph.strategy(new ComputerDataStrategy(new HashSet<>(Arrays.asList("***hidden-guy"))));
final Vertex v = sg.addVertex("***hidden-guy", "X", "not-hidden-guy", "Y");
final Iterator<VertexProperty<String>> props = v.properties();
@@ -61,7 +61,7 @@ public class ComputerDataStrategyTest extends AbstractGremlinTest {
@Test
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
public void shouldAccessHiddenProperties() {
- final StrategyGraph sg = g.strategy(new ComputerDataStrategy(new HashSet<>(Arrays.asList("***hidden-guy"))));
+ final StrategyGraph sg = graph.strategy(new ComputerDataStrategy(new HashSet<>(Arrays.asList("***hidden-guy"))));
final Vertex v = sg.addVertex("***hidden-guy", "X", "not-hidden-guy", "Y");
final Iterator<VertexProperty<String>> props = v.properties("***hidden-guy");
@@ -78,7 +78,7 @@ public class ComputerDataStrategyTest extends AbstractGremlinTest {
@Test
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
public void shouldHideHiddenKeys() {
- final StrategyGraph sg = g.strategy(new ComputerDataStrategy(new HashSet<>(Arrays.asList("***hidden-guy"))));
+ final StrategyGraph sg = graph.strategy(new ComputerDataStrategy(new HashSet<>(Arrays.asList("***hidden-guy"))));
final Vertex v = sg.addVertex("***hidden-guy", "X", "not-hidden-guy", "Y");
final Set<String> keys = v.keys();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/94cc1de2/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexTest.java
index bbb8e0a..3df9810 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexTest.java
@@ -46,7 +46,7 @@ public class DetachedVertexTest extends AbstractGremlinTest {
@Test
@FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY)
public void shouldNotConstructNewWithSomethingAlreadyDetached() {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final DetachedVertex dv = DetachedFactory.detach(v, true);
assertSame(dv, DetachedFactory.detach(dv, true));
}
@@ -54,7 +54,7 @@ public class DetachedVertexTest extends AbstractGremlinTest {
@Test
@FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY)
public void shouldConstructDetachedVertex() {
- final Vertex v = g.addVertex("test", "123");
+ final Vertex v = graph.addVertex("test", "123");
final DetachedVertex detachedVertex = DetachedFactory.detach(v, true);
assertEquals(v.id(), detachedVertex.id());
@@ -66,7 +66,7 @@ public class DetachedVertexTest extends AbstractGremlinTest {
@Test
@FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY)
public void shouldConstructDetachedVertexAsReference() {
- final Vertex v = g.addVertex("test", "123", "test", "321");
+ final Vertex v = graph.addVertex("test", "123", "test", "321");
final DetachedVertex detachedVertex = DetachedFactory.detach(v, false);
assertEquals(v.id(), detachedVertex.id());
@@ -77,7 +77,7 @@ public class DetachedVertexTest extends AbstractGremlinTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.CREW)
public void shouldDetachVertexWithMultiPropertiesAndMetaProperties() {
- final DetachedVertex v1 = DetachedFactory.detach(convertToVertex(g, "marko"), true);
+ final DetachedVertex v1 = DetachedFactory.detach(convertToVertex(graph, "marko"), true);
assertEquals("person", v1.label());
assertEquals(2, v1.keys().size());
@@ -121,7 +121,7 @@ public class DetachedVertexTest extends AbstractGremlinTest {
public void shouldAttachToGraph() {
final Vertex toDetach = g.V(convertToVertexId("josh")).next();
final DetachedVertex detachedVertex = DetachedFactory.detach(toDetach, true);
- final Vertex attached = detachedVertex.attach(g);
+ final Vertex attached = detachedVertex.attach(graph);
assertEquals(toDetach, attached);
assertFalse(attached instanceof DetachedVertex);
@@ -144,7 +144,7 @@ public class DetachedVertexTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = Graph.Features.EdgePropertyFeatures.FEATURE_INTEGER_VALUES)
public void shouldNotEvaluateToEqualDifferentId() {
final DetachedVertex originalMarko = DetachedFactory.detach(g.V(convertToVertexId("marko")).next(), true);
- final Vertex secondMarko = g.addVertex("name", "marko", "age", 29);
+ final Vertex secondMarko = graph.addVertex("name", "marko", "age", 29);
assertFalse(DetachedFactory.detach(secondMarko, true).equals(originalMarko));
}
@@ -235,7 +235,7 @@ public class DetachedVertexTest extends AbstractGremlinTest {
@Test(expected = UnsupportedOperationException.class)
@FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY)
public void shouldNotAllowAddEdge() {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final DetachedVertex detachedVertex = DetachedFactory.detach(v, true);
detachedVertex.addEdge("test", null);
}
@@ -243,7 +243,7 @@ public class DetachedVertexTest extends AbstractGremlinTest {
@Test(expected = UnsupportedOperationException.class)
@FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY)
public void shouldNotAllowSetProperty() {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final DetachedVertex detachedVertex = DetachedFactory.detach(v, true);
detachedVertex.property("test", "test");
}
@@ -251,7 +251,7 @@ public class DetachedVertexTest extends AbstractGremlinTest {
@Test(expected = UnsupportedOperationException.class)
@FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY)
public void shouldNotAllowRemove() {
- final Vertex v = g.addVertex();
+ final Vertex v = graph.addVertex();
final DetachedVertex detachedVertex = DetachedFactory.detach(v, true);
detachedVertex.remove();
}