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/18 21:01:44 UTC

[4/4] incubator-tinkerpop git commit: Big refactor on the process tests.

Big refactor on the process tests.

Added UseEngine annotation to mark a test as one using a particular TraversalEngine.Type.  This allowed the removal of the boolean that used to be used to validate whether a graph would run a test given its ability to support GraphComputer.  The process computer/standard suite enforces that annotation and yields error messages that make sure the tests are setup properly.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/58affa2f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/58affa2f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/58affa2f

Branch: refs/heads/master
Commit: 58affa2f3218d54206c805064b129aa8938e5128
Parents: cae8df0
Author: Stephen Mallette <sp...@apache.org>
Authored: Wed Feb 18 14:58:35 2015 -0500
Committer: Stephen Mallette <sp...@apache.org>
Committed: Wed Feb 18 14:58:35 2015 -0500

----------------------------------------------------------------------
 .../step/branch/GroovyBranchTest.groovy         |   4 +
 .../step/branch/GroovyChooseTest.groovy         |   4 +
 .../step/branch/GroovyLocalTest.groovy          |   4 +
 .../step/branch/GroovyRepeatTest.groovy         |  11 +-
 .../step/branch/GroovyUnionTest.groovy          |   4 +
 .../traversal/step/filter/GroovyAndTest.groovy  |   4 +
 .../traversal/step/filter/GroovyCoinTest.groovy |   4 +
 .../step/filter/GroovyCyclicPathTest.groovy     |   4 +
 .../step/filter/GroovyDedupTest.groovy          |  49 +++++--
 .../step/filter/GroovyExceptTest.groovy         |   4 +
 .../step/filter/GroovyFilterTest.groovy         |   4 +
 .../step/filter/GroovyHasNotTest.groovy         |   4 +
 .../traversal/step/filter/GroovyHasTest.groovy  |   7 +-
 .../traversal/step/filter/GroovyIsTest.groovy   |   4 +
 .../traversal/step/filter/GroovyOrTest.groovy   |   4 +
 .../step/filter/GroovyRangeTest.groovy          | 123 ++++++++++++-----
 .../step/filter/GroovyRetainTest.groovy         |   4 +
 .../step/filter/GroovySampleTest.groovy         |  32 ++++-
 .../step/filter/GroovySimplePathTest.groovy     |   4 +
 .../step/filter/GroovyWhereTest.groovy          |  32 +++--
 .../traversal/step/map/GroovyBackTest.groovy    |   4 +
 .../step/map/GroovyCoalesceTest.groovy          |  18 ++-
 .../traversal/step/map/GroovyCountTest.groovy   |  18 ++-
 .../traversal/step/map/GroovyFoldTest.groovy    |  19 ++-
 .../traversal/step/map/GroovyMapTest.groovy     |  30 +++-
 .../traversal/step/map/GroovyMatchTest.groovy   |   3 +
 .../traversal/step/map/GroovyMaxTest.groovy     |   4 +
 .../traversal/step/map/GroovyMeanTest.groovy    |   4 +
 .../traversal/step/map/GroovyMinTest.groovy     |   4 +
 .../traversal/step/map/GroovyOrderTest.groovy   |  68 ++++++---
 .../traversal/step/map/GroovyPathTest.groovy    |  42 ++++--
 .../step/map/GroovyPropertiesTest.groovy        |   4 +
 .../traversal/step/map/GroovySelectTest.groovy  | 108 ++++++++++-----
 .../traversal/step/map/GroovySumTest.groovy     |   4 +
 .../traversal/step/map/GroovyUnfoldTest.groovy  |   8 +-
 .../step/map/GroovyValueMapTest.groovy          |   4 +
 .../traversal/step/map/GroovyVertexTest.groovy  |   4 +
 .../step/sideEffect/GroovyAddEdgeTest.groovy    |   3 +
 .../step/sideEffect/GroovyAggregateTest.groovy  |   4 +
 .../step/sideEffect/GroovyGroupCountTest.groovy |   4 +
 .../step/sideEffect/GroovyGroupTest.groovy      |   4 +
 .../step/sideEffect/GroovyInjectTest.groovy     |  32 ++++-
 .../step/sideEffect/GroovyProfileTest.groovy    |   4 +
 .../step/sideEffect/GroovySackTest.groovy       |   4 +
 .../sideEffect/GroovySideEffectCapTest.groovy   |   4 +
 .../step/sideEffect/GroovySideEffectTest.groovy |   3 +
 .../step/sideEffect/GroovyStoreTest.groovy      |   4 +
 .../step/sideEffect/GroovySubgraphTest.groovy   |   3 +
 .../step/sideEffect/GroovyTreeTest.groovy       |  27 ++--
 .../apache/tinkerpop/gremlin/GraphProvider.java |   2 -
 .../process/AbstractGremlinProcessTest.java     |  19 ++-
 .../gremlin/process/ProcessComputerSuite.java   |  11 ++
 .../gremlin/process/ProcessStandardSuite.java   |  11 ++
 .../tinkerpop/gremlin/process/UseEngine.java    |  35 +++++
 .../process/computer/GraphComputerTest.java     |   8 +-
 .../ranking/PageRankVertexProgramTest.java      |   7 +-
 .../computer/util/ComputerDataStrategyTest.java |   3 +
 .../graph/traversal/step/branch/BranchTest.java |  23 +---
 .../graph/traversal/step/branch/ChooseTest.java |  17 +--
 .../graph/traversal/step/branch/LocalTest.java  |  63 +--------
 .../graph/traversal/step/branch/RepeatTest.java |  57 +-------
 .../graph/traversal/step/branch/UnionTest.java  |  52 ++-----
 .../graph/traversal/step/filter/AndTest.java    |  23 +---
 .../graph/traversal/step/filter/CoinTest.java   |  25 +---
 .../traversal/step/filter/CyclicPathTest.java   |  20 +--
 .../graph/traversal/step/filter/DedupTest.java  |  39 +++---
 .../graph/traversal/step/filter/ExceptTest.java |  49 +++----
 .../graph/traversal/step/filter/FilterTest.java |  64 ++++-----
 .../graph/traversal/step/filter/HasNotTest.java |  10 +-
 .../graph/traversal/step/filter/HasTest.java    |  88 +-----------
 .../graph/traversal/step/filter/IsTest.java     |  38 +----
 .../graph/traversal/step/filter/OrTest.java     |  24 +---
 .../graph/traversal/step/filter/RangeTest.java  |  70 +++++-----
 .../graph/traversal/step/filter/RetainTest.java |  26 ++--
 .../graph/traversal/step/filter/SampleTest.java |  32 ++---
 .../traversal/step/filter/SimplePathTest.java   |  20 +--
 .../graph/traversal/step/filter/WhereTest.java  |  34 ++---
 .../graph/traversal/step/map/BackTest.java      |  60 +-------
 .../graph/traversal/step/map/CoalesceTest.java  |  38 +----
 .../graph/traversal/step/map/CountTest.java     |  48 ++-----
 .../graph/traversal/step/map/FoldTest.java      |  28 ++--
 .../graph/traversal/step/map/MapTest.java       |  45 +++---
 .../graph/traversal/step/map/MatchTest.java     |   7 +-
 .../graph/traversal/step/map/MaxTest.java       |  22 +--
 .../graph/traversal/step/map/MeanTest.java      |  17 +--
 .../graph/traversal/step/map/MinTest.java       |  22 +--
 .../graph/traversal/step/map/OrderTest.java     |  77 ++++-------
 .../graph/traversal/step/map/PathTest.java      |  41 +-----
 .../traversal/step/map/PropertiesTest.java      |  25 +---
 .../graph/traversal/step/map/SelectTest.java    |  86 +++++-------
 .../graph/traversal/step/map/SumTest.java       |  17 +--
 .../graph/traversal/step/map/UnfoldTest.java    |  29 ++--
 .../graph/traversal/step/map/ValueMapTest.java  |  30 +---
 .../graph/traversal/step/map/VertexTest.java    | 138 +------------------
 .../traversal/step/sideEffect/AddEdgeTest.java  |   3 +
 .../step/sideEffect/AggregateTest.java          |  25 +---
 .../step/sideEffect/GroupCountTest.java         |  41 +-----
 .../traversal/step/sideEffect/GroupTest.java    |  37 +----
 .../traversal/step/sideEffect/InjectTest.java   |  23 ++--
 .../traversal/step/sideEffect/ProfileTest.java  |  19 ++-
 .../traversal/step/sideEffect/SackTest.java     |  33 ++---
 .../step/sideEffect/SideEffectCapTest.java      |  27 +---
 .../step/sideEffect/SideEffectTest.java         |   3 +
 .../traversal/step/sideEffect/StoreTest.java    |  33 +----
 .../traversal/step/sideEffect/SubgraphTest.java |   3 +
 .../traversal/step/sideEffect/TreeTest.java     |  40 +-----
 .../step/util/TraversalSideEffectsTest.java     |   7 +-
 .../TraversalVerificationStrategyTest.java      |   5 +
 .../process/traversal/CoreTraversalTest.java    |   3 +
 .../gremlin/process/util/PathTest.java          |   3 +
 110 files changed, 1095 insertions(+), 1562 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/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 2f9920b..2bc4287 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
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch
 
 import org.apache.tinkerpop.gremlin.process.Traversal
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
+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
 
@@ -32,6 +34,7 @@ import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.label
  */
 public abstract class GroovyBranchTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends BranchTest {
 
         @Override
@@ -51,6 +54,7 @@ public abstract class GroovyBranchTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends BranchTest {
 
         @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyChooseTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyChooseTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyChooseTest.groovy
index cd44bdd..c5ae9d4 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyChooseTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyChooseTest.groovy
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch
 
 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.__
 import org.apache.tinkerpop.gremlin.structure.Vertex
 
@@ -29,6 +31,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
  */
 public abstract class GroovyChooseTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends ChooseTest {
 
         @Override
@@ -37,6 +40,7 @@ public abstract class GroovyChooseTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends ChooseTest {
 
         @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyLocalTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyLocalTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyLocalTest.groovy
index 1e8c42a..d4dbed2 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyLocalTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyLocalTest.groovy
@@ -21,6 +21,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch
 import org.apache.tinkerpop.gremlin.process.T
 import org.apache.tinkerpop.gremlin.process.Traversal
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.TraversalEngine
+import org.apache.tinkerpop.gremlin.process.UseEngine
 import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.LocalTest
 import org.apache.tinkerpop.gremlin.structure.Edge
 import org.apache.tinkerpop.gremlin.structure.Order
@@ -33,6 +35,7 @@ import org.apache.tinkerpop.gremlin.process.graph.traversal.__
  */
 public abstract class GroovyLocalTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends LocalTest {
 
         @Override
@@ -86,6 +89,7 @@ public abstract class GroovyLocalTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends LocalTest {
 
         @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyRepeatTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyRepeatTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyRepeatTest.groovy
index 5041177..942de11 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyRepeatTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyRepeatTest.groovy
@@ -22,6 +22,8 @@ import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
 import org.apache.tinkerpop.gremlin.process.Path
 import org.apache.tinkerpop.gremlin.process.T
 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.__
 import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.RepeatTest
 import org.apache.tinkerpop.gremlin.structure.Vertex
@@ -33,10 +35,8 @@ import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*;
  */
 public abstract class GroovyRepeatTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends RepeatTest {
-        public StandardTest() {
-            requiresGraphComputer = false;
-        }
 
         @Override
         public Traversal<Vertex, Path> get_g_V_repeatXoutX_timesX2X_emit_path() {
@@ -84,11 +84,8 @@ public abstract class GroovyRepeatTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends RepeatTest {
-        public ComputerTest() {
-            requiresGraphComputer = true;
-        }
-
         @Override
         public Traversal<Vertex, Path> get_g_V_repeatXoutX_timesX2X_emit_path() {
             ComputerTestHelper.compute("g.V.repeat(__.out).times(2).emit.path", g)

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyUnionTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyUnionTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyUnionTest.groovy
index 286ee16..0c4a5c4 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyUnionTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/GroovyUnionTest.groovy
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch
 
 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.__
 import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.UnionTest
 import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine
@@ -32,6 +34,7 @@ import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*
  */
 public abstract class GroovyUnionTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends UnionTest {
 
         public Traversal<Vertex, String> get_g_V_unionXout__inX_name() {
@@ -68,6 +71,7 @@ public abstract class GroovyUnionTest {
 
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends UnionTest {
 
         public Traversal<Vertex, String> get_g_V_unionXout__inX_name() {

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyAndTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyAndTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyAndTest.groovy
index 778d3f3..1761ea6 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyAndTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyAndTest.groovy
@@ -21,6 +21,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
 import org.apache.tinkerpop.gremlin.process.T
 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.AndTest
 import org.apache.tinkerpop.gremlin.structure.Vertex
 
@@ -34,6 +36,7 @@ import static org.apache.tinkerpop.gremlin.structure.Compare.gte
  */
 public abstract class GroovyAndTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends AndTest {
 
         @Override
@@ -47,6 +50,7 @@ public abstract class GroovyAndTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends AndTest {
 
         @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCoinTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCoinTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCoinTest.groovy
index 3f683a7..089fe3f 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCoinTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCoinTest.groovy
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter
 
 import org.apache.tinkerpop.gremlin.process.Traversal
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.TraversalEngine
+import org.apache.tinkerpop.gremlin.process.UseEngine
 import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.CoinTest
 import org.apache.tinkerpop.gremlin.structure.Vertex
 
@@ -28,6 +30,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
  */
 public abstract class GroovyCoinTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends CoinTest {
 
         @Override
@@ -41,6 +44,7 @@ public abstract class GroovyCoinTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends CoinTest {
 
         @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCyclicPathTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCyclicPathTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCyclicPathTest.groovy
index 295fa4f..a218b28 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCyclicPathTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyCyclicPathTest.groovy
@@ -21,6 +21,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter
 import org.apache.tinkerpop.gremlin.process.Path
 import org.apache.tinkerpop.gremlin.process.Traversal
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.TraversalEngine
+import org.apache.tinkerpop.gremlin.process.UseEngine
 import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.CyclicPathTest
 import org.apache.tinkerpop.gremlin.structure.Vertex
 
@@ -29,6 +31,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
  */
 public abstract class GroovyCyclicPathTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends CyclicPathTest {
 
         @Override
@@ -42,6 +45,7 @@ public abstract class GroovyCyclicPathTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends CyclicPathTest {
 
         @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyDedupTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyDedupTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyDedupTest.groovy
index 08afc2b..c7e5cd7 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyDedupTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyDedupTest.groovy
@@ -18,12 +18,16 @@
  */
 package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter
 
+import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
 import org.apache.tinkerpop.gremlin.process.Scope
 import org.apache.tinkerpop.gremlin.process.T
 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.traversal.engine.StandardTraversalEngine
 import org.apache.tinkerpop.gremlin.structure.Vertex
+import org.junit.Test
 
 import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.bothE
 import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.dedup
@@ -34,6 +38,7 @@ import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.dedup
  */
 public abstract class GroovyDedupTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends DedupTest {
         @Override
         public Traversal<Vertex, String> get_g_V_both_dedup_name() {
@@ -46,7 +51,7 @@ public abstract class GroovyDedupTest {
         }
 
         @Override
-        public Traversal<Vertex, String> get_g_V_both_propertiesXnameX_orderXa_bX_dedup_value() {
+        public Traversal<Vertex, String> get_g_V_both_name_orderXa_bX_dedup() {
             g.V().both().properties('name').order.by { a, b -> a.value() <=> b.value() }.dedup.value
         }
 
@@ -56,31 +61,47 @@ public abstract class GroovyDedupTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends DedupTest {
         @Override
-        public Traversal<Vertex, String> get_g_V_both_dedup_name() {
-            g.engine(StandardTraversalEngine.standard) // TODO
-            g.V.both.dedup.name
-            //ComputerTestHelper.compute("g.V.both.dedup.name", g);
+        @Test
+        @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+        public void g_V_both_dedup_name() {
         }
 
         @Override
-        public Traversal<Vertex, String> get_g_V_both_hasXlabel_softwareX_dedup_byXlangX_name() {
-            g.engine(StandardTraversalEngine.standard) // TODO
-            g.V.both.has(T.label, 'software').dedup.by('lang').name
-            //ComputerTestHelper.compute("g.V.both.has(T.label,'software').dedup.by('lang').name", g);
+        @Test
+        @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+        public void g_V_both_hasXlabel_softwareX_dedup_byXlangX_name() {
         }
 
         @Override
-        public Traversal<Vertex, String> get_g_V_both_propertiesXnameX_orderXa_bX_dedup_value() {
-            g.engine(StandardTraversalEngine.standard) // TODO
-            g.V().both().properties('name').order.by { a, b -> a.value() <=> b.value() }.dedup.value
-            //ComputerTestHelper.compute("g.V.both.properties('name').order.by { a, b -> a.value() <=> b.value() }.dedup.value", g);
+        @Test
+        @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+        public void g_V_both_name_orderXa_bX_dedup() {
         }
 
         @Override
-        Traversal<Vertex, Map<String, Set<Double>>> get_g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXdedupXlocalXX_cap() {
+        public Traversal<Vertex, Map<String, Set<Double>>> get_g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXdedupXlocalXX_cap() {
             ComputerTestHelper.compute("g.V().group().by(T.label).by(bothE().values('weight').fold()).by(dedup(Scope.local)).cap()", g);
         }
+
+        @Override
+        Traversal<Vertex, String> get_g_V_both_dedup_name() {
+            // override with nothing until the test itself is supported
+            return null
+        }
+
+        @Override
+        Traversal<Vertex, String> get_g_V_both_hasXlabel_softwareX_dedup_byXlangX_name() {
+            // override with nothing until the test itself is supported
+            return null
+        }
+
+        @Override
+        Traversal<Vertex, String> get_g_V_both_name_orderXa_bX_dedup() {
+            // override with nothing until the test itself is supported
+            return null
+        }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyExceptTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyExceptTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyExceptTest.groovy
index 30638a2..955648a 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyExceptTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyExceptTest.groovy
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter
 
 import org.apache.tinkerpop.gremlin.process.Path
 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.__
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
 import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.ExceptTest
@@ -31,6 +33,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
  */
 public abstract class GroovyExceptTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends ExceptTest {
 
         @Override
@@ -70,6 +73,7 @@ public abstract class GroovyExceptTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends ExceptTest {
 
         @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/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 a41614c..f07cb6a 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
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter
 
 import org.apache.tinkerpop.gremlin.process.Traversal
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
+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
@@ -29,6 +31,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
  */
 public abstract class GroovyFilterTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends FilterTest {
 
         @Override
@@ -72,6 +75,7 @@ public abstract class GroovyFilterTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends FilterTest {
 
         @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasNotTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasNotTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasNotTest.groovy
index 95af73f..1d5bf40 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasNotTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasNotTest.groovy
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter
 
 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.__
 import org.apache.tinkerpop.gremlin.structure.Vertex
 
@@ -28,6 +30,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
  */
 public abstract class GroovyHasNotTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends HasNotTest {
         @Override
         public Traversal<Vertex, Vertex> get_g_VX1X_hasNotXprop(final Object v1Id, final String propertyKey) {
@@ -45,6 +48,7 @@ public abstract class GroovyHasNotTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends HasNotTest {
         @Override
         public Traversal<Vertex, Vertex> get_g_VX1X_hasNotXprop(final Object v1Id, final String propertyKey) {

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasTest.groovy
index 291d3d2..f63745f 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyHasTest.groovy
@@ -18,12 +18,11 @@
  */
 package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter
 
-import org.apache.tinkerpop.gremlin.process.T
 import org.apache.tinkerpop.gremlin.process.Traversal
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.HasTest
+import org.apache.tinkerpop.gremlin.process.TraversalEngine
+import org.apache.tinkerpop.gremlin.process.UseEngine
 import org.apache.tinkerpop.gremlin.structure.Compare
-import org.apache.tinkerpop.gremlin.structure.Contains
 import org.apache.tinkerpop.gremlin.structure.Edge
 import org.apache.tinkerpop.gremlin.structure.Vertex
 import org.apache.tinkerpop.gremlin.process.graph.traversal.__
@@ -32,6 +31,7 @@ import org.apache.tinkerpop.gremlin.process.graph.traversal.__
  */
 public abstract class GroovyHasTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends HasTest {
 
         @Override
@@ -110,6 +110,7 @@ public abstract class GroovyHasTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends HasTest {
 
         @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyIsTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyIsTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyIsTest.groovy
index 52cde81..4b958c9 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyIsTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyIsTest.groovy
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter
 
 import org.apache.tinkerpop.gremlin.process.Traversal
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.TraversalEngine
+import org.apache.tinkerpop.gremlin.process.UseEngine
 import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.IsTest
 import org.apache.tinkerpop.gremlin.structure.Compare
 import org.apache.tinkerpop.gremlin.structure.Vertex
@@ -29,6 +31,7 @@ import org.apache.tinkerpop.gremlin.process.graph.traversal.__
  */
 public abstract class GroovyIsTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends IsTest {
 
         @Override
@@ -57,6 +60,7 @@ public abstract class GroovyIsTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends IsTest {
 
         @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyOrTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyOrTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyOrTest.groovy
index c28bec8..874cf5f 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyOrTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyOrTest.groovy
@@ -21,6 +21,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
 import org.apache.tinkerpop.gremlin.process.T
 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.OrTest
 import org.apache.tinkerpop.gremlin.structure.Vertex
 
@@ -34,6 +36,7 @@ import static org.apache.tinkerpop.gremlin.structure.Compare.gte
  */
 public abstract class GroovyOrTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends OrTest {
 
         @Override
@@ -47,6 +50,7 @@ public abstract class GroovyOrTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends OrTest {
 
         @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRangeTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRangeTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRangeTest.groovy
index b5d3152..a212a25 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRangeTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRangeTest.groovy
@@ -18,17 +18,22 @@
  */
 package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter
 
+import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest
 import org.apache.tinkerpop.gremlin.process.Scope
 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.__
 import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine
 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 StandardTest extends RangeTest {
 
         @Override
@@ -77,71 +82,117 @@ public abstract class GroovyRangeTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends RangeTest {
 
         @Override
-        public Traversal<Vertex, Vertex> get_g_VX1X_out_limitX2X(final Object v1Id) {
-            g.engine(StandardTraversalEngine.standard) // TODO
-            g.V(v1Id).out.limit(2)
-            //ComputerTestHelper.compute("g.V(v1Id).out.limit(2)", g)
+        @Test
+        @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+        public void g_VX1X_out_limitX2X() {
         }
 
         @Override
-        public Traversal<Vertex, Vertex> get_g_V_localXoutE_limitX1X_inVX_limitX3X() {
-            g.engine(StandardTraversalEngine.standard) // TODO
-            g.V.local(__.outE.limit(3)).inV.limit(3)
-            //ComputerTestHelper.compute("g.V.local(__.outE.limit(3)).inV.limit(3)", g)
+        @Test
+        @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+        public void g_V_localXoutE_limitX1X_inVX_limitX3X() {
         }
 
         @Override
-        public Traversal<Vertex, Vertex> get_g_VX1X_outXknowsX_outEXcreatedX_rangeX0_1X_inV(final Object v1Id) {
-            g.engine(StandardTraversalEngine.standard) // TODO
-            g.V(v1Id).out('knows').outE('created')[0].inV()
-            //ComputerTestHelper.compute("g.V(v1Id).out('knows').outE('created')[0].inV()", g)
+        @Test
+        @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+        public void g_VX1X_outXknowsX_outEXcreatedX_rangeX0_1X_inV() {
         }
 
         @Override
-        public Traversal<Vertex, Vertex> get_g_VX1X_outXknowsX_outXcreatedX_rangeX0_1X(final Object v1Id) {
-            g.engine(StandardTraversalEngine.standard) // TODO
-            g.V(v1Id).out('knows').out('created')[0]
-            //ComputerTestHelper.compute("g.V(v1Id).out('knows').out('created')[0]", g)
+        @Test
+        @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+        public void g_VX1X_outXknowsX_outXcreatedX_rangeX0_1X() {
         }
 
         @Override
-        public Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inXcreatedX_rangeX1_3X(final Object v1Id) {
-            g.engine(StandardTraversalEngine.standard) // TODO
-            g.V(v1Id).out('created').in('created')[1..3]
-            //ComputerTestHelper.compute("g.V(v1Id).out('created').in('created')[1..3]", g)
+        @Test
+        @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+        public void g_VX1X_outXcreatedX_inXcreatedX_rangeX1_3X() {
         }
 
         @Override
-        public Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inEXcreatedX_rangeX1_3X_outV(final Object v1Id) {
-            g.engine(StandardTraversalEngine.standard) // TODO
-            g.V(v1Id).out('created').inE('created')[1..3].outV
-            //ComputerTestHelper.compute("g.V(v1Id).out('created').inE('created')[1..3].outV", g)
+        @Test
+        @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+        public void g_VX1X_outXcreatedX_inEXcreatedX_rangeX1_3X_outV() {
         }
 
         @Override
-        public Traversal<Vertex, Vertex> get_g_V_repeatXbothX_timesX3X_rangeX5_11X() {
-            g.engine(StandardTraversalEngine.standard) // TODO
-            g.V().repeat(__.both).times(3)[5..11]
-            //ComputerTestHelper.compute("g.V().repeat(__.both).times(3)[5..11]", g)
+        @Test
+        @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+        public void g_V_repeatXbothX_timesX3X_rangeX5_11X() {
         }
 
         @Override
-        Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_limitXlocal_1XX_asXwX_select_byXnameX_by() {
-            g.engine(StandardTraversalEngine.standard)
+        @Test
+        @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+        void g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_limitXlocal_1XX_asXwX_select_byXnameX_by() {
+
+        }
+
+        @Override
+        @Test
+        @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+        void g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_rangeXlocal_1_3XX_asXwX_select_byXnameX_by() {
             // TODO: the traversal should work in computer mode, but throws a ClassCastException
-            g.V().hasLabel('software').as('s').local(__.inE('created').values('weight').fold().limit(Scope.local, 1)).as('w').select().by('name').by()
-            //ComputerTestHelper.compute("g.V().hasLabel('software').as('s').local(__.inE('created').values('weight').fold().limit(Scope.local, 1)).as('p').select().by('name').by()", g)
+        }
+
+        @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
+        }
+
+        @Override
+        Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_limitXlocal_1XX_asXwX_select_byXnameX_by() {
+            // override with nothing until the test itself is supported
+            return null
         }
 
         @Override
         Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXsoftwareX_asXsX_localXinEXcreatedX_valuesXweightX_fold_rangeXlocal_1_3XX_asXwX_select_byXnameX_by() {
-            g.engine(StandardTraversalEngine.standard)
-            // TODO: the traversal should work in computer mode, but throws a ClassCastException
-            g.V().hasLabel('software').as('s').local(__.inE('created').values('weight').fold().range(Scope.local, 1, 3)).as('w').select().by('name').by()
-            //ComputerTestHelper.compute("g.V().hasLabel('software').as('s').local(__.inE('created').values('weight').fold().range(Scope.local, 1, 3)).as('p').select().by('name').by()", g)
+            // override with nothing until the test itself is supported
+            return null
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRetainTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRetainTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRetainTest.groovy
index bb34aa1..1a262d6 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRetainTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyRetainTest.groovy
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter
 
 import org.apache.tinkerpop.gremlin.process.Traversal
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.TraversalEngine
+import org.apache.tinkerpop.gremlin.process.UseEngine
 import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.RetainTest
 import org.apache.tinkerpop.gremlin.structure.Vertex
 
@@ -28,6 +30,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
  */
 public abstract class GroovyRetainTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends RetainTest {
         @Override
         public Traversal<Vertex, Vertex> get_g_VX1X_out_retainXg_v2X(final Object v1Id, final Object v2Id) {
@@ -45,6 +48,7 @@ public abstract class GroovyRetainTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends RetainTest {
         @Override
         public Traversal<Vertex, Vertex> get_g_VX1X_out_retainXg_v2X(final Object v1Id, final Object v2Id) {

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySampleTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySampleTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySampleTest.groovy
index 86490d9..7522baf 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySampleTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySampleTest.groovy
@@ -18,14 +18,18 @@
  */
 package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter
 
+import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
 import org.apache.tinkerpop.gremlin.process.Scope
 import org.apache.tinkerpop.gremlin.process.T
 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.__
 import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine
 import org.apache.tinkerpop.gremlin.structure.Edge
 import org.apache.tinkerpop.gremlin.structure.Vertex
+import org.junit.Test
 
 import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.bothE
 import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.sample
@@ -35,6 +39,7 @@ import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.sample
  */
 public abstract class GroovySampleTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends SampleTest {
 
         @Override
@@ -63,18 +68,21 @@ public abstract class GroovySampleTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends SampleTest {
 
         @Override
-        public Traversal<Edge, Edge> get_g_E_sampleX1X() {
-            g.engine(StandardTraversalEngine.standard);
-            g.E.sample(1) // TODO: makes no sense when its global
+        @Test
+        @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+        public void g_E_sampleX1X() {
+            // TODO: makes no sense when its global
         }
 
         @Override
-        public Traversal<Edge, Edge> get_g_E_sampleX2X_byXweightX() {
-            g.engine(StandardTraversalEngine.standard);
-            g.E.sample(2).by('weight') // TODO: makes no sense when its global
+        @Test
+        @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+        public void g_E_sampleX2X_byXweightX() {
+            // TODO: makes no sense when its global
         }
 
         @Override
@@ -91,5 +99,17 @@ public abstract class GroovySampleTest {
         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)).cap()", 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
+        }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySimplePathTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySimplePathTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySimplePathTest.groovy
index 4dffd51..2f72355 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySimplePathTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovySimplePathTest.groovy
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter
 
 import org.apache.tinkerpop.gremlin.process.Path
 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.__
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
 import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.SimplePathTest
@@ -30,6 +32,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
  */
 public abstract class GroovySimplePathTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends SimplePathTest {
 
         @Override
@@ -43,6 +46,7 @@ public abstract class GroovySimplePathTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends SimplePathTest {
 
         @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyWhereTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyWhereTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyWhereTest.groovy
index f3c7dab..75a8d56 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyWhereTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/GroovyWhereTest.groovy
@@ -18,20 +18,25 @@
  */
 package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter
 
+import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest
 import org.apache.tinkerpop.gremlin.process.Traversal
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.TraversalEngine
+import org.apache.tinkerpop.gremlin.process.UseEngine
 import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.WhereTest
 import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine
 import org.apache.tinkerpop.gremlin.structure.Compare
 import org.apache.tinkerpop.gremlin.structure.Vertex
 
 import org.apache.tinkerpop.gremlin.process.graph.traversal.__
+import org.junit.Test
 
 /**
  * @author Marko A. Rodriguez (http://markorodriguez.com)
  */
 public abstract class GroovyWhereTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends WhereTest {
         @Override
         public Traversal<Vertex, Map<String, Object>> get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_eq_bX() {
@@ -54,6 +59,7 @@ public abstract class GroovyWhereTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends WhereTest {
         @Override
         public Traversal<Vertex, Map<String, Object>> get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_eq_bX() {
@@ -66,17 +72,27 @@ public abstract class GroovyWhereTest {
         }
 
         @Override
-        public Traversal<Vertex, Map<String, Object>> get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXb_hasXname_markoXX() {
-            // TODO: ComputerTestHelper.compute("g.V.has('age').as('a').out.in.has('age').as('b').select().where(__.as('b').has('name', 'marko'))", g);
-            g.engine(StandardTraversalEngine.standard);
-            g.V.has('age').as('a').out.in.has('age').as('b').select().where(__.as('b').has('name', 'marko'));
+        @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
-        public Traversal<Vertex, Map<String, Object>> get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_select_whereXa_outXknowsX_bX() {
-            // TODO: ComputerTestHelper.compute("g.V().has('age').as('a').out.in.has('age').as('b').select().where(__.as('a').out('knows').as('b'))", g);
-            g.engine(StandardTraversalEngine.standard);
-            g.V().has('age').as('a').out.in.has('age').as('b').select().where(__.as('a').out('knows').as('b'));
+        @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
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyBackTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyBackTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyBackTest.groovy
index ded1ba7..d0c0048 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyBackTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyBackTest.groovy
@@ -19,6 +19,8 @@
 package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map
 
 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.__
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
 import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.BackTest
@@ -30,6 +32,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
  */
 public abstract class GroovyBackTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends BackTest {
 
         @Override
@@ -85,6 +88,7 @@ public abstract class GroovyBackTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends BackTest {
 
         @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCoalesceTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCoalesceTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCoalesceTest.groovy
index 215e434..4375c06 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCoalesceTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCoalesceTest.groovy
@@ -18,11 +18,15 @@
  */
 package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map
 
+import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
 import org.apache.tinkerpop.gremlin.process.Path
 import org.apache.tinkerpop.gremlin.process.T
 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.structure.Vertex
+import org.junit.Test
 
 import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.out
 import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.outE
@@ -33,6 +37,7 @@ import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.outE
  */
 public abstract class GroovyCoalesceTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends CoalesceTest {
 
         @Override
@@ -61,6 +66,7 @@ public abstract class GroovyCoalesceTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends CoalesceTest {
 
         @Override
@@ -84,9 +90,15 @@ public abstract class GroovyCoalesceTest {
         }
 
         @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);  // TODO
-            // ComputerTestHelper.compute("g.V().coalesce(outE('knows'), outE('created')).otherV().path().by('name').by(T.label)", g)
+        @Test
+        @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+        public void g_V_coalesceXoutEXknowsX_outEXcreatedXX_otherV_path_byXnameX_byXlabelX() {
+        }
+
+        @Override
+        Traversal<Vertex, Path> get_g_V_coalesceXoutEXknowsX_outEXcreatedXX_otherV_path_byXnameX_byXlabelX() {
+            // override with nothing until the test itself is supported
+            return null
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCountTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCountTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCountTest.groovy
index 7b54bc9..7e788df 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCountTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyCountTest.groovy
@@ -18,18 +18,23 @@
  */
 package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map
 
+import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
 import org.apache.tinkerpop.gremlin.process.Scope
 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.__
 import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine
 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 StandardTest extends CountTest {
         @Override
         public Traversal<Vertex, Long> get_g_V_count() {
@@ -67,6 +72,7 @@ public abstract class GroovyCountTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends CountTest {
         @Override
         public Traversal<Vertex, Long> get_g_V_count() {
@@ -99,9 +105,15 @@ public abstract class GroovyCountTest {
         }
 
         @Override
-        public Traversal<Vertex, Long> get_g_V_fold_countXlocalX() {
-            g.engine(StandardTraversalEngine.standard);
-            g.V.fold.count(Scope.local);   // TODO: fold
+        @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
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyFoldTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyFoldTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyFoldTest.groovy
index 6ce11ac..832f4e9 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyFoldTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyFoldTest.groovy
@@ -18,17 +18,22 @@
  */
 package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map
 
+import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest
 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.FoldTest
 import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine
 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 StandardTest extends FoldTest {
         @Override
         public Traversal<Vertex, List<Vertex>> get_g_V_fold() {
@@ -46,6 +51,7 @@ public abstract class GroovyFoldTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends FoldTest {
         @Override
         public Traversal<Vertex, List<Vertex>> get_g_V_fold() {
@@ -53,14 +59,21 @@ public abstract class GroovyFoldTest {
         }
 
         @Override
-        public Traversal<Vertex, Vertex> get_g_V_fold_unfold() {
-            g.engine(StandardTraversalEngine.standard);
-            g.V.fold.unfold    // Does not work in OLAP cause fold() is not an endstep.
+        @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
+        }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/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 4c7f4cd..d640d13 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,17 +18,22 @@
  */
 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.process.ComputerTestHelper
+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
 
 /**
  * @author Stephen Mallette (http://stephen.genoprime.com)
  */
 public abstract class GroovyMapTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends MapTest {
 
         @Override
@@ -57,6 +62,7 @@ public abstract class GroovyMapTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends MapTest {
 
         @Override
@@ -75,17 +81,29 @@ public abstract class GroovyMapTest {
         }
 
         @Override
-        public Traversal<Vertex, String> get_g_V_asXaX_out_mapXa_nameX() {
+        @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
-            g.engine(StandardTraversalEngine.standard);
-            g.V.as('a').out.map { v -> v.path('a').name };
         }
 
         @Override
-        public Traversal<Vertex, String> get_g_V_asXaX_out_out_mapXa_name_it_nameX() {
+        @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
-            g.engine(StandardTraversalEngine.standard);
-            g.V().as('a').out.out().map { v -> v.path('a').name + v.name };
+        }
+
+        @Override
+        Traversal<Vertex, String> get_g_V_asXaX_out_mapXa_nameX() {
+            // override with nothing until the test itself is supported
+            return null
+        }
+
+        @Override
+        Traversal<Vertex, String> get_g_V_asXaX_out_out_mapXa_name_it_nameX() {
+            // override with nothing until the test itself is supported
+            return null
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMatchTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMatchTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMatchTest.groovy
index df83e57..97b7f63 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMatchTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMatchTest.groovy
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map
 
 import org.apache.tinkerpop.gremlin.process.T
 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.MatchTest
 import org.apache.tinkerpop.gremlin.structure.Compare
 import org.apache.tinkerpop.gremlin.structure.Vertex
@@ -29,6 +31,7 @@ import org.apache.tinkerpop.gremlin.process.graph.traversal.__
  */
 public abstract class GroovyMatchTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends MatchTest {
 
         @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMaxTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMaxTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMaxTest.groovy
index 100f943..10b3b98 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMaxTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMaxTest.groovy
@@ -21,6 +21,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
 import org.apache.tinkerpop.gremlin.process.Scope
 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.__
 import org.apache.tinkerpop.gremlin.structure.Vertex
 
@@ -32,6 +34,7 @@ import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.max
  */
 public abstract class GroovyMaxTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends MaxTest {
 
         @Override
@@ -50,6 +53,7 @@ public abstract class GroovyMaxTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends MaxTest {
 
         @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMeanTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMeanTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMeanTest.groovy
index 8524e6e..dc21e74 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMeanTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMeanTest.groovy
@@ -21,6 +21,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
 import org.apache.tinkerpop.gremlin.process.Scope
 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.structure.Vertex
 
 import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.bothE
@@ -31,6 +33,7 @@ import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.mean
  */
 public abstract class GroovyMeanTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends MeanTest {
 
         @Override
@@ -44,6 +47,7 @@ public abstract class GroovyMeanTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends MeanTest {
 
         @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMinTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMinTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMinTest.groovy
index 3b6152a..65bf5a4 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMinTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyMinTest.groovy
@@ -21,6 +21,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
 import org.apache.tinkerpop.gremlin.process.Scope
 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.__
 import org.apache.tinkerpop.gremlin.structure.Vertex
 
@@ -32,6 +34,7 @@ import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.min
  */
 public abstract class GroovyMinTest {
 
+    @UseEngine(TraversalEngine.Type.STANDARD)
     public static class StandardTest extends MinTest {
 
         @Override
@@ -50,6 +53,7 @@ public abstract class GroovyMinTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends MinTest {
 
         @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyOrderTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyOrderTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyOrderTest.groovy
index 5f793d4..3e6652f 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyOrderTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyOrderTest.groovy
@@ -18,20 +18,23 @@
  */
 package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map
 
+import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
 import org.apache.tinkerpop.gremlin.process.Scope
 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.__
-import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine
 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 StandardTest extends OrderTest {
 
         @Override
@@ -88,6 +91,7 @@ public abstract class GroovyOrderTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends OrderTest {
 
         @Override
@@ -101,27 +105,21 @@ public abstract class GroovyOrderTest {
         }
 
         @Override
-        public Traversal<Vertex, String> get_g_V_order_byXname_incrX_name() {
-            g.engine(StandardTraversalEngine.standard);
-            g.V.order.by('name', Order.incr).name
-        }
-
-        @Override
-        public Traversal<Vertex, String> get_g_V_order_byXnameX_name() {
-            g.engine(StandardTraversalEngine.standard);
-            g.V.order.by('name', Order.incr).name
+        @Test
+        @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+        public void g_V_order_byXname_incrX_name() {
         }
 
         @Override
-        public Traversal<Vertex, Double> get_g_V_outE_order_byXweight_decrX_weight() {
-            g.engine(StandardTraversalEngine.standard);
-            g.V.outE.order.by('weight', Order.decr).weight
+        @Test
+        @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+        public void g_V_outE_order_byXweight_decrX_weight() {
         }
 
         @Override
-        public Traversal<Vertex, String> get_g_V_order_byXname_a1_b1X_byXname_b2_a2X_name() {
-            g.engine(StandardTraversalEngine.standard);
-             g.V.order.by('name') { a, b -> a[1].compareTo(b[1]) }.by('name') { a, b -> b[2].compareTo(a[2]) }.name;
+        @Test
+        @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+        public void g_V_order_byXname_a1_b1X_byXname_b2_a2X_name() {
         }
 
         @Override
@@ -145,11 +143,39 @@ public abstract class GroovyOrderTest {
         }
 
         @Override
-        public Traversal<Vertex, Vertex> get_g_V_order_byXoutE_count__decrX() {
-            g.engine(StandardTraversalEngine.standard);
-            g.V.order.by(__.outE.count, Order.decr)
-            // TODO ComputerTestHelper.compute("g.V.order.by(__.outE.count, Order.decr)", g)
+        @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
+        }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPathTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPathTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPathTest.groovy
index 436e2d3..411828d 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPathTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPathTest.groovy
@@ -18,18 +18,23 @@
  */
 package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map
 
+import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest
 import org.apache.tinkerpop.gremlin.process.Path
 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.__
 import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
 import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.PathTest
 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 StandardTest extends PathTest {
 
         @Override
@@ -58,6 +63,7 @@ public abstract class GroovyPathTest {
         }
     }
 
+    @UseEngine(TraversalEngine.Type.COMPUTER)
     public static class ComputerTest extends PathTest {
 
         @Override
@@ -66,26 +72,44 @@ public abstract class GroovyPathTest {
         }
 
         @Override
-        public Traversal<Vertex, Path> get_g_VX1X_out_path_byXageX_byXnameX(final Object v1Id) {
-            g.V(v1Id).out.path.by('age').by('name');
-            // TODO
+        @Test
+        @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+        public void g_VX1X_out_path_byXageX_byXnameX() {
         }
 
         @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');
-            //TODO
+        @Test
+        @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+        void g_V_repeatXoutX_timesX2X_path_byXitX_byXnameX_byXlangX() {
         }
 
         @Override
-        public Traversal<Vertex, Path> get_g_V_out_out_path_byXnameX_byXageX() {
-            g.V.out.out.path.by('name').by('age');
-            // TODO
+        @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
+        }
     }
 }