You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/05/01 17:53:02 UTC
[31/50] [abbrv] incubator-tinkerpop git commit: Groovy-Gremlin test
suite now using ScriptEngine bindings so IDs are not string generated by
pulled from bindings.
Groovy-Gremlin test suite now using ScriptEngine bindings so IDs are not string generated by pulled from bindings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/c14a5dee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c14a5dee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c14a5dee
Branch: refs/heads/variables
Commit: c14a5deed8902b5d62df1541acd0c054fb591ff3
Parents: 250b27d
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Apr 30 11:26:04 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Apr 30 11:26:04 2015 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +
.../traversal/TraversalScriptSupplier.java | 15 ++++--
.../traversal/TraversalVertexProgram.java | 4 +-
.../tinkerpop/gremlin/structure/Element.java | 2 +-
.../process/computer/ComputerTestHelper.groovy | 11 +++--
.../step/branch/GroovyLocalTest.groovy | 19 ++++----
.../step/branch/GroovyRepeatTest.groovy | 12 ++---
.../step/branch/GroovyUnionTest.groovy | 10 ++--
.../step/filter/GroovyCyclicPathTest.groovy | 8 +--
.../step/filter/GroovyExceptTest.groovy | 12 ++---
.../step/filter/GroovyFilterTest.groovy | 6 +--
.../step/filter/GroovyHasNotTest.groovy | 4 +-
.../traversal/step/filter/GroovyHasTest.groovy | 29 ++++++-----
.../traversal/step/filter/GroovyIsTest.groovy | 10 ++--
.../step/filter/GroovyRetainTest.groovy | 10 ++--
.../step/filter/GroovySimplePathTest.groovy | 6 +--
.../step/map/GroovyCoalesceTest.groovy | 8 +--
.../traversal/step/map/GroovyMapTest.groovy | 8 +--
.../traversal/step/map/GroovyPathTest.groovy | 6 +--
.../step/map/GroovyPropertiesTest.groovy | 8 +--
.../traversal/step/map/GroovySelectTest.groovy | 18 +++----
.../step/map/GroovyValueMapTest.groovy | 6 +--
.../traversal/step/map/GroovyVertexTest.groovy | 51 ++++++++++----------
.../traversal/step/branch/UnionTest.java | 3 +-
24 files changed, 140 insertions(+), 128 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 3fc133a..5290b61 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,6 +25,8 @@ image::http://www.tinkerpop.com/docs/current/images/gremlin-hindu.png[width=225]
TinkerPop 3.0.0.M9 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* `TraversalScriptSupplier` now takes an `Object` var args for setting `ScriptEngine` bindings if needed.
+* `Compare` is now more lenient on `Number`-types.
* Removed `Compare.inside` and `Compare.outside` as they are not primitive comparators and should be composed from primitives.
* Introduced `P` (predicate) for cleaner looking `is()`, `has()`, and `where()` calls -- e.g. `has('age',eq(32))`.
* `GraphTraversalSource` is now the location for `withXXX()` operations. No longer do they exist at `GraphTraversal`.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalScriptSupplier.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalScriptSupplier.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalScriptSupplier.java
index ca187b1..1df5828 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalScriptSupplier.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalScriptSupplier.java
@@ -39,20 +39,27 @@ public final class TraversalScriptSupplier<S, E> implements Supplier<Traversal.A
private final Class<? extends Graph> graphClass;
private final String scriptEngineName;
private final String traversalScript;
+ private final Object[] bindings;
- public TraversalScriptSupplier(final Class<? extends Graph> graphClass, final TraversalSource.Builder traversalContextBuilder, final String scriptEngineName, final String traversalScript) {
+ public TraversalScriptSupplier(final Class<? extends Graph> graphClass, final TraversalSource.Builder traversalContextBuilder, final String scriptEngineName, final String traversalScript, final Object... bindings) {
this.traversalContextBuilder = traversalContextBuilder;
this.graphClass = graphClass;
this.scriptEngineName = scriptEngineName;
this.traversalScript = traversalScript;
+ this.bindings = bindings;
}
public Traversal.Admin<S, E> get() {
try {
final ScriptEngine engine = ScriptEngineCache.get(this.scriptEngineName);
- final Bindings bindings = engine.createBindings();
- bindings.put("g", this.traversalContextBuilder.create(ShellGraph.of(this.graphClass)));
- return (Traversal.Admin<S, E>) engine.eval(this.traversalScript, bindings);
+ final Bindings engineBindings = engine.createBindings();
+ engineBindings.put("g", this.traversalContextBuilder.create(ShellGraph.of(this.graphClass)));
+ if (this.bindings.length % 2 != 0)
+ throw new IllegalArgumentException("The provided key/value bindings array length must be a multiple of two");
+ for (int i = 0; i < this.bindings.length; i = i + 2) {
+ engineBindings.put((String) this.bindings[i], this.bindings[i + 1]);
+ }
+ return (Traversal.Admin<S, E>) engine.eval(this.traversalScript, engineBindings);
} catch (final ScriptException e) {
throw new IllegalStateException(e.getMessage(), e);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
index 3fe61c9..4f630c6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
@@ -279,8 +279,8 @@ public final class TraversalVertexProgram implements VertexProgram<TraverserSet<
super(TraversalVertexProgram.class);
}
- public Builder traversal(final Class<? extends Graph> graphClass, final TraversalSource.Builder builder, final String scriptEngine, final String traversalScript) {
- LambdaHolder.storeState(this.configuration, LambdaHolder.Type.SERIALIZED_OBJECT, TRAVERSAL_SUPPLIER, new TraversalScriptSupplier<>(graphClass, builder, scriptEngine, traversalScript));
+ public Builder traversal(final Class<? extends Graph> graphClass, final TraversalSource.Builder builder, final String scriptEngine, final String traversalScript, final Object... bindings) {
+ LambdaHolder.storeState(this.configuration, LambdaHolder.Type.SERIALIZED_OBJECT, TRAVERSAL_SUPPLIER, new TraversalScriptSupplier<>(graphClass, builder, scriptEngine, traversalScript, bindings));
return this;
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java
index 8ba3c62..b6538b9 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java
@@ -122,7 +122,7 @@ public abstract interface Element {
}
public static IllegalArgumentException providedKeyValuesMustBeAMultipleOfTwo() {
- return new IllegalArgumentException("The provided key/value array must be a multiple of two");
+ return new IllegalArgumentException("The provided key/value array length must be a multiple of two");
}
public static IllegalArgumentException providedKeyValuesMustHaveALegalKeyOnEvenIndices() {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/computer/ComputerTestHelper.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/computer/ComputerTestHelper.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/computer/ComputerTestHelper.groovy
index f62ad8c..ff34c91 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/computer/ComputerTestHelper.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/computer/ComputerTestHelper.groovy
@@ -18,9 +18,9 @@
*/
package org.apache.tinkerpop.gremlin.process.computer
+import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource
-import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource
import org.apache.tinkerpop.gremlin.structure.Graph
@@ -33,14 +33,15 @@ public class ComputerTestHelper {
final Graph graph,
final TraversalSource.Builder builder,
final String scriptEngineName,
- final String traversalScript) {
+ final String traversalScript,
+ final Object... bindings) {
- final TraversalVertexProgram program = TraversalVertexProgram.build().traversal(graph.getClass(), builder, scriptEngineName, traversalScript).create();
+ final TraversalVertexProgram program = TraversalVertexProgram.build().traversal(graph.getClass(), builder, scriptEngineName, traversalScript, bindings).create();
final ComputerResult result = builder.create(graph).getGraphComputer().get().program(program).submit().get();
return program.computerResultTraversal(result);
}
- public static final Traversal compute(final String script, final GraphTraversalSource g) {
- return ComputerTestHelper.compute(g.getGraph().get(), g.asBuilder(), "gremlin-groovy", script);
+ public static final Traversal compute(final String script, final GraphTraversalSource g, final Object... bindings) {
+ return ComputerTestHelper.compute(g.getGraph().get(), g.asBuilder(), "gremlin-groovy", script, bindings);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyLocalTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyLocalTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyLocalTest.groovy
index 45b8436..a929cd3 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyLocalTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyLocalTest.groovy
@@ -18,17 +18,16 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.branch
-import org.apache.tinkerpop.gremlin.structure.T
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
import org.apache.tinkerpop.gremlin.structure.Edge
import org.apache.tinkerpop.gremlin.structure.Order
+import org.apache.tinkerpop.gremlin.structure.T
import org.apache.tinkerpop.gremlin.structure.Vertex
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
-
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
@@ -108,7 +107,7 @@ public abstract class GroovyLocalTest {
@Override
public Traversal<Vertex, String> get_g_VX1X_localXoutEXknowsX_limitX1XX_inV_name(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).local(__.outE('knows').limit(1)).inV.name", g);
+ ComputerTestHelper.compute("g.V(v1Id).local(__.outE('knows').limit(1)).inV.name", g, "v1Id", v1Id);
}
@Override
@@ -118,22 +117,22 @@ public abstract class GroovyLocalTest {
@Override
public Traversal<Vertex, Edge> get_g_VX4X_localXbothEX1_createdX_limitX1XX(final Object v4Id) {
- ComputerTestHelper.compute("g.V(${v4Id}).local(__.bothE('created').limit(1))", g);
+ ComputerTestHelper.compute("g.V(v4Id).local(__.bothE('created').limit(1))", g, "v4Id", v4Id);
}
@Override
public Traversal<Vertex, Edge> get_g_VX4X_localXbothEXknows_createdX_limitX1XX(final Object v4Id) {
- ComputerTestHelper.compute("g.V(${v4Id}).local(__.bothE('knows', 'created').limit(1))", g);
+ ComputerTestHelper.compute("g.V(v4Id).local(__.bothE('knows', 'created').limit(1))", g, "v4Id", v4Id);
}
@Override
public Traversal<Vertex, String> get_g_VX4X_localXbothE_limitX1XX_otherV_name(final Object v4Id) {
- ComputerTestHelper.compute("g.V(${v4Id}).local(__.bothE.limit(1)).otherV.name", g);
+ ComputerTestHelper.compute("g.V(v4Id).local(__.bothE.limit(1)).otherV.name", g, "v4Id", v4Id);
}
@Override
public Traversal<Vertex, String> get_g_VX4X_localXbothE_limitX2XX_otherV_name(final Object v4Id) {
- ComputerTestHelper.compute("g.V(${v4Id}).local(__.bothE.limit(2)).otherV.name", g);
+ ComputerTestHelper.compute("g.V(v4Id).local(__.bothE.limit(2)).otherV.name", g, "v4Id", v4Id);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy
index 91690e7..67a989d 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy
@@ -18,17 +18,17 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.branch
-import org.apache.tinkerpop.gremlin.process.*
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.Path
-import org.apache.tinkerpop.gremlin.structure.T
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
+import org.apache.tinkerpop.gremlin.structure.T
import org.apache.tinkerpop.gremlin.structure.Vertex
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.groupCount
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.has;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.has
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -59,7 +59,7 @@ public abstract class GroovyRepeatTest {
}
@Override
- public Traversal<Vertex, String> get_g_VX1X_timesX2X_repeatXoutX_name(Object v1Id) {
+ public Traversal<Vertex, String> get_g_VX1X_timesX2X_repeatXoutX_name(final Object v1Id) {
g.V(v1Id).times(2).repeat(__.out).name
}
@@ -108,7 +108,7 @@ public abstract class GroovyRepeatTest {
@Override
public Traversal<Vertex, String> get_g_VX1X_timesX2X_repeatXoutX_name(Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).times(2).repeat(__.out).name", g)
+ ComputerTestHelper.compute("g.V(v1Id).times(2).repeat(__.out).name", g, "v1Id", v1Id)
}
@Override
@@ -123,7 +123,7 @@ public abstract class GroovyRepeatTest {
@Override
public Traversal<Vertex, String> get_g_V_emitXhasXlabel_personXX_repeatXoutX_name(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).emit(has(T.label, 'person')).repeat(__.out).name", g)
+ ComputerTestHelper.compute("g.V(v1Id).emit(has(T.label, 'person')).repeat(__.out).name", g, "v1Id", v1Id)
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyUnionTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyUnionTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyUnionTest.groovy
index 626a19e..6bbf309 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyUnionTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyUnionTest.groovy
@@ -18,12 +18,11 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.branch
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
-import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine
import org.apache.tinkerpop.gremlin.structure.Vertex
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.*
@@ -78,7 +77,7 @@ public abstract class GroovyUnionTest {
}
public Traversal<Vertex, String> get_g_VX1X_unionXrepeatXoutX_timesX2X__outX_name(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).union(repeat(__.out).times(2), __.out).name", g)
+ ComputerTestHelper.compute("g.V(v1Id).union(repeat(__.out).times(2), __.out).name", g, "v1Id", v1Id)
}
public Traversal<Vertex, String> get_g_V_chooseXlabel_is_person__unionX__out_lang__out_nameX__in_labelX() {
@@ -104,8 +103,7 @@ public abstract class GroovyUnionTest {
@Override
public Traversal<Vertex, Number> get_g_VX1_2X_unionXoutE_count__inE_count__outE_weight_sumX(
final Object v1Id, final Object v2Id) {
- g.engine(StandardTraversalEngine.INSTANCE);
- g.V(v1Id, v2Id).union(outE().count, inE().count, outE().weight.sum);
+ ComputerTestHelper.compute("g.V(v1Id, v2Id).union(outE().count, inE().count, outE().weight.sum)", g, "v1Id", v1Id, "v2Id", v2Id);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyCyclicPathTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyCyclicPathTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyCyclicPathTest.groovy
index 042d4e0..ebe8338 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyCyclicPathTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyCyclicPathTest.groovy
@@ -48,13 +48,13 @@ public abstract class GroovyCyclicPathTest {
public static class ComputerTraversals extends CyclicPathTest {
@Override
- Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inXcreatedX_cyclicPath(final Object v1) {
- ComputerTestHelper.compute("g.V(${v1}).out('created').in('created').cyclicPath", g);
+ Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inXcreatedX_cyclicPath(final Object v1Id) {
+ ComputerTestHelper.compute("g.V(v1Id).out('created').in('created').cyclicPath", g, "v1Id", v1Id);
}
@Override
- Traversal<Vertex, Path> get_g_VX1X_outXcreatedX_inXcreatedX_cyclicPath_path(final Object v1) {
- ComputerTestHelper.compute("g.V(${v1}).out('created').in('created').cyclicPath().path()", g);
+ Traversal<Vertex, Path> get_g_VX1X_outXcreatedX_inXcreatedX_cyclicPath_path(final Object v1Id) {
+ ComputerTestHelper.compute("g.V(v1Id).out('created').in('created').cyclicPath().path()", g, "v1Id",v1Id);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyExceptTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyExceptTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyExceptTest.groovy
index 03537bc..68af198 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyExceptTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyExceptTest.groovy
@@ -83,17 +83,17 @@ public abstract class GroovyExceptTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_out_exceptXg_v2X(final Object v1Id, final Object v2Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out.except(g.V(${v2Id}).next())", g);
+ ComputerTestHelper.compute("g.V(v1Id).out.except(g.V(v2Id).next())", g, "v1Id", v1Id, "v2Id", v2Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_out_aggregateXxX_out_exceptXxX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out.aggregate('x').out.except('x')", g);
+ ComputerTestHelper.compute("g.V(v1Id).out.aggregate('x').out.except('x')", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, String> get_g_VX1X_outXcreatedX_inXcreatedX_exceptXg_v1X_name(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out('created').in('created').except(g.V(${v1Id}).next()).values('name')", g);
+ ComputerTestHelper.compute("g.V(v1Id).out('created').in('created').except(g.V(v1Id).next()).values('name')", g, "v1Id", v1Id);
}
@Override
@@ -109,18 +109,18 @@ public abstract class GroovyExceptTest {
@Override
public Traversal<Vertex, Path> get_g_VX1X_repeatXbothEXcreatedX_exceptXeX_aggregateXeX_otherVX_emit_path(
final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).repeat(__.bothE('created').except('e').aggregate('e').otherV).emit.path", g);
+ ComputerTestHelper.compute("g.V(v1Id).repeat(__.bothE('created').except('e').aggregate('e').otherV).emit.path", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Path> get_g_VX1X_repeatXbothEXcreatedX_dedup_otherVX_emit_path(
final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).repeat(__.bothE('created').dedup.otherV).emit.path", g);
+ ComputerTestHelper.compute("g.V(v1Id).repeat(__.bothE('created').dedup.otherV).emit.path", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, String> get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_exceptXaX_name(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).as('a').out('created').in('created').except('a').name", g);
+ ComputerTestHelper.compute("g.V(v1Id).as('a').out('created').in('created').except('a').name", g, "v1Id", v1Id);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyFilterTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyFilterTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyFilterTest.groovy
index 6b854eb..40cf643 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyFilterTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyFilterTest.groovy
@@ -19,10 +19,10 @@
package org.apache.tinkerpop.gremlin.process.traversal.step.filter
import org.apache.tinkerpop.gremlin.LoadGraphWith
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.structure.Edge
import org.apache.tinkerpop.gremlin.structure.Vertex
import org.junit.Test
@@ -153,12 +153,12 @@ public abstract class GroovyFilterTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_filterXage_gt_30X(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).filter { it.age > 30 }", g);
+ ComputerTestHelper.compute("g.V(v1Id).filter { it.age > 30 }", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_out_filterXage_gt_30X(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out.filter { it.property('age').orElse(0) > 30 }", g);
+ ComputerTestHelper.compute("g.V(v1Id).out.filter { it.property('age').orElse(0) > 30 }", g, "v1Id", v1Id);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasNotTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasNotTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasNotTest.groovy
index 6e63e96..5593053 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasNotTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasNotTest.groovy
@@ -18,10 +18,10 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.filter
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
import org.apache.tinkerpop.gremlin.structure.Vertex
@@ -52,7 +52,7 @@ public abstract class GroovyHasNotTest {
public static class ComputerTraversals extends HasNotTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_hasNotXprop(final Object v1Id, final String propertyKey) {
- ComputerTestHelper.compute("g.V(${v1Id}).hasNot('${propertyKey}')", g);
+ ComputerTestHelper.compute("g.V(v1Id).hasNot('${propertyKey}')", g, "v1Id", v1Id);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasTest.groovy
index 630b103..e270c65 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasTest.groovy
@@ -18,15 +18,18 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.filter
-import org.apache.tinkerpop.gremlin.structure.T
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
-import static org.apache.tinkerpop.gremlin.structure.P.*;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
import org.apache.tinkerpop.gremlin.structure.Edge
+import org.apache.tinkerpop.gremlin.structure.T
import org.apache.tinkerpop.gremlin.structure.Vertex
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
+
+import static org.apache.tinkerpop.gremlin.structure.P.gt
+import static org.apache.tinkerpop.gremlin.structure.P.inside
+
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
@@ -112,7 +115,7 @@ public abstract class GroovyHasTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outE_hasXweight_inside_0_06X_inV(final Object v1Id) {
- g.V(v1Id).outE.has('weight',inside(0.0d, 0.6d)).inV
+ g.V(v1Id).outE.has('weight', inside(0.0d, 0.6d)).inV
}
}
@@ -120,7 +123,7 @@ public abstract class GroovyHasTest {
public static class ComputerTraversals extends HasTest {
@Override
public Traversal<Edge, Edge> get_g_EX11X_outV_outE_hasXid_10X(final Object e11Id, final Object e8Id) {
- ComputerTestHelper.compute("g.E($e11Id).outV.outE.has(T.id, $e8Id)", g);
+ ComputerTestHelper.compute("g.E(e11Id).outV.outE.has(T.id, e8Id)", g, "e11Id", e11Id, "e8Id", e8Id);
}
@Override
@@ -130,12 +133,12 @@ public abstract class GroovyHasTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_hasXkeyX(final Object v1Id, final String key) {
- ComputerTestHelper.compute("g.V(${v1Id}).has('${key}')", g);
+ ComputerTestHelper.compute("g.V(v1Id).has('${key}')", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_hasXname_markoX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).has('name', 'marko')", g);
+ ComputerTestHelper.compute("g.V(v1Id).has('name', 'marko')", g, "v1Id", v1Id);
}
@Override
@@ -155,12 +158,12 @@ public abstract class GroovyHasTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_hasXage_gt_30X(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).has('age', gt(30))", g);
+ ComputerTestHelper.compute("g.V(v1Id).has('age', gt(30))", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_out_hasIdX2X(final Object v1Id, final Object v2Id) {
- ComputerTestHelper.compute(" g.V(${v1Id}).out.hasId(${v2Id})", g);
+ ComputerTestHelper.compute(" g.V(v1Id).out.hasId(v2Id)", g, "v1Id", v1Id, "v2Id", v2Id);
}
@Override
@@ -170,7 +173,7 @@ public abstract class GroovyHasTest {
@Override
public Traversal<Edge, Edge> get_g_EX7X_hasLabelXknowsX(final Object e7Id) {
- ComputerTestHelper.compute(" g.E(${e7Id}).hasLabel('knows')", g);
+ ComputerTestHelper.compute("g.E(e7Id).hasLabel('knows')", g, "e7Id", e7Id);
}
@Override
@@ -195,7 +198,7 @@ public abstract class GroovyHasTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outE_hasXweight_inside_0_06X_inV(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE.has('weight', inside(0.0d, 0.6d)).inV", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE.has('weight', inside(0.0d, 0.6d)).inV", g, "v1Id", v1Id);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyIsTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyIsTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyIsTest.groovy
index f407664..e567735 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyIsTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyIsTest.groovy
@@ -66,27 +66,27 @@ public abstract class GroovyIsTest {
@Override
public Traversal<Vertex, Integer> get_g_V_valuesXageX_isX32X() {
- ComputerTestHelper.compute("g.V().values('age').is(32)", g)
+ ComputerTestHelper.compute("g.V.age.is(32)", g)
}
@Override
public Traversal<Vertex, Integer> get_g_V_valuesXageX_isXlte_30X() {
- ComputerTestHelper.compute("g.V().values('age').is(lte(30))", g)
+ ComputerTestHelper.compute("g.V.age.is(lte(30))", g)
}
@Override
public Traversal<Vertex, Integer> get_g_V_valuesXageX_isXgte_29X_isXlt_34X() {
- ComputerTestHelper.compute("g.V().values('age').is(gte(29)).is(lt(34))", g)
+ ComputerTestHelper.compute("g.V.age.is(gte(29)).is(lt(34))", g)
}
@Override
public Traversal<Vertex, String> get_g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX() {
- ComputerTestHelper.compute("g.V().has(__.in('created').count().is(1)).values('name')", g)
+ ComputerTestHelper.compute("g.V.has(__.in('created').count.is(1)).name", g)
}
@Override
public Traversal<Vertex, String> get_g_V_hasXinXcreatedX_count_isXgte_2XX_valuesXnameX() {
- ComputerTestHelper.compute("g.V().has(__.in('created').count().is(gte(2l))).values('name')", g)
+ ComputerTestHelper.compute("g.V.has(__.in('created').count.is(gte(2l))).name", g)
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRetainTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRetainTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRetainTest.groovy
index 0c271de..16308e3 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRetainTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRetainTest.groovy
@@ -18,10 +18,10 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.filter
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.structure.Vertex
/**
@@ -51,17 +51,17 @@ public abstract class GroovyRetainTest {
public static class ComputerTraversals extends RetainTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_out_retainXg_v2X(final Object v1Id, final Object v2Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out.retain(g.V($v2Id).next())", g);
+ ComputerTestHelper.compute("g.V(v1Id).out.retain(g.V(v2Id).next())", g, "v1Id", v1Id, "v2Id", v2Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_out_aggregateXxX_out_retainXxX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out.aggregate('x').out.retain('x')", g);
+ ComputerTestHelper.compute("g.V(v1Id).out.aggregate('x').out.retain('x')", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, String> get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_retainXaX_name(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).as('a').out('created').in('created').retain('a').name", g);
+ ComputerTestHelper.compute("g.V(v1Id).as('a').out('created').in('created').retain('a').name", g, "v1Id", v1Id);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovySimplePathTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovySimplePathTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovySimplePathTest.groovy
index b9789fe..4ef3635 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovySimplePathTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovySimplePathTest.groovy
@@ -18,12 +18,12 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.filter
+import org.apache.tinkerpop.gremlin.process.UseEngine
+import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.Path
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
-import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
import org.apache.tinkerpop.gremlin.structure.Vertex
/**
@@ -50,7 +50,7 @@ public abstract class GroovySimplePathTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inXcreatedX_simplePath(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out('created').in('created').simplePath", g);
+ ComputerTestHelper.compute("g.V(v1Id).out('created').in('created').simplePath", g, "v1Id", v1Id);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyCoalesceTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyCoalesceTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyCoalesceTest.groovy
index 96116c7..56a450d 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyCoalesceTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyCoalesceTest.groovy
@@ -18,12 +18,12 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.Path
-import org.apache.tinkerpop.gremlin.structure.T
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
+import org.apache.tinkerpop.gremlin.structure.T
import org.apache.tinkerpop.gremlin.structure.Vertex
import org.junit.Test
@@ -75,12 +75,12 @@ public abstract class GroovyCoalesceTest {
@Override
public Traversal<Vertex, String> get_g_VX1X_coalesceXoutXknowsX_outXcreatedXX_valuesXnameX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).coalesce(out('knows'), out('created')).values('name')", g)
+ ComputerTestHelper.compute("g.V(v1Id).coalesce(out('knows'), out('created')).values('name')", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, String> get_g_VX1X_coalesceXoutXcreatedX_outXknowsXX_valuesXnameX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).coalesce(out('created'), out('knows')).values('name')", g)
+ ComputerTestHelper.compute("g.V(v1Id).coalesce(out('created'), out('knows')).values('name')", g, "v1Id", v1Id)
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMapTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMapTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMapTest.groovy
index ff6a4c9..7be3fd7 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMapTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMapTest.groovy
@@ -19,10 +19,10 @@
package org.apache.tinkerpop.gremlin.process.traversal.step.map
import org.apache.tinkerpop.gremlin.LoadGraphWith
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.structure.Vertex
import org.junit.Test
@@ -87,17 +87,17 @@ public abstract class GroovyMapTest {
@Override
public Traversal<Vertex, String> get_g_VX1X_mapXnameX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).map { v -> v.name }", g);
+ ComputerTestHelper.compute("g.V(v1Id).map { v -> v.name }", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Integer> get_g_VX1X_outE_label_mapXlengthX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE.label.map { l -> l.length() }", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE.label.map { l -> l.length() }", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Integer> get_g_VX1X_out_mapXnameX_mapXlengthX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out.map { v -> v.name }.map { n -> n.length() }", g);
+ ComputerTestHelper.compute("g.V(v1Id).out.map { v -> v.name }.map { n -> n.length() }", g, "v1Id", v1Id);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPathTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPathTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPathTest.groovy
index 62fae7c..1929523 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPathTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPathTest.groovy
@@ -18,12 +18,12 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map
+import org.apache.tinkerpop.gremlin.process.UseEngine
+import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.Path
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
-import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
import org.apache.tinkerpop.gremlin.structure.Vertex
import org.junit.Test
@@ -66,7 +66,7 @@ public abstract class GroovyPathTest {
@Override
public Traversal<Vertex, Path> get_g_VX1X_name_path(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).identity.name.path", g);
+ ComputerTestHelper.compute("g.V(v1Id).identity.name.path", g, "v1Id", v1Id);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
index 17d6585..bdffe9d 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
@@ -18,11 +18,11 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map
-import org.apache.tinkerpop.gremlin.structure.T
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
+import org.apache.tinkerpop.gremlin.structure.T
import org.apache.tinkerpop.gremlin.structure.Vertex
/**
@@ -64,7 +64,7 @@ public abstract class GroovyPropertiesTest {
@Override
public Traversal<Vertex, Object> get_g_V_hasXageX_properties_hasXid_nameIdX_value(final Object nameId) {
- ComputerTestHelper.compute("g.V.has('age').properties().has(T.id, $nameId).value()", g)
+ ComputerTestHelper.compute("g.V.has('age').properties().has(T.id, nameId).value()", g, "nameId", nameId)
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy
index 02d4956..ee6cda1 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy
@@ -160,7 +160,7 @@ public abstract class GroovySelectTest {
@Override
public Traversal<Vertex, Map<String, Vertex>> get_g_VX1X_asXaX_outXknowsX_asXbX_select(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).as('a').out('knows').as('b').select()", g);
+ ComputerTestHelper.compute("g.V(v1Id).as('a').out('knows').as('b').select()", g, "v1Id", v1Id);
}
@Override
@@ -171,7 +171,7 @@ public abstract class GroovySelectTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_asXaX_outXknowsX_asXbX_selectXaX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).as('a').out('knows').as('b').select('a')", g);
+ ComputerTestHelper.compute("g.V(v1Id).as('a').out('knows').as('b').select('a')", g, "v1Id", v1Id);
}
@Override
@@ -272,41 +272,41 @@ public abstract class GroovySelectTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_asXhereX_out_selectXhereX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).as('here').out.select('here')", g);
+ ComputerTestHelper.compute("g.V(v1Id).as('here').out.select('here')", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX4X_out_asXhereX_hasXlang_javaX_selectXhereX(final Object v4Id) {
- ComputerTestHelper.compute("g.V(${v4Id}).out.as('here').has('lang', 'java').select('here')", g);
+ ComputerTestHelper.compute("g.V(v4Id).out.as('here').has('lang', 'java').select('here')", g, "v4Id", v4Id);
}
@Override
public Traversal<Vertex, String> get_g_VX4X_out_asXhereX_hasXlang_javaX_selectXhereX_name(
final Object v4Id) {
- ComputerTestHelper.compute("g.V(${v4Id}).out.as('here').has('lang', 'java').select('here').name", g);
+ ComputerTestHelper.compute("g.V(v4Id).out.as('here').has('lang', 'java').select('here').name", g, "v4Id", v4Id);
}
@Override
public Traversal<Vertex, Edge> get_g_VX1X_outE_asXhereX_inV_hasXname_vadasX_selectXhereX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE.as('here').inV.has('name', 'vadas').select('here')", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE.as('here').inV.has('name', 'vadas').select('here')", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Edge> get_g_VX1X_outEXknowsX_hasXweight_1X_asXhereX_inV_hasXname_joshX_selectXhereX(
final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE('knows').has('weight', 1.0d).as('here').inV.has('name', 'josh').select('here')", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE('knows').has('weight', 1.0d).as('here').inV.has('name', 'josh').select('here')", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Edge> get_g_VX1X_outEXknowsX_asXhereX_hasXweight_1X_inV_hasXname_joshX_selectXhereX(
final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE('knows').as('here').has('weight', 1.0d).inV.has('name','josh').select('here')", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE('knows').as('here').has('weight', 1.0d).inV.has('name','josh').select('here')", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Edge> get_g_VX1X_outEXknowsX_asXhereX_hasXweight_1X_asXfakeX_inV_hasXname_joshX_selectXhereX(
final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE('knows').as('here').has('weight', 1.0d).as('fake').inV.has('name','josh').select('here')", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE('knows').as('here').has('weight', 1.0d).as('fake').inV.has('name','josh').select('here')", g, "v1Id", v1Id);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
index 21c36cd..3b82a2e 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
@@ -18,10 +18,10 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.structure.Vertex
/**
@@ -61,7 +61,7 @@ public abstract class GroovyValueMapTest {
@Override
public Traversal<Vertex, Map<String, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out('created').valueMap", g);
+ ComputerTestHelper.compute("g.V(v1Id).out('created').valueMap", g, "v1Id", v1Id);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy
index c1a07bb..b5fd13e 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy
@@ -18,15 +18,16 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
-import static org.apache.tinkerpop.gremlin.structure.P.*;
import org.apache.tinkerpop.gremlin.structure.Direction
import org.apache.tinkerpop.gremlin.structure.Edge
import org.apache.tinkerpop.gremlin.structure.Vertex
+import static org.apache.tinkerpop.gremlin.structure.P.lt
+
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
@@ -177,17 +178,17 @@ public abstract class GroovyVertexTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_out(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out", g);
+ ComputerTestHelper.compute("g.V(v1Id).out", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX2X_in(final Object v2Id) {
- ComputerTestHelper.compute("g.V(${v2Id}).in", g);
+ ComputerTestHelper.compute("g.V(v2Id).in", g, "v2Id", v2Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX4X_both(final Object v4Id) {
- ComputerTestHelper.compute("g.V(${v4Id}).both", g);
+ ComputerTestHelper.compute("g.V(v4Id).both", g, "v4Id", v4Id);
}
@Override
@@ -197,37 +198,37 @@ public abstract class GroovyVertexTest {
@Override
public Traversal<Edge, Edge> get_g_EX11X(final Object e11Id) {
- ComputerTestHelper.compute("g.E($e11Id)", g)
+ ComputerTestHelper.compute("g.E(e11Id)", g, "e11Id", e11Id)
}
@Override
public Traversal<Vertex, Edge> get_g_VX1X_outE(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Edge> get_g_VX2X_inE(final Object v2Id) {
- ComputerTestHelper.compute("g.V(${v2Id}).inE", g);
+ ComputerTestHelper.compute("g.V(v2Id).inE", g, "v2Id", v2Id);
}
@Override
public Traversal<Vertex, Edge> get_g_VX4X_bothE(final Object v4Id) {
- ComputerTestHelper.compute("g.V(${v4Id}).bothE", g);
+ ComputerTestHelper.compute("g.V(v4Id).bothE", g, "v4Id", v4Id);
}
@Override
public Traversal<Vertex, Edge> get_g_VX4X_bothEXcreatedX(final Object v4Id) {
- ComputerTestHelper.compute("g.V(${v4Id}).bothE('created')", g);
+ ComputerTestHelper.compute("g.V(v4Id).bothE('created')", g, "v4Id", v4Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outE_inV(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE.inV", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE.inV", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX2X_inE_outV(final Object v2Id) {
- ComputerTestHelper.compute("g.V(${v2Id}).inE.outV", g);
+ ComputerTestHelper.compute("g.V(v2Id).inE.outV", g, "v2Id", v2Id);
}
@Override
@@ -242,62 +243,62 @@ public abstract class GroovyVertexTest {
@Override
public Traversal<Vertex, String> get_g_VX1X_outEXknowsX_bothV_name(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE('knows').bothV.name", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE('knows').bothV.name", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outXknowsX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out('knows')", g);
+ ComputerTestHelper.compute("g.V(v1Id).out('knows')", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outXknows_createdX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out('knows', 'created')", g);
+ ComputerTestHelper.compute("g.V(v1Id).out('knows', 'created')", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outEXknowsX_inV(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE('knows').inV()", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE('knows').inV()", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outEXknows_createdX_inV(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE('knows', 'created').inV", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE('knows', 'created').inV", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_V_out_out() {
- ComputerTestHelper.compute("g.V().out().out()", g);
+ ComputerTestHelper.compute("g.V.out().out()", g);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_out_out_out(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out.out.out", g);
+ ComputerTestHelper.compute("g.V(v1Id).out.out.out", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, String> get_g_VX1X_out_name(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out.name", g);
+ ComputerTestHelper.compute("g.V(v1Id).out.name", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outE_otherV(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE.otherV", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE.otherV", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX4X_bothE_otherV(final Object v4Id) {
- ComputerTestHelper.compute("g.V(${v4Id}).bothE.otherV", g);
+ ComputerTestHelper.compute("g.V(v4Id).bothE.otherV", g, "v4Id", v4Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX4X_bothE_hasXweight_lt_1X_otherV(final Object v4Id) {
- ComputerTestHelper.compute("g.V(${v4Id}).bothE.has('weight', lt(1.0d)).otherV", g);
+ ComputerTestHelper.compute("g.V(v4Id).bothE.has('weight', lt(1.0d)).otherV", g, "v4Id", v4Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_to_XOUT_knowsX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).to(Direction.OUT, 'knows')", g);
+ ComputerTestHelper.compute("g.V(v1Id).to(Direction.OUT, 'knows')", g, "v1Id", v1Id);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/UnionTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/UnionTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/UnionTest.java
index 6c90288..8b5325d 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/UnionTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/UnionTest.java
@@ -21,9 +21,9 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.branch;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
+import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
@@ -127,6 +127,7 @@ public abstract class UnionTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
@IgnoreEngine(TraversalEngine.Type.COMPUTER)
+ // NEED TO DETERMINE IF TRAVERSAL IS LOCAL AND THEN ALLOW COUNT ON LOCALS
public void g_VX1_2X_unionXoutE_count__inE_count__outE_weight_sumX() {
final Traversal<Vertex, Number> traversal = get_g_VX1_2X_unionXoutE_count__inE_count__outE_weight_sumX(convertToVertexId("marko"), convertToVertexId("vadas"));
printTraversalForm(traversal);