You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/02/19 01:33:46 UTC
[5/7] incubator-tinkerpop git commit: Implement IgnoreEngine on the
sideeffect tests.
Implement IgnoreEngine on the sideeffect tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/962fe210
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/962fe210
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/962fe210
Branch: refs/heads/master
Commit: 962fe21076a96d2f7dba88a45fd490c15676a434
Parents: 746caed
Author: Stephen Mallette <sp...@apache.org>
Authored: Wed Feb 18 19:29:25 2015 -0500
Committer: Stephen Mallette <sp...@apache.org>
Committed: Wed Feb 18 19:29:25 2015 -0500
----------------------------------------------------------------------
.../step/sideEffect/GroovyProfileTest.groovy | 11 +++
.../gremlin/process/ProcessComputerSuite.java | 16 ++--
.../step/sideEffect/AggregateTest.java | 5 +-
.../step/sideEffect/GroupCountTest.java | 5 +-
.../traversal/step/sideEffect/GroupTest.java | 6 +-
.../traversal/step/sideEffect/InjectTest.java | 20 +----
.../traversal/step/sideEffect/ProfileTest.java | 90 ++++++++++----------
.../traversal/step/sideEffect/SackTest.java | 12 +--
.../step/sideEffect/SideEffectCapTest.java | 5 +-
.../traversal/step/sideEffect/StoreTest.java | 6 +-
.../traversal/step/sideEffect/TreeTest.java | 5 +-
11 files changed, 75 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/962fe210/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyProfileTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyProfileTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyProfileTest.groovy
index 73c47d8..b7ff9b0 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyProfileTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyProfileTest.groovy
@@ -26,6 +26,8 @@ import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.Prof
import org.apache.tinkerpop.gremlin.process.util.metric.StandardTraversalMetrics
import org.apache.tinkerpop.gremlin.structure.Vertex
import org.apache.tinkerpop.gremlin.process.graph.traversal.__
+import org.junit.Ignore
+
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
@@ -44,6 +46,10 @@ public abstract class GroovyProfileTest {
g.V.repeat(__.both()).times(3).profile();
}
+ @Override
+ Traversal<Vertex, StandardTraversalMetrics> get_g_V_sleep_sleep_profile() {
+ return null
+ }
}
@UseEngine(TraversalEngine.Type.COMPUTER)
@@ -59,6 +65,11 @@ public abstract class GroovyProfileTest {
public Traversal<Vertex, StandardTraversalMetrics> get_g_V_repeat_both_profile() {
ComputerTestHelper.compute("g.V.repeat(__.both()).times(3).profile()", g);
}
+
+ @Override
+ Traversal<Vertex, StandardTraversalMetrics> get_g_V_sleep_sleep_profile() {
+ return null
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/962fe210/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 a6b7d20..e7c4d83 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
@@ -117,17 +117,17 @@ public class ProcessComputerSuite extends AbstractGremlinSuite {
// sideEffect
// TODO: AddEdgeTest.ComputerTest.class,
- AggregateTest.ComputerTest.class,
- GroupTest.ComputerTest.class,
- GroupCountTest.ComputerTest.class,
+ AggregateTest.StandardTest.class,
+ GroupTest.StandardTest.class,
+ GroupCountTest.StandardTest.class,
// TODO: InjectTest.ComputerTest.class,
- ProfileTest.ComputerTest.class,
- SackTest.ComputerTest.class,
- SideEffectCapTest.ComputerTest.class,
+ ProfileTest.StandardTest.class,
+ SackTest.StandardTest.class,
+ SideEffectCapTest.StandardTest.class,
// TODO: REMOVE? SideEffectTest.ComputerTest.class,
- StoreTest.ComputerTest.class,
+ StoreTest.StandardTest.class,
// TODO: REMOVE? SubgraphTest.ComputerTest.class,
- TreeTest.ComputerTest.class,
+ TreeTest.StandardTest.class,
// algorithms
PageRankVertexProgramTest.class,
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/962fe210/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AggregateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AggregateTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AggregateTest.java
index 652e500..90a6590 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AggregateTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AggregateTest.java
@@ -124,6 +124,7 @@ public abstract class AggregateTest extends AbstractGremlinProcessTest {
@UseEngine(TraversalEngine.Type.STANDARD)
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class StandardTest extends AggregateTest {
@Override
@@ -145,8 +146,4 @@ public abstract class AggregateTest extends AbstractGremlinProcessTest {
return g.V(1).as("x").bothE().as("e").value("weight").except("w").aggregate("w").back("e").otherV().jump("x", t -> true, t -> true).path();
}*/
}
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTest extends StandardTest {
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/962fe210/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountTest.java
index 7a49f0b..a73b92e 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountTest.java
@@ -123,6 +123,7 @@ public abstract class GroupCountTest extends AbstractGremlinProcessTest {
}
@UseEngine(TraversalEngine.Type.STANDARD)
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class StandardTest extends GroupCountTest {
@Override
@@ -157,8 +158,4 @@ public abstract class GroupCountTest extends AbstractGremlinProcessTest {
repeat(in()).times(2).groupCount("m").by("name")).cap("m");
}
}
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTest extends StandardTest {
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/962fe210/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupTest.java
index dc313ac..d81aca9 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupTest.java
@@ -139,6 +139,7 @@ public abstract class GroupTest extends AbstractGremlinProcessTest {
}
@UseEngine(TraversalEngine.Type.STANDARD)
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class StandardTest extends GroupTest {
@Override
@@ -167,9 +168,4 @@ public abstract class GroupTest extends AbstractGremlinProcessTest {
return (Traversal) g.V().group().by(outE().count()).by("name");
}
}
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTest extends StandardTest {
- }
-
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/962fe210/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/InjectTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/InjectTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/InjectTest.java
index 2695645..8f08af5 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/InjectTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/InjectTest.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect;
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.Path;
import org.apache.tinkerpop.gremlin.process.Traversal;
import org.apache.tinkerpop.gremlin.process.TraversalEngine;
@@ -46,6 +47,7 @@ public abstract class InjectTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
+ @IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void g_VX1X_out_injectXv2X_name() {
final Traversal<Vertex, String> traversal = get_g_VX1X_out_injectXv2X_name(convertToVertexId("marko"), convertToVertexId("vadas"));
printTraversalForm(traversal);
@@ -62,6 +64,7 @@ public abstract class InjectTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
+ @IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void g_VX1X_out_name_injectXdanielX_asXaX_mapXlengthX_path() {
final Traversal<Vertex, Path> traversal = get_g_VX1X_out_name_injectXdanielX_asXaX_mapXlengthX_path(convertToVertexId("marko"));
printTraversalForm(traversal);
@@ -81,6 +84,7 @@ public abstract class InjectTest extends AbstractGremlinProcessTest {
}
@UseEngine(TraversalEngine.Type.STANDARD)
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class StandardTest extends InjectTest {
@Override
@@ -93,20 +97,4 @@ public abstract class InjectTest extends AbstractGremlinProcessTest {
return g.V(v1Id).out().<String>values("name").inject("daniel").as("a").map(t -> t.get().length()).path();
}
}
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTest extends StandardTest {
-
- @Override
- @Test
- @org.junit.Ignore(TRAVERSAL_NOT_SUPPORTED_BY_COMPUTER)
- public void g_VX1X_out_injectXv2X_name() {
- }
-
- @Override
- @Test
- @org.junit.Ignore(TRAVERSAL_NOT_SUPPORTED_BY_COMPUTER)
- public void g_VX1X_out_name_injectXdanielX_asXaX_mapXlengthX_path() {
- }
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/962fe210/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileTest.java
index 61dfc16..e178d17 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileTest.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect;
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.Traversal;
import org.apache.tinkerpop.gremlin.process.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.Traverser;
@@ -47,6 +48,8 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, StandardTraversalMetrics> get_g_V_repeat_both_profile();
+ public abstract Traversal<Vertex, StandardTraversalMetrics> get_g_V_sleep_sleep_profile();
+
@Test
@LoadGraphWith(MODERN)
public void g_V_out_out_modern_profile() {
@@ -119,8 +122,46 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
assertEquals(100, totalPercentDuration, 0.000001);
}
+ /*
@Test
@LoadGraphWith(MODERN)
+ public void testProfileTimes() {
+ final Traversal<Vertex, StandardTraversalMetrics> traversal = get_g_V_sleep_sleep_profile();
+ printTraversalForm(traversal);
+
+ traversal.iterate();
+
+ assertEquals("There should be 6 steps in this traversal (counting injected profile steps).", 6, traversal.asAdmin().getSteps().size());
+
+ TraversalMetrics traversalMetrics = traversal.asAdmin().getSideEffects().get(TraversalMetrics.METRICS_KEY);
+ traversalMetrics.toString(); // ensure no exceptions are thrown
+
+ // Grab the second (sideEffect{sleep}) step and check the times.
+ Metrics metrics = traversalMetrics.getMetrics(1);
+ // 6 elements w/ a 10ms sleep each = 60ms with 10ms for other computation
+ assertTrue("Duration should be at least the length of the sleep: " + metrics.getDuration(TimeUnit.MILLISECONDS),
+ metrics.getDuration(TimeUnit.MILLISECONDS) >= 60);
+ assertTrue("Check that duration is within tolerant range: " + metrics.getDuration(TimeUnit.MILLISECONDS),
+ metrics.getDuration(TimeUnit.MILLISECONDS) < 80);
+
+ // 6 elements w/ a 5ms sleep each = 30ms plus 20ms for other computation
+ metrics = traversalMetrics.getMetrics(2);
+ assertTrue("Duration should be at least the length of the sleep: " + metrics.getDuration(TimeUnit.MILLISECONDS),
+ metrics.getDuration(TimeUnit.MILLISECONDS) >= 30);
+ assertTrue("Check that duration is within tolerant range: " + metrics.getDuration(TimeUnit.MILLISECONDS),
+ metrics.getDuration(TimeUnit.MILLISECONDS) < 50);
+
+ double totalPercentDuration = 0;
+ for (Metrics m : traversalMetrics.getMetrics()) {
+ totalPercentDuration += m.getPercentDuration();
+ }
+ assertEquals(100, totalPercentDuration, 0.000001);
+ }
+ */
+
+ @Test
+ @LoadGraphWith(MODERN)
+ @IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void g_V_repeat_both_modern_profile() {
final Traversal<Vertex, StandardTraversalMetrics> traversal = get_g_V_repeat_both_profile();
printTraversalForm(traversal);
@@ -151,43 +192,9 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
}
@UseEngine(TraversalEngine.Type.STANDARD)
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class StandardTest extends ProfileTest {
- @Test
- @LoadGraphWith(MODERN)
- public void testProfileTimes() {
- final Traversal<Vertex, StandardTraversalMetrics> traversal = get_g_V_sleep_sleep_profile();
- printTraversalForm(traversal);
-
- traversal.iterate();
-
- assertEquals("There should be 6 steps in this traversal (counting injected profile steps).", 6, traversal.asAdmin().getSteps().size());
-
- TraversalMetrics traversalMetrics = traversal.asAdmin().getSideEffects().get(TraversalMetrics.METRICS_KEY);
- traversalMetrics.toString(); // ensure no exceptions are thrown
-
- // Grab the second (sideEffect{sleep}) step and check the times.
- Metrics metrics = traversalMetrics.getMetrics(1);
- // 6 elements w/ a 10ms sleep each = 60ms with 10ms for other computation
- assertTrue("Duration should be at least the length of the sleep: " + metrics.getDuration(TimeUnit.MILLISECONDS),
- metrics.getDuration(TimeUnit.MILLISECONDS) >= 60);
- assertTrue("Check that duration is within tolerant range: " + metrics.getDuration(TimeUnit.MILLISECONDS),
- metrics.getDuration(TimeUnit.MILLISECONDS) < 80);
-
- // 6 elements w/ a 5ms sleep each = 30ms plus 20ms for other computation
- metrics = traversalMetrics.getMetrics(2);
- assertTrue("Duration should be at least the length of the sleep: " + metrics.getDuration(TimeUnit.MILLISECONDS),
- metrics.getDuration(TimeUnit.MILLISECONDS) >= 30);
- assertTrue("Check that duration is within tolerant range: " + metrics.getDuration(TimeUnit.MILLISECONDS),
- metrics.getDuration(TimeUnit.MILLISECONDS) < 50);
-
- double totalPercentDuration = 0;
- for (Metrics m : traversalMetrics.getMetrics()) {
- totalPercentDuration += m.getPercentDuration();
- }
- assertEquals(100, totalPercentDuration, 0.000001);
- }
-
@Override
public Traversal<Vertex, StandardTraversalMetrics> get_g_V_out_out_profile() {
return (Traversal) g.V().out().out().profile();
@@ -198,6 +205,7 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
return (Traversal) g.V().repeat(both()).times(3).profile();
}
+ @Override
public Traversal<Vertex, StandardTraversalMetrics> get_g_V_sleep_sleep_profile() {
return (Traversal) g.V().sideEffect(new Consumer<Traverser<Vertex>>() {
@Override
@@ -221,16 +229,4 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
}
}
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTest extends StandardTest {
-
- @Override
- @Test
- @LoadGraphWith(MODERN)
- @org.junit.Ignore(TRAVERSAL_NOT_SUPPORTED_BY_COMPUTER)
- public void testProfileTimes() {
-
- }
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/962fe210/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackTest.java
index f4f80fe..fd8f0df 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackTest.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect;
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.Traversal;
import org.apache.tinkerpop.gremlin.process.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.UseEngine;
@@ -66,6 +67,7 @@ public abstract class SackTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
+ @IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void g_V_withSackXmap__map_cloneX_out_out_sackXmap_a_nameX_sack() {
final Traversal<Vertex, Map> traversal = get_g_V_withSackXmap__map_cloneX_out_out_sackXmap_a_nameX_sack();
int counter = 0;
@@ -80,6 +82,7 @@ public abstract class SackTest extends AbstractGremlinProcessTest {
}
@UseEngine(TraversalEngine.Type.STANDARD)
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class StandardTest extends SackTest {
@Override
public Traversal<Vertex, Double> get_g_V_withSackX0X_outE_sackXsum_weightX_inV_sack_sum() {
@@ -99,13 +102,4 @@ public abstract class SackTest extends AbstractGremlinProcessTest {
}).sack();
}
}
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTest extends StandardTest {
- @Override
- @Test
- @org.junit.Ignore(TRAVERSAL_NOT_SUPPORTED_BY_COMPUTER)
- public void g_V_withSackXmap__map_cloneX_out_out_sackXmap_a_nameX_sack() {
- }
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/962fe210/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapTest.java
index c2e2c09..9aa7b22 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapTest.java
@@ -78,6 +78,7 @@ public abstract class SideEffectCapTest extends AbstractGremlinProcessTest {
}
@UseEngine(TraversalEngine.Type.STANDARD)
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class StandardTest extends SideEffectCapTest {
@Override
public Traversal<Vertex, Map<String, Long>> get_g_V_hasXageX_groupCountXaX_byXnameX_out_capXaX() {
@@ -91,8 +92,4 @@ public abstract class SideEffectCapTest extends AbstractGremlinProcessTest {
values("name").groupCount("b")).cap("a", "b");
}
}
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTest extends StandardTest {
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/962fe210/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StoreTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StoreTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StoreTest.java
index 3a61db3..e9d58b0 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StoreTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StoreTest.java
@@ -112,6 +112,7 @@ public abstract class StoreTest extends AbstractGremlinProcessTest {
}
@UseEngine(TraversalEngine.Type.STANDARD)
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class StandardTest extends StoreTest {
@Override
public Traversal<Vertex, Collection> get_g_V_storeXaX_byXnameX_out_capXaX() {
@@ -133,9 +134,4 @@ public abstract class StoreTest extends AbstractGremlinProcessTest {
return (Traversal) g.V().store("a").by(outE("created").count()).out().out().store("a").by(inE("created").values("weight").sum());
}
}
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTest extends StandardTest {
- }
-
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/962fe210/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java
index b62f797..d5b5010 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java
@@ -105,6 +105,7 @@ public abstract class TreeTest extends AbstractGremlinProcessTest {
}
@UseEngine(TraversalEngine.Type.STANDARD)
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class StandardTest extends TreeTest {
@Override
public Traversal<Vertex, Tree> get_g_VX1X_out_out_tree_byXnameX(final Object v1Id) {
@@ -131,8 +132,4 @@ public abstract class TreeTest extends AbstractGremlinProcessTest {
return (Traversal) g.V().out().out().tree("a");
}
}
-
- @UseEngine(TraversalEngine.Type.COMPUTER)
- public static class ComputerTest extends StandardTest {
- }
}