You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2015/05/11 13:44:09 UTC
[38/50] [abbrv] incubator-tinkerpop git commit: greatly simplified
the groovy test suite. its all generated via strings and thus,
no need for STANDARD and COMPUTER versions of the tests.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/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 562771c..2fbae41 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
@@ -33,19 +33,23 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.filter.GroovyAndTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.GroovyCoinTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.GroovyCyclicPathTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.GroovyDedupTest;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.GroovyExceptTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.GroovyFilterTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.GroovyHasNotTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.GroovyHasTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.GroovyIsTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.GroovyOrTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.GroovyRangeTest;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.GroovyRetainTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.GroovySampleTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.GroovySimplePathTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.GroovyWhereTest;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyAddEdgeTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyCoalesceTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyCountTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyFoldTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyMapTest;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyMatchTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyMaxTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyMeanTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyMinTest;
@@ -64,7 +68,9 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroovyInje
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroovyProfileTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroovySackTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroovySideEffectCapTest;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroovySideEffectTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroovyStoreTest;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroovySubgraphTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroovyTreeTest;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.StructureStandardSuite;
@@ -91,61 +97,60 @@ public class GroovyProcessComputerSuite extends ProcessComputerSuite {
private static final Class<?>[] allTests = new Class<?>[]{
//branch
- GroovyBranchTest.ComputerTraversals.class,
- GroovyChooseTest.ComputerTraversals.class,
- GroovyLocalTest.ComputerTraversals.class,
- GroovyRepeatTest.ComputerTraversals.class,
- GroovyUnionTest.ComputerTraversals.class,
+ GroovyBranchTest.Traversals.class,
+ GroovyChooseTest.Traversals.class,
+ GroovyLocalTest.Traversals.class,
+ GroovyRepeatTest.Traversals.class,
+ GroovyUnionTest.Traversals.class,
// filter
- GroovyAndTest.ComputerTraversals.class,
- GroovyCoinTest.ComputerTraversals.class,
- GroovyCyclicPathTest.ComputerTraversals.class,
- GroovyDedupTest.ComputerTraversals.class,
- // TODO: GroovyExceptTest.ComputerTest.class,
- GroovyFilterTest.ComputerTraversals.class,
- GroovyHasNotTest.ComputerTraversals.class,
- GroovyHasTest.ComputerTraversals.class,
- GroovyIsTest.ComputerTraversals.class,
- GroovyOrTest.ComputerTraversals.class,
- GroovyRangeTest.ComputerTraversals.class,
- // TODO: GroovyRetainTest.ComputerTest.class,
- GroovySampleTest.ComputerTraversals.class,
- GroovySimplePathTest.ComputerTraversals.class,
- GroovyWhereTest.ComputerTraversals.class,
+ GroovyAndTest.Traversals.class,
+ GroovyCoinTest.Traversals.class,
+ GroovyCyclicPathTest.Traversals.class,
+ GroovyDedupTest.Traversals.class,
+ GroovyExceptTest.Traversals.class,
+ GroovyFilterTest.Traversals.class,
+ GroovyHasNotTest.Traversals.class,
+ GroovyHasTest.Traversals.class,
+ GroovyIsTest.Traversals.class,
+ GroovyOrTest.Traversals.class,
+ GroovyRangeTest.Traversals.class,
+ GroovyRetainTest.Traversals.class,
+ GroovySampleTest.Traversals.class,
+ GroovySimplePathTest.Traversals.class,
+ GroovyWhereTest.Traversals.class,
// map
- GroovyCoalesceTest.ComputerTraversals.class,
- GroovyCountTest.ComputerTraversals.class,
- GroovyFoldTest.ComputerTraversals.class,
- GroovyMapTest.ComputerTraversals.class,
- // TODO: GroovyMatchTest.ComputerTest.class,
- GroovyMaxTest.ComputerTraversals.class,
- GroovyMeanTest.ComputerTraversals.class,
- GroovyMinTest.ComputerTraversals.class,
- GroovyOrderTest.ComputerTraversals.class,
- GroovyPathTest.ComputerTraversals.class,
- GroovyPropertiesTest.ComputerTraversals.class,
- GroovySelectTest.ComputerTraversals.class,
- GroovySumTest.ComputerTraversals.class,
- GroovyUnfoldTest.ComputerTraversals.class,
- GroovyValueMapTest.ComputerTraversals.class,
- GroovyVertexTest.ComputerTraversals.class,
-
+ GroovyCoalesceTest.Traversals.class,
+ GroovyCountTest.Traversals.class,
+ GroovyFoldTest.Traversals.class,
+ GroovyMapTest.Traversals.class,
+ GroovyMatchTest.Traversals.class,
+ GroovyMaxTest.Traversals.class,
+ GroovyMeanTest.Traversals.class,
+ GroovyMinTest.Traversals.class,
+ GroovyOrderTest.Traversals.class,
+ GroovyPathTest.Traversals.class,
+ GroovyPropertiesTest.Traversals.class,
+ GroovySelectTest.Traversals.class,
+ GroovySumTest.Traversals.class,
+ GroovyUnfoldTest.Traversals.class,
+ GroovyValueMapTest.Traversals.class,
+ GroovyVertexTest.Traversals.class,
// sideEffect
- // TODO: GroovyAddEdgeTest.ComputerTest.class,
- GroovyAggregateTest.ComputerTraversals.class,
- GroovyGroupTest.ComputerTraversals.class,
- GroovyGroupCountTest.ComputerTraversals.class,
- GroovyInjectTest.ComputerTraversals.class,
- GroovyProfileTest.ComputerTraversals.class,
- GroovySackTest.ComputerTraversals.class,
- GroovySideEffectCapTest.ComputerTraversals.class,
- // TODO: GroovySideEffectTest.ComputerTest.class,
- GroovyStoreTest.ComputerTraversals.class,
- // TODO: GroovySubgraphTest.ComputerTest.class,
- GroovyTreeTest.ComputerTraversals.class,
+ GroovyAddEdgeTest.Traversals.class,
+ GroovyAggregateTest.Traversals.class,
+ GroovyGroupTest.Traversals.class,
+ GroovyGroupCountTest.Traversals.class,
+ GroovyInjectTest.Traversals.class,
+ GroovyProfileTest.Traversals.class,
+ GroovySackTest.Traversals.class,
+ GroovySideEffectCapTest.Traversals.class,
+ GroovySideEffectTest.Traversals.class,
+ GroovyStoreTest.Traversals.class,
+ GroovySubgraphTest.Traversals.class,
+ GroovyTreeTest.Traversals.class,
// algorithms
PageRankVertexProgramTest.class,
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/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 7798682..75aa509 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
@@ -96,62 +96,62 @@ public class GroovyProcessStandardSuite extends ProcessStandardSuite {
*/
private static final Class<?>[] allTests = new Class<?>[]{
// branch
- GroovyBranchTest.StandardTraversals.class,
- GroovyChooseTest.StandardTraversals.class,
- GroovyLocalTest.StandardTraversals.class,
- GroovyRepeatTest.StandardTraversals.class,
- GroovyUnionTest.StandardTraversals.class,
+ GroovyBranchTest.Traversals.class,
+ GroovyChooseTest.Traversals.class,
+ GroovyLocalTest.Traversals.class,
+ GroovyRepeatTest.Traversals.class,
+ GroovyUnionTest.Traversals.class,
// filter
- GroovyAndTest.StandardTraversals.class,
- GroovyCoinTest.StandardTraversals.class,
- GroovyCyclicPathTest.StandardTraversals.class,
- GroovyDedupTest.StandardTraversals.class,
- GroovyDropTest.StandardTraversals.class,
- GroovyExceptTest.StandardTraversals.class,
- GroovyFilterTest.StandardTraversals.class,
- GroovyHasNotTest.StandardTraversals.class,
- GroovyHasTest.StandardTraversals.class,
- GroovyIsTest.StandardTraversals.class,
- GroovyOrTest.StandardTraversals.class,
- GroovyRangeTest.StandardTraversals.class,
- GroovyRetainTest.StandardTraversals.class,
- GroovySampleTest.StandardTraversals.class,
- GroovySimplePathTest.StandardTraversals.class,
- GroovyWhereTest.StandardTraversals.class,
+ GroovyAndTest.Traversals.class,
+ GroovyCoinTest.Traversals.class,
+ GroovyCyclicPathTest.Traversals.class,
+ GroovyDedupTest.Traversals.class,
+ GroovyDropTest.Traversals.class,
+ GroovyExceptTest.Traversals.class,
+ GroovyFilterTest.Traversals.class,
+ GroovyHasNotTest.Traversals.class,
+ GroovyHasTest.Traversals.class,
+ GroovyIsTest.Traversals.class,
+ GroovyOrTest.Traversals.class,
+ GroovyRangeTest.Traversals.class,
+ GroovyRetainTest.Traversals.class,
+ GroovySampleTest.Traversals.class,
+ GroovySimplePathTest.Traversals.class,
+ GroovyWhereTest.Traversals.class,
// map
- GroovyAddEdgeTest.StandardTraversals.class,
- GroovyAddVertexTest.StandardTraversals.class,
- GroovyCoalesceTest.StandardTraversals.class,
- GroovyCountTest.StandardTraversals.class,
- GroovyFoldTest.StandardTraversals.class,
- GroovyMapTest.StandardTraversals.class,
- GroovyMatchTest.StandardTraversals.class,
- GroovyMaxTest.StandardTraversals.class,
- GroovyMeanTest.StandardTraversals.class,
- GroovyMinTest.StandardTraversals.class,
- GroovyOrderTest.StandardTraversals.class,
- GroovyPathTest.StandardTraversals.class,
- GroovyPropertiesTest.StandardTraversals.class,
- GroovySelectTest.StandardTraversals.class,
- GroovySumTest.StandardTraversals.class,
- GroovyUnfoldTest.StandardTraversals.class,
- GroovyValueMapTest.StandardTraversals.class,
- GroovyVertexTest.StandardTraversals.class,
+ GroovyAddEdgeTest.Traversals.class,
+ GroovyAddVertexTest.Traversals.class,
+ GroovyCoalesceTest.Traversals.class,
+ GroovyCountTest.Traversals.class,
+ GroovyFoldTest.Traversals.class,
+ GroovyMapTest.Traversals.class,
+ GroovyMatchTest.Traversals.class,
+ GroovyMaxTest.Traversals.class,
+ GroovyMeanTest.Traversals.class,
+ GroovyMinTest.Traversals.class,
+ GroovyOrderTest.Traversals.class,
+ GroovyPathTest.Traversals.class,
+ GroovyPropertiesTest.Traversals.class,
+ GroovySelectTest.Traversals.class,
+ GroovySumTest.Traversals.class,
+ GroovyUnfoldTest.Traversals.class,
+ GroovyValueMapTest.Traversals.class,
+ GroovyVertexTest.Traversals.class,
// sideEffect
- GroovyAggregateTest.StandardTraversals.class,
- GroovyGroupTest.StandardTraversals.class,
- GroovyGroupCountTest.StandardTraversals.class,
- GroovyInjectTest.StandardTraversals.class,
- GroovyProfileTest.StandardTraversals.class,
- GroovySackTest.StandardTraversals.class,
- GroovySideEffectCapTest.StandardTraversals.class,
- GroovySideEffectTest.StandardTraversals.class,
- GroovyStoreTest.StandardTraversals.class,
- GroovySubgraphTest.StandardTraversals.class,
- GroovyTreeTest.StandardTraversals.class,
+ GroovyAggregateTest.Traversals.class,
+ GroovyGroupTest.Traversals.class,
+ GroovyGroupCountTest.Traversals.class,
+ GroovyInjectTest.Traversals.class,
+ GroovyProfileTest.Traversals.class,
+ GroovySackTest.Traversals.class,
+ GroovySideEffectCapTest.Traversals.class,
+ GroovySideEffectTest.Traversals.class,
+ GroovyStoreTest.Traversals.class,
+ GroovySubgraphTest.Traversals.class,
+ GroovyTreeTest.Traversals.class,
// util
- GroovyTraversalSideEffectsTest.StandardTraversals.class,
+ GroovyTraversalSideEffectsTest.Traversals.class,
// compliance
CoreTraversalTest.class,
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
index 3f790b8..032fe57 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
@@ -18,12 +18,13 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map;
-import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
import org.apache.tinkerpop.gremlin.FeatureRequirement;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
+import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
+import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
+import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -38,7 +39,7 @@ import static org.junit.Assert.assertEquals;
* @author Marko A. Rodriguez (http://markorodriguez.com)
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-public abstract class AddEdgeTest extends AbstractGremlinTest {
+public abstract class AddEdgeTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Edge> get_g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_aX(final Object v1Id);
@@ -49,6 +50,7 @@ public abstract class AddEdgeTest extends AbstractGremlinTest {
@Test
@LoadGraphWith(MODERN)
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
+ @IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_aX() {
final Traversal<Vertex, Edge> traversal = get_g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_aX(convertToVertexId("marko"));
printTraversalForm(traversal);
@@ -68,6 +70,7 @@ public abstract class AddEdgeTest extends AbstractGremlinTest {
@Test
@LoadGraphWith(MODERN)
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
+ @IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_a_weight_2X() {
final Traversal<Vertex, Edge> traversal = get_g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_a_weight_2X(convertToVertexId("marko"));
printTraversalForm(traversal);
@@ -89,6 +92,7 @@ public abstract class AddEdgeTest extends AbstractGremlinTest {
@Test
@LoadGraphWith(MODERN)
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
+ @IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void g_V_addOutEXexistsWith__g_V__time_nowX() {
final Traversal<Vertex, Edge> traversal = get_g_V_addOutEXexistsWith__g_V__time_nowX();
printTraversalForm(traversal);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectTest.java
index 7d8cada..8545095 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectTest.java
@@ -18,11 +18,12 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect;
-import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
+import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
+import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
+import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
@@ -38,7 +39,7 @@ import static org.junit.Assert.*;
* @author Marko A. Rodriguez (http://markorodriguez.com)
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-public abstract class SideEffectTest extends AbstractGremlinTest {
+public abstract class SideEffectTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, String> get_g_VX1X_sideEffectXstore_aX_name(final Object v1Id);
public abstract Traversal<Vertex, String> get_g_VX1X_out_sideEffectXincr_cX_name(final Object v1Id);
@@ -47,6 +48,7 @@ public abstract class SideEffectTest extends AbstractGremlinTest {
@Test
@LoadGraphWith(MODERN)
+ @IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void g_VX1X_sideEffectXstore_aX_name() {
final Traversal<Vertex, String> traversal = get_g_VX1X_sideEffectXstore_aX_name(convertToVertexId("marko"));
printTraversalForm(traversal);
@@ -57,6 +59,7 @@ public abstract class SideEffectTest extends AbstractGremlinTest {
@Test
@LoadGraphWith(MODERN)
+ @IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void g_VX1X_out_sideEffectXincr_cX_name() {
final Traversal<Vertex, String> traversal = get_g_VX1X_out_sideEffectXincr_cX_name(convertToVertexId("marko"));
printTraversalForm(traversal);
@@ -77,6 +80,7 @@ public abstract class SideEffectTest extends AbstractGremlinTest {
@Test
@LoadGraphWith(MODERN)
+ @IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void g_VX1X_out_sideEffectXX_name() {
final Traversal<Vertex, String> traversal = get_g_VX1X_out_sideEffectXX_name(convertToVertexId("marko"));
printTraversalForm(traversal);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
index a3cc8ed..198c9eb 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
@@ -18,21 +18,22 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect;
+import org.apache.commons.configuration.Configuration;
import org.apache.tinkerpop.gremlin.FeatureRequirement;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
+import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
+import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.commons.configuration.Configuration;
import org.junit.Test;
import java.util.Arrays;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.*;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.bothE;
import static org.apache.tinkerpop.gremlin.structure.Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES;
import static org.apache.tinkerpop.gremlin.structure.Graph.Features.ElementFeatures.FEATURE_USER_SUPPLIED_IDS;
import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES;
@@ -54,6 +55,7 @@ public abstract class SubgraphTest extends AbstractGremlinProcessTest {
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = FEATURE_ADD_EDGES)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS)
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS)
+ @IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void g_V_withSideEffectXsgX_outEXknowsX_subgraphXsgX_name_capXsgX() throws Exception {
final Configuration config = graphProvider.newGraphConfiguration("subgraph", this.getClass(), name.getMethodName(), MODERN);
graphProvider.clear(config);
@@ -86,6 +88,7 @@ public abstract class SubgraphTest extends AbstractGremlinProcessTest {
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = FEATURE_ADD_EDGES)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS)
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS)
+ @IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void g_V_withSideEffectXsgX_repeatXbothEXcreatedX_subgraphXsgX_outVX_timesX5X_name_dedup() throws Exception {
final Configuration config = graphProvider.newGraphConfiguration("subgraph", this.getClass(), name.getMethodName(), MODERN);
graphProvider.clear(config);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier2.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier2.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier2.java
index b3366c5..66cc883 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier2.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier2.java
@@ -20,15 +20,19 @@ package org.apache.tinkerpop.gremlin.hadoop.process.computer.example;
import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import java.util.Map;
+import java.util.function.Function;
import java.util.function.Supplier;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public class TraversalSupplier2 implements Supplier<Traversal> {
+public class TraversalSupplier2 implements Function<Graph, Traversal<Vertex, Map<Integer,Long>>> {
@Override
- public Traversal get() {
- return HadoopGraph.open().traversal().V().<String>values("name").map(s -> s.get().length()).groupCount().<Integer>by(i -> i + 100);
+ public Traversal<Vertex,Map<Integer,Long>> apply(final Graph graph) {
+ return (Traversal) graph.traversal().V().<String>values("name").map(s -> s.get().length()).groupCount().<Integer>by(i -> i + 100);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier3.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier3.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier3.java
index a1c0ecb..4b41791 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier3.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier3.java
@@ -18,18 +18,21 @@
*/
package org.apache.tinkerpop.gremlin.hadoop.process.computer.example;
-import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
import java.util.Collection;
-import java.util.function.Supplier;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public class TraversalSupplier3 implements Supplier<Traversal> {
+public class TraversalSupplier3 implements Function<Graph, Traversal<Vertex, Map<String, List<Vertex>>>> {
@Override
- public Traversal get() {
- return HadoopGraph.open().traversal().V().<String>values("name").group().<String>by(s -> s.substring(1, 2)).by(v -> v).<Collection>by(Collection::size);
+ public Traversal<Vertex, Map<String, List<Vertex>>> apply(final Graph graph) {
+ return (Traversal) graph.traversal().V().<String>values("name").group().<String>by(s -> s.substring(1, 2)).by(v -> v).<Collection>by(Collection::size);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/abd23f4e/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java
index 3999d80..febd4c4 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java
@@ -67,15 +67,15 @@ import java.util.stream.Stream;
method = "g_V_matchXa_0sungBy_b__a_0writtenBy_c__b_writtenBy_d__c_sungBy_d__d_hasXname_GarciaXX",
reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.")
@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyMatchTest$StandardTraversals",
+ test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyMatchTest$Traversals",
method = "g_V_matchXa_hasXname_GarciaX__a_0writtenBy_b__a_0sungBy_bX",
reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.")
@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyMatchTest$StandardTraversals",
+ test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyMatchTest$Traversals",
method = "g_V_matchXa_0sungBy_b__a_0sungBy_c__b_writtenBy_d__c_writtenBy_e__d_hasXname_George_HarisonX__e_hasXname_Bob_MarleyXX",
reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.")
@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyMatchTest$StandardTraversals",
+ test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyMatchTest$Traversals",
method = "g_V_matchXa_0sungBy_b__a_0writtenBy_c__b_writtenBy_d__c_sungBy_d__d_hasXname_GarciaXX",
reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.")
@Graph.OptOut(
@@ -91,15 +91,15 @@ import java.util.stream.Stream;
method = "g_V_repeatXoutX_timesX8X_count",
reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.")
@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyCountTest$StandardTraversals",
+ test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyCountTest$Traversals",
method = "g_V_both_both_count",
reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.")
@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyCountTest$StandardTraversals",
+ test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyCountTest$Traversals",
method = "g_V_repeatXoutX_timesX3X_count",
reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.")
@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyCountTest$StandardTraversals",
+ test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyCountTest$Traversals",
method = "g_V_repeatXoutX_timesX8X_count",
reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.")
@Graph.OptOut(
@@ -119,7 +119,7 @@ import java.util.stream.Stream;
method = "g_V_out_out_grateful_profile",
reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.")
@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroovyProfileTest$StandardTraversals",
+ test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroovyProfileTest$Traversals",
method = "g_V_out_out_grateful_profile",
reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.")
public class HadoopGraph implements Graph {