You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/05/09 22:41:48 UTC
[2/7] 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.
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/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 06cf352..1238cca 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
@@ -19,17 +19,11 @@
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.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.Vertex
-import org.junit.Test
-
-import static __.values
-import static org.apache.tinkerpop.gremlin.process.traversal.Scope.local
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -38,321 +32,137 @@ import static org.apache.tinkerpop.gremlin.process.traversal.Scope.local
public abstract class GroovySelectTest {
@UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends SelectTest {
+ public static class Traversals extends SelectTest {
@Override
public Traversal<Vertex, Map<String, Vertex>> get_g_VX1X_asXaX_outXknowsX_asXbX_select(final Object v1Id) {
- g.V(v1Id).as('a').out('knows').as('b').select()
+ GroovyTestHelper.compute("g.V(v1Id).as('a').out('knows').as('b').select()", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, Map<String, String>> get_g_VX1X_asXaX_outXknowsX_asXbX_select_byXnameX(
final Object v1Id) {
- g.V(v1Id).as('a').out('knows').as('b').select.by('name')
+ GroovyTestHelper.compute("g.V(v1Id).as('a').out('knows').as('b').select.by('name')", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_asXaX_outXknowsX_asXbX_selectXaX(final Object v1Id) {
- g.V(v1Id).as('a').out('knows').as('b').select('a')
+ GroovyTestHelper.compute("g.V(v1Id).as('a').out('knows').as('b').select('a')", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, String> get_g_VX1X_asXaX_outXknowsX_asXbX_selectXaX_byXnameX(
final Object v1Id) {
- g.V(v1Id).as('a').out('knows').as('b').select('a').by('name')
+ GroovyTestHelper.compute("g.V(v1Id).as('a').out('knows').as('b').select('a').by('name')", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, Map<String, String>> get_g_V_asXaX_out_asXbX_select_byXnameX() {
- g.V.as('a').out.as('b').select.by('name')
+ GroovyTestHelper.compute("g.V.as('a').out.as('b').select.by('name')", g)
}
@Override
public Traversal<Vertex, Map<String, String>> get_g_V_asXaX_out_aggregateXxX_asXbX_select_byXnameX() {
- g.V.as('a').out.aggregate('x').as('b').select.by('name')
+ GroovyTestHelper.compute("g.V.as('a').out.aggregate('x').as('b').select.by('name')", g)
}
@Override
public Traversal<Vertex, Map<String, String>> get_g_V_asXaX_name_order_asXbX_select_byXnameX_by_XitX() {
- g.V().as('a').name.order().as('b').select.by('name').by
+ GroovyTestHelper.compute("g.V().as('a').name.order().as('b').select.by('name').by", g)
}
@Override
public Traversal<Vertex, Map<String, Object>> get_g_V_hasXname_gremlinX_inEXusesX_order_byXskill_incrX_asXaX_outV_asXbX_select_byXskillX_byXnameX() {
- g.V.has('name', 'gremlin').inE('uses').order.by('skill', Order.incr).as('a').outV.as('b').select.by('skill').by('name')
+ GroovyTestHelper.compute("g.V.has('name', 'gremlin').inE('uses').order.by('skill', Order.incr).as('a').outV.as('b').select.by('skill').by('name')", g)
}
@Override
public Traversal<Vertex, Map<String, Object>> get_g_V_hasXname_isXmarkoXX_asXaX_select() {
- g.V.has(values('name').is('marko')).as('a').select
+ GroovyTestHelper.compute("g.V.has(values('name').is('marko')).as('a').select", g)
}
@Override
public Traversal<Vertex, Map<String, Object>> get_g_V_label_groupCount_asXxX_select() {
- g.V().label().groupCount().as('x').select()
+ GroovyTestHelper.compute("g.V().label().groupCount().as('x').select()", g)
}
@Override
public Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXpersonX_asXpersonX_localXbothE_label_groupCountX_asXrelationsX_select_byXnameX_by() {
- g.V().hasLabel('person').as('person').local(__.bothE().label().groupCount()).as('relations').select().by('name').by()
+ GroovyTestHelper.compute("g.V().hasLabel('person').as('person').local(__.bothE().label().groupCount()).as('relations').select().by('name').by()", g)
}
@Override
public Traversal<Vertex, Map<String, Vertex>> get_g_V_chooseXoutE_count_isX0X__asXaX__asXbXX_select() {
- g.V().choose(__.outE().count().is(0L), __.as('a'), __.as('b')).select();
+ GroovyTestHelper.compute("g.V().choose(__.outE().count().is(0L), __.as('a'), __.as('b')).select()", g)
}
@Override
Traversal<Vertex, Map<String, List<Vertex>>> get_g_V_asXaX_outXcreatedX_asXaX_select() {
- g.V.as('a').out('created').as('a').select
+ GroovyTestHelper.compute("g.V.as('a').out('created').as('a').select", g)
}
//
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_asXhereX_out_selectXhereX(final Object v1Id) {
- g.V(v1Id).as('here').out.select('here')
+ GroovyTestHelper.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) {
- g.V(v4Id).out.as('here').has('lang', 'java').select('here')
+ GroovyTestHelper.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) {
- g.V(v4Id).out.as('here').has('lang', 'java').select('here').name
+ GroovyTestHelper.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) {
- g.V(v1Id).outE.as('here').inV.has('name', 'vadas').select('here')
+ GroovyTestHelper.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) {
- g.V(v1Id).outE('knows').has('weight', 1.0d).as('here').inV.has('name', 'josh').select('here')
+ GroovyTestHelper.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) {
- g.V(v1Id).outE('knows').as('here').has('weight', 1.0d).inV.has('name', 'josh').select('here')
+ GroovyTestHelper.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) {
- g.V(v1Id).outE("knows").as('here').has('weight', 1.0d).as('fake').inV.has("name", 'josh').select('here')
+ GroovyTestHelper.compute("g.V(v1Id).outE('knows').as('here').has('weight', 1.0d).as('fake').inV.has('name', 'josh').select('here')", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, Vertex> get_g_V_asXhereXout_name_selectXhereX() {
- g.V().as("here").out.name.select("here");
- }
-
-
- @Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_outXcreatedX_unionXasXprojectX_inXcreatedX_hasXname_markoX_selectXprojectX__asXprojectX_inXcreatedX_inXknowsX_hasXname_markoX_selectXprojectXX_groupCount_byXnameX() {
- g.V.out('created')
- .union(__.as('project').in('created').has('name', 'marko').select('project'),
- __.as('project').in('created').in('knows').has('name', 'marko').select('project')).groupCount().by('name');
- }
-
- @Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_asXaX_hasXname_markoX_asXbX_asXcX_select_by_byXnameX_byXageX() {
- g.V.as('a').has('name', 'marko').as('b').as('c').select().by().by('name').by('age')
- }
-
- @Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXsoftwareX_asXnameX_asXlanguageX_asXcreatorsX_select_byXnameX_byXlangX_byXinXcreatedX_valuesXnameX_fold_orderXlocalXX() {
- g.V.hasLabel('software').as('name').as('language').as('creators').select().by('name').by('lang').
- by(__.in('created').values('name').fold().order(local))
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends SelectTest {
-
- @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, "v1Id", v1Id);
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_VX1X_asXaX_outXknowsX_asXbX_select_byXnameX() {
- }
-
- @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, "v1Id", v1Id);
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_VX1X_asXaX_outXknowsX_asXbX_selectXaX_byXnameX() {
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_V_asXaX_out_asXbX_select_byXnameX() {
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_V_asXaX_name_order_asXbX_select_byXnameX_byXitX() {
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_V_hasXname_gremlinX_inEXusesX_order_byXskill_incrX_asXaX_outV_asXbX_select_byXskillX_byXnameX() {
- }
-
- @Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_hasXname_isXmarkoXX_asXaX_select() {
- ComputerTestHelper.compute("g.V.has(values('name').is('marko')).as('a').select", g)
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_V_label_groupCount_asXxX_select() {
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- void g_V_hasLabelXpersonX_asXpersonX_localXbothE_label_groupCountX_asXrelationsX_select_byXnameX_by() {
- }
-
- @Override
- Traversal<Vertex, Map<String, String>> get_g_VX1X_asXaX_outXknowsX_asXbX_select_byXnameX(Object v1Id) {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- Traversal<Vertex, String> get_g_VX1X_asXaX_outXknowsX_asXbX_selectXaX_byXnameX(Object v1Id) {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- Traversal<Vertex, Map<String, String>> get_g_V_asXaX_out_asXbX_select_byXnameX() {
- // override with nothing until the test itself is supported
- return null
+ GroovyTestHelper.compute("g.V().as('here').out.name.select('here')", g)
}
- @Override
- Traversal<Vertex, Map<String, String>> get_g_V_asXaX_out_aggregateXxX_asXbX_select_byXnameX() {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- Traversal<Vertex, Map<String, String>> get_g_V_asXaX_name_order_asXbX_select_byXnameX_by_XitX() {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- Traversal<Vertex, Map<String, Object>> get_g_V_hasXname_gremlinX_inEXusesX_order_byXskill_incrX_asXaX_outV_asXbX_select_byXskillX_byXnameX() {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- Traversal<Vertex, Map<String, Object>> get_g_V_label_groupCount_asXxX_select() {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXpersonX_asXpersonX_localXbothE_label_groupCountX_asXrelationsX_select_byXnameX_by() {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- public Traversal<Vertex, Map<String, Vertex>> get_g_V_chooseXoutE_count_isX0X__asXaX__asXbXX_select() {
- ComputerTestHelper.compute("g.V.choose(__.outE.count.is(0L), __.as('a'), __.as('b')).select()", g)
- }
-
- @Override
- public Traversal<Vertex, Map<String, List<Vertex>>> get_g_V_asXaX_outXcreatedX_asXaX_select() {
- ComputerTestHelper.compute("g.V.as('a').out('created').as('a').select", g);
- }
-
- //
-
- @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, "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, "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, "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, "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, "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, "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, "v1Id", v1Id);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_asXhereXout_name_selectXhereX() {
- ComputerTestHelper.compute("g.V().as('here').out.name.select('here')", g);
- }
@Override
public Traversal<Vertex, Map<String, Long>> get_g_V_outXcreatedX_unionXasXprojectX_inXcreatedX_hasXname_markoX_selectXprojectX__asXprojectX_inXcreatedX_inXknowsX_hasXname_markoX_selectXprojectXX_groupCount_byXnameX() {
- ComputerTestHelper.compute("""
- g.V.out('created')
+ GroovyTestHelper.compute("""g.V.out('created')
.union(__.as('project').in('created').has('name', 'marko').select('project'),
- __.as('project').in('created').in('knows').has('name', 'marko').select('project')).groupCount().by('name');
- """, g)
+ __.as('project').in('created').in('knows').has('name', 'marko').select('project')).groupCount().by('name')""", g)
}
@Override
public Traversal<Vertex, Map<String, Object>> get_g_V_asXaX_hasXname_markoX_asXbX_asXcX_select_by_byXnameX_byXageX() {
- ComputerTestHelper.compute("g.V.as('a').has('name', 'marko').as('b').as('c').select().by().by('name').by('age')", g)
+ GroovyTestHelper.compute("g.V.as('a').has('name', 'marko').as('b').as('c').select().by().by('name').by('age')", g)
}
@Override
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
public Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXsoftwareX_asXnameX_asXlanguageX_asXcreatorsX_select_byXnameX_byXlangX_byXinXcreatedX_valuesXnameX_fold_orderXlocalXX() {
+ GroovyTestHelper.compute("""g.V.hasLabel('software').as('name').as('language').as('creators').select().by('name').by('lang').
+ by(__.in('created').values('name').fold().order(local))""", 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/map/GroovySumTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySumTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySumTest.groovy
index 9c72f6c..27fd903 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySumTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySumTest.groovy
@@ -18,46 +18,25 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map
-import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
-import org.apache.tinkerpop.gremlin.process.traversal.Scope
+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.__.bothE
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.sum
-
/**
* @author Daniel Kuppitz (http://gremlin.guru)
*/
public abstract class GroovySumTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends SumTest {
-
- @Override
- public Traversal<Vertex, Double> get_g_V_valuesXageX_sum() {
- g.V().values('age').sum()
- }
-
- @Override
- public Traversal<Vertex, Map<String, Number>> get_g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_valuesXweightX_foldX_byXsumXlocalXX() {
- g.V().hasLabel('software').group().by('name').by(bothE().values('weight').fold()).by(sum(Scope.local))
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends SumTest {
+ public static class Traversals extends SumTest {
@Override
public Traversal<Vertex, Double> get_g_V_valuesXageX_sum() {
- ComputerTestHelper.compute("g.V.age.sum", g)
+ GroovyTestHelper.compute("g.V.age.sum", g)
}
@Override
public Traversal<Vertex, Map<String, Number>> get_g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_valuesXweightX_foldX_byXsumXlocalXX() {
- ComputerTestHelper.compute("g.V().hasLabel('software').group().by('name').by(bothE().values('weight').fold()).by(sum(Scope.local))", g)
+ GroovyTestHelper.compute("g.V().hasLabel('software').group().by('name').by(bothE().values('weight').fold()).by(sum(local))", g)
}
}
}
\ No newline at end of file
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/map/GroovyUnfoldTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyUnfoldTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyUnfoldTest.groovy
index 9901805..06d3504 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyUnfoldTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyUnfoldTest.groovy
@@ -18,11 +18,8 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map
-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.Edge
import org.apache.tinkerpop.gremlin.structure.Vertex
@@ -31,31 +28,16 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyUnfoldTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends UnfoldTest {
+ public static class Traversals extends UnfoldTest {
@Override
public Traversal<Vertex, Edge> get_g_V_localXoutE_foldX_unfold() {
- g.V.local(__.outE.fold).unfold
+ GroovyTestHelper.compute("g.V.local(__.outE.fold).unfold", g)
}
@Override
public Traversal<Vertex, String> get_g_V_valueMap_unfold_mapXkeyX() {
- g.V.valueMap.unfold.map { it.key }
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends UnfoldTest {
-
- @Override
- public Traversal<Vertex, Edge> get_g_V_localXoutE_foldX_unfold() {
- ComputerTestHelper.compute("g.V.local(__.outE.fold).unfold", g)
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_valueMap_unfold_mapXkeyX() {
- ComputerTestHelper.compute("g.V.valueMap.unfold.map { it.key }", g)
+ GroovyTestHelper.compute("g.V.valueMap.unfold.map { it.key }", 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/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 3b82a2e..96ab120 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,8 @@
*/
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.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
/**
@@ -29,39 +27,20 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyValueMapTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends ValueMapTest {
+ public static class Traversals extends ValueMapTest {
@Override
public Traversal<Vertex, Map<String, List>> get_g_V_valueMap() {
- g.V.valueMap
+ GroovyTestHelper.compute("g.V.valueMap", g);
}
@Override
public Traversal<Vertex, Map<String, List>> get_g_V_valueMapXname_ageX() {
- g.V.valueMap('name', 'age')
+ GroovyTestHelper.compute("g.V.valueMap('name', 'age')", g);
}
@Override
public Traversal<Vertex, Map<String, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id) {
- g.V(v1Id).out('created').valueMap
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends ValueMapTest {
- @Override
- public Traversal<Vertex, Map<String, List>> get_g_V_valueMap() {
- ComputerTestHelper.compute("g.V.valueMap", g);
- }
-
- @Override
- public Traversal<Vertex, Map<String, List>> get_g_V_valueMapXname_ageX() {
- ComputerTestHelper.compute("g.V.valueMap('name', 'age')", g);
- }
-
- @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, "v1Id", v1Id);
+ GroovyTestHelper.compute("g.V(v1Id).out('created').valueMap", 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/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 b5fd13e..91b736e 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,287 +18,146 @@
*/
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.computer.GroovyTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-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)
*/
public abstract class GroovyVertexTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends VertexTest {
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V() {
- g.V
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_out(final Object v1Id) {
- g.V(v1Id).out
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX2X_in(final Object v2Id) {
- g.V(v2Id).in
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX4X_both(final Object v4Id) {
- g.V(v4Id).both
- }
-
-
- @Override
- public Traversal<Edge, Edge> get_g_E() {
- g.E
- }
-
- @Override
- public Traversal<Edge, Edge> get_g_EX11X(final Object e11Id) {
- g.E(e11Id);
- }
-
- @Override
- public Traversal<Vertex, Edge> get_g_VX1X_outE(final Object v1Id) {
- g.V(v1Id).outE
- }
-
- @Override
- public Traversal<Vertex, Edge> get_g_VX2X_inE(final Object v2Id) {
- g.V(v2Id).inE
- }
-
- @Override
- public Traversal<Vertex, Edge> get_g_VX4X_bothE(final Object v4Id) {
- g.V(v4Id).bothE
- }
-
- @Override
- public Traversal<Vertex, Edge> get_g_VX4X_bothEXcreatedX(final Object v4Id) {
- g.V(v4Id).bothE('created')
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_outE_inV(final Object v1Id) {
- g.V(v1Id).outE.inV
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX2X_inE_outV(final Object v2Id) {
- g.V(v2Id).inE.outV
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_outE_hasXweight_1X_outV() {
- g.V.outE.has('weight', 1.0d).outV
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_out_outE_inV_inE_inV_both_name() {
- g.V.out.outE.inV.inE.inV.both.name
- }
-
- @Override
- public Traversal<Vertex, String> get_g_VX1X_outEXknowsX_bothV_name(final Object v1Id) {
- g.V(v1Id).outE('knows').bothV.name
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_outXknowsX(final Object v1Id) {
- g.V(v1Id).out('knows')
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_outXknows_createdX(final Object v1Id) {
- g.V(v1Id).out('knows', 'created')
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_outEXknowsX_inV(final Object v1Id) {
- g.V(v1Id).outE('knows').inV()
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_outEXknows_createdX_inV(final Object v1Id) {
- g.V(v1Id).outE('knows', 'created').inV
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_out_out() {
- g.V().out().out()
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_out_out_out(final Object v1Id) {
- g.V(v1Id).out.out.out
- }
-
- @Override
- public Traversal<Vertex, String> get_g_VX1X_out_name(final Object v1Id) {
- g.V(v1Id).out.name
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_outE_otherV(final Object v1Id) {
- g.V(v1Id).outE.otherV
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX4X_bothE_otherV(final Object v4Id) {
- g.V(v4Id).bothE.otherV
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX4X_bothE_hasXweight_lt_1X_otherV(final Object v4Id) {
- g.V(v4Id).bothE.has('weight', lt(1.0d)).otherV
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_to_XOUT_knowsX(final Object v1Id) {
- g.V(v1Id).to(Direction.OUT, 'knows');
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends VertexTest {
+ public static class Traversals extends VertexTest {
@Override
public Traversal<Vertex, Vertex> get_g_V() {
- ComputerTestHelper.compute("g.V", g);
+ GroovyTestHelper.compute("g.V", g);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_out(final Object v1Id) {
- ComputerTestHelper.compute("g.V(v1Id).out", g, "v1Id", v1Id);
+ GroovyTestHelper.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, "v2Id", v2Id);
+ GroovyTestHelper.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, "v4Id", v4Id);
+ GroovyTestHelper.compute("g.V(v4Id).both", g, "v4Id", v4Id);
}
@Override
public Traversal<Edge, Edge> get_g_E() {
- ComputerTestHelper.compute("g.E", g);
+ GroovyTestHelper.compute("g.E", g);
}
@Override
public Traversal<Edge, Edge> get_g_EX11X(final Object e11Id) {
- ComputerTestHelper.compute("g.E(e11Id)", g, "e11Id", e11Id)
+ GroovyTestHelper.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, "v1Id", v1Id);
+ GroovyTestHelper.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, "v2Id", v2Id);
+ GroovyTestHelper.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, "v4Id", v4Id);
+ GroovyTestHelper.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, "v4Id", v4Id);
+ GroovyTestHelper.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, "v1Id", v1Id);
+ GroovyTestHelper.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, "v2Id", v2Id);
+ GroovyTestHelper.compute("g.V(v2Id).inE.outV", g, "v2Id", v2Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_V_outE_hasXweight_1X_outV() {
- ComputerTestHelper.compute("g.V.outE.has('weight', 1.0d).outV", g);
+ GroovyTestHelper.compute("g.V.outE.has('weight', 1.0d).outV", g);
}
@Override
public Traversal<Vertex, String> get_g_V_out_outE_inV_inE_inV_both_name() {
- ComputerTestHelper.compute("g.V.out.outE.inV.inE.inV.both.name", g);
+ GroovyTestHelper.compute("g.V.out.outE.inV.inE.inV.both.name", g);
}
@Override
public Traversal<Vertex, String> get_g_VX1X_outEXknowsX_bothV_name(final Object v1Id) {
- ComputerTestHelper.compute("g.V(v1Id).outE('knows').bothV.name", g, "v1Id", v1Id);
+ GroovyTestHelper.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, "v1Id", v1Id);
+ GroovyTestHelper.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, "v1Id", v1Id);
+ GroovyTestHelper.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, "v1Id", v1Id);
+ GroovyTestHelper.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, "v1Id", v1Id);
+ GroovyTestHelper.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);
+ GroovyTestHelper.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, "v1Id", v1Id);
+ GroovyTestHelper.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, "v1Id", v1Id);
+ GroovyTestHelper.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, "v1Id", v1Id);
+ GroovyTestHelper.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, "v4Id", v4Id);
+ GroovyTestHelper.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, "v4Id", v4Id);
+ GroovyTestHelper.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, "v1Id", v1Id);
+ GroovyTestHelper.compute("g.V(v1Id).to(Direction.OUT, 'knows')", 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/sideEffect/GroovyAggregateTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyAggregateTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyAggregateTest.groovy
index e22d6af..76b7338 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyAggregateTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyAggregateTest.groovy
@@ -18,11 +18,9 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect
+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,41 +28,21 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyAggregateTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends AggregateTest {
+ public static class Traversals extends AggregateTest {
@Override
public Traversal<Vertex, List<String>> get_g_V_name_aggregateXxX_capXxX() {
- g.V.name.aggregate('x').cap('x')
+ GroovyTestHelper.compute("g.V.name.aggregate('x').cap('x')", g)
}
@Override
public Traversal<Vertex, List<String>> get_g_V_aggregateXxX_byXnameX_capXxX() {
- g.V.aggregate('x').by('name').cap('x')
+ GroovyTestHelper.compute("g.V.aggregate('x').by('name').cap('x')", g)
}
@Override
public Traversal<Vertex, Path> get_g_V_out_aggregateXaX_path() {
- g.V.out.aggregate('a').path;
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends AggregateTest {
-
- @Override
- public Traversal<Vertex, List<String>> get_g_V_name_aggregateXxX_capXxX() {
- ComputerTestHelper.compute("g.V.name.aggregate('x').cap('x')", g)
- }
-
- @Override
- public Traversal<Vertex, List<String>> get_g_V_aggregateXxX_byXnameX_capXxX() {
- ComputerTestHelper.compute("g.V.aggregate('x').by('name').cap('x')", g)
- }
-
- @Override
- public Traversal<Vertex, Path> get_g_V_out_aggregateXaX_path() {
- ComputerTestHelper.compute("g.V.out.aggregate('a').path", g)
+ GroovyTestHelper.compute("g.V.out.aggregate('a').path", 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/sideEffect/GroovyGroupCountTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupCountTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupCountTest.groovy
index cba9f10..ad5bec1 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupCountTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupCountTest.groovy
@@ -18,11 +18,8 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect
-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
/**
@@ -30,93 +27,46 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyGroupCountTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends GroupCountTest {
+ public static class Traversals extends GroupCountTest {
@Override
public Traversal<Vertex, Map<String, Long>> get_g_V_outXcreatedX_groupCount_byXnameX() {
- g.V.out('created').groupCount.by('name')
+ GroovyTestHelper.compute("g.V.out('created').groupCount.by('name')", g)
}
@Override
public Traversal<Vertex, Map<String, Long>> get_g_V_outXcreatedX_groupCountXaX_byXnameX_capXaX() {
- g.V.out('created').groupCount('a').by('name').cap('a')
+ GroovyTestHelper.compute("g.V.out('created').groupCount('a').by('name').cap('a')", g)
}
@Override
public Traversal<Vertex, Map<String, Long>> get_g_V_outXcreatedX_name_groupCount() {
- g.V.out('created').name.groupCount
+ GroovyTestHelper.compute("g.V.out('created').name.groupCount", g)
}
@Override
public Traversal<Vertex, Map<String, Long>> get_g_V_outXcreatedX_name_groupCountXaX_capXaX() {
- g.V.out('created').name.groupCount('a').cap('a')
+ GroovyTestHelper.compute("g.V.out('created').name.groupCount('a').cap('a')", g)
}
@Override
public Traversal<Vertex, Map<Object, Long>> get_g_V_hasXnoX_groupCount() {
- g.V.has('no').groupCount;
+ GroovyTestHelper.compute("g.V.has('no').groupCount", g)
}
@Override
public Traversal<Vertex, Map<Object, Long>> get_g_V_hasXnoX_groupCountXaX_capXaX() {
- g.V.has('no').groupCount('a').cap('a');
+ GroovyTestHelper.compute("g.V.has('no').groupCount('a').cap('a')", g)
}
@Override
public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXout_groupCountXaX_byXnameXX_timesX2X_capXaX() {
- g.V.repeat(__.out.groupCount('a').by('name')).times(2).cap('a')
+ GroovyTestHelper.compute("g.V.repeat(__.out.groupCount('a').by('name')).times(2).cap('a')", g)
}
@Override
public Traversal<Vertex, Map<String, Long>> get_g_V_unionXrepeatXoutX_timesX2X_groupCountXmX_byXlangXX__repeatXinX_timesX2X_groupCountXmX_byXnameXX_capXmX() {
- g.V.union(
- __.repeat(__.out).times(2).groupCount('m').by('lang'),
- __.repeat(__.in).times(2).groupCount('m').by('name')).cap('m')
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends GroupCountTest {
-
- @Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_outXcreatedX_groupCount_byXnameX() {
- ComputerTestHelper.compute("g.V.out('created').groupCount.by('name')", g)
- }
-
- @Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_outXcreatedX_groupCountXaX_byXnameX_capXaX() {
- ComputerTestHelper.compute("g.V.out('created').groupCount('a').by('name').cap('a')", g)
- }
-
- @Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_outXcreatedX_name_groupCount() {
- ComputerTestHelper.compute("g.V.out('created').name.groupCount", g)
- }
-
- @Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_outXcreatedX_name_groupCountXaX_capXaX() {
- ComputerTestHelper.compute("g.V.out('created').name.groupCount('a').cap('a')", g)
- }
-
- @Override
- public Traversal<Vertex, Map<Object, Long>> get_g_V_hasXnoX_groupCount() {
- ComputerTestHelper.compute("g.V.has('no').groupCount", g)
- }
-
- @Override
- public Traversal<Vertex, Map<Object, Long>> get_g_V_hasXnoX_groupCountXaX_capXaX() {
- ComputerTestHelper.compute("g.V.has('no').groupCount('a').cap('a')", g)
- }
-
- @Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXout_groupCountXaX_byXnameXX_timesX2X_capXaX() {
- ComputerTestHelper.compute("g.V.repeat(__.out.groupCount('a').by('name')).times(2).cap('a')", g)
- }
-
- @Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_unionXrepeatXoutX_timesX2X_groupCountXmX_byXlangXX__repeatXinX_timesX2X_groupCountXmX_byXnameXX_capXmX() {
- ComputerTestHelper.compute("""
+ GroovyTestHelper.compute("""
g.V.union(
__.repeat(__.out).times(2).groupCount('m').by('lang'),
__.repeat(__.in).times(2).groupCount('m').by('name')).cap('m')
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/sideEffect/GroovyGroupTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupTest.groovy
index 988ca17..52733de 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupTest.groovy
@@ -18,12 +18,8 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect
-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.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
/**
@@ -31,71 +27,36 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyGroupTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends GroupTest {
+ public static class Traversals extends GroupTest {
@Override
public Traversal<Vertex, Map<String, Collection<Vertex>>> get_g_V_group_byXnameX() {
- g.V.group.by('name')
+ GroovyTestHelper.compute("g.V.group.by('name')", g)
}
@Override
public Traversal<Vertex, Map<String, Collection<Vertex>>> get_g_V_groupXaX_byXnameX_capXaX() {
- g.V.group('a').by('name').cap('a')
+ GroovyTestHelper.compute("g.V.group('a').by('name').cap('a')", g)
}
@Override
public Traversal<Vertex, Map<String, Collection<String>>> get_g_V_hasXlangX_groupXaX_byXlangX_byXnameX_out_capXaX() {
- g.V.has('lang').group('a').by('lang').by('name').out.cap('a')
+ GroovyTestHelper.compute("g.V.has('lang').group('a').by('lang').by('name').out.cap('a')", g)
}
@Override
public Traversal<Vertex, Map<String, Long>> get_g_V_hasXlangX_group_byXlangX_byX1X_byXcountXlocalXX() {
- g.V.has('lang').group.by('lang').by(__.inject(1)).by(__.count(Scope.local));
+ GroovyTestHelper.compute("g.V.has('lang').group.by('lang').by(__.inject(1)).by(__.count(Scope.local))", g)
}
@Override
public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXout_groupXaX_byXnameX_by_byXcountXlocalXX_timesX2X_capXaX() {
- g.V.repeat(__.out.group('a').by('name').by.by(__.count(Scope.local))).times(2).cap('a')
+ GroovyTestHelper.compute("g.V.repeat(__.out.group('a').by('name').by.by(__.count(Scope.local))).times(2).cap('a')", g)
}
@Override
public Traversal<Vertex, Map<Long, Collection<String>>> get_g_V_group_byXoutE_countX_byXnameX() {
- g.V.group.by(__.outE.count).by('name')
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends GroupTest {
-
- @Override
- public Traversal<Vertex, Map<String, Collection<Vertex>>> get_g_V_group_byXnameX() {
- ComputerTestHelper.compute("g.V.group.by('name')", g)
- }
-
- @Override
- public Traversal<Vertex, Map<String, Collection<Vertex>>> get_g_V_groupXaX_byXnameX_capXaX() {
- ComputerTestHelper.compute("g.V.group('a').by('name').cap('a')", g)
- }
-
- @Override
- public Traversal<Vertex, Map<String, Collection<String>>> get_g_V_hasXlangX_groupXaX_byXlangX_byXnameX_out_capXaX() {
- ComputerTestHelper.compute("g.V.has('lang').group('a').by('lang').by('name').out.cap('a')", g)
- }
-
- @Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_hasXlangX_group_byXlangX_byX1X_byXcountXlocalXX() {
- ComputerTestHelper.compute("g.V.has('lang').group.by('lang').by(__.inject(1)).by(__.count(Scope.local))", g)
- }
-
- @Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXout_groupXaX_byXnameX_by_byXcountXlocalXX_timesX2X_capXaX() {
- ComputerTestHelper.compute("g.V.repeat(__.out.group('a').by('name').by.by(__.count(Scope.local))).times(2).cap('a')", g)
- }
-
- @Override
- public Traversal<Vertex, Map<Long, Collection<String>>> get_g_V_group_byXoutE_countX_byXnameX() {
- ComputerTestHelper.compute("g.V.group.by(__.outE.count).by('name')", g)
+ GroovyTestHelper.compute("g.V.group.by(__.outE.count).by('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/sideEffect/GroovyInjectTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyInjectTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyInjectTest.groovy
index e56f652..3d5dc99 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyInjectTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyInjectTest.groovy
@@ -20,18 +20,14 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect
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.structure.Vertex
-import org.junit.Test
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public abstract class GroovyInjectTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends InjectTest {
+ public static class Traversals extends InjectTest {
@Override
public Traversal<Vertex, String> get_g_VX1X_out_injectXv2X_name(final Object v1Id, final Object v2Id) {
g.V(v1Id).out.inject(g.V(v2Id).next()).name
@@ -42,33 +38,4 @@ public abstract class GroovyInjectTest {
g.V(v1Id).out().name.inject('daniel').as('a').map { it.length() }.path
}
}
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends InjectTest {
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- void g_VX1X_out_injectXv2X_name() {
- super.g_VX1X_out_injectXv2X_name()
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- void g_VX1X_out_name_injectXdanielX_asXaX_mapXlengthX_path() {
- super.g_VX1X_out_name_injectXdanielX_asXaX_mapXlengthX_path()
- }
-
- @Override
- Traversal<Vertex, String> get_g_VX1X_out_injectXv2X_name(Object v1Id, Object v2Id) {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- Traversal<Vertex, Path> get_g_VX1X_out_name_injectXdanielX_asXaX_mapXlengthX_path(Object v1Id) {
- // override with nothing until the test itself is supported
- return null
- }
- }
}
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/sideEffect/GroovyProfileTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyProfileTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyProfileTest.groovy
index 41ca348..886cacc 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyProfileTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyProfileTest.groovy
@@ -18,75 +18,37 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect
+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.process.traversal.util.StandardTraversalMetrics
import org.apache.tinkerpop.gremlin.structure.Vertex
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public abstract class GroovyProfileTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends ProfileTest {
-
- @Override
- Traversal<Vertex, StandardTraversalMetrics> get_g_V_out_out_profile() {
- g.V.out.out.profile();
- }
-
- @Override
- public Traversal<Vertex, StandardTraversalMetrics> get_g_V_repeat_both_profile() {
- g.V.repeat(__.both()).times(3).profile();
- }
-
- @Override
- Traversal<Vertex, StandardTraversalMetrics> get_g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX_profile() {
- g.V().has(__.in("created").count().is(1l)).values("name").profile();
- }
-
- @org.junit.Ignore
- @Override
- void g_V_sleep_sleep_profile() {
- }
-
- @Override
- Traversal<Vertex, StandardTraversalMetrics> get_g_V_sleep_sleep_profile() {
- return null
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends ProfileTest {
+ public static class Traversals extends ProfileTest {
@Override
public Traversal<Vertex, StandardTraversalMetrics> get_g_V_out_out_profile() {
- ComputerTestHelper.compute("g.V.out.out.profile()", g);
+ g.V.out.out.profile() // locked traversals
}
@Override
public Traversal<Vertex, StandardTraversalMetrics> get_g_V_repeat_both_profile() {
- ComputerTestHelper.compute("g.V.repeat(__.both()).times(3).profile()", g);
+ GroovyTestHelper.compute("g.V.repeat(__.both()).times(3).profile()", g);
}
@Override
Traversal<Vertex, StandardTraversalMetrics> get_g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX_profile() {
- ComputerTestHelper.compute(" g.V().has(__.in('created').count().is(1l)).values('name').profile()", g);
- }
-
- @Override
- @org.junit.Ignore
- void g_V_sleep_sleep_profile() {
+ GroovyTestHelper.compute("g.V().has(__.in('created').count().is(1l)).values('name').profile()", g);
}
@Override
Traversal<Vertex, StandardTraversalMetrics> get_g_V_sleep_sleep_profile() {
- return null
+ GroovyTestHelper.compute("g.V().sideEffect{Thread.sleep(10)}.sideEffect{Thread.sleep(5)}.profile()", 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/sideEffect/GroovySackTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
index 21929a0..e29af96 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy
@@ -18,55 +18,30 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect
-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.Operator.sum
-
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public abstract class GroovySackTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends SackTest {
-
- @Override
- public Traversal<Vertex, Double> get_g_withSackX0X_V_outE_sackXsum_weightX_inV_sack_sum() {
- g.withSack(0.0f).V().outE.sack(sum, 'weight').inV.sack.sum()
- }
-
- @Override
- public Traversal<Vertex, Float> get_g_withSackX0X_V_repeatXoutE_sackXsum_weightX_inVX_timesX2X_sack() {
- g.withSack(0.0f).V.repeat(__.outE.sack(sum, 'weight').inV).times(2).sack
- }
-
- @Override
- public Traversal<Vertex, Map> get_g_withSackXmap__map_cloneX_V_out_out_sackXmap_a_nameX_sack() {
- g.withSack { [:] } { it.clone() }.V.out().out().sack { m, v -> m['a'] = v.name; m }.sack()
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends SackTest {
+ public static class Traversals extends SackTest {
@Override
public Traversal<Vertex, Double> get_g_withSackX0X_V_outE_sackXsum_weightX_inV_sack_sum() {
- ComputerTestHelper.compute("g.withSack(0.0f).V().outE.sack(sum, 'weight').inV.sack.sum()", g);
+ GroovyTestHelper.compute("g.withSack(0.0f).V().outE.sack(sum, 'weight').inV.sack.sum()", g);
}
@Override
public Traversal<Vertex, Float> get_g_withSackX0X_V_repeatXoutE_sackXsum_weightX_inVX_timesX2X_sack() {
- ComputerTestHelper.compute("g.withSack(0.0f).V.repeat(__.outE.sack(sum, 'weight').inV).times(2).sack", g)
+ GroovyTestHelper.compute("g.withSack(0.0f).V.repeat(__.outE.sack(sum, 'weight').inV).times(2).sack", g)
}
@Override
public Traversal<Vertex, Map> get_g_withSackXmap__map_cloneX_V_out_out_sackXmap_a_nameX_sack() {
- ComputerTestHelper.compute("g.withSack{[:]}{ it.clone() }.V.out().out().sack { m, v -> m['a'] = v.name; m }.sack()", g);
+ GroovyTestHelper.compute("g.withSack{[:]}{ it.clone() }.V.out().out().sack { m, v -> m['a'] = v.name; m }.sack()", 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/sideEffect/GroovySideEffectCapTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySideEffectCapTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySideEffectCapTest.groovy
index 54ed543..24456fe 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySideEffectCapTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySideEffectCapTest.groovy
@@ -20,7 +20,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect
import org.apache.tinkerpop.gremlin.structure.T
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
-import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.computer.GroovyTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.structure.Vertex
@@ -30,31 +30,15 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
*/
public abstract class GroovySideEffectCapTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends SideEffectCapTest {
+ public static class Traversals extends SideEffectCapTest {
@Override
public Traversal<Vertex, Map<String, Long>> get_g_V_hasXageX_groupCountXaX_byXnameX_out_capXaX() {
- g.V.has('age').groupCount('a').by('name').out.cap('a')
+ GroovyTestHelper.compute("g.V.has('age').groupCount('a').by('name').out.cap('a')", g)
}
@Override
public Traversal<Vertex, Map<String, Map<Object, Long>>> get_g_V_chooseXlabel_person__age_groupCountXaX__name_groupCountXbXX_capXa_bX() {
- g.V.choose(__.has(T.label, 'person'),
- __.age.groupCount('a'),
- __.values("name").groupCount('b')).cap('a', 'b')
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends SideEffectCapTest {
- @Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_hasXageX_groupCountXaX_byXnameX_out_capXaX() {
- ComputerTestHelper.compute("g.V.has('age').groupCount('a').by('name').out.cap('a')", g)
- }
-
- @Override
- public Traversal<Vertex, Map<String, Map<Object, Long>>> get_g_V_chooseXlabel_person__age_groupCountXaX__name_groupCountXbXX_capXa_bX() {
- ComputerTestHelper.compute("""
+ GroovyTestHelper.compute("""
g.V.choose(__.has(T.label, 'person'),
__.age.groupCount('a'),
__.values("name").groupCount('b')).cap('a', 'b')
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/sideEffect/GroovySideEffectTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySideEffectTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySideEffectTest.groovy
index bd04f2d..dc610e4 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySideEffectTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySideEffectTest.groovy
@@ -18,9 +18,8 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect
+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
/**
@@ -28,29 +27,28 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovySideEffectTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends SideEffectTest {
+ public static class Traversals extends SideEffectTest {
@Override
public Traversal<Vertex, String> get_g_VX1X_sideEffectXstore_aX_name(final Object v1Id) {
- g.withSideEffect('a') { [] }.V(v1Id).sideEffect {
+ GroovyTestHelper.compute("""g.withSideEffect('a') { [] }.V(v1Id).sideEffect {
it.sideEffects('a').clear();
it.sideEffects('a').add(it.get());
- }.name;
+ }.name""", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, String> get_g_VX1X_out_sideEffectXincr_cX_name(final Object v1Id) {
- g.withSideEffect('c') { [0] }.V(v1Id).out.sideEffect {
- def temp = it.sideEffects('c')[0];
+ GroovyTestHelper.compute("""g.withSideEffect('c') { [0] }.V(v1Id).out.sideEffect {
+ temp = it.sideEffects('c')[0];
it.sideEffects('c').clear();
it.sideEffects('c').add(temp + 1);
- }.name
+ }.name""", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, String> get_g_VX1X_out_sideEffectXX_name(final Object v1Id) {
- g.V(v1Id).out().sideEffect {}.name
+ GroovyTestHelper.compute("g.V(v1Id).out().sideEffect {}.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/sideEffect/GroovyStoreTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyStoreTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyStoreTest.groovy
index 971a4f7..d0e5b43 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyStoreTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyStoreTest.groovy
@@ -18,11 +18,8 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect
+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.process.computer.ComputerTestHelper
import org.apache.tinkerpop.gremlin.structure.Vertex
/**
@@ -30,54 +27,27 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyStoreTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends StoreTest {
+ public static class Traversals extends StoreTest {
@Override
public Traversal<Vertex, Collection> get_g_V_storeXaX_byXnameX_out_capXaX() {
- g.V().store('a').by('name').out().cap('a');
+ GroovyTestHelper.compute("g.V().store('a').by('name').out().cap('a')", g)
}
@Override
public Traversal<Vertex, Collection> get_g_VX1X_storeXaX_byXnameX_out_storeXaX_byXnameX_name_capXaX(
final Object v1Id) {
- g.V(v1Id).store('a').by('name').out().store('a').by('name').name.cap('a');
+ GroovyTestHelper.compute("g.V(${v1Id}).store('a').by('name').out().store('a').by('name').name.cap('a')", g)
}
@Override
public Traversal<Vertex, Set<String>> get_g_V_withSideEffectXa_setX_both_name_storeXaX_capXaX() {
- g.withSideEffect('a') { [] as Set }.V.both.name.store('a').cap('a')
- }
-
-
- @Override
- public Traversal<Vertex, Collection> get_g_V_storeXaX_byXoutEXcreatedX_countX_out_out_storeXaX_byXinEXcreatedX_weight_sumX_capXaX() {
- g.V.store('a').by(__.outE('created').count).out.out.store('a').by(__.inE('created').weight.sum).cap('a');
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends StoreTest {
-
- @Override
- public Traversal<Vertex, Collection> get_g_V_storeXaX_byXnameX_out_capXaX() {
- ComputerTestHelper.compute("g.V().store('a').by('name').out().cap('a')", g)
- }
-
- @Override
- public Traversal<Vertex, Collection> get_g_VX1X_storeXaX_byXnameX_out_storeXaX_byXnameX_name_capXaX(
- final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).store('a').by('name').out().store('a').by('name').name.cap('a')", g)
- }
-
- @Override
- public Traversal<Vertex, Set<String>> get_g_V_withSideEffectXa_setX_both_name_storeXaX_capXaX() {
- ComputerTestHelper.compute("g.withSideEffect('a'){[] as Set}.V.both.name.store('a').cap('a')", g);
+ GroovyTestHelper.compute("g.withSideEffect('a'){[] as Set}.V.both.name.store('a').cap('a')", g);
}
@Override
public Traversal<Vertex, Collection> get_g_V_storeXaX_byXoutEXcreatedX_countX_out_out_storeXaX_byXinEXcreatedX_weight_sumX_capXaX() {
- ComputerTestHelper.compute("g.V.store('a').by(__.outE('created').count).out.out.store('a').by(__.inE('created').weight.sum).cap('a')", g);
+ GroovyTestHelper.compute("g.V.store('a').by(__.outE('created').count).out.out.store('a').by(__.inE('created').weight.sum).cap('a')", 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/sideEffect/GroovySubgraphTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySubgraphTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySubgraphTest.groovy
index 620b0ff..5b3d801 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySubgraphTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySubgraphTest.groovy
@@ -18,31 +18,28 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect
+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.Graph
import org.apache.tinkerpop.gremlin.structure.Vertex
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public abstract class GroovySubgraphTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends SubgraphTest {
+ public static class Traversals extends SubgraphTest {
@Override
public Traversal<Vertex, Graph> get_g_V_withSideEffectXsgX_outEXknowsX_subgraphXsgX_name_capXsgX(
final Object v1Id, final Graph subgraph) {
- g.withSideEffect('sg') { subgraph }.V(v1Id).outE('knows').subgraph('sg').name.cap('sg')
+ GroovyTestHelper.compute("g.withSideEffect('sg') { subgraph }.V(v1Id).outE('knows').subgraph('sg').name.cap('sg')", g, "v1Id", v1Id, "subgraph", subgraph)
}
@Override
public Traversal<Vertex, String> get_g_V_withSideEffectXsgX_repeatXbothEXcreatedX_subgraphXsgX_outVX_timesX5X_name_dedup(
final Graph subgraph) {
- g.withSideEffect('sg') { subgraph }.V.repeat(__.bothE('created').subgraph('sg').outV).times(5).name.dedup
+ GroovyTestHelper.compute("g.withSideEffect('sg') { subgraph }.V.repeat(__.bothE('created').subgraph('sg').outV).times(5).name.dedup", g, "subgraph", subgraph)
}
}
}
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/sideEffect/GroovyTreeTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyTreeTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyTreeTest.groovy
index 0dc037d..b5ae25d 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyTreeTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyTreeTest.groovy
@@ -18,92 +18,47 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect
-import org.apache.tinkerpop.gremlin.process.*
-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.traversal.step.util.Tree
import org.apache.tinkerpop.gremlin.structure.Vertex
-import org.junit.Test
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public abstract class GroovyTreeTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends TreeTest {
+ public static class Traversals extends TreeTest {
@Override
public Traversal<Vertex, Tree> get_g_V_out_out_tree_byXidX() {
- g.V.out.out.tree.by(T.id);
+ GroovyTestHelper.compute("g.V.out.out.tree.by(id)", g)
}
@Override
public Traversal<Vertex, Tree> get_g_V_out_out_treeXaX_byXidX_capXaX() {
- g.V.out.out.tree('a').by(T.id).cap('a');
- }
-
- @Override
- public Traversal<Vertex, Tree> get_g_VX1X_out_out_tree_byXnameX(final Object v1Id) {
- g.V(v1Id).out.out.tree.by('name');
- }
-
- @Override
- public Traversal<Vertex, Tree> get_g_VX1X_out_out_treeXaX_byXnameX_both_both_capXaX(final Object v1Id) {
- g.V(v1Id).out.out.tree('a').by('name').both.both.cap('a');
+ GroovyTestHelper.compute("g.V.out.out.tree('a').by(id).cap('a')", g)
}
@Override
public Traversal<Vertex, Tree> get_g_V_out_out_tree() {
- g.V.out.out.tree();
+ GroovyTestHelper.compute("g.V.out.out.tree()", g)
}
@Override
public Traversal<Vertex, Tree> get_g_V_out_out_treeXaX_capXaX() {
- g.V.out.out.tree('a').cap('a');
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends TreeTest {
-
- @Override
- public Traversal<Vertex, Tree> get_g_V_out_out_tree_byXidX() {
- ComputerTestHelper.compute("g.V.out.out.tree.by(id)", g)
+ GroovyTestHelper.compute("g.V.out.out.tree('a').cap('a')", g)
}
@Override
- public Traversal<Vertex, Tree> get_g_V_out_out_treeXaX_byXidX_capXaX() {
- ComputerTestHelper.compute("g.V.out.out.tree('a').by(id).cap('a')", g)
- }
-
- @Override
- public Traversal<Vertex, Tree> get_g_V_out_out_tree() {
- ComputerTestHelper.compute("g.V.out.out.tree()", g)
- }
-
- @Override
- public Traversal<Vertex, Tree> get_g_V_out_out_treeXaX_capXaX() {
- ComputerTestHelper.compute("g.V.out.out.tree('a').cap('a')", g)
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- void g_VX1X_out_out_tree_byXnameX() {
-
+ public Traversal<Vertex, Tree> get_g_VX1X_out_out_treeXaX_byXnameX_both_both_capXaX(final Object v1Id) {
+ GroovyTestHelper.compute("g.V(v1Id).out.out.tree('a').by('name').both.both.cap('a')", g, "v1Id", v1Id)
}
@Override
- Traversal<Vertex, Tree> get_g_VX1X_out_out_tree_byXnameX(Object v1Id) {
- return null
+ public Traversal<Vertex, Tree> get_g_VX1X_out_out_tree_byXnameX(final Object v1Id) {
+ GroovyTestHelper.compute("g.V(v1Id).out.out.tree.by('name')", g, "v1Id", v1Id)
}
- @Override
- Traversal<Vertex, Tree> get_g_VX1X_out_out_treeXaX_byXnameX_both_both_capXaX(Object v1Id) {
- return null
- }
}
}