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:49 UTC
[3/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/filter/GroovyOrTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyOrTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyOrTest.groovy
index 1e711fe..7b0a014 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyOrTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyOrTest.groovy
@@ -18,48 +18,25 @@
*/
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.structure.T
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.gt
-import static org.apache.tinkerpop.gremlin.structure.P.gte;
-
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public abstract class GroovyOrTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends OrTest {
-
- @Override
- public Traversal<Vertex, String> get_g_V_orXhasXage_gt_27X__outE_count_gte_2X_name() {
- g.V.or(has('age', gt(27)), outE().count.is(gte(2l))).name
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_orXoutEXknowsX__hasXlabel_softwareX_or_hasXage_gte_35XX_name() {
- g.V.or(outE('knows'), has(T.label, 'software') | has('age', gte(35))).name
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends OrTest {
+ public static class Traversals extends OrTest {
@Override
public Traversal<Vertex, String> get_g_V_orXhasXage_gt_27X__outE_count_gte_2X_name() {
- ComputerTestHelper.compute("g.V.or(has('age', gt(27)), outE().count.is(gte(2l))).name", g)
+ GroovyTestHelper.compute("g.V.or(has('age', gt(27)), outE().count.is(gte(2l))).name", g)
}
@Override
public Traversal<Vertex, String> get_g_V_orXoutEXknowsX__hasXlabel_softwareX_or_hasXage_gte_35XX_name() {
- ComputerTestHelper.compute("g.V.or(outE('knows'), has(T.label, 'software') | has('age', gte(35))).name", g)
+ GroovyTestHelper.compute("g.V.or(outE('knows'), has(T.label, 'software') | has('age', gte(35))).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/GroovyRangeTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy
index c8611ea..d8f183f 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy
@@ -18,143 +18,50 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.filter
-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.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 GroovyRangeTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends RangeTest {
+ public static class Traversals extends RangeTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_out_limitX2X(final Object v1Id) {
- g.V(v1Id).out.limit(2)
+ GroovyTestHelper.compute("g.V(v1Id).out.limit(2)", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, Vertex> get_g_V_localXoutE_limitX1X_inVX_limitX3X() {
- g.V.local(__.outE.limit(3)).inV.limit(3)
+ GroovyTestHelper.compute("g.V.local(__.outE.limit(3)).inV.limit(3)", g)
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outXknowsX_outEXcreatedX_rangeX0_1X_inV(final Object v1Id) {
- g.V(v1Id).out('knows').outE('created')[0].inV()
+ GroovyTestHelper.compute("g.V(v1Id).out('knows').outE('created')[0].inV()", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outXknowsX_outXcreatedX_rangeX0_1X(final Object v1Id) {
- g.V(v1Id).out('knows').out('created')[0]
+ GroovyTestHelper.compute("g.V(v1Id).out('knows').out('created')[0]", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inXcreatedX_rangeX1_3X(final Object v1Id) {
- g.V(v1Id).out('created').in('created')[1..3]
+ GroovyTestHelper.compute("g.V(v1Id).out('created').in('created')[1..3]", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inEXcreatedX_rangeX1_3X_outV(final Object v1Id) {
- g.V(v1Id).out('created').inE('created')[1..3].outV
+ GroovyTestHelper.compute("g.V(v1Id).out('created').inE('created')[1..3].outV", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, Vertex> get_g_V_repeatXbothX_timesX3X_rangeX5_11X() {
- g.V().repeat(__.both).times(3)[5..11];
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends RangeTest {
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_VX1X_out_limitX2X() {
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_V_localXoutE_limitX1X_inVX_limitX3X() {
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_VX1X_outXknowsX_outEXcreatedX_rangeX0_1X_inV() {
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_VX1X_outXknowsX_outXcreatedX_rangeX0_1X() {
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_VX1X_outXcreatedX_inXcreatedX_rangeX1_3X() {
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_VX1X_outXcreatedX_inEXcreatedX_rangeX1_3X_outV() {
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_V_repeatXbothX_timesX3X_rangeX5_11X() {
- }
-
- @Override
- Traversal<Vertex, Vertex> get_g_VX1X_out_limitX2X(Object v1Id) {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- Traversal<Vertex, Vertex> get_g_V_localXoutE_limitX1X_inVX_limitX3X() {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- Traversal<Vertex, Vertex> get_g_VX1X_outXknowsX_outEXcreatedX_rangeX0_1X_inV(Object v1Id) {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- Traversal<Vertex, Vertex> get_g_VX1X_outXknowsX_outXcreatedX_rangeX0_1X(Object v1Id) {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inXcreatedX_rangeX1_3X(Object v1Id) {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inEXcreatedX_rangeX1_3X_outV(Object v1Id) {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- Traversal<Vertex, Vertex> get_g_V_repeatXbothX_timesX3X_rangeX5_11X() {
- // override with nothing until the test itself is supported
- return null
+ GroovyTestHelper.compute("g.V().repeat(__.both).times(3)[5..11]", 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/GroovyRetainTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRetainTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRetainTest.groovy
index 16308e3..4182840 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRetainTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRetainTest.groovy
@@ -18,10 +18,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.structure.Vertex
/**
@@ -29,39 +27,20 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyRetainTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends RetainTest {
+ public static class Traversals extends RetainTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_out_retainXg_v2X(final Object v1Id, final Object v2Id) {
- g.V(v1Id).out.retain(g.V(v2Id).next())
+ GroovyTestHelper.compute("g.V(v1Id).out.retain(g.V(v2Id).next())", g, "v1Id", v1Id, "v2Id", v2Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_out_aggregateXxX_out_retainXxX(final Object v1Id) {
- g.V(v1Id).out.aggregate('x').out.retain('x')
+ GroovyTestHelper.compute("g.V(v1Id).out.aggregate('x').out.retain('x')", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, String> get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_retainXaX_name(final Object v1Id) {
- g.V(v1Id).as('a').out('created').in('created').retain('a').name
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends RetainTest {
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_out_retainXg_v2X(final Object v1Id, final Object v2Id) {
- ComputerTestHelper.compute("g.V(v1Id).out.retain(g.V(v2Id).next())", g, "v1Id", v1Id, "v2Id", v2Id);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_out_aggregateXxX_out_retainXxX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(v1Id).out.aggregate('x').out.retain('x')", g, "v1Id", v1Id);
- }
-
- @Override
- public Traversal<Vertex, String> get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_retainXaX_name(final Object v1Id) {
- ComputerTestHelper.compute("g.V(v1Id).as('a').out('created').in('created').retain('a').name", g, "v1Id", v1Id);
+ GroovyTestHelper.compute("g.V(v1Id).as('a').out('created').in('created').retain('a').name", g, "v1Id", v1Id);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovySampleTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovySampleTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovySampleTest.groovy
index 77273e2..531fd40 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovySampleTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovySampleTest.groovy
@@ -18,7 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.filter
-import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.computer.GroovyTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.Scope
import org.apache.tinkerpop.gremlin.structure.T
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
@@ -37,77 +37,31 @@ import static __.sample
*/
public abstract class GroovySampleTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends SampleTest {
+ public static class Traversals extends SampleTest {
@Override
public Traversal<Edge, Edge> get_g_E_sampleX1X() {
- g.E.sample(1)
+ GroovyTestHelper.compute("g.E.sample(1)",g)
}
@Override
public Traversal<Edge, Edge> get_g_E_sampleX2X_byXweightX() {
- g.E.sample(2).by('weight')
+ GroovyTestHelper.compute("g.E.sample(2).by('weight')",g)
}
@Override
public Traversal<Vertex, Edge> get_g_V_localXoutE_sampleX1X_byXweightXX() {
- g.V.local(__.outE.sample(1).by('weight'))
+ GroovyTestHelper.compute("g.V.local(__.outE.sample(1).by('weight'))",g)
}
@Override
Traversal<Vertex, Map<String, Collection<Double>>> get_g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXsampleXlocal_2XX() {
- g.V().group().by(T.label).by(bothE().values('weight').fold()).by(sample(Scope.local, 2))
+ GroovyTestHelper.compute("g.V().group().by(T.label).by(bothE().values('weight').fold()).by(sample(local, 2))",g)
}
@Override
Traversal<Vertex, Map<String, Collection<Double>>> get_g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXsampleXlocal_5XX() {
- g.V().group().by(T.label).by(bothE().values('weight').fold()).by(sample(Scope.local, 5))
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends SampleTest {
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_E_sampleX1X() {
- // TODO: makes no sense when its global
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_E_sampleX2X_byXweightX() {
- // TODO: makes no sense when its global
- }
-
- @Override
- public Traversal<Vertex, Edge> get_g_V_localXoutE_sampleX1X_byXweightXX() {
- ComputerTestHelper.compute("g.V.local(__.outE.sample(1).by('weight'))", g)
- }
-
- @Override
- Traversal<Vertex, Map<String, Collection<Double>>> get_g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXsampleXlocal_2XX() {
- ComputerTestHelper.compute("g.V().group().by(T.label).by(bothE().values('weight').fold()).by(sample(Scope.local, 2))", g)
- }
-
- @Override
- Traversal<Vertex, Map<String, Collection<Double>>> get_g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXsampleXlocal_5XX() {
- ComputerTestHelper.compute("g.V().group().by(T.label).by(bothE().values('weight').fold()).by(sample(Scope.local, 5))", g)
- }
-
- @Override
- Traversal<Edge, Edge> get_g_E_sampleX1X() {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- Traversal<Edge, Edge> get_g_E_sampleX2X_byXweightX() {
- // override with nothing until the test itself is supported
- return null
+ GroovyTestHelper.compute("g.V().group().by(T.label).by(bothE().values('weight').fold()).by(sample(local, 5))",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/GroovySimplePathTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovySimplePathTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovySimplePathTest.groovy
index 4ef3635..74762ac 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovySimplePathTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovySimplePathTest.groovy
@@ -18,12 +18,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
/**
@@ -31,31 +28,16 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovySimplePathTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends SimplePathTest {
+ public static class Traversals extends SimplePathTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inXcreatedX_simplePath(final Object v1Id) {
- g.V(v1Id).out('created').in('created').simplePath
+ GroovyTestHelper.compute("g.V(v1Id).out('created').in('created').simplePath", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Path> get_g_V_repeatXboth_simplePathX_timesX3X_path() {
- return g.V.repeat(__.both.simplePath).times(3).path()
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends SimplePathTest {
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inXcreatedX_simplePath(final Object v1Id) {
- ComputerTestHelper.compute("g.V(v1Id).out('created').in('created').simplePath", g, "v1Id", v1Id);
- }
-
- @Override
- public Traversal<Vertex, Path> get_g_V_repeatXboth_simplePathX_timesX3X_path() {
- ComputerTestHelper.compute("g.V.repeat(__.both.simplePath).times(3).path()", g);
+ GroovyTestHelper.compute("g.V.repeat(__.both.simplePath).times(3).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/filter/GroovyWhereTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyWhereTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyWhereTest.groovy
index 402a5df..6e6fad0 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyWhereTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyWhereTest.groovy
@@ -18,45 +18,37 @@
*/
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 org.junit.Test
-
-import static org.apache.tinkerpop.gremlin.structure.P.eq
-import static org.apache.tinkerpop.gremlin.structure.P.neq
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public abstract class GroovyWhereTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends WhereTest {
+ public static class Traversals extends WhereTest {
/// where(local)
@Override
public Traversal<Vertex, Map<String, Object>> get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_eq_bX() {
- g.V.has('age').as('a').out.in.has('age').as('b').select().where('a', eq('b'));
+ GroovyTestHelper.compute("g.V.has('age').as('a').out.in.has('age').as('b').select().where('a', eq('b'))", g)
}
@Override
public Traversal<Vertex, Map<String, Object>> get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_neq_bX() {
- g.V.has('age').as('a').out.in.has('age').as('b').select().where('a', neq('b'));
+ GroovyTestHelper.compute("g.V.has('age').as('a').out.in.has('age').as('b').select().where('a', neq('b'))", g)
}
@Override
public Traversal<Vertex, Map<String, Object>> get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXb_hasXname_markoXX() {
- g.V.has('age').as('a').out.in.has('age').as('b').select().where(__.as('b').has('name', 'marko'));
+ GroovyTestHelper.compute("g.V.has('age').as('a').out.in.has('age').as('b').select().where(__.as('b').has('name', 'marko'))", g)
}
@Override
public Traversal<Vertex, Map<String, Object>> get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_outXknowsX_bX() {
- g.V().has('age').as('a').out.in.has('age').as('b').select().where(__.as('a').out('knows').as('b'));
+ GroovyTestHelper.compute("g.V().has('age').as('a').out.in.has('age').as('b').select().where(__.as('a').out('knows').as('b'))", g)
}
/// where(global)
@@ -64,60 +56,13 @@ public abstract class GroovyWhereTest {
@Override
public Traversal<Vertex, String> get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_asXbX_whereXa_neq_bX_name(
final Object v1Id) {
- g.V(v1Id).as('a').out('created').in('created').as('b').where('a', neq('b')).name
- }
-
- @Override
- public Traversal<Vertex, Object> get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_asXbX_whereXasXbX_outXcreatedX_hasXname_rippleXX_valuesXage_nameX(final Object v1Id) {
- g.V(v1Id).as('a').out('created').in('created').as('b').where(__.as('b').out('created').has('name','ripple')).values('age','name');
+ GroovyTestHelper.compute("g.V(v1Id).as('a').out('created').in('created').as('b').where('a', neq('b')).name", g, "v1Id", v1Id)
}
- }
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends WhereTest {
@Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_eq_bX() {
- ComputerTestHelper.compute("g.V.has('age').as('a').out.in.has('age').as('b').select().where('a', eq('b'))", g);
- }
-
- @Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_neq_bX() {
- ComputerTestHelper.compute("g.V.has('age').as('a').out.in.has('age').as('b').select().where('a', neq('b'))", g);
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXb_hasXname_markoXX() {
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_outXknowsX_bX() {
- }
-
- @Override
- Traversal<Vertex, Map<String, Object>> get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXb_hasXname_markoXX() {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- Traversal<Vertex, Map<String, Object>> get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_outXknowsX_bX() {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- public Traversal<Vertex, String> get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_asXbX_whereXa_neq_bX_name(
+ public Traversal<Vertex, Object> get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_asXbX_whereXasXbX_outXcreatedX_hasXname_rippleXX_valuesXage_nameX(
final Object v1Id) {
- ComputerTestHelper.compute("g.V(v1Id).as('a').out('created').in('created').as('b').where('a', neq('b')).name ", g, "v1Id", v1Id);
- }
-
- @Override
- public Traversal<Vertex, Object> get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_asXbX_whereXasXbX_outXcreatedX_hasXname_rippleXX_valuesXage_nameX(final Object v1Id) {
- return null;
+ GroovyTestHelper.compute("g.V(v1Id).as('a').out('created').in('created').as('b').where(__.as('b').out('created').has('name','ripple')).values('age','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/map/GroovyAddEdgeTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy
index b1fd7cd..1c1b4c4 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy
@@ -18,9 +18,8 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map
+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.Edge
import org.apache.tinkerpop.gremlin.structure.Vertex
@@ -29,23 +28,22 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyAddEdgeTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends AddEdgeTest {
+ public static class Traversals extends AddEdgeTest {
@Override
public Traversal<Vertex, Edge> get_g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_aX(final Object v1Id) {
- g.V(v1Id).as('a').out('created').addOutE('createdBy', 'a')
+ GroovyTestHelper.compute("g.V(v1Id).as('a').out('created').addOutE('createdBy', 'a')", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, Edge> get_g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_a_weight_2X(
final Object v1Id) {
- g.V(v1Id).as('a').out('created').addOutE('createdBy', 'a', 'weight', 2)
+ GroovyTestHelper.compute("g.V(v1Id).as('a').out('created').addOutE('createdBy', 'a', 'weight', 2)", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, Edge> get_g_V_addOutEXexistsWith__g_V__time_nowX() {
- g.V.addOutE('existsWith', g.V, 'time', 'now');
+ GroovyTestHelper.compute("g.V.addOutE('existsWith', g.V, 'time', 'now')", 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/GroovyAddVertexTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddVertexTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddVertexTest.groovy
index 53eb6ef..dc161f0 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddVertexTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddVertexTest.groovy
@@ -19,10 +19,8 @@
package org.apache.tinkerpop.gremlin.process.traversal.step.map
-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
/**
@@ -30,17 +28,16 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyAddVertexTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends AddVertexTest {
+ public static class Traversals extends AddVertexTest {
@Override
public Traversal<Vertex, Vertex> get_g_V_addVXlabel_animal_age_0X() {
- g.V.addV(T.label, 'animal', 'age', 0);
+ GroovyTestHelper.compute("g.V.addV(T.label, 'animal', 'age', 0)", g)
}
@Override
public Traversal<Vertex, Vertex> get_g_addVXlabel_person_name_stephenX() {
- g.addV(T.label, 'person', 'name', 'stephen');
+ GroovyTestHelper.compute("g.addV(T.label, 'person', 'name', 'stephen')", 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/GroovyCoalesceTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyCoalesceTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyCoalesceTest.groovy
index 56a450d..760c60a 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyCoalesceTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyCoalesceTest.groovy
@@ -18,17 +18,10 @@
*/
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.Path
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.structure.T
import org.apache.tinkerpop.gremlin.structure.Vertex
-import org.junit.Test
-
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.out
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outE
/**
*
@@ -36,68 +29,31 @@ import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outE
*/
public abstract class GroovyCoalesceTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends CoalesceTest {
+ public static class Traversals extends CoalesceTest {
@Override
public Traversal<Vertex, Vertex> get_g_V_coalesceXoutXfooX_outXbarXX() {
- g.V().coalesce(out('foo'), out('bar'));
+ GroovyTestHelper.compute("g.V().coalesce(out('foo'), out('bar'))", g)
}
@Override
public Traversal<Vertex, String> get_g_VX1X_coalesceXoutXknowsX_outXcreatedXX_valuesXnameX(final Object v1Id) {
- g.V(v1Id).coalesce(out('knows'), out('created')).values('name');
+ GroovyTestHelper.compute("g.V(v1Id).coalesce(out('knows'), out('created')).values('name')", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, String> get_g_VX1X_coalesceXoutXcreatedX_outXknowsXX_valuesXnameX(final Object v1Id) {
- g.V(v1Id).coalesce(out('created'), out('knows')).values('name');
+ GroovyTestHelper.compute("g.V(v1Id).coalesce(out('created'), out('knows')).values('name')", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, Map<String, Long>> get_g_V_coalesceXoutXlikesX_outXknowsX_inXcreatedXX_groupCount_byXnameX() {
- g.V.coalesce(out('likes'), out('knows'), out('created')).groupCount().by('name');
- }
-
- @Override
- public Traversal<Vertex, Path> get_g_V_coalesceXoutEXknowsX_outEXcreatedXX_otherV_path_byXnameX_byXlabelX() {
- g.V.coalesce(outE('knows'), outE('created')).otherV.path.by('name').by(T.label);
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends CoalesceTest {
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_coalesceXoutXfooX_outXbarXX() {
- ComputerTestHelper.compute("g.V().coalesce(out('foo'), out('bar'))", g)
- }
-
- @Override
- public Traversal<Vertex, String> get_g_VX1X_coalesceXoutXknowsX_outXcreatedXX_valuesXnameX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(v1Id).coalesce(out('knows'), out('created')).values('name')", g, "v1Id", v1Id)
- }
-
- @Override
- public Traversal<Vertex, String> get_g_VX1X_coalesceXoutXcreatedX_outXknowsXX_valuesXnameX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(v1Id).coalesce(out('created'), out('knows')).values('name')", g, "v1Id", v1Id)
- }
-
- @Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_coalesceXoutXlikesX_outXknowsX_inXcreatedXX_groupCount_byXnameX() {
- ComputerTestHelper.compute("g.V().coalesce(out('likes'), out('knows'), out('created')).groupCount().by('name')", g)
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_V_coalesceXoutEXknowsX_outEXcreatedXX_otherV_path_byXnameX_byXlabelX() {
+ GroovyTestHelper.compute("g.V().coalesce(out('likes'), out('knows'), out('created')).groupCount().by('name')", g)
}
@Override
Traversal<Vertex, Path> get_g_V_coalesceXoutEXknowsX_outEXcreatedXX_otherV_path_byXnameX_byXlabelX() {
- // override with nothing until the test itself is supported
- return null
+ GroovyTestHelper.compute("g.V.coalesce(outE('knows'), outE('created')).otherV.path.by('name').by(T.label)", 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/GroovyCountTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyCountTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyCountTest.groovy
index c50605c..e0b5f9c 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyCountTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyCountTest.groovy
@@ -18,100 +18,49 @@
*/
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.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 GroovyCountTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends CountTest {
+ public static class Traversals extends CountTest {
@Override
public Traversal<Vertex, Long> get_g_V_count() {
- g.V.count()
+ GroovyTestHelper.compute("g.V.count()", g)
}
@Override
public Traversal<Vertex, Long> get_g_V_out_count() {
- g.V.out.count
+ GroovyTestHelper.compute("g.V.out.count", g)
}
@Override
public Traversal<Vertex, Long> get_g_V_both_both_count() {
- g.V.both.both.count()
+ GroovyTestHelper.compute("g.V.both.both.count()", g)
}
@Override
public Traversal<Vertex, Long> get_g_V_repeatXoutX_timesX3X_count() {
- g.V().repeat(__.out).times(3).count()
+ GroovyTestHelper.compute("g.V().repeat(__.out).times(3).count()", g);
}
@Override
public Traversal<Vertex, Long> get_g_V_repeatXoutX_timesX8X_count() {
- g.V.repeat(__.out).times(8).count()
+ GroovyTestHelper.compute("g.V.repeat(__.out).times(8).count()", g);
}
@Override
public Traversal<Vertex, Long> get_g_V_hasXnoX_count() {
- g.V.has('no').count
+ GroovyTestHelper.compute("g.V.has('no').count", g)
}
@Override
public Traversal<Vertex, Long> get_g_V_fold_countXlocalX() {
- return g.V.fold.count(Scope.local);
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends CountTest {
- @Override
- public Traversal<Vertex, Long> get_g_V_count() {
- ComputerTestHelper.compute("g.V.count()", g)
- }
-
- @Override
- public Traversal<Vertex, Long> get_g_V_out_count() {
- ComputerTestHelper.compute("g.V.out.count", g)
- }
-
- @Override
- public Traversal<Vertex, Long> get_g_V_both_both_count() {
- ComputerTestHelper.compute("g.V.both.both.count()", g)
- }
-
- @Override
- public Traversal<Vertex, Long> get_g_V_repeatXoutX_timesX3X_count() {
- ComputerTestHelper.compute("g.V().repeat(__.out).times(3).count()", g);
- }
-
- @Override
- public Traversal<Vertex, Long> get_g_V_repeatXoutX_timesX8X_count() {
- ComputerTestHelper.compute("g.V.repeat(__.out).times(8).count()", g);
- }
-
- @Override
- public Traversal<Vertex, Long> get_g_V_hasXnoX_count() {
- ComputerTestHelper.compute("g.V.has('no').count", g)
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_V_fold_countXlocalX() {
- }
-
- @Override
- Traversal<Vertex, Long> get_g_V_fold_countXlocalX() {
- // override with nothing until the test itself is supported
- return null
+ GroovyTestHelper.compute("g.V.fold.count(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/GroovyFoldTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyFoldTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyFoldTest.groovy
index 6b8e9c7..ecbe53c 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyFoldTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyFoldTest.groovy
@@ -18,59 +18,29 @@
*/
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.structure.Vertex
-import org.junit.Test
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public abstract class GroovyFoldTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends FoldTest {
+ public static class Traversals extends FoldTest {
@Override
public Traversal<Vertex, List<Vertex>> get_g_V_fold() {
- g.V.fold
+ GroovyTestHelper.compute("g.V.fold", g)
}
@Override
public Traversal<Vertex, Vertex> get_g_V_fold_unfold() {
- g.V.fold.unfold
+ GroovyTestHelper.compute("g.V.fold.unfold", g)
}
@Override
public Traversal<Vertex, Integer> get_g_V_age_foldX0_plusX() {
- g.V.age.fold(0) { seed, age -> seed + age };
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends FoldTest {
- @Override
- public Traversal<Vertex, List<Vertex>> get_g_V_fold() {
- ComputerTestHelper.compute("g.V.fold", g)
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_V_fold_unfold() {
- // Does not work in OLAP cause fold() is not an endstep.
- }
-
- @Override
- public Traversal<Vertex, Integer> get_g_V_age_foldX0_plusX() {
- ComputerTestHelper.compute("g.V.age.fold(0) { seed, age -> seed + age }", g);
- }
-
- @Override
- Traversal<Vertex, Vertex> get_g_V_fold_unfold() {
- // override with nothing until the test itself is supported
- return null
+ GroovyTestHelper.compute("g.V.age.fold(0) { seed, age -> seed + age }", 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/GroovyMapTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMapTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMapTest.groovy
index 7be3fd7..f76f995 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMapTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMapTest.groovy
@@ -18,112 +18,40 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map
-import org.apache.tinkerpop.gremlin.LoadGraphWith
-import org.apache.tinkerpop.gremlin.process.UseEngine
-import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.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
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public abstract class GroovyMapTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends MapTest {
+ public static class Traversals extends MapTest {
@Override
public Traversal<Vertex, String> get_g_VX1X_mapXnameX(final Object v1Id) {
- g.V(v1Id).map { v -> v.name };
+ GroovyTestHelper.compute("g.V(v1Id).map { v -> v.name }", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, Integer> get_g_VX1X_outE_label_mapXlengthX(final Object v1Id) {
- g.V(v1Id).outE.label.map { l -> l.length() };
+ GroovyTestHelper.compute("g.V(v1Id).outE.label.map { l -> l.length() }", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, Integer> get_g_VX1X_out_mapXnameX_mapXlengthX(final Object v1Id) {
- g.V(v1Id).out.map { v -> v.name }.map { n -> n.length() };
+ GroovyTestHelper.compute("g.V(v1Id).out.map { v -> v.name }.map { n -> n.length() }", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, String> get_g_withPath_V_asXaX_out_mapXa_nameX() {
- g.withPath().V.as('a').out.map { v -> v.path('a').name };
+ GroovyTestHelper.compute("g.withPath().V.as('a').out.map { v -> v.path('a').name }", g)
}
@Override
public Traversal<Vertex, String> get_g_withPath_V_asXaX_out_out_mapXa_name_it_nameX() {
- g.withPath().V().as('a').out.out().map { v -> v.path('a').name + v.name };
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends MapTest {
-
- @Test
- @LoadGraphWith(org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN)
- @Override
- public void g_VX1X_mapXnameX() {
- super.g_VX1X_mapXnameX();
- }
-
- @Test
- @LoadGraphWith(org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN)
- @Override
- public void g_VX1X_outE_label_mapXlengthX() {
- super.g_VX1X_outE_label_mapXlengthX();
- }
-
- @Test
- @LoadGraphWith(org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN)
- @Override
- public void g_VX1X_out_mapXnameX_mapXlengthX() {
- super.g_VX1X_out_mapXnameX_mapXlengthX();
- }
-
-
- @Override
- public Traversal<Vertex, String> get_g_VX1X_mapXnameX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(v1Id).map { v -> v.name }", g, "v1Id", v1Id);
- }
-
- @Override
- public Traversal<Vertex, Integer> get_g_VX1X_outE_label_mapXlengthX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(v1Id).outE.label.map { l -> l.length() }", g, "v1Id", v1Id);
- }
-
- @Override
- public Traversal<Vertex, Integer> get_g_VX1X_out_mapXnameX_mapXlengthX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(v1Id).out.map { v -> v.name }.map { n -> n.length() }", g, "v1Id", v1Id);
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_V_asXaX_out_mapXa_nameX() {
- // TODO: Doesn't work for graph computer because sideEffects are not accessible
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_V_asXaX_out_out_mapXa_name_it_nameX() {
- // TODO: Doesn't work for graph computer because sideEffects are not accessible
- }
-
- @Override
- Traversal<Vertex, String> get_g_withPath_V_asXaX_out_mapXa_nameX() {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- Traversal<Vertex, String> get_g_withPath_V_asXaX_out_out_mapXa_name_it_nameX() {
- // override with nothing until the test itself is supported
- return null
+ GroovyTestHelper.compute("g.withPath().V().as('a').out.out().map { v -> v.path('a').name + v.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/map/GroovyMatchTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMatchTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMatchTest.groovy
index 2cffab9..de5b92d 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMatchTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMatchTest.groovy
@@ -32,8 +32,7 @@ import static org.apache.tinkerpop.gremlin.structure.P.neq;
*/
public abstract class GroovyMatchTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends MatchTest {
+ public static class Traversals extends MatchTest {
@Override
public Traversal<Vertex, Map<String, Vertex>> get_g_V_matchXa_out_bX() {
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/GroovyMaxTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMaxTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMaxTest.groovy
index 7cef641..1acd815 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMaxTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMaxTest.groovy
@@ -18,57 +18,31 @@
*/
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.process.traversal.dsl.graph.__
import org.apache.tinkerpop.gremlin.structure.Vertex
-import static __.bothE
-import static __.max
-
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public abstract class GroovyMaxTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends MaxTest {
-
- @Override
- public Traversal<Vertex, Integer> get_g_V_age_max() {
- g.V.age.max
- }
-
- @Override
- public Traversal<Vertex, Integer> get_g_V_repeatXbothX_timesX5X_age_max() {
- g.V.repeat(__.both).times(5).age.max
- }
-
- @Override
- public Traversal<Vertex, Map<String, Number>> get_g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_valuesXweightX_foldX_byXmaxXlocalXX() {
- g.V().hasLabel('software').group().by('name').by(bothE().values('weight').fold()).by(max(Scope.local))
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends MaxTest {
+ public static class Traversals extends MaxTest {
@Override
public Traversal<Vertex, Integer> get_g_V_age_max() {
- ComputerTestHelper.compute("g.V.age.max", g)
+ GroovyTestHelper.compute("g.V.age.max", g)
}
@Override
public Traversal<Vertex, Integer> get_g_V_repeatXbothX_timesX5X_age_max() {
- ComputerTestHelper.compute("g.V.repeat(__.both).times(5).age.max", g)
+ GroovyTestHelper.compute("g.V.repeat(__.both).times(5).age.max", g)
}
@Override
public Traversal<Vertex, Map<String, Number>> get_g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_valuesXweightX_foldX_byXmaxXlocalXX() {
- ComputerTestHelper.compute("g.V().hasLabel('software').group().by('name').by(bothE().values('weight').fold()).by(max(Scope.local))", g)
+ GroovyTestHelper.compute("g.V().hasLabel('software').group().by('name').by(bothE().values('weight').fold()).by(max(Scope.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/GroovyMeanTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMeanTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMeanTest.groovy
index 5a32f96..ea6018e 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMeanTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMeanTest.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.__.mean
-
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public abstract class GroovyMeanTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends MeanTest {
-
- @Override
- public Traversal<Vertex, Double> get_g_V_age_mean() {
- g.V.age.mean
- }
-
- @Override
- public Traversal<Vertex, Map<String, Number>> get_g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_valuesXweightX_foldX_byXmeanXlocalXX() {
- g.V().hasLabel('software').group().by('name').by(bothE().values('weight').fold()).by(mean(Scope.local))
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends MeanTest {
+ public static class Traversals extends MeanTest {
@Override
public Traversal<Vertex, Double> get_g_V_age_mean() {
- ComputerTestHelper.compute("g.V.age.mean", g)
+ GroovyTestHelper.compute("g.V.age.mean", g)
}
@Override
public Traversal<Vertex, Map<String, Number>> get_g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_valuesXweightX_foldX_byXmeanXlocalXX() {
- ComputerTestHelper.compute("g.V().hasLabel('software').group().by('name').by(bothE().values('weight').fold()).by(mean(Scope.local))", g)
+ GroovyTestHelper.compute("g.V().hasLabel('software').group().by('name').by(bothE().values('weight').fold()).by(mean(Scope.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/GroovyMinTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMinTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMinTest.groovy
index 7746fdf..0f3e522 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMinTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMinTest.groovy
@@ -18,57 +18,30 @@
*/
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.process.traversal.dsl.graph.__
import org.apache.tinkerpop.gremlin.structure.Vertex
-import static __.bothE
-import static __.min
-
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public abstract class GroovyMinTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends MinTest {
-
- @Override
- public Traversal<Vertex, Integer> get_g_V_age_min() {
- g.V.age.min
- }
-
- @Override
- public Traversal<Vertex, Integer> get_g_V_repeatXbothX_timesX5X_age_min() {
- g.V.repeat(__.both).times(5).age.min
- }
-
- @Override
- public Traversal<Vertex, Map<String, Number>> get_g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_valuesXweightX_foldX_byXminXlocalXX() {
- g.V().hasLabel('software').group().by('name').by(bothE().values('weight').fold()).by(min(Scope.local))
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends MinTest {
+ public static class Traversals extends MinTest {
@Override
public Traversal<Vertex, Integer> get_g_V_age_min() {
- ComputerTestHelper.compute("g.V.age.min", g)
+ GroovyTestHelper.compute("g.V.age.min", g)
}
@Override
public Traversal<Vertex, Integer> get_g_V_repeatXbothX_timesX5X_age_min() {
- ComputerTestHelper.compute("g.V.repeat(__.both).times(5).age.min", g)
+ GroovyTestHelper.compute("g.V.repeat(__.both).times(5).age.min", g)
}
@Override
public Traversal<Vertex, Map<String, Number>> get_g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_valuesXweightX_foldX_byXminXlocalXX() {
- ComputerTestHelper.compute("g.V().hasLabel('software').group().by('name').by(bothE().values('weight').fold()).by(min(Scope.local))", g)
+ GroovyTestHelper.compute("g.V().hasLabel('software').group().by('name').by(bothE().values('weight').fold()).by(min(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/GroovyOrderTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
index 6471725..e055594 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
@@ -18,171 +18,68 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map
-import org.apache.tinkerpop.gremlin.LoadGraphWith
-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.Order
import org.apache.tinkerpop.gremlin.structure.Vertex
-import org.junit.Test
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public abstract class GroovyOrderTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends OrderTest {
+ public static class Traversals extends OrderTest {
@Override
public Traversal<Vertex, String> get_g_V_name_order() {
- g.V().name.order()
+ GroovyTestHelper.compute("g.V().name.order()", g)
}
@Override
public Traversal<Vertex, String> get_g_V_name_order_byXa1_b1X_byXb2_a2X() {
- g.V.name.order.by { a, b -> a[1] <=> b[1] }.by { a, b -> b[2] <=> a[2] }
+ GroovyTestHelper.compute("g.V.name.order.by { a, b -> a[1] <=> b[1] }.by { a, b -> b[2] <=> a[2] }", g)
}
@Override
public Traversal<Vertex, String> get_g_V_order_byXname_incrX_name() {
- g.V.order.by('name', Order.incr).name
+ GroovyTestHelper.compute("g.V.order.by('name', Order.incr).name", g)
}
@Override
public Traversal<Vertex, String> get_g_V_order_byXnameX_name() {
- g.V.order.by('name', Order.incr).name
+ GroovyTestHelper.compute("g.V.order.by('name', Order.incr).name", g)
}
@Override
public Traversal<Vertex, Double> get_g_V_outE_order_byXweight_decrX_weight() {
- g.V.outE.order.by('weight', Order.decr).weight
+ GroovyTestHelper.compute("g.V.outE.order.by('weight', Order.decr).weight", g)
}
@Override
public Traversal<Vertex, String> get_g_V_order_byXname_a1_b1X_byXname_b2_a2X_name() {
- return g.V.order.by('name', { a, b -> a[1].compareTo(b[1]) }).by('name', { a, b -> b[2].compareTo(a[2]) }).name;
+ GroovyTestHelper.compute("g.V.order.by('name', { a, b -> a[1].compareTo(b[1]) }).by('name', { a, b -> b[2].compareTo(a[2]) }).name", g)
}
@Override
public Traversal<Vertex, Map<String, Vertex>> get_g_V_asXaX_outXcreatedX_asXbX_order_byXshuffleX_select() {
- g.V.as('a').out('created').as('b').order.by(Order.shuffle).select();
+ GroovyTestHelper.compute("g.V.as('a').out('created').as('b').order.by(Order.shuffle).select()", g)
}
@Override
public Traversal<Vertex, Map<Integer, Integer>> get_g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalueDecrX_byXkeyIncrX(
final Object v1Id) {
- g.V(v1Id).map {
+ GroovyTestHelper.compute("""g.V(v1Id).map {
final Map map = [:];
map[1] = it.age;
map[2] = it.age * 2;
map[3] = it.age * 3;
map[4] = it.age;
return map;
- }.order(Scope.local).by(Order.valueDecr).by(Order.keyIncr);
+ }.order(local).by(valueDecr).by(keyIncr)""", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_V_order_byXoutE_count__decrX() {
- g.V.order.by(__.outE.count, Order.decr)
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends OrderTest {
-
- @Override
- public Traversal<Vertex, String> get_g_V_name_order() {
- ComputerTestHelper.compute("g.V().name.order()", g)
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_name_order_byXa1_b1X_byXb2_a2X() {
- ComputerTestHelper.compute("g.V.name.order.by { a, b -> a[1] <=> b[1] }.by{ a, b -> b[2] <=> a[2] }", g)
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_V_order_byXname_incrX_name() {
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_V_outE_order_byXweight_decrX_weight() {
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_V_order_byXname_a1_b1X_byXname_b2_a2X_name() {
- }
-
- @Override
- public Traversal<Vertex, Map<String, Vertex>> get_g_V_asXaX_outXcreatedX_asXbX_order_byXshuffleX_select() {
- ComputerTestHelper.compute("g.V.as('a').out('created').as('b').order.by(Order.shuffle).select()", g);
- }
-
- @Override
- public Traversal<Vertex, Map<Integer, Integer>> get_g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalueDecrX_byXkeyIncrX(
- final Object v1Id) {
- ComputerTestHelper.compute("""
- g.V(${v1Id}).map {
- final Map map = [:];
- map[1] = it.age;
- map[2] = it.age * 2;
- map[3] = it.age * 3;
- map[4] = it.age;
- return map;
- }.order(Scope.local).by(Order.valueDecr).by(Order.keyIncr);
- """, g)
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_V_order_byXoutE_count__decrX() {
- }
-
- @Override
- Traversal<Vertex, String> get_g_V_order_byXname_incrX_name() {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- Traversal<Vertex, String> get_g_V_order_byXnameX_name() {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- Traversal<Vertex, Double> get_g_V_outE_order_byXweight_decrX_weight() {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- Traversal<Vertex, String> get_g_V_order_byXname_a1_b1X_byXname_b2_a2X_name() {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- Traversal<Vertex, Vertex> get_g_V_order_byXoutE_count__decrX() {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Test
- @LoadGraphWith(org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN)
- @Override
- public void g_V_name_order_byXa1_b1X_byXb2_a2X() {
- super.g_V_name_order_byXa1_b1X_byXb2_a2X();
+ GroovyTestHelper.compute("g.V.order.by(__.outE.count, decr)", 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/GroovyPathTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPathTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPathTest.groovy
index 1929523..42a031c 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPathTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPathTest.groovy
@@ -18,96 +18,41 @@
*/
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.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
-import org.junit.Test
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public abstract class GroovyPathTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends PathTest {
+ public static class Traversals extends PathTest {
@Override
public Traversal<Vertex, Path> get_g_VX1X_name_path(final Object v1Id) {
- g.V(v1Id).identity.name.path
+ GroovyTestHelper.compute("g.V(v1Id).name.path", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Path> get_g_VX1X_out_path_byXageX_byXnameX(final Object v1Id) {
- g.V(v1Id).out.path.by('age').by('name');
+ GroovyTestHelper.compute("g.V(v1Id).out.path.by('age').by('name')", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, Path> get_g_V_repeatXoutX_timesX2X_path_by_byXnameX_byXlangX() {
- g.V.repeat(__.out).times(2).path.by.by('name').by('lang');
+ GroovyTestHelper.compute("g.V.repeat(__.out).times(2).path.by.by('name').by('lang')", g)
}
@Override
public Traversal<Vertex, Path> get_g_V_out_out_path_byXnameX_byXageX() {
- g.V.out.out.path.by('name').by('age');
+ GroovyTestHelper.compute("g.V.out.out.path.by('name').by('age')", g)
}
@Override
public Traversal<Vertex, Path> get_g_V_asXaX_hasXname_markoX_asXbX_hasXage_29X_asXcX_path() {
- g.V.as('a').has('name', 'marko').as('b').has('age', 29).as('c').path;
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends PathTest {
-
- @Override
- public Traversal<Vertex, Path> get_g_VX1X_name_path(final Object v1Id) {
- ComputerTestHelper.compute("g.V(v1Id).identity.name.path", g, "v1Id", v1Id);
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_VX1X_out_path_byXageX_byXnameX() {
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- void g_V_repeatXoutX_timesX2X_path_byXitX_byXnameX_byXlangX() {
- }
-
- @Override
- @Test
- @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
- public void g_V_out_out_path_byXnameX_byXageX() {
- }
-
- @Override
- public Traversal<Vertex, Path> get_g_V_asXaX_hasXname_markoX_asXbX_hasXage_29X_asXcX_path() {
- ComputerTestHelper.compute("g.V.as('a').has('name', 'marko').as('b').has('age', 29).as('c').path", g);
- }
-
- @Override
- Traversal<Vertex, Path> get_g_VX1X_out_path_byXageX_byXnameX(Object v1Id) {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- Traversal<Vertex, Path> get_g_V_repeatXoutX_timesX2X_path_by_byXnameX_byXlangX() {
- // override with nothing until the test itself is supported
- return null
- }
-
- @Override
- Traversal<Vertex, Path> get_g_V_out_out_path_byXnameX_byXageX() {
- // override with nothing until the test itself is supported
- return null
+ GroovyTestHelper.compute("g.V.as('a').has('name', 'marko').as('b').has('age', 29).as('c').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/map/GroovyPropertiesTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
index bdffe9d..b998cd3 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
@@ -18,11 +18,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.T
import org.apache.tinkerpop.gremlin.structure.Vertex
/**
@@ -30,41 +27,21 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyPropertiesTest {
- @UseEngine(TraversalEngine.Type.STANDARD)
- public static class StandardTraversals extends PropertiesTest {
+ public static class Traversals extends PropertiesTest {
@Override
public Traversal<Vertex, Object> get_g_V_hasXageX_propertiesXname_ageX_value() {
- g.V.has('age').properties('name', 'age').value
+ GroovyTestHelper.compute("g.V.has('age').properties('name', 'age').value", g)
}
@Override
public Traversal<Vertex, Object> get_g_V_hasXageX_propertiesXage_nameX_value() {
- g.V.has('age').properties('age', 'name').value
+ GroovyTestHelper.compute("g.V.has('age').properties('age', 'name').value", g)
}
@Override
public Traversal<Vertex, Object> get_g_V_hasXageX_properties_hasXid_nameIdX_value(final Object nameId) {
- g.V.has('age').properties().has(T.id, nameId).value()
- }
- }
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTraversals extends PropertiesTest {
-
- @Override
- public Traversal<Vertex, Object> get_g_V_hasXageX_propertiesXname_ageX_value() {
- ComputerTestHelper.compute("g.V.has('age').properties('name', 'age').value", g)
- }
-
- @Override
- public Traversal<Vertex, Object> get_g_V_hasXageX_propertiesXage_nameX_value() {
- ComputerTestHelper.compute("g.V.has('age').properties('age', 'name').value", g)
- }
-
- @Override
- public Traversal<Vertex, Object> get_g_V_hasXageX_properties_hasXid_nameIdX_value(final Object nameId) {
- ComputerTestHelper.compute("g.V.has('age').properties().has(T.id, nameId).value()", g, "nameId", nameId)
+ GroovyTestHelper.compute("g.V.has('age').properties().has(T.id, nameId).value()", g, "nameId", nameId)
}
}