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 2016/08/22 21:43:49 UTC
[1/2] tinkerpop git commit: if property id is number,
coerce to Long else use the id. CTR.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1278 67b4d1133 -> f44bad526
if property id is number, coerce to Long else use the id. CTR.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4daefb37
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4daefb37
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4daefb37
Branch: refs/heads/TINKERPOP-1278
Commit: 4daefb37a2fabc5fd17bf1ab4d98f6b814c0ff09
Parents: f929db0
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Aug 22 14:36:51 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Aug 22 14:54:29 2016 -0600
----------------------------------------------------------------------
.../gremlin/process/traversal/step/map/PropertiesTest.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4daefb37/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 9cc08b1..b5b4310 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
@@ -98,12 +98,14 @@ public abstract class PropertiesTest extends AbstractGremlinProcessTest {
keys.add(vertexProperty.key());
values.add(vertexProperty.value());
ids.add(vertexProperty.id());
+ Object id = vertexProperty.id();
+ id = id instanceof Number ? ((Number) id).longValue() : id;
+ Object otherId = convertToVertex(graph, vertexProperty.value()).property("name").id();
+ otherId = otherId instanceof Number ? ((Number) otherId).longValue() : otherId;
+ assertEquals(otherId, id);
assertEquals("name", vertexProperty.key());
assertEquals(convertToVertex(graph, vertexProperty.value()).values("name").next(), vertexProperty.value());
assertEquals(convertToVertex(graph, vertexProperty.value()).value("name"), vertexProperty.value());
- assertEquals(convertToVertex(graph, vertexProperty.value()).properties("name").next().id(), vertexProperty.id());
- assertEquals(convertToVertex(graph, vertexProperty.value()).property("name").id(), vertexProperty.id());
- // assertEquals(convertToVertexId(vertexProperty.value()), vertexProperty.element().id());
}
assertEquals(4, counter);
assertEquals(1, keys.size());
@@ -114,7 +116,6 @@ public abstract class PropertiesTest extends AbstractGremlinProcessTest {
assertTrue(values.contains("josh"));
assertTrue(values.contains("peter"));
assertEquals(4, ids.size());
-
}
public static class Traversals extends PropertiesTest {
[2/2] tinkerpop git commit: Merge branch 'master' into TINKERPOP-1278
Posted by ok...@apache.org.
Merge branch 'master' into TINKERPOP-1278
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f44bad52
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f44bad52
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f44bad52
Branch: refs/heads/TINKERPOP-1278
Commit: f44bad526f3956995e006d2b8ae558581f82c8ce
Parents: 67b4d11 4daefb3
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Aug 22 15:43:35 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Aug 22 15:43:35 2016 -0600
----------------------------------------------------------------------
.../gremlin/process/traversal/step/map/PropertiesTest.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------