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:44:22 UTC
[1/2] incubator-tinkerpop git commit: test fix ups.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/newapi 96eef74f3 -> 03ea120ee
test fix ups.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/42e9245a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/42e9245a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/42e9245a
Branch: refs/heads/newapi
Commit: 42e9245aab183cb3f5b2b4917654d379ab63d260
Parents: ae392a4
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Mar 9 14:44:15 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Mar 9 14:44:15 2015 -0600
----------------------------------------------------------------------
.../graph/traversal/step/sideEffect/GraphStep.java | 4 ++++
.../org/apache/tinkerpop/gremlin/structure/EdgeTest.java | 2 +-
.../tinkerpop/gremlin/structure/SerializationTest.java | 8 ++++----
.../tinkerpop/gremlin/structure/VertexPropertyTest.java | 10 +++++-----
.../apache/tinkerpop/gremlin/structure/VertexTest.java | 6 +++---
.../gremlin/structure/strategy/SequenceStrategyTest.java | 4 ++--
6 files changed, 19 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/42e9245a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GraphStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GraphStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GraphStep.java
index ea06660..51582d9 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GraphStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GraphStep.java
@@ -49,6 +49,10 @@ public class GraphStep<S extends Element> extends StartStep<S> implements Engine
this.graph = graph;
this.returnClass = returnClass;
this.ids = ids;
+ for (int i = 0; i < this.ids.length; i++) {
+ if (this.ids[i] instanceof Element)
+ this.ids[i] = ((Element) this.ids[i]).id();
+ }
this.iteratorSupplier = () -> (Iterator<S>) (Vertex.class.isAssignableFrom(this.returnClass) ?
this.graph.vertices(this.ids) :
this.graph.edges(this.ids));
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/42e9245a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java
index 3256e91..1a1d9d4 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java
@@ -226,7 +226,7 @@ public class EdgeTest {
assertTrue(keys.contains("name"));
assertTrue(keys.contains("location"));
- e.properties().remove();
+ e.properties().forEachRemaining(Property::remove);
keys = e.keys();
assertEquals(0, keys.size());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/42e9245a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
index 02de2e0..373f50b 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
@@ -133,23 +133,23 @@ public class SerializationTest {
public void shouldSerializeVertexPropertyWithPropertiesAsDetached() throws Exception {
final GryoMapper gryoMapper = g.io().gryoMapper().create();
final Kryo kryo = gryoMapper.createMapper();
- final VertexProperty vp = g.vertices(convertToVertexId("marko")).next().properties("location").next();
+ final VertexProperty<?> vp = g.vertices(convertToVertexId("marko")).next().properties("location").next();
final ByteArrayOutputStream stream = new ByteArrayOutputStream();
final Output output = new Output(stream);
kryo.writeObject(output, vp);
output.close();
final Input input = new Input(stream.toByteArray());
- final VertexProperty detached = kryo.readObject(input, VertexProperty.class);
+ final VertexProperty<?> detached = kryo.readObject(input, VertexProperty.class);
input.close();
assertNotNull(detached);
assertEquals(vp.label(), detached.label());
assertEquals(vp.id(), detached.id());
assertEquals(vp.value(), detached.value());
assertEquals(vp.values("startTime").next(), detached.values("startTime").next());
- assertEquals(((VertexProperty) vp.properties("startTime").next()).key(), ((VertexProperty) detached.properties("startTime").next()).key());
+ assertEquals(vp.properties("startTime").next().key(), detached.properties("startTime").next().key());
assertEquals(vp.values("endTime").next(), detached.values("endTime").next());
- assertEquals(((VertexProperty) vp.properties("endTime").next()).key(), ((VertexProperty) detached.properties("endTime").next()).key());
+ assertEquals(vp.properties("endTime").next().key(), detached.properties("endTime").next().key());
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/42e9245a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java
index 7be6b02..c3eef9a 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java
@@ -153,7 +153,7 @@ public class VertexPropertyTest extends AbstractGremlinTest {
assertTrue(values.contains("marko a. rodriguez"));
assertTrue(values.contains("marko rodriguez"));
});
- v.properties("name").remove();
+ v.properties("name").forEachRemaining(Property::remove);
tryCommit(g, g -> {
assertEquals(0, IteratorUtils.count(v.properties()));
assertEquals(0, IteratorUtils.count(v.properties("name")));
@@ -186,7 +186,7 @@ public class VertexPropertyTest extends AbstractGremlinTest {
final Vertex u = g.addVertex("name", "marko", "name", "marko a. rodriguez", "name", "marko rodriguez");
tryCommit(g);
- u.properties().remove();
+ u.properties().forEachRemaining(Property::remove);
u.property(VertexProperty.Cardinality.single, "name", "okram", "acl", "private", "date", 2014);
tryCommit(g, g -> {
assertEquals(1, IteratorUtils.count(u.properties("name")));
@@ -312,11 +312,11 @@ public class VertexPropertyTest extends AbstractGremlinTest {
a.property("name").remove();
a.property("name").remove();
a.property("name").remove();
- b.properties("name").remove();
+ b.properties("name").forEachRemaining(Property::remove);
b.property("name").remove();
- b.properties("name").remove();
+ b.properties("name").forEachRemaining(Property::remove);
b.property("name").remove();
- b.properties("name").remove();
+ b.properties("name").forEachRemaining(Property::remove);
b.property("name").remove();
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/42e9245a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java
index 4c771ae..d952328 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexTest.java
@@ -219,7 +219,7 @@ public class VertexTest {
assertFalse(v.keys().contains("location"));
assertVertexEdgeCounts(1, 0).accept(g);
- v.properties("name").remove();
+ v.properties("name").forEachRemaining(Property::remove);
v.property("name", "marko rodriguez");
assertEquals(34, (int) v.value("age"));
assertEquals("marko rodriguez", v.<String>value("name"));
@@ -244,7 +244,7 @@ public class VertexTest {
v.property("location").remove();
assertVertexEdgeCounts(1, 0).accept(g);
assertEquals(2, IteratorUtils.count(v.properties()));
- v.properties().remove();
+ v.properties().forEachRemaining(Property::remove);
assertEquals(0, IteratorUtils.count(v.properties()));
assertVertexEdgeCounts(1, 0).accept(g);
}
@@ -397,7 +397,7 @@ public class VertexTest {
assertTrue(keys.contains("name"));
assertTrue(keys.contains("location"));
- v.properties().remove();
+ v.properties().forEachRemaining(Property::remove);
keys = v.keys();
assertEquals(0, keys.size());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/42e9245a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/SequenceStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/SequenceStrategyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/SequenceStrategyTest.java
index c79b6f4..5944794 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/SequenceStrategyTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/SequenceStrategyTest.java
@@ -433,7 +433,7 @@ public class SequenceStrategyTest extends AbstractGremlinTest {
// the implementation
assertEquals("working2", v.property("anonymous").value());
// now do something with that vertex after the fact
- v.properties("anonymous").remove();
+ v.properties("anonymous").forEachRemaining(Property::remove);
v.property("anonymous", "working1");
return v;
};
@@ -449,7 +449,7 @@ public class SequenceStrategyTest extends AbstractGremlinTest {
// the implementation
assertEquals("working3", v.property("anonymous").value());
// now do something with that vertex after the fact
- v.properties("anonymous").remove();
+ v.properties("anonymous").forEachRemaining(Property::remove);
v.property("anonymous", "working2");
return v;
};
[2/2] incubator-tinkerpop git commit: Merge branch 'newapi' of
https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop into newapi
Posted by ok...@apache.org.
Merge branch 'newapi' of https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop into newapi
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/03ea120e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/03ea120e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/03ea120e
Branch: refs/heads/newapi
Commit: 03ea120ee5fd76fc2bec0cff99d52342db2e10b6
Parents: 42e9245 96eef74
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Mar 9 14:44:18 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Mar 9 14:44:18 2015 -0600
----------------------------------------------------------------------
.../org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/03ea120e/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexPropertyTest.java
----------------------------------------------------------------------