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/02/19 16:29:11 UTC
incubator-tinkerpop git commit: GroovyComputerTests can do
LambdaXXXSteps. Overrides provided. Removed testsToEnforce as they seem to do
nothing and are always out of sync.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master d5d32fb02 -> b9431fde2
GroovyComputerTests can do LambdaXXXSteps. Overrides provided. Removed testsToEnforce as they seem to do nothing and are always out of sync.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/b9431fde
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b9431fde
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b9431fde
Branch: refs/heads/master
Commit: b9431fde289fe79e34a4813979767ef52f3c6f60
Parents: d5d32fb
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Feb 19 08:29:08 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Feb 19 08:29:08 2015 -0700
----------------------------------------------------------------------
.../step/branch/GroovyBranchTest.groovy | 17 +++--
.../step/filter/GroovyFilterTest.groovy | 64 +++++++++++++++-
.../traversal/step/map/GroovyMapTest.groovy | 30 +++++++-
.../process/GroovyProcessComputerSuite.java | 2 +-
.../process/GroovyProcessStandardSuite.java | 2 +-
.../gremlin/process/ProcessComputerSuite.java | 77 +-------------------
.../gremlin/process/ProcessStandardSuite.java | 77 +-------------------
7 files changed, 104 insertions(+), 165 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b9431fde/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyBranchTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyBranchTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyBranchTest.groovy
index 9855586..1982d4c 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyBranchTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyBranchTest.groovy
@@ -18,16 +18,16 @@
*/
package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch
-import org.apache.tinkerpop.gremlin.process.Traversal
+import org.apache.tinkerpop.gremlin.LoadGraphWith
import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.Traversal
import org.apache.tinkerpop.gremlin.process.TraversalEngine
import org.apache.tinkerpop.gremlin.process.UseEngine
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.BranchTest
-import org.apache.tinkerpop.gremlin.structure.Vertex
-
import org.apache.tinkerpop.gremlin.process.graph.traversal.__
+import org.apache.tinkerpop.gremlin.structure.Vertex
+import org.junit.Test
-import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.label
+import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -57,6 +57,13 @@ public abstract class GroovyBranchTest {
@UseEngine(TraversalEngine.Type.COMPUTER)
public static class ComputerTraversals extends BranchTest {
+ @Test
+ @LoadGraphWith(MODERN)
+ @Override
+ public void g_V_branchXlabel_eq_person__a_bX_optionXa__ageX_optionXb__langX_optionXb__nameX() {
+ super.g_V_branchXlabel_eq_person__a_bX_optionXa__ageX_optionXb__langX_optionXb__nameX();
+ }
+
@Override
public Traversal<Vertex, Object> get_g_V_branchXlabel_eq_person__a_bX_optionXa__ageX_optionXb__langX_optionXb__nameX() {
ComputerTestHelper.compute("g.V.branch(__.label.is('person').count).option(1L, __.age).option(0L, __.lang).option(0L,__.name)", g);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b9431fde/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyFilterTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyFilterTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyFilterTest.groovy
index 4df0f53..fb9e8b9 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyFilterTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyFilterTest.groovy
@@ -18,13 +18,16 @@
*/
package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter
-import org.apache.tinkerpop.gremlin.process.Traversal
+import org.apache.tinkerpop.gremlin.LoadGraphWith
import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.Traversal
import org.apache.tinkerpop.gremlin.process.TraversalEngine
import org.apache.tinkerpop.gremlin.process.UseEngine
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.FilterTest
import org.apache.tinkerpop.gremlin.structure.Edge
import org.apache.tinkerpop.gremlin.structure.Vertex
+import org.junit.Test
+
+import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -78,6 +81,63 @@ public abstract class GroovyFilterTest {
@UseEngine(TraversalEngine.Type.COMPUTER)
public static class ComputerTraversals extends FilterTest {
+
+ @Test
+ @LoadGraphWith(MODERN)
+ @Override
+ public void g_V_filterXfalseX() {
+ super.g_V_filterXfalseX();
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ @Override
+ public void g_V_filterXtrueX() {
+ super.g_V_filterXtrueX();
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ @Override
+ public void g_V_filterXlang_eq_javaX() {
+ super.g_V_filterXlang_eq_javaX();
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ @Override
+ public void g_VX1X_filterXage_gt_30X() {
+ super.g_VX1X_filterXage_gt_30X();
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ @Override
+ public void g_VX1X_out_filterXage_gt_30X() {
+ super.g_VX1X_out_filterXage_gt_30X();
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ @Override
+ public void g_V_filterXname_startsWith_m_OR_name_startsWith_pX() {
+ super.g_V_filterXname_startsWith_m_OR_name_startsWith_pX();
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ @Override
+ public void g_E_filterXfalseX() {
+ super.g_E_filterXfalseX();
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ @Override
+ public void g_E_filterXtrueX() {
+ super.g_E_filterXtrueX();
+ }
+
@Override
public Traversal<Vertex, Vertex> get_g_V_filterXfalseX() {
ComputerTestHelper.compute("g.V.filter { false }", g);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b9431fde/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMapTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMapTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMapTest.groovy
index 5898757..4fd8e4d 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMapTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMapTest.groovy
@@ -18,16 +18,16 @@
*/
package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map
-import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest
-import org.apache.tinkerpop.gremlin.process.Traversal
+import org.apache.tinkerpop.gremlin.LoadGraphWith
import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.Traversal
import org.apache.tinkerpop.gremlin.process.TraversalEngine
import org.apache.tinkerpop.gremlin.process.UseEngine
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.MapTest
-import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine
import org.apache.tinkerpop.gremlin.structure.Vertex
import org.junit.Test
+import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN
+
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
@@ -65,6 +65,28 @@ public abstract class GroovyMapTest {
@UseEngine(TraversalEngine.Type.COMPUTER)
public static class ComputerTraversals extends MapTest {
+ @Test
+ @LoadGraphWith(MODERN)
+ @Override
+ public void g_VX1X_mapXnameX() {
+ super.g_VX1X_mapXnameX();
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ @Override
+ public void g_VX1X_outE_label_mapXlengthX() {
+ super.g_VX1X_outE_label_mapXlengthX();
+ }
+
+ @Test
+ @LoadGraphWith(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);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b9431fde/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java
index fb6a48d..5ba57ed 100644
--- a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java
+++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java
@@ -105,7 +105,7 @@ public class GroovyProcessComputerSuite extends ProcessComputerSuite {
};
public GroovyProcessComputerSuite(final Class<?> klass, final RunnerBuilder builder) throws InitializationError {
- super(klass, builder, testsToExecute, testsToEnforce);
+ super(klass, builder, testsToExecute, testsToExecute);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b9431fde/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java
index 3a4a2c2..303b96c 100644
--- a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java
+++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java
@@ -102,7 +102,7 @@ public class GroovyProcessStandardSuite extends ProcessStandardSuite {
public GroovyProcessStandardSuite(final Class<?> klass, final RunnerBuilder builder) throws InitializationError {
- super(klass, builder, testsToExecute, testsToEnforce, true);
+ super(klass, builder, testsToExecute, testsToExecute, true);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b9431fde/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
index 07df30b..25485eb 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
@@ -181,81 +181,6 @@ public class ProcessComputerSuite extends AbstractGremlinSuite {
};
/**
- * Tests that will be enforced by the suite where instances of them should be in the list of testsToExecute.
- */
- protected static final Class<?>[] testsToEnforce = new Class<?>[]{
- // basic api semantics testing
- GraphComputerTest.class,
-
- // branch
- BranchTest.class,
- ChooseTest.class,
- LocalTest.class,
- RepeatTest.class,
- UnionTest.class,
-
- // filter
- AndTest.class,
- CoinTest.class,
- CyclicPathTest.class,
- DedupTest.class,
- ExceptTest.class,
- FilterTest.class,
- HasNotTest.class,
- HasTest.class,
- IsTest.class,
- OrTest.class,
- RangeTest.class,
- RetainTest.class,
- SampleTest.class,
- SimplePathTest.class,
- WhereTest.class,
-
-
- // map
- BackTest.class,
- CountTest.class,
- // FoldTest.class,
- MapTest.class,
- MaxTest.class,
- MeanTest.class,
- MinTest.class,
- SumTest.class,
- // MatchTest.class,
- OrderTest.class,
- PathTest.class,
- PropertiesTest.class,
- SelectTest.class,
- UnfoldTest.class,
- ValueMapTest.class,
- VertexTest.class,
- CoalesceTest.class,
-
-
- // sideEffect
- // AddEdgeTest.class,
- AggregateTest.class,
- GroupTest.class,
- GroupCountTest.class,
- InjectTest.class,
- ProfileTest.class,
- SackTest.class,
- SideEffectCapTest.class,
- // SideEffectTest.class,
- StoreTest.class,
- // SubgraphTest.class,
- TreeTest.class,
-
-
- // algorithms
- PageRankVertexProgramTest.class,
-
- // strategy
- ComputerDataStrategyTest.class,
- TraversalVerificationStrategyTest.class
- };
-
- /**
* This list of tests in the suite that will be executed. Gremlin developers should add to this list
* as needed to enforce tests upon implementations.
*/
@@ -275,7 +200,7 @@ public class ProcessComputerSuite extends AbstractGremlinSuite {
}
public ProcessComputerSuite(final Class<?> klass, final RunnerBuilder builder) throws InitializationError {
- super(klass, builder, testsToExecute, testsToEnforce, false, TraversalEngine.Type.COMPUTER);
+ super(klass, builder, testsToExecute, testsToExecute, false, TraversalEngine.Type.COMPUTER);
}
public ProcessComputerSuite(final Class<?> klass, final RunnerBuilder builder, final Class<?>[] testsToExecute, final Class<?>[] testsToEnforce) throws InitializationError {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b9431fde/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
index 0fb4d7f..eccafbf 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
@@ -140,80 +140,6 @@ public class ProcessStandardSuite extends AbstractGremlinSuite {
};
/**
- * Tests that will be enforced by the suite where instances of them should be in the list of testsToExecute.
- */
- protected static Class<?>[] testsToEnforce = new Class<?>[]{
- // branch
- BranchTest.class,
- ChooseTest.class,
- LocalTest.class,
- RepeatTest.class,
- UnionTest.class,
-
- // filter
- AndTest.class,
- CoinTest.class,
- CyclicPathTest.class,
- DedupTest.class,
- ExceptTest.class,
- FilterTest.class,
- HasNotTest.class,
- HasTest.class,
- IsTest.class,
- OrTest.class,
- RangeTest.class,
- RetainTest.class,
- SampleTest.class,
- SimplePathTest.class,
- WhereTest.class,
-
- // map
- BackTest.class,
- CountTest.class,
- FoldTest.class,
- MapTest.class,
- MatchTest.class,
- MaxTest.class,
- MeanTest.class,
- MinTest.class,
- SumTest.class,
- OrderTest.class,
- org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.PathTest.class,
- SelectTest.class,
- VertexTest.class,
- UnfoldTest.class,
- ValueMapTest.class,
- CoalesceTest.class,
-
- // sideEffect
- AddEdgeTest.class,
- AggregateTest.class,
- GroupTest.class,
- GroupCountTest.class,
- InjectTest.class,
- ProfileTest.class,
- SackTest.class,
- SideEffectCapTest.class,
- SideEffectTest.class,
- StoreTest.class,
- SubgraphTest.class,
- TreeTest.class,
-
- // util
- TraversalSideEffectsTest.class,
-
- // compliance
- CoreTraversalTest.class,
- PathTest.class,
-
- // algorithms
- // PageRankVertexProgramTest.class
-
- // strategy
- TraversalVerificationStrategyTest.class
- };
-
- /**
* This list of tests in the suite that will be executed. Gremlin developers should add to this list
* as needed to enforce tests upon implementations.
*/
@@ -229,12 +155,11 @@ public class ProcessStandardSuite extends AbstractGremlinSuite {
.filter(c -> filters.contains(c.getName()))
.collect(Collectors.toList());
testsToExecute = allowed.toArray(new Class<?>[allowed.size()]);
- testsToEnforce = testsToExecute;
}
}
public ProcessStandardSuite(final Class<?> klass, final RunnerBuilder builder) throws InitializationError {
- super(klass, builder, testsToExecute, testsToEnforce);
+ super(klass, builder, testsToExecute, testsToExecute);
}
public ProcessStandardSuite(final Class<?> klass, final RunnerBuilder builder, final Class<?>[] testsToExecute, final Class<?>[] testsToEnforce) throws InitializationError {