You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by da...@apache.org on 2017/01/30 18:00:33 UTC
[6/7] tinkerpop git commit: fixed test that was failing due to
unordered nature of dict
fixed test that was failing due to unordered nature of dict
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/329c1e1c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/329c1e1c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/329c1e1c
Branch: refs/heads/TINKERPOP-1599
Commit: 329c1e1cd85f54715de9bf43530227134f1c9e05
Parents: 484c91e
Author: davebshow <da...@gmail.com>
Authored: Sat Jan 28 13:48:36 2017 -0500
Committer: davebshow <da...@gmail.com>
Committed: Mon Jan 30 11:51:24 2017 -0500
----------------------------------------------------------------------
.../jython/tests/structure/io/test_graphson.py | 25 ++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/329c1e1c/gremlin-python/src/main/jython/tests/structure/io/test_graphson.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/tests/structure/io/test_graphson.py b/gremlin-python/src/main/jython/tests/structure/io/test_graphson.py
index e8aa572..9baf794 100644
--- a/gremlin-python/src/main/jython/tests/structure/io/test_graphson.py
+++ b/gremlin-python/src/main/jython/tests/structure/io/test_graphson.py
@@ -181,8 +181,25 @@ class TestGraphSONWriter(TestCase):
assert """true""" == self.graphson_writer.writeObject(True)
def test_P(self):
- assert """{"@type":"g:P","@value":{"predicate":"and","value":[{"@type":"g:P","@value":{"predicate":"or","value":[{"@type":"g:P","@value":{"predicate":"lt","value":"b"}},{"@type":"g:P","@value":{"predicate":"gt","value":"c"}}]}},{"@type":"g:P","@value":{"predicate":"neq","value":"d"}}]}}""" == self.graphson_writer.writeObject(
- P.lt("b").or_(P.gt("c")).and_(P.neq("d")))
+ result = {'@type': 'g:P',
+ '@value': {
+ 'predicate': 'and',
+ 'value': [{
+ '@type': 'g:P',
+ '@value': {
+ 'predicate': 'or',
+ 'value': [{
+ '@type': 'g:P',
+ '@value': {'predicate': 'lt', 'value': 'b'}
+ },
+ {'@type': 'g:P', '@value': {'predicate': 'gt', 'value': 'c'}}
+ ]
+ }
+ },
+ {'@type': 'g:P', '@value': {'predicate': 'neq', 'value': 'd'}}]}}
+
+ assert result == json.loads(
+ self.graphson_writer.writeObject(P.lt("b").or_(P.gt("c")).and_(P.neq("d"))))
def test_strategies(self):
# we have a proxy model for now given that we don't want to have to have g:XXX all registered on the Gremlin traversal machine (yet)
@@ -195,7 +212,7 @@ class TestGraphSONWriter(TestCase):
def test_graph(self):
assert {"@type": "g:Vertex",
"@value": {"id": {"@type": "g:Int64", "@value": 12}, "label": "person"}} == json.loads(
- self.graphson_writer.writeObject(Vertex(12l, "person")))
+ self.graphson_writer.writeObject(Vertex(long(12), "person")))
assert {"@type": "g:Edge", "@value": {"id": {"@type": "g:Int32", "@value": 7},
"outV": {"@type": "g:Int32", "@value": 0},
"outVLabel": "person",
@@ -255,4 +272,4 @@ class TestGraphSONWriter(TestCase):
if __name__ == '__main__':
- unittest.main()
\ No newline at end of file
+ unittest.main()