TINKERPOP-1898 Specifically tested SubgraphStrategy for jython evaluation
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c677a21d Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c677a21d Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c677a21d Branch: refs/heads/TINKERPOP-1897 Commit: c677a21d3fde73c496145915c66e7963c5290f69 Parents: f3172bc Author: Stephen Mallette <sp...@genoprime.com> Authored: Fri Mar 9 10:17:09 2018 -0500 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Mon Mar 12 11:56:16 2018 -0400 ---------------------------------------------------------------------- .../tinkerpop/gremlin/python/jsr223/JythonTranslator.java | 2 +- .../gremlin/python/jsr223/JythonTranslatorTest.java | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c677a21d/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java ---------------------------------------------------------------------- diff --git a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java index 3d7d9fe..e043278 100644 --- a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java +++ b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslator.java @@ -80,6 +80,6 @@ public final class JythonTranslator extends PythonTranslator { if (proxy.getConfiguration().isEmpty()) return proxy.getStrategyClass().getCanonicalName() + ".instance()"; else - return proxy.getStrategyClass().getCanonicalName() + ".create(new org.apache.commons.configuration.MapConfiguration(" + convertToString(ConfigurationConverter.getMap(proxy.getConfiguration())) + "))"; + return proxy.getStrategyClass().getCanonicalName() + ".create(org.apache.commons.configuration.MapConfiguration(" + convertToString(ConfigurationConverter.getMap(proxy.getConfiguration())) + "))"; } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c677a21d/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java ---------------------------------------------------------------------- diff --git a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java index e35898b..343819c 100644 --- a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java +++ b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java @@ -23,6 +23,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traverser; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; +import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy; import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategy; import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy; import org.apache.tinkerpop.gremlin.structure.Vertex; @@ -33,6 +34,7 @@ import org.junit.Test; import java.util.ArrayList; import java.util.List; +import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -111,9 +113,10 @@ public class JythonTranslatorTest { // present GraphTraversalSource g = TinkerFactory.createModern().traversal(); g = g.withStrategies(new TranslationStrategy(g, JythonTranslator.of("g"))); - final List<Object> o = g.withStrategies(ReadOnlyStrategy.instance()). - V().has("name").map(Lambda.function("lambda x: type(x.get())")).toList(); + final List<Object> o = g.withStrategies(ReadOnlyStrategy.instance(), + SubgraphStrategy.build().checkAdjacentVertices(false).vertices(hasLabel("person")).create()). + V().has("name").map(Lambda.function("lambda x: type(x.get())")).toList(); - assertEquals(6, o.size()); + assertEquals(4, o.size()); } }
