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/03/09 21:19:36 UTC
incubator-tinkerpop git commit: BatchTest and FeatureSupportTest
complete.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/newapi b18aad460 -> bb14d7a80
BatchTest and FeatureSupportTest complete.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/bb14d7a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/bb14d7a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/bb14d7a8
Branch: refs/heads/newapi
Commit: bb14d7a80dfc3083133be2c7a5978eeb488d90ad
Parents: b18aad4
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Mar 9 14:19:32 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Mar 9 14:19:32 2015 -0600
----------------------------------------------------------------------
.../tinkerpop/gremlin/structure/BatchTest.java | 65 ++++++++++----------
.../gremlin/structure/FeatureSupportTest.java | 6 +-
2 files changed, 37 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/bb14d7a8/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/BatchTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/BatchTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/BatchTest.java
index 100023a..38f5913 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/BatchTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/BatchTest.java
@@ -25,8 +25,11 @@ import org.apache.tinkerpop.gremlin.GraphManager;
import org.apache.tinkerpop.gremlin.process.T;
import org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph;
import org.apache.tinkerpop.gremlin.structure.util.batch.Exists;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.junit.Test;
+import java.util.List;
+
import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_USER_SUPPLIED_IDS;
import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures.FEATURE_INTEGER_VALUES;
import static org.junit.Assert.*;
@@ -57,7 +60,7 @@ public class BatchTest extends AbstractGremlinTest {
final Vertex vStephen = g.V().has("name", "stephen").next();
assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(1), vStephen.outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
+ assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
final Vertex vMarko = g.V().has("name", "marko").next();
assertEquals(29, vMarko.property("age").value());
@@ -80,7 +83,7 @@ public class BatchTest extends AbstractGremlinTest {
final Vertex vStephen = g.V().has("name", "stephen").next();
assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(1), vStephen.outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
+ assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
final Vertex vMarko = g.V().has("name", "marko").next();
assertEquals(29, vMarko.property("age").value());
@@ -140,7 +143,7 @@ public class BatchTest extends AbstractGremlinTest {
final Vertex vStephen = g.V().has("name", "stephen").next();
assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(1), vStephen.outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
+ assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
final Vertex vMarko = g.V().has("name", "marko").next();
assertEquals(34, vMarko.property("age").value());
@@ -163,7 +166,7 @@ public class BatchTest extends AbstractGremlinTest {
final Vertex vStephen = g.V().has("name", "stephen").next();
assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(1), vStephen.outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
+ assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
final Vertex vMarko = g.V().has("name", "marko").next();
assertEquals(34, vMarko.property("age").value());
@@ -175,7 +178,7 @@ public class BatchTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = Graph.Features.EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS)
public void shouldLoadVerticesIncrementallyWithSuppliedIdentifierOverwriteExistingVertex() {
- final BatchGraph graph = BatchGraph.build(g)
+ final BatchGraph<?> graph = BatchGraph.build(g)
.incrementalLoading(true, Exists.OVERWRITE, Exists.IGNORE)
.bufferSize(1).create();
final Object id1 = GraphManager.getGraphProvider().convertId("1");
@@ -188,13 +191,13 @@ public class BatchTest extends AbstractGremlinTest {
final Vertex vStephen = g.V().has("name", "stephen").next();
assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(1), vStephen.outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
+ assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
final Vertex vMarko = g.V().has("name", "marko").next();
- assertEquals(2, vMarko.properties("age").count().next().intValue());
- assertEquals(2, vMarko.properties("name").count().next().intValue());
- assertTrue(vMarko.valueMap().next().get("age").contains(29));
- assertTrue(vMarko.valueMap().next().get("age").contains(34));
+ assertEquals(2, IteratorUtils.count(vMarko.properties("age")));
+ assertEquals(2, IteratorUtils.count(vMarko.properties("name")));
+ assertTrue(((List) g.V(vMarko).valueMap().next().get("age")).contains(29));
+ assertTrue(((List) g.V(vMarko).valueMap().next().get("age")).contains(34));
}
@Test
@@ -215,13 +218,13 @@ public class BatchTest extends AbstractGremlinTest {
final Vertex vStephen = g.V().has("name", "stephen").next();
assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(1), vStephen.outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
+ assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
final Vertex vMarko = g.V().has("name", "marko").next();
- assertEquals(2, vMarko.properties("age").count().next().intValue());
- assertEquals(2, vMarko.properties("name").count().next().intValue());
- assertTrue(vMarko.valueMap().next().get("age").contains(29));
- assertTrue(vMarko.valueMap().next().get("age").contains(34));
+ assertEquals(2, IteratorUtils.count(vMarko.properties("age")));
+ assertEquals(2, IteratorUtils.count(vMarko.properties("name")));
+ assertTrue(((List) g.V(vMarko).valueMap().next().get("age")).contains(29));
+ assertTrue(((List) g.V(vMarko).valueMap().next().get("age")).contains(34));
}
@Test
@@ -245,8 +248,8 @@ public class BatchTest extends AbstractGremlinTest {
final Vertex vStephen = g.V().has("name", "stephen").next();
assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(1), vStephen.outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
- assertEquals(new Long(0), vStephen.outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
+ assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
+ assertEquals(new Long(0), g.V(vStephen).outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
final Vertex vMarko = g.V().has("name", "marko").next();
assertEquals(29, vMarko.property("age").value());
@@ -270,8 +273,8 @@ public class BatchTest extends AbstractGremlinTest {
final Vertex vStephen = g.V().has("name", "stephen").next();
assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(1), vStephen.outE("knows").has("uid", "abcde").has("weight", 1.0d).inV().has("name", "marko").count().next());
- assertEquals(new Long(0), vStephen.outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
+ assertEquals(new Long(1), g.V(vStephen).outE("knows").has("uid", "abcde").has("weight", 1.0d).inV().has("name", "marko").count().next());
+ assertEquals(new Long(0), g.V(vStephen).outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
final Vertex vMarko = g.V().has("name", "marko").next();
assertEquals(29, vMarko.property("age").value());
@@ -296,8 +299,8 @@ public class BatchTest extends AbstractGremlinTest {
final Vertex vStephen = g.V().has("name", "stephen").next();
assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(0), vStephen.outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
- assertEquals(new Long(1), vStephen.outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
+ assertEquals(new Long(0), g.V(vStephen).outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
+ assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
final Vertex vMarko = g.V().has("name", "marko").next();
assertEquals(29, vMarko.property("age").value());
@@ -321,8 +324,8 @@ public class BatchTest extends AbstractGremlinTest {
final Vertex vStephen = g.V().has("name", "stephen").next();
assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(0), vStephen.outE("knows").has("uid", "abcde").has("weight", 1.0d).inV().has("name", "marko").count().next());
- assertEquals(new Long(1), vStephen.outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
+ assertEquals(new Long(0), g.V(vStephen).outE("knows").has("uid", "abcde").has("weight", 1.0d).inV().has("name", "marko").count().next());
+ assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
final Vertex vMarko = g.V().has("name", "marko").next();
assertEquals(29, vMarko.property("age").value());
@@ -347,8 +350,8 @@ public class BatchTest extends AbstractGremlinTest {
final Vertex vStephen = g.V().has("name", "stephen").next();
assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(0), vStephen.outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
- assertEquals(new Long(1), vStephen.outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
+ assertEquals(new Long(0), g.V(vStephen).outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
+ assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
final Vertex vMarko = g.V().has("name", "marko").next();
assertEquals(29, vMarko.property("age").value());
@@ -372,8 +375,8 @@ public class BatchTest extends AbstractGremlinTest {
final Vertex vStephen = g.V().has("name", "stephen").next();
assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(0), vStephen.outE("knows").has("uid", "abcde").has("weight", 1.0d).inV().has("name", "marko").count().next());
- assertEquals(new Long(1), vStephen.outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
+ assertEquals(new Long(0), g.V(vStephen).outE("knows").has("uid", "abcde").has("weight", 1.0d).inV().has("name", "marko").count().next());
+ assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
final Vertex vMarko = g.V().has("name", "marko").next();
assertEquals(29, vMarko.property("age").value());
@@ -439,8 +442,8 @@ public class BatchTest extends AbstractGremlinTest {
final Vertex vStephen = g.V().has("name", "stephen").next();
assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(1), vStephen.outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
- assertEquals(new Long(1), vStephen.outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
+ assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
+ assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
final Vertex vMarko = g.V().has("name", "marko").next();
assertEquals(29, vMarko.property("age").value());
@@ -464,8 +467,8 @@ public class BatchTest extends AbstractGremlinTest {
final Vertex vStephen = g.V().has("name", "stephen").next();
assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(1), vStephen.outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
- assertEquals(new Long(1), vStephen.outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
+ assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
+ assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
final Vertex vMarko = g.V().has("name", "marko").next();
assertEquals(29, vMarko.property("age").value());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/bb14d7a8/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java
index 29a3d8a..d8fc09d 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/FeatureSupportTest.java
@@ -29,7 +29,7 @@ import org.apache.tinkerpop.gremlin.structure.Graph.Features.EdgePropertyFeature
import org.apache.tinkerpop.gremlin.structure.Graph.Features.GraphFeatures;
import org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures;
import org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures;
-import org.apache.tinkerpop.gremlin.util.StreamFactory;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
@@ -748,7 +748,7 @@ public class FeatureSupportTest {
public void shouldSupportMultiPropertyIfTheSameKeyCanBeAssignedMoreThanOnce() throws Exception {
try {
final Vertex v = g.addVertex("name", "stephen", "name", "steve");
- if (StreamFactory.stream(v.iterators().propertyIterator()).count() == 2)
+ if (2 == IteratorUtils.count(v.properties()))
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), VertexFeatures.FEATURE_MULTI_PROPERTIES));
} catch (Exception ex) {
validateException(VertexProperty.Exceptions.multiPropertiesNotSupported(), ex);
@@ -793,7 +793,7 @@ public class FeatureSupportTest {
public void shouldSupportMetaPropertyIfPropertiesHaveAnIteratorViaVertexProperty() throws Exception {
try {
final Vertex v = g.addVertex("name", "stephen");
- v.property("name").iterators();
+ v.property("name").properties();
fail(String.format(INVALID_FEATURE_SPECIFICATION, VertexFeatures.class.getSimpleName(), VertexFeatures.FEATURE_META_PROPERTIES));
} catch (Exception ex) {
validateException(VertexProperty.Exceptions.metaPropertiesNotSupported(), ex);