Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c7f4a534 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c7f4a534 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c7f4a534 Branch: refs/heads/master Commit: c7f4a534d401abdb2afea0cf0b2bd3418c492d57 Parents: 8b76225 3303ef9 Author: Stephen Mallette <sp...@genoprime.com> Authored: Fri Oct 27 14:29:25 2017 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Fri Oct 27 14:29:25 2017 -0400 ---------------------------------------------------------------------- gremlin-python/pom.xml | 10 ++++++---- .../python/jsr223/GremlinJythonScriptEngineTest.java | 2 ++ .../gremlin/python/jsr223/JythonTranslatorTest.java | 2 ++ .../python/jsr223/PythonGremlinScriptEngineTest.java | 2 ++ .../gremlin/python/jsr223/PythonProcessComputerTest.java | 2 ++ .../gremlin/python/jsr223/PythonProcessStandardTest.java | 2 ++ .../python/structure/io/graphson/GraphSONReaderTest.java | 2 ++ .../python/structure/io/graphson/GraphSONWriterTest.java | 2 ++ 8 files changed, 20 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c7f4a534/gremlin-python/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c7f4a534/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/structure/io/graphson/GraphSONReaderTest.java ---------------------------------------------------------------------- diff --cc gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/structure/io/graphson/GraphSONReaderTest.java index 92cc07c,40235a7..d1e37b6 --- a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/structure/io/graphson/GraphSONReaderTest.java +++ b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/structure/io/graphson/GraphSONReaderTest.java @@@ -51,48 -50,45 +52,49 @@@ import static org.junit.Assert.assertTr /** * @author Marko A. Rodriguez (http://markorodriguez.com) */ + @Ignore public class GraphSONReaderTest { - private static final ScriptEngine jythonEngine = JythonScriptEngineSetup.setup((PyScriptEngine) new ScriptEngineManager().getEngineByName("jython")); - private static final ObjectMapper mapper = GraphSONMapper.build().version(GraphSONVersion.V2_0).create().createMapper(); + private static final Set<GraphSONVersion> VERSIONS = new HashSet<>(Arrays.asList(GraphSONVersion.V2_0, GraphSONVersion.V3_0)); private static final GraphTraversalSource g = TinkerFactory.createModern().traversal(); - @Test public void shouldDeserializeGraphObjects() throws Exception { - final Vertex vertex = g.V(1).next(); - jythonEngine.getBindings(ScriptContext.ENGINE_SCOPE).put("x", mapper.writeValueAsString(vertex)); - assertEquals(vertex.toString(), jythonEngine.eval("str(graphson_reader.readObject(x))")); - assertTrue((Boolean) jythonEngine.eval("isinstance(graphson_reader.readObject(x),Vertex)")); - assertEquals("person", jythonEngine.eval("graphson_reader.readObject(x).label")); - assertEquals(1, jythonEngine.eval("graphson_reader.readObject(x).id")); - // - final Edge edge = g.V(1).outE("created").next(); - jythonEngine.getBindings(ScriptContext.ENGINE_SCOPE).put("x", mapper.writeValueAsString(edge)); - assertEquals(edge.toString(), jythonEngine.eval("str(graphson_reader.readObject(x))")); - assertTrue((Boolean) jythonEngine.eval("isinstance(graphson_reader.readObject(x),Edge)")); - assertEquals("created", jythonEngine.eval("graphson_reader.readObject(x).label")); - // - final VertexProperty vertexProperty = (VertexProperty) g.V(1).properties("name").next(); - jythonEngine.getBindings(ScriptContext.ENGINE_SCOPE).put("x", mapper.writeValueAsString(vertexProperty)); - assertEquals(vertexProperty.toString(), jythonEngine.eval("str(graphson_reader.readObject(x))")); - assertTrue((Boolean) jythonEngine.eval("isinstance(graphson_reader.readObject(x),VertexProperty)")); - // - final Property property = g.V(1).outE("created").properties("weight").next(); - jythonEngine.getBindings(ScriptContext.ENGINE_SCOPE).put("x", mapper.writeValueAsString(property)); - assertEquals(property.toString(), jythonEngine.eval("str(graphson_reader.readObject(x))")); - assertTrue((Boolean) jythonEngine.eval("isinstance(graphson_reader.readObject(x),Property)")); - // - final Traverser<Vertex> traverser = new DefaultRemoteTraverser<>(vertex, 3L); - jythonEngine.getBindings(ScriptContext.ENGINE_SCOPE).put("x", mapper.writeValueAsString(traverser)); - assertEquals(traverser.toString(), jythonEngine.eval("str(graphson_reader.readObject(x))")); - assertEquals(BigInteger.valueOf(3L), jythonEngine.eval("graphson_reader.readObject(x).bulk")); // jython uses big integer in Java - assertTrue((Boolean) jythonEngine.eval("isinstance(graphson_reader.readObject(x).object,Vertex)")); - assertTrue((Boolean) jythonEngine.eval("isinstance(graphson_reader.readObject(x),Traverser)")); + for (final GraphSONVersion version : VERSIONS) { + final ScriptEngine jythonEngine = JythonScriptEngineSetup.setup((PyScriptEngine) new ScriptEngineManager().getEngineByName("jython")); + jythonEngine.eval("graphson_reader = " + (version.equals(GraphSONVersion.V2_0) ? "graphsonV2d0_reader" : "graphsonV3d0_reader")); + final ObjectMapper mapper = GraphSONMapper.build().version(version).create().createMapper(); + // + final Vertex vertex = g.V(1).next(); + jythonEngine.getBindings(ScriptContext.ENGINE_SCOPE).put("x", mapper.writeValueAsString(vertex)); + assertEquals(vertex.toString(), jythonEngine.eval("str(graphson_reader.readObject(x))")); + assertTrue((Boolean) jythonEngine.eval("isinstance(graphson_reader.readObject(x),Vertex)")); + assertEquals("person", jythonEngine.eval("graphson_reader.readObject(x).label")); + assertEquals(1, jythonEngine.eval("graphson_reader.readObject(x).id")); + // + final Edge edge = g.V(1).outE("created").next(); + jythonEngine.getBindings(ScriptContext.ENGINE_SCOPE).put("x", mapper.writeValueAsString(edge)); + assertEquals(edge.toString(), jythonEngine.eval("str(graphson_reader.readObject(x))")); + assertTrue((Boolean) jythonEngine.eval("isinstance(graphson_reader.readObject(x),Edge)")); + assertEquals("created", jythonEngine.eval("graphson_reader.readObject(x).label")); + // + final VertexProperty vertexProperty = (VertexProperty) g.V(1).properties("name").next(); + jythonEngine.getBindings(ScriptContext.ENGINE_SCOPE).put("x", mapper.writeValueAsString(vertexProperty)); + assertEquals(vertexProperty.toString(), jythonEngine.eval("str(graphson_reader.readObject(x))")); + assertTrue((Boolean) jythonEngine.eval("isinstance(graphson_reader.readObject(x),VertexProperty)")); + // + final Property property = g.V(1).outE("created").properties("weight").next(); + jythonEngine.getBindings(ScriptContext.ENGINE_SCOPE).put("x", mapper.writeValueAsString(property)); + assertEquals(property.toString(), jythonEngine.eval("str(graphson_reader.readObject(x))")); + assertTrue((Boolean) jythonEngine.eval("isinstance(graphson_reader.readObject(x),Property)")); + // + final Traverser<Vertex> traverser = new DefaultRemoteTraverser<>(vertex, 3L); + jythonEngine.getBindings(ScriptContext.ENGINE_SCOPE).put("x", mapper.writeValueAsString(traverser)); + assertEquals(traverser.toString(), jythonEngine.eval("str(graphson_reader.readObject(x))")); + assertEquals(BigInteger.valueOf(3L), jythonEngine.eval("graphson_reader.readObject(x).bulk")); // jython uses big integer in Java + assertTrue((Boolean) jythonEngine.eval("isinstance(graphson_reader.readObject(x).object,Vertex)")); + assertTrue((Boolean) jythonEngine.eval("isinstance(graphson_reader.readObject(x),Traverser)")); + } } @Test http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c7f4a534/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/structure/io/graphson/GraphSONWriterTest.java ---------------------------------------------------------------------- diff --cc gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/structure/io/graphson/GraphSONWriterTest.java index 3ae4e55,b3b4af1..905d9c7 --- a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/structure/io/graphson/GraphSONWriterTest.java +++ b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/structure/io/graphson/GraphSONWriterTest.java @@@ -51,9 -50,11 +52,10 @@@ import static org.junit.Assert.assertTr /** * @author Marko A. Rodriguez (http://markorodriguez.com) */ + @Ignore public class GraphSONWriterTest { - private static final ScriptEngine jythonEngine = JythonScriptEngineSetup.setup((PyScriptEngine) new ScriptEngineManager().getEngineByName("jython")); - private static final ObjectMapper mapper = GraphSONMapper.build().version(GraphSONVersion.V2_0).create().createMapper(); + private static final Set<GraphSONVersion> VERSIONS = new HashSet<>(Arrays.asList(GraphSONVersion.V2_0, GraphSONVersion.V3_0)); @Test public void shouldSerializeNumbers() throws Exception {
