You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2015/05/11 13:44:12 UTC
[41/50] [abbrv] incubator-tinkerpop git commit: greatly simplified
the groovy test suite. its all generated via strings and thus,
no need for STANDARD and COMPUTER versions of the tests.
greatly simplified the groovy test suite. its all generated via strings and thus, no need for STANDARD and COMPUTER versions of the tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/abd23f4e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/abd23f4e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/abd23f4e
Branch: refs/heads/TINKERPOP3-666
Commit: abd23f4ef34cb3143178573e543b76837052cf84
Parents: 2a5fa04
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Sat May 9 14:23:44 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Sat May 9 14:23:44 2015 -0600
----------------------------------------------------------------------
.../traversal/TraversalVertexProgram.java | 11 +-
.../process/computer/ComputerTestHelper.groovy | 47 ----
.../process/computer/GroovyTestHelper.groovy | 53 ++++
.../GroovyTraversalSideEffectsTest.groovy | 10 +-
.../step/branch/GroovyBranchTest.groovy | 41 +---
.../step/branch/GroovyChooseTest.groovy | 20 +-
.../step/branch/GroovyLocalTest.groovy | 85 +------
.../step/branch/GroovyRepeatTest.groovy | 78 +-----
.../step/branch/GroovyUnionTest.groovy | 57 +----
.../traversal/step/filter/GroovyAndTest.groovy | 30 +--
.../traversal/step/filter/GroovyCoinTest.groovy | 26 +-
.../step/filter/GroovyCyclicPathTest.groovy | 25 +-
.../step/filter/GroovyDedupTest.groovy | 60 +----
.../traversal/step/filter/GroovyDropTest.groovy | 12 +-
.../step/filter/GroovyExceptTest.groovy | 70 +-----
.../step/filter/GroovyFilterTest.groovy | 122 +--------
.../step/filter/GroovyHasNotTest.groovy | 32 +--
.../traversal/step/filter/GroovyHasTest.groovy | 138 ++---------
.../traversal/step/filter/GroovyIsTest.groovy | 49 +---
.../traversal/step/filter/GroovyOrTest.groovy | 31 +--
.../step/filter/GroovyRangeTest.groovy | 111 +--------
.../step/filter/GroovyRetainTest.groovy | 31 +--
.../step/filter/GroovySampleTest.groovy | 60 +----
.../step/filter/GroovySimplePathTest.groovy | 26 +-
.../step/filter/GroovyWhereTest.groovy | 73 +-----
.../traversal/step/map/GroovyAddEdgeTest.groovy | 12 +-
.../step/map/GroovyAddVertexTest.groovy | 11 +-
.../step/map/GroovyCoalesceTest.groovy | 58 +----
.../traversal/step/map/GroovyCountTest.groovy | 69 +-----
.../traversal/step/map/GroovyFoldTest.groovy | 40 +--
.../traversal/step/map/GroovyMapTest.groovy | 86 +------
.../traversal/step/map/GroovyMatchTest.groovy | 3 +-
.../traversal/step/map/GroovyMaxTest.groovy | 36 +--
.../traversal/step/map/GroovyMeanTest.groovy | 29 +--
.../traversal/step/map/GroovyMinTest.groovy | 37 +--
.../traversal/step/map/GroovyOrderTest.groovy | 127 +---------
.../traversal/step/map/GroovyPathTest.groovy | 69 +-----
.../step/map/GroovyPropertiesTest.groovy | 33 +--
.../traversal/step/map/GroovySelectTest.groovy | 246 +++----------------
.../traversal/step/map/GroovySumTest.groovy | 29 +--
.../traversal/step/map/GroovyUnfoldTest.groovy | 26 +-
.../step/map/GroovyValueMapTest.groovy | 31 +--
.../traversal/step/map/GroovyVertexTest.groovy | 197 +++------------
.../step/sideEffect/GroovyAggregateTest.groovy | 32 +--
.../step/sideEffect/GroovyGroupCountTest.groovy | 70 +-----
.../step/sideEffect/GroovyGroupTest.groovy | 55 +----
.../step/sideEffect/GroovyInjectTest.groovy | 35 +--
.../step/sideEffect/GroovyProfileTest.groovy | 50 +---
.../step/sideEffect/GroovySackTest.groovy | 35 +--
.../sideEffect/GroovySideEffectCapTest.groovy | 24 +-
.../step/sideEffect/GroovySideEffectTest.groovy | 18 +-
.../step/sideEffect/GroovyStoreTest.groovy | 42 +---
.../step/sideEffect/GroovySubgraphTest.groovy | 11 +-
.../step/sideEffect/GroovyTreeTest.groovy | 65 +----
.../process/GroovyProcessComputerSuite.java | 103 ++++----
.../process/GroovyProcessStandardSuite.java | 102 ++++----
.../process/traversal/step/map/AddEdgeTest.java | 10 +-
.../step/sideEffect/SideEffectTest.java | 10 +-
.../traversal/step/sideEffect/SubgraphTest.java | 9 +-
.../computer/example/TraversalSupplier2.java | 10 +-
.../computer/example/TraversalSupplier3.java | 13 +-
.../gremlin/hadoop/structure/HadoopGraph.java | 14 +-
62 files changed, 579 insertions(+), 2566 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/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 581a263..5e74393 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
@@ -94,12 +94,11 @@ public final class TraversalVertexProgram implements VertexProgram<TraverserSet<
}
/**
- * A helper method to yield a {@link Supplier} of {@link Traversal} from the {@link Configuration}.
- * The supplier is either a {@link Class}, {@link org.apache.tinkerpop.gremlin.process.computer.util.ScriptEngineLambda}, or a direct Java8 lambda.
+ * A helper method to yield a {@link Traversal} from the {@link Graph} and provided {@link Configuration}.
*
* @param graph the graph that the traversal will run against
- * @param configuration The configuration containing the public static TRAVERSAL_SUPPLIER key.
- * @return the traversal supplier in the configuration
+ * @param configuration The configuration containing the TRAVERSAL_SUPPLIER key.
+ * @return the traversal supplied by the configuration
*/
public static Traversal.Admin<?, ?> getTraversal(final Graph graph, final Configuration configuration) {
return VertexProgram.<TraversalVertexProgram>createVertexProgram(graph, configuration).getTraversal();
@@ -113,7 +112,7 @@ public final class TraversalVertexProgram implements VertexProgram<TraverserSet<
public void loadState(final Graph graph, final Configuration configuration) {
this.configurationTraversal = ConfigurationTraversal.loadState(graph, configuration, TRAVERSAL_SUPPLIER);
if (null == this.configurationTraversal) {
- throw new IllegalArgumentException("The configuration does not have a traversal supplier");
+ throw new IllegalArgumentException("The configuration does not have a traversal supplier:" + TRAVERSAL_SUPPLIER);
}
this.traversal = this.configurationTraversal.get();
((ComputerResultStep) this.traversal.getEndStep()).byPass();
@@ -291,7 +290,7 @@ public final class TraversalVertexProgram implements VertexProgram<TraverserSet<
}
- public Builder traversal(final Class<Function<Graph,Traversal.Admin<?, ?>>> traversalClass) {
+ public Builder traversal(final Class<Function<Graph, Traversal.Admin<?, ?>>> traversalClass) {
ConfigurationTraversal.storeState(traversalClass, this.configuration, TRAVERSAL_SUPPLIER);
return this;
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/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
deleted file mode 100644
index c054fc8..0000000
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/computer/ComputerTestHelper.groovy
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-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.traversal.dsl.graph.GraphTraversalSource
-import org.apache.tinkerpop.gremlin.structure.Graph
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public class ComputerTestHelper {
-
- public static final Traversal.Admin<?,?> compute(
- final Graph graph,
- final TraversalSource.Builder builder,
- final String scriptEngineName,
- final String traversalScript,
- final Object... bindings) {
-
- final TraversalVertexProgram program = TraversalVertexProgram.build().traversal(builder, scriptEngineName, traversalScript, bindings).create(graph);
- final ComputerResult result = builder.create(graph).getGraphComputer().get().program(program).submit().get();
- return program.computerResultTraversal(result);
- }
-
- public static final <S,E> Traversal.Admin<S,E> 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/abd23f4e/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/computer/GroovyTestHelper.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/computer/GroovyTestHelper.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/computer/GroovyTestHelper.groovy
new file mode 100644
index 0000000..d648720
--- /dev/null
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/computer/GroovyTestHelper.groovy
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.computer
+
+import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalScriptFunction
+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.traversal.dsl.graph.GraphTraversalSource
+import org.apache.tinkerpop.gremlin.structure.Graph
+
+/**
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ */
+public class GroovyTestHelper {
+
+ public static final Traversal.Admin<?, ?> compute(
+ final Graph graph,
+ final TraversalSource.Builder builder,
+ final String scriptEngineName,
+ final String traversalScript,
+ final Object... bindings) {
+
+ if (builder.create(graph).getGraphComputer().isPresent()) {
+ final TraversalVertexProgram program = TraversalVertexProgram.build().traversal(builder, scriptEngineName, traversalScript, bindings).create(graph);
+ final ComputerResult result = builder.create(graph).getGraphComputer().get().program(program).submit().get();
+ return program.computerResultTraversal(result);
+ } else {
+ return new TraversalScriptFunction<>(builder, scriptEngineName, traversalScript, bindings).apply(graph);
+ }
+ }
+
+ public static final <S, E> Traversal.Admin<S, E> compute(
+ final String script, final GraphTraversalSource g, final Object... bindings) {
+ return GroovyTestHelper.compute(g.getGraph().get(), g.asBuilder(), "gremlin-groovy", script, bindings);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/GroovyTraversalSideEffectsTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/GroovyTraversalSideEffectsTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/GroovyTraversalSideEffectsTest.groovy
index 0f35473..d0c6038 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/GroovyTraversalSideEffectsTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/GroovyTraversalSideEffectsTest.groovy
@@ -17,19 +17,15 @@
* under the License.
*/
package org.apache.tinkerpop.gremlin.process.traversal
-
-import org.apache.tinkerpop.gremlin.process.UseEngine
-
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
abstract class GroovyTraversalSideEffectsTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends TraversalSideEffectsTest {
+ public static class Traversals extends TraversalSideEffectsTest {
@Override
- TraversalSideEffects get_g_V_asAdmin_getSideEffects() {
- g.V.asAdmin().sideEffects
+ public TraversalSideEffects get_g_V_asAdmin_getSideEffects() {
+ g.V().asAdmin().getSideEffects()
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyBranchTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyBranchTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyBranchTest.groovy
index d1671a4..8e0c6eb 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyBranchTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyBranchTest.groovy
@@ -18,58 +18,25 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.branch
-import org.apache.tinkerpop.gremlin.LoadGraphWith
-import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.computer.GroovyTestHelper
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
-import org.junit.Test
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public abstract class GroovyBranchTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends BranchTest {
+ public static class Traversals extends BranchTest {
@Override
public Traversal<Vertex, Object> get_g_V_branchXlabel_eq_person__a_bX_optionXa__ageX_optionXb__langX_optionXb__nameX() {
- g.V.branch(__.label.is('person').count)
- .option(1L, __.age)
- .option(0L, __.lang)
- .option(0L, __.name)
+ GroovyTestHelper.compute("g.V.branch(__.label.is('person').count).option(1L, __.age).option(0L, __.lang).option(0L,__.name)", g);
}
@Override
public Traversal<Vertex, Object> get_g_V_branchXlabelX_optionXperson__ageX_optionXsoftware__langX_optionXsoftware__nameX() {
- g.V.branch(__.label)
- .option('person', __.age)
- .option('software', __.lang)
- .option('software', __.name);
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends BranchTest {
-
- @Test
- @LoadGraphWith(org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN)
- @Override
- public void g_V_branchXlabel_eq_person__a_bX_optionXa__ageX_optionXb__langX_optionXb__nameX() {
- super.g_V_branchXlabel_eq_person__a_bX_optionXa__ageX_optionXb__langX_optionXb__nameX();
- }
-
- @Override
- public Traversal<Vertex, Object> get_g_V_branchXlabel_eq_person__a_bX_optionXa__ageX_optionXb__langX_optionXb__nameX() {
- ComputerTestHelper.compute("g.V.branch(__.label.is('person').count).option(1L, __.age).option(0L, __.lang).option(0L,__.name)", g);
- }
-
- @Override
- public Traversal<Vertex, Object> get_g_V_branchXlabelX_optionXperson__ageX_optionXsoftware__langX_optionXsoftware__nameX() {
- ComputerTestHelper.compute("""
+ GroovyTestHelper.compute("""
g.V.branch(__.label)
.option('person', __.age)
.option('software', __.lang)
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyChooseTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyChooseTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyChooseTest.groovy
index 3ec89e9..f0c66b9 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyChooseTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyChooseTest.groovy
@@ -18,11 +18,8 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.branch
-import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.computer.GroovyTestHelper
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
/**
@@ -31,21 +28,10 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyChooseTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends ChooseTest {
-
- @Override
- public Traversal<Vertex, Object> get_g_V_chooseXout_countX_optionX2L__nameX_optionX3L__valueMapX() {
- g.V.choose(__.out.count).option(2L, __.values('name')).option(3L, __.valueMap())
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends ChooseTest {
-
+ public static class Traversals extends ChooseTest {
@Override
public Traversal<Vertex, Object> get_g_V_chooseXout_countX_optionX2L__nameX_optionX3L__valueMapX() {
- ComputerTestHelper.compute("g.V.choose(__.out.count).option(2L, __.values('name')).option(3L, __.valueMap())", g);
+ GroovyTestHelper.compute("g.V.choose(__.out.count).option(2L, __.values('name')).option(3L, __.valueMap())", g);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/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 d698403..fcf7a8c 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,14 +18,9 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.branch
-import org.apache.tinkerpop.gremlin.process.UseEngine
-import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.computer.GroovyTestHelper
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.Edge
-import org.apache.tinkerpop.gremlin.structure.Order
-import org.apache.tinkerpop.gremlin.structure.T
import org.apache.tinkerpop.gremlin.structure.Vertex
/**
@@ -33,112 +28,56 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyLocalTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends LocalTest {
+ public static class Traversals extends LocalTest {
@Override
public Traversal<Vertex, String> get_g_V_localXpropertiesXlocationX_order_byXvalueX_limitX2XX_value() {
- g.V.local(__.properties('location').order.by(T.value, Order.incr).limit(2)).value
+ GroovyTestHelper.compute("g.V.local(__.properties('location').order.by(T.value,Order.incr).limit(2)).value", g);
}
@Override
public Traversal<Vertex, Map<String, Object>> get_g_V_hasXlabel_personX_asXaX_localXoutXcreatedX_asXbXX_selectXa_bX_byXnameX_byXidX() {
- g.V.has(T.label, 'person').as('a').local(__.out('created').as('b')).select('a', 'b').by('name').by(T.id)
+ GroovyTestHelper.compute("g.V.has(T.label, 'person').as('a').local(__.out('created').as('b')).select('a', 'b').by('name').by(T.id)", g);
}
@Override
public Traversal<Vertex, Long> get_g_V_localXoutE_countX() {
- g.V.local(__.outE.count());
+ GroovyTestHelper.compute("g.V.local(__.outE.count())", g);
}
@Override
public Traversal<Vertex, String> get_g_VX1X_localXoutEXknowsX_limitX1XX_inV_name(final Object v1Id) {
- g.V(v1Id).local(__.outE('knows').limit(1)).inV.name
+ GroovyTestHelper.compute("g.V(v1Id).local(__.outE('knows').limit(1)).inV.name", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, String> get_g_V_localXbothEXcreatedX_limitX1XX_otherV_name() {
- g.V().local(__.bothE('created').limit(1)).otherV.name
+ GroovyTestHelper.compute("g.V().local(__.bothE('created').limit(1)).otherV.name", g);
}
@Override
public Traversal<Vertex, Edge> get_g_VX4X_localXbothEX1_createdX_limitX1XX(final Object v4Id) {
- g.V(v4Id).local(__.bothE('created').limit(1))
+ GroovyTestHelper.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) {
- g.V(v4Id).local(__.bothE('knows', 'created').limit(1))
+ GroovyTestHelper.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) {
- g.V(v4Id).local(__.bothE.limit(1)).otherV.name
+ GroovyTestHelper.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) {
- g.V(v4Id).local(__.bothE.limit(2)).otherV.name
+ GroovyTestHelper.compute("g.V(v4Id).local(__.bothE.limit(2)).otherV.name", g, "v4Id", v4Id);
}
@Override
public Traversal<Vertex, String> get_g_V_localXinEXknowsX_limitX2XX_outV_name() {
- g.V().inE('knows').local(__.limit(2).outV).name
+ GroovyTestHelper.compute("g.V().local(__.inE('knows').limit(2).outV).name", g);
}
}
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends LocalTest {
-
- @Override
- public Traversal<Vertex, String> get_g_V_localXpropertiesXlocationX_order_byXvalueX_limitX2XX_value() {
- ComputerTestHelper.compute("g.V.local(__.properties('location').order.by(T.value,Order.incr).limit(2)).value", g);
- }
-
- @Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_hasXlabel_personX_asXaX_localXoutXcreatedX_asXbXX_selectXa_bX_byXnameX_byXidX() {
- ComputerTestHelper.compute("g.V.has(T.label, 'person').as('a').local(__.out('created').as('b')).select('a', 'b').by('name').by(T.id)", g);
- }
-
- @Override
- public Traversal<Vertex, Long> get_g_V_localXoutE_countX() {
- ComputerTestHelper.compute("g.V.local(__.outE.count())", g);
- }
-
- @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, "v1Id", v1Id);
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_localXbothEXcreatedX_limitX1XX_otherV_name() {
- ComputerTestHelper.compute("g.V().local(__.bothE('created').limit(1)).otherV.name", g);
- }
-
- @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, "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, "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, "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, "v4Id", v4Id);
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_localXinEXknowsX_limitX2XX_outV_name() {
- ComputerTestHelper.compute("g.V().local(__.inE('knows').limit(2).outV).name", g);
- }
- }
-
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/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 67a989d..c3c872e 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,117 +18,61 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.branch
-import org.apache.tinkerpop.gremlin.process.UseEngine
-import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.computer.GroovyTestHelper
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.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
-
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public abstract class GroovyRepeatTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends RepeatTest {
-
- @Override
- public Traversal<Vertex, Path> get_g_V_repeatXoutX_timesX2X_emit_path() {
- g.V.repeat(__.out).times(2).emit.path
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_repeatXoutX_timesX2X_repeatXinX_timesX2X_name() {
- g.V.repeat(__.out).times(2).repeat(__.in).times(2).name
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_repeatXoutX_timesX2X() {
- g.V.repeat(__.out).times(2)
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_repeatXoutX_timesX2X_emit() {
- g.V.repeat(__.out).times(2).emit;
- }
-
- @Override
- public Traversal<Vertex, String> get_g_VX1X_timesX2X_repeatXoutX_name(final Object v1Id) {
- g.V(v1Id).times(2).repeat(__.out).name
- }
-
- @Override
- public Traversal<Vertex, Path> get_g_V_emit_repeatXoutX_timesX2X_path() {
- g.V.emit.repeat(__.out).times(2).path
- }
-
- @Override
- public Traversal<Vertex, Path> get_g_V_emit_timesX2X_repeatXoutX_path() {
- g.V.emit.times(2).repeat(__.out).path
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_emitXhasXlabel_personXX_repeatXoutX_name(final Object v1Id) {
- g.V(v1Id).emit(has(T.label, 'person')).repeat(__.out).name
- }
-
- @Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXgroupCountXmX_byXnameX_outX_timesX2X_capXmX() {
- g.V.repeat(groupCount('m').by('name').out).times(2).cap('m')
- }
- }
+ public static class Traversals extends RepeatTest {
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends RepeatTest {
@Override
public Traversal<Vertex, Path> get_g_V_repeatXoutX_timesX2X_emit_path() {
- ComputerTestHelper.compute("g.V.repeat(__.out).times(2).emit.path", g)
+ GroovyTestHelper.compute("g.V.repeat(__.out).times(2).emit.path", g)
}
@Override
public Traversal<Vertex, String> get_g_V_repeatXoutX_timesX2X_repeatXinX_timesX2X_name() {
- ComputerTestHelper.compute("g.V.repeat(__.out).times(2).repeat(__.in).times(2).name", g)
+ GroovyTestHelper.compute("g.V.repeat(__.out).times(2).repeat(__.in).times(2).name", g)
}
@Override
public Traversal<Vertex, Vertex> get_g_V_repeatXoutX_timesX2X() {
- ComputerTestHelper.compute("g.V.repeat(__.out).times(2)", g)
+ GroovyTestHelper.compute("g.V.repeat(__.out).times(2)", g)
}
@Override
public Traversal<Vertex, Vertex> get_g_V_repeatXoutX_timesX2X_emit() {
- ComputerTestHelper.compute("g.V.repeat(__.out).times(2).emit", g)
+ GroovyTestHelper.compute("g.V.repeat(__.out).times(2).emit", g)
}
@Override
public Traversal<Vertex, String> get_g_VX1X_timesX2X_repeatXoutX_name(Object v1Id) {
- ComputerTestHelper.compute("g.V(v1Id).times(2).repeat(__.out).name", g, "v1Id", v1Id)
+ GroovyTestHelper.compute("g.V(v1Id).times(2).repeat(__.out).name", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, Path> get_g_V_emit_repeatXoutX_timesX2X_path() {
- ComputerTestHelper.compute("g.V.emit.repeat(__.out).times(2).path", g)
+ GroovyTestHelper.compute("g.V.emit.repeat(__.out).times(2).path", g)
}
@Override
public Traversal<Vertex, Path> get_g_V_emit_timesX2X_repeatXoutX_path() {
- ComputerTestHelper.compute("g.V.emit.times(2).repeat(__.out).path", g)
+ GroovyTestHelper.compute("g.V.emit.times(2).repeat(__.out).path", g)
}
@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, "v1Id", v1Id)
+ GroovyTestHelper.compute("g.V(v1Id).emit(has(T.label, 'person')).repeat(__.out).name", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXgroupCountXmX_byXnameX_outX_timesX2X_capXmX() {
- ComputerTestHelper.compute("g.V.repeat(groupCount('m').by('name').out).times(2).cap('m')", g)
+ GroovyTestHelper.compute("g.V.repeat(groupCount('m').by('name').out).times(2).cap('m')", g)
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/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 6bbf309..c20daee 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
@@ -19,77 +19,36 @@
package org.apache.tinkerpop.gremlin.process.traversal.step.branch
import org.apache.tinkerpop.gremlin.process.UseEngine
-import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.computer.GroovyTestHelper
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.Vertex
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.*
-
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public abstract class GroovyUnionTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends UnionTest {
-
- public Traversal<Vertex, String> get_g_V_unionXout__inX_name() {
- g.V.union(__.out, __.in).name
- }
-
- public Traversal<Vertex, String> get_g_VX1X_unionXrepeatXoutX_timesX2X__outX_name(final Object v1Id) {
- g.V(v1Id).union(repeat(__.out).times(2), __.out).name
- }
-
- public Traversal<Vertex, String> get_g_V_chooseXlabel_is_person__unionX__out_lang__out_nameX__in_labelX() {
- g.V.choose(__.label.is('person'), union(__.out.lang, __.out.name), __.in.label)
- }
-
- public Traversal<Vertex, Map<String, Long>> get_g_V_chooseXlabel_is_person__unionX__out_lang__out_nameX__in_labelX_groupCount() {
- g.V.choose(__.label.is('person'), union(__.out.lang, __.out.name), __.in.label).groupCount
- }
-
- public Traversal<Vertex, Map<String, Long>> get_g_V_unionXrepeatXunionXoutXcreatedX__inXcreatedXX_timesX2X__repeatXunionXinXcreatedX__outXcreatedXX_timesX2XX_label_groupCount() {
- g.V.union(
- repeat(union(
- out('created'),
- __.in('created'))).times(2),
- repeat(union(
- __.in('created'),
- out('created'))).times(2)).label.groupCount()
- }
-
- @Override
- public Traversal<Vertex, Number> get_g_VX1_2X_unionXoutE_count__inE_count__outE_weight_sumX(
- final Object v1Id, final Object v2Id) {
- g.V(v1Id, v2Id).union(outE().count, inE().count, outE().weight.sum);
- }
-
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends UnionTest {
+ public static class Traversals extends UnionTest {
public Traversal<Vertex, String> get_g_V_unionXout__inX_name() {
- ComputerTestHelper.compute("g.V.union(__.out, __.in).name", g)
+ GroovyTestHelper.compute("g.V.union(__.out, __.in).name", g)
}
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, "v1Id", v1Id)
+ GroovyTestHelper.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() {
- ComputerTestHelper.compute("g.V.choose(__.label.is('person'), union(__.out.lang, __.out.name), __.in.label)", g)
+ GroovyTestHelper.compute("g.V.choose(__.label.is('person'), union(__.out.lang, __.out.name), __.in.label)", g)
}
public Traversal<Vertex, Map<String, Long>> get_g_V_chooseXlabel_is_person__unionX__out_lang__out_nameX__in_labelX_groupCount() {
- ComputerTestHelper.compute("g.V.choose(__.label.is('person'), union(__.out.lang, __.out.name), __.in.label).groupCount", g)
+ GroovyTestHelper.compute("g.V.choose(__.label.is('person'), union(__.out.lang, __.out.name), __.in.label).groupCount", g)
}
public Traversal<Vertex, Map<String, Long>> get_g_V_unionXrepeatXunionXoutXcreatedX__inXcreatedXX_timesX2X__repeatXunionXinXcreatedX__outXcreatedXX_timesX2XX_label_groupCount() {
- ComputerTestHelper.compute("""
+ GroovyTestHelper.compute("""
g.V.union(
repeat(union(
out('created'),
@@ -103,7 +62,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) {
- ComputerTestHelper.compute("g.V(v1Id, v2Id).union(outE().count, inE().count, outE().weight.sum)", g, "v1Id", v1Id, "v2Id", v2Id);
+ GroovyTestHelper.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/abd23f4e/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy
index 8581464..fdd8f90 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyAndTest.groovy
@@ -18,47 +18,25 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.filter
-import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
-import org.apache.tinkerpop.gremlin.structure.T
+import org.apache.tinkerpop.gremlin.process.computer.GroovyTestHelper
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 static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.has
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outE
-import static org.apache.tinkerpop.gremlin.structure.P.*;
-
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public abstract class GroovyAndTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends AndTest {
-
- @Override
- public Traversal<Vertex, String> get_g_V_andXhasXage_gt_27X__outE_count_gt_2X_name() {
- g.V.and(has('age', gt(27)), outE().count.is(gte(2l))).name
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_andXoutE__hasXlabel_personX_and_hasXage_gte_32XX_name() {
- g.V.and(outE(), has(T.label, 'person') & has('age', gte(32))).name
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends AndTest {
+ public static class Traversals extends AndTest {
@Override
public Traversal<Vertex, String> get_g_V_andXhasXage_gt_27X__outE_count_gt_2X_name() {
- ComputerTestHelper.compute("g.V.and(has('age',gt(27)), outE().count.is(gte(2l))).name", g)
+ GroovyTestHelper.compute("g.V.and(has('age',gt(27)), outE().count.is(gte(2l))).name", g)
}
@Override
public Traversal<Vertex, String> get_g_V_andXoutE__hasXlabel_personX_and_hasXage_gte_32XX_name() {
- ComputerTestHelper.compute("g.V.and(outE(), has(T.label, 'person') & has('age', gte(32))).name", g)
+ GroovyTestHelper.compute("g.V.and(outE(), has(T.label, 'person') & has('age', gte(32))).name", g)
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyCoinTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyCoinTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyCoinTest.groovy
index 01ae205..8127595 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyCoinTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyCoinTest.groovy
@@ -18,10 +18,8 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.filter
+import org.apache.tinkerpop.gremlin.process.computer.GroovyTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
-import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.structure.Vertex
/**
@@ -29,31 +27,15 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyCoinTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends CoinTest {
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_coinX1X() {
- g.V.coin(1.0f)
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_coinX0X() {
- g.V.coin(0.0f)
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends CoinTest {
-
+ public static class Traversals extends CoinTest {
@Override
public Traversal<Vertex, Vertex> get_g_V_coinX1X() {
- ComputerTestHelper.compute("g.V.coin(1.0f)", g);
+ GroovyTestHelper.compute("g.V.coin(1.0f)", g);
}
@Override
public Traversal<Vertex, Vertex> get_g_V_coinX0X() {
- ComputerTestHelper.compute("g.V.coin(0.0f)", g);
+ GroovyTestHelper.compute("g.V.coin(0.0f)", g);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/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 ebe8338..fceaec9 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
@@ -18,11 +18,9 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.filter
+import org.apache.tinkerpop.gremlin.process.computer.GroovyTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.Path
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
-import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.structure.Vertex
/**
@@ -30,31 +28,16 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyCyclicPathTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends CyclicPathTest {
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inXcreatedX_cyclicPath(final Object v1Id) {
- g.V(v1Id).out('created').in('created').cyclicPath
- }
-
- @Override
- public Traversal<Vertex, Path> get_g_VX1X_outXcreatedX_inXcreatedX_cyclicPath_path(final Object v1Id) {
- g.V(v1Id).out('created').in('created').cyclicPath.path
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends CyclicPathTest {
+ public static class Traversals extends CyclicPathTest {
@Override
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);
+ GroovyTestHelper.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 v1Id) {
- ComputerTestHelper.compute("g.V(v1Id).out('created').in('created').cyclicPath().path()", g, "v1Id",v1Id);
+ GroovyTestHelper.compute("g.V(v1Id).out('created').in('created').cyclicPath().path()", g, "v1Id", v1Id);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDedupTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDedupTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDedupTest.groovy
index c303f03..5e22987 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDedupTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDedupTest.groovy
@@ -18,17 +18,9 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.filter
-import org.apache.tinkerpop.gremlin.process.*
-import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
-import org.apache.tinkerpop.gremlin.process.traversal.Scope
-import org.apache.tinkerpop.gremlin.structure.T
+import org.apache.tinkerpop.gremlin.process.computer.GroovyTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
import org.apache.tinkerpop.gremlin.structure.Vertex
-import org.junit.Test
-
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.bothE
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.dedup
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -36,32 +28,8 @@ import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.dedup
*/
public abstract class GroovyDedupTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends DedupTest {
- @Override
- public Traversal<Vertex, String> get_g_V_both_dedup_name() {
- g.V.both.dedup.name
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_both_hasXlabel_softwareX_dedup_byXlangX_name() {
- g.V.both.has(T.label, 'software').dedup.by('lang').name
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_both_name_orderXa_bX_dedup() {
- g.V().both().properties('name').order.by { a, b -> a.value() <=> b.value() }.dedup.value
- }
-
- @Override
- Traversal<Vertex, Map<String, Set<Double>>> get_g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXdedupXlocalXX() {
- g.V().group().by(T.label).by(bothE().values('weight').fold()).by(dedup(Scope.local))
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends DedupTest {
- @Override
+ public static class Traversals extends DedupTest {
+ /*@Override
@Test
@org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
public void g_V_both_dedup_name() {
@@ -77,29 +45,27 @@ public abstract class GroovyDedupTest {
@Test
@org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
public void g_V_both_name_orderXa_bX_dedup() {
- }
+ }*/
@Override
- public Traversal<Vertex, Map<String, Set<Double>>> get_g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXdedupXlocalXX() {
- ComputerTestHelper.compute("g.V().group().by(T.label).by(bothE().values('weight').fold()).by(dedup(Scope.local))", g);
+ public Traversal<Vertex, String> get_g_V_both_dedup_name() {
+ GroovyTestHelper.compute("g.V.both.dedup.name", g);
}
@Override
- Traversal<Vertex, String> get_g_V_both_dedup_name() {
- // override with nothing until the test itself is supported
- return null
+ public Traversal<Vertex, Map<String, Set<Double>>> get_g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXdedupXlocalXX() {
+ GroovyTestHelper.compute("g.V().group().by(T.label).by(bothE().values('weight').fold()).by(dedup(Scope.local))", g);
}
+
@Override
- Traversal<Vertex, String> get_g_V_both_hasXlabel_softwareX_dedup_byXlangX_name() {
- // override with nothing until the test itself is supported
- return null
+ public Traversal<Vertex, String> get_g_V_both_hasXlabel_softwareX_dedup_byXlangX_name() {
+ GroovyTestHelper.compute("g.V.both.has(T.label, 'software').dedup.by('lang').name", g);
}
@Override
- Traversal<Vertex, String> get_g_V_both_name_orderXa_bX_dedup() {
- // override with nothing until the test itself is supported
- return null
+ public Traversal<Vertex, String> get_g_V_both_name_orderXa_bX_dedup() {
+ return GroovyTestHelper.compute("g.V().both().properties('name').order.by { a, b -> a.value() <=> b.value() }.dedup.value", g);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDropTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDropTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDropTest.groovy
index e738662..1f5a8d7 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDropTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDropTest.groovy
@@ -19,9 +19,8 @@
package org.apache.tinkerpop.gremlin.process.traversal.step.filter
-import org.apache.tinkerpop.gremlin.process.UseEngine
+import org.apache.tinkerpop.gremlin.process.computer.GroovyTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
import org.apache.tinkerpop.gremlin.structure.Edge
import org.apache.tinkerpop.gremlin.structure.Vertex
import org.apache.tinkerpop.gremlin.structure.VertexProperty
@@ -31,22 +30,21 @@ import org.apache.tinkerpop.gremlin.structure.VertexProperty
*/
public abstract class GroovyDropTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends DropTest {
+ public static class Traversals extends DropTest {
@Override
public Traversal<Vertex, Vertex> get_g_V_drop() {
- g.V.drop
+ GroovyTestHelper.compute("g.V.drop", g)
}
@Override
public Traversal<Vertex, Edge> get_g_V_outE_drop() {
- g.V.outE.drop
+ GroovyTestHelper.compute("g.V.outE.drop", g)
}
@Override
public Traversal<Vertex, VertexProperty> get_g_V_properties_drop() {
- g.V.properties().drop
+ GroovyTestHelper.compute("g.V.properties().drop", g)
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/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 68af198..0b03f2d 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
@@ -18,12 +18,9 @@
*/
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.computer.GroovyTestHelper
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.traversal.dsl.graph.__
import org.apache.tinkerpop.gremlin.structure.Vertex
/**
@@ -32,95 +29,48 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyExceptTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends ExceptTest {
+ public static class Traversals extends ExceptTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_out_exceptXg_v2X(final Object v1Id, final Object v2Id) {
- g.V(v1Id).out.except(g.V(v2Id).next())
+ GroovyTestHelper.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) {
- g.V(v1Id).out.aggregate('x').out.except('x')
+ GroovyTestHelper.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) {
- g.V(v1Id).out('created').in('created').except(g.V(v1Id).next()).values('name')
+ GroovyTestHelper.compute("g.V(v1Id).out('created').in('created').except(g.V(v1Id).next()).values('name')", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_V_exceptXg_V_toListX() {
- g.V.out.except(g.V.toList())
+ GroovyTestHelper.compute("g.V.out.except(g.V.toList())", g);
}
@Override
public Traversal<Vertex, Vertex> get_g_V_exceptXX() {
- g.V.out.except([])
+ GroovyTestHelper.compute("g.V.out.except([])", g);
}
@Override
public Traversal<Vertex, Path> get_g_VX1X_repeatXbothEXcreatedX_exceptXeX_aggregateXeX_otherVX_emit_path(
final Object v1Id) {
- g.V(v1Id).repeat(__.bothE('created').except('e').aggregate('e').otherV).emit.path
+ GroovyTestHelper.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) {
- g.V(v1Id).repeat(__.bothE('created').dedup.otherV).emit.path
+ GroovyTestHelper.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) {
- g.V(v1Id).as('a').out('created').in('created').except('a').name
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends ExceptTest {
-
- @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, "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, "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, "v1Id", v1Id);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_exceptXg_V_toListX() {
- ComputerTestHelper.compute("g.V.out.except(g.V.toList())", g);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_exceptXX() {
- ComputerTestHelper.compute("g.V.out.except([])", g);
- }
-
- @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, "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, "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, "v1Id", v1Id);
+ GroovyTestHelper.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/abd23f4e/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 40cf643..ffc7140 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
@@ -20,7 +20,7 @@ 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.computer.GroovyTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
import org.apache.tinkerpop.gremlin.structure.Edge
@@ -32,148 +32,46 @@ import org.junit.Test
*/
public abstract class GroovyFilterTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends FilterTest {
+ public static class Traversals extends FilterTest {
@Override
public Traversal<Vertex, Vertex> get_g_V_filterXfalseX() {
- g.V.filter { false }
+ GroovyTestHelper.compute("g.V.filter { false }", g);
}
@Override
public Traversal<Vertex, Vertex> get_g_V_filterXtrueX() {
- g.V.filter { true }
+ GroovyTestHelper.compute("g.V.filter { true }", g);
}
@Override
public Traversal<Vertex, Vertex> get_g_V_filterXlang_eq_javaX() {
- g.V.filter { it.property('lang').orElse("none") == 'java' }
+ GroovyTestHelper.compute("g.V.filter { it.property('lang').orElse('none') == 'java' }", g);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_filterXage_gt_30X(final Object v1Id) {
- g.V(v1Id).filter { it.age > 30 }
+ GroovyTestHelper.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) {
- g.V(v1Id).out.filter { it.property('age').orElse(0) > 30 }
+ GroovyTestHelper.compute("g.V(v1Id).out.filter { it.property('age').orElse(0) > 30 }", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_V_filterXname_startsWith_m_OR_name_startsWith_pX() {
- g.V.filter { it.name.startsWith('m') || it.name.startsWith('p') }
+ GroovyTestHelper.compute("g.V.filter { it.name.startsWith('m') || it.name.startsWith('p') }", g);
}
@Override
public Traversal<Edge, Edge> get_g_E_filterXfalseX() {
- g.E.filter { false }
+ GroovyTestHelper.compute("g.E.filter { false }", g);
}
@Override
public Traversal<Edge, Edge> get_g_E_filterXtrueX() {
- g.E.filter { true }
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends FilterTest {
-
-
- @Test
- @LoadGraphWith(org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN)
- @Override
- public void g_V_filterXfalseX() {
- super.g_V_filterXfalseX();
- }
-
- @Test
- @LoadGraphWith(org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN)
- @Override
- public void g_V_filterXtrueX() {
- super.g_V_filterXtrueX();
- }
-
- @Test
- @LoadGraphWith(org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN)
- @Override
- public void g_V_filterXlang_eq_javaX() {
- super.g_V_filterXlang_eq_javaX();
- }
-
- @Test
- @LoadGraphWith(org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN)
- @Override
- public void g_VX1X_filterXage_gt_30X() {
- super.g_VX1X_filterXage_gt_30X();
- }
-
- @Test
- @LoadGraphWith(org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN)
- @Override
- public void g_VX1X_out_filterXage_gt_30X() {
- super.g_VX1X_out_filterXage_gt_30X();
- }
-
- @Test
- @LoadGraphWith(org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN)
- @Override
- public void g_V_filterXname_startsWith_m_OR_name_startsWith_pX() {
- super.g_V_filterXname_startsWith_m_OR_name_startsWith_pX();
- }
-
- @Test
- @LoadGraphWith(org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN)
- @Override
- public void g_E_filterXfalseX() {
- super.g_E_filterXfalseX();
- }
-
- @Test
- @LoadGraphWith(org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN)
- @Override
- public void g_E_filterXtrueX() {
- super.g_E_filterXtrueX();
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_filterXfalseX() {
- ComputerTestHelper.compute("g.V.filter { false }", g);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_filterXtrueX() {
- ComputerTestHelper.compute("g.V.filter { true }", g);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_filterXlang_eq_javaX() {
- ComputerTestHelper.compute("g.V.filter { it.property('lang').orElse('none') == 'java' }", g);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_filterXage_gt_30X(final Object v1Id) {
- 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, "v1Id", v1Id);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_filterXname_startsWith_m_OR_name_startsWith_pX() {
- ComputerTestHelper.compute("g.V.filter { it.name.startsWith('m') || it.name.startsWith('p') }", g);
- }
-
- @Override
- public Traversal<Edge, Edge> get_g_E_filterXfalseX() {
- ComputerTestHelper.compute("g.E.filter { false }", g);
- }
-
- @Override
- public Traversal<Edge, Edge> get_g_E_filterXtrueX() {
- ComputerTestHelper.compute("g.E.filter { true }", g);
+ GroovyTestHelper.compute("g.E.filter { true }", g);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/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 5593053..839215f 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,11 +18,8 @@
*/
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.computer.GroovyTestHelper
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.Vertex
/**
@@ -30,39 +27,20 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyHasNotTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends HasNotTest {
+ public static class Traversals extends HasNotTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_hasNotXprop(final Object v1Id, final String propertyKey) {
- g.V(v1Id).hasNot(propertyKey)
+ GroovyTestHelper.compute("g.V(v1Id).hasNot('${propertyKey}')", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_V_hasNotXprop(final String propertyKey) {
- g.V.hasNot(propertyKey)
+ GroovyTestHelper.compute("g.V.hasNot('${propertyKey}')", g);
}
@Override
public Traversal<Vertex, String> get_g_V_hasNotXoutXcreatedXX() {
- return g.V().hasNot(__.out('created')).values('name');
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- 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, "v1Id", v1Id);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_hasNotXprop(final String propertyKey) {
- ComputerTestHelper.compute("g.V.hasNot('${propertyKey}')", g);
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_hasNotXoutXcreatedXX() {
- ComputerTestHelper.compute("return g.V().hasNot(__.out('created')).values('name')", g);
+ GroovyTestHelper.compute("return g.V().hasNot(__.out('created')).values('name')", g);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/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 3295d70..2f5a86c 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,197 +18,101 @@
*/
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.computer.GroovyTestHelper
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.Edge
-import org.apache.tinkerpop.gremlin.structure.T
import org.apache.tinkerpop.gremlin.structure.Vertex
-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)
*/
public abstract class GroovyHasTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends HasTest {
-
- @Override
- public Traversal<Edge, Edge> get_g_EX11X_outV_outE_hasXid_10X(final Object e11Id, final Object e8Id) {
- g.E(e11Id).outV.outE.has(T.id, e8Id);
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_outXknowsX_hasXoutXcreatedXX_name() {
- g.V.out('knows').has(__.out('created')).name
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_hasXkeyX(final Object v1Id, final String key) {
- g.V(v1Id).has(key)
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_hasXname_markoX(final Object v1Id) {
- g.V(v1Id).has('name', 'marko')
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_hasXname_markoX() {
- g.V.has('name', 'marko')
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_hasXname_blahX() {
- g.V.has('name', 'blah')
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_hasXblahX() {
- g.V.has('blah')
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_hasXage_gt_30X(final Object v1Id) {
- g.V(v1Id).has('age', gt(30))
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_out_hasIdX2X(final Object v1Id, final Object v2Id) {
- g.V(v1Id).out.hasId(v2Id)
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_out_hasIdX2_3X(final Object v1Id, final Object v2Id, final Object v3Id) {
- g.V(v1Id).out.hasId(v2Id, v3Id)
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_hasXage_gt_30X() {
- g.V.has('age', gt(30))
- }
-
- @Override
- public Traversal<Edge, Edge> get_g_EX7X_hasLabelXknowsX(final Object e7Id) {
- g.E(e7Id).hasLabel('knows')
- }
-
- @Override
- public Traversal<Edge, Edge> get_g_E_hasLabelXknowsX() {
- g.E.hasLabel('knows')
- }
-
- @Override
- public Traversal<Edge, Edge> get_g_E_hasLabelXuses_traversesX() {
- g.E.hasLabel('uses', 'traverses')
- }
-
- @Override
- Traversal<Vertex, Vertex> get_g_V_hasLabelXperson_software_blahX() {
- g.V.hasLabel("person", "software", 'blah');
- }
-
- @Override
- public Traversal<Vertex, Integer> get_g_V_hasXperson_name_markoX_age() {
- g.V.has('person', 'name', 'marko').age;
- }
-
- @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
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends HasTest {
+ public static class Traversals 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, "e11Id", e11Id, "e8Id", e8Id);
+ GroovyTestHelper.compute("g.E(e11Id).outV.outE.has(T.id, e8Id)", g, "e11Id", e11Id, "e8Id", e8Id);
}
@Override
public Traversal<Vertex, String> get_g_V_outXknowsX_hasXoutXcreatedXX_name() {
- ComputerTestHelper.compute("g.V.out('knows').has(__.out('created')).name", g);
+ GroovyTestHelper.compute("g.V.out('knows').has(__.out('created')).name", g);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_hasXkeyX(final Object v1Id, final String key) {
- ComputerTestHelper.compute("g.V(v1Id).has('${key}')", g, "v1Id", v1Id);
+ GroovyTestHelper.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, "v1Id", v1Id);
+ GroovyTestHelper.compute("g.V(v1Id).has('name', 'marko')", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_V_hasXname_markoX() {
- ComputerTestHelper.compute("g.V.has('name', 'marko')", g);
+ GroovyTestHelper.compute("g.V.has('name', 'marko')", g);
}
@Override
public Traversal<Vertex, Vertex> get_g_V_hasXname_blahX() {
- ComputerTestHelper.compute(" g.V.has('name', 'blah')", g);
+ GroovyTestHelper.compute(" g.V.has('name', 'blah')", g);
}
@Override
public Traversal<Vertex, Vertex> get_g_V_hasXblahX() {
- ComputerTestHelper.compute("g.V.has('blah')", g);
+ GroovyTestHelper.compute("g.V.has('blah')", g);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_hasXage_gt_30X(final Object v1Id) {
- ComputerTestHelper.compute("g.V(v1Id).has('age', gt(30))", g, "v1Id", v1Id);
+ GroovyTestHelper.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, "v1Id", v1Id, "v2Id", v2Id);
+ GroovyTestHelper.compute(" g.V(v1Id).out.hasId(v2Id)", g, "v1Id", v1Id, "v2Id", v2Id);
}
@Override
- public Traversal<Vertex, Vertex> get_g_VX1X_out_hasIdX2_3X(final Object v1Id, final Object v2Id, final Object v3Id) {
- ComputerTestHelper.compute(" g.V(v1Id).out.hasId(v2Id, v3Id)", g, "v1Id", v1Id, "v2Id", v2Id, "v3Id", v3Id);
+ public Traversal<Vertex, Vertex> get_g_VX1X_out_hasIdX2_3X(
+ final Object v1Id, final Object v2Id, final Object v3Id) {
+ GroovyTestHelper.compute(" g.V(v1Id).out.hasId(v2Id, v3Id)", g, "v1Id", v1Id, "v2Id", v2Id, "v3Id", v3Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_V_hasXage_gt_30X() {
- ComputerTestHelper.compute("g.V.has('age', gt(30))", g);
+ GroovyTestHelper.compute("g.V.has('age', gt(30))", g);
}
@Override
public Traversal<Edge, Edge> get_g_EX7X_hasLabelXknowsX(final Object e7Id) {
- ComputerTestHelper.compute("g.E(e7Id).hasLabel('knows')", g, "e7Id", e7Id);
+ GroovyTestHelper.compute("g.E(e7Id).hasLabel('knows')", g, "e7Id", e7Id);
}
@Override
public Traversal<Edge, Edge> get_g_E_hasLabelXknowsX() {
- ComputerTestHelper.compute("g.E.hasLabel('knows')", g);
+ GroovyTestHelper.compute("g.E.hasLabel('knows')", g);
}
@Override
public Traversal<Edge, Edge> get_g_E_hasLabelXuses_traversesX() {
- ComputerTestHelper.compute("g.E.hasLabel('uses', 'traverses')", g);
+ GroovyTestHelper.compute("g.E.hasLabel('uses', 'traverses')", g);
}
@Override
Traversal<Vertex, Vertex> get_g_V_hasLabelXperson_software_blahX() {
- ComputerTestHelper.compute("g.V.hasLabel('person', 'software', 'blah')", g);
+ GroovyTestHelper.compute("g.V.hasLabel('person', 'software', 'blah')", g);
}
@Override
public Traversal<Vertex, Integer> get_g_V_hasXperson_name_markoX_age() {
- ComputerTestHelper.compute("g.V.has('person', 'name', 'marko').age", g);
+ GroovyTestHelper.compute("g.V.has('person', 'name', 'marko').age", g);
}
@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, "v1Id", v1Id);
+ GroovyTestHelper.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/abd23f4e/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 e567735..05559e9 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
@@ -18,75 +18,40 @@
*/
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.computer.GroovyTestHelper
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.Vertex
-import static org.apache.tinkerpop.gremlin.structure.P.*
-
/**
* @author Daniel Kuppitz (http://gremlin.guru)
*/
public abstract class GroovyIsTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends IsTest {
-
- @Override
- public Traversal<Vertex, Integer> get_g_V_valuesXageX_isX32X() {
- return g.V().values('age').is(32);
- }
-
- @Override
- public Traversal<Vertex, Integer> get_g_V_valuesXageX_isXlte_30X() {
- return g.V().values('age').is(lte(30));
- }
-
- @Override
- public Traversal<Vertex, Integer> get_g_V_valuesXageX_isXgte_29X_isXlt_34X() {
- return g.V().values('age').is(gte(29)).is(lt(34));
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX() {
- return g.V().has(__.in('created').count().is(1)).values('name');
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_hasXinXcreatedX_count_isXgte_2XX_valuesXnameX() {
- return g.V().has(__.in('created').count().is(gte(2l))).values('name');
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends IsTest {
+ public static class Traversals extends IsTest {
@Override
public Traversal<Vertex, Integer> get_g_V_valuesXageX_isX32X() {
- ComputerTestHelper.compute("g.V.age.is(32)", g)
+ GroovyTestHelper.compute("g.V.age.is(32)", g)
}
@Override
public Traversal<Vertex, Integer> get_g_V_valuesXageX_isXlte_30X() {
- ComputerTestHelper.compute("g.V.age.is(lte(30))", g)
+ GroovyTestHelper.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.age.is(gte(29)).is(lt(34))", g)
+ GroovyTestHelper.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)).name", g)
+ GroovyTestHelper.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))).name", g)
+ GroovyTestHelper.compute("g.V.has(__.in('created').count.is(gte(2l))).name", g)
}
}
}