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:43 UTC
[3/4] incubator-tinkerpop git commit: Big refactor on the process
tests.
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/GroovyPropertiesTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPropertiesTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPropertiesTest.groovy
index 58e1326..9fcb914 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPropertiesTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyPropertiesTest.groovy
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map
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.PropertiesTest
import org.apache.tinkerpop.gremlin.structure.Vertex
@@ -28,6 +30,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyPropertiesTest {
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends PropertiesTest {
@Override
@@ -41,6 +44,7 @@ public abstract class GroovyPropertiesTest {
}
}
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class ComputerTest extends PropertiesTest {
@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/GroovySelectTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovySelectTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovySelectTest.groovy
index 6809429..e306880 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovySelectTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovySelectTest.groovy
@@ -18,12 +18,16 @@
*/
package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map
+import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest
import org.apache.tinkerpop.gremlin.process.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.traversal.engine.StandardTraversalEngine
import org.apache.tinkerpop.gremlin.structure.Order
import org.apache.tinkerpop.gremlin.structure.Vertex
+import org.junit.Test
import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.values
@@ -32,6 +36,7 @@ import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.values
*/
public abstract class GroovySelectTest {
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends SelectTest {
@Override
@@ -67,7 +72,7 @@ public abstract class GroovySelectTest {
}
@Override
- public Traversal<Vertex, Map<String, String>> get_g_V_asXaX_name_order_asXbX_select_byXnameX_by() {
+ public Traversal<Vertex, Map<String, String>> get_g_V_asXaX_name_order_asXbX_select_byXnameX_by_XitX() {
g.V().as('a').name.order().as('b').select.by('name').by
}
@@ -92,6 +97,7 @@ public abstract class GroovySelectTest {
}
}
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class ComputerTest extends SelectTest {
@Override
@@ -100,11 +106,9 @@ public abstract class GroovySelectTest {
}
@Override
- public Traversal<Vertex, Map<String, String>> get_g_VX1X_asXaX_outXknowsX_asXbX_select_byXnameX(
- final Object v1Id) {
- g.engine(StandardTraversalEngine.standard);
- g.V(v1Id).as('a').out('knows').as('b').select.by('name')
- // TODO
+ @Test
+ @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+ public void g_VX1X_asXaX_outXknowsX_asXbX_select_byXnameX() {
}
@Override
@@ -113,56 +117,92 @@ public abstract class GroovySelectTest {
}
@Override
- public Traversal<Vertex, String> get_g_VX1X_asXaX_outXknowsX_asXbX_selectXaX_byXnameX(
- final Object v1Id) {
- g.engine(StandardTraversalEngine.standard);
- g.V(v1Id).as('a').out('knows').as('b').select('a').by('name')
- //TODO
+ @Test
+ @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+ public void g_VX1X_asXaX_outXknowsX_asXbX_selectXaX_byXnameX() {
}
@Override
- public Traversal<Vertex, Map<String, String>> get_g_V_asXaX_out_asXbX_select_byXnameX() {
- g.engine(StandardTraversalEngine.standard);
- g.V.as('a').out.as('b').select.by('name') // TODO computer
+ @Test
+ @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+ public void g_V_asXaX_out_asXbX_select_byXnameX() {
}
@Override
- public Traversal<Vertex, Map<String, String>> get_g_V_asXaX_out_aggregate_asXbX_select_byXnameX() {
- g.engine(StandardTraversalEngine.standard);
- g.V.as('a').out.aggregate.as('b').select.by('name') // TODO computer
+ @Test
+ @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+ void g_V_asXaX_name_order_asXbX_select_byXnameX_byXitX() {
}
@Override
- public Traversal<Vertex, Map<String, String>> get_g_V_asXaX_name_order_asXbX_select_byXnameX_by() {
- g.engine(StandardTraversalEngine.standard);
- g.V().as('a').name.order().as('b').select.by('name').by // TODO: computer
+ @Test
+ @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+ public void g_V_hasXname_gremlinX_inEXusesX_order_byXskill_incrX_asXaX_outV_asXbX_select_byXskillX_byXnameX() {
}
@Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_hasXname_gremlinX_inEXusesX_order_byXskill_incrX_asXaX_outV_asXbX_select_byXskillX_byXnameX() {
- g.engine(StandardTraversalEngine.standard);
- g.V.has('name', 'gremlin').inE('uses').order.by('skill', Order.incr).as('a').outV.as('b').select.by('skill').by('name')
- // TODO: computer
+ public Traversal<Vertex, Map<String, Object>> get_g_V_hasXname_isXmarkoXX_asXaX_select() {
+ ComputerTestHelper.compute("g.V.has(values('name').is('marko')).as('a').select", g)
}
@Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_hasXname_isXmarkoXX_asXaX_select() {
- ComputerTestHelper.compute("g.V.has(values('name').is('marko')).as('a').select", g)
+ @Test
+ @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+ public void g_V_label_groupCount_cap_asXxX_select() {
}
@Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_label_groupCount_cap_asXxX_select() {
- g.engine(StandardTraversalEngine.standard);
- g.V().label().groupCount().cap().as('x').select()
- //ComputerTestHelper.compute("g.V().label().groupCount().cap().as('x').select()", g)
+ @Test
+ @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+ void g_V_hasLabelXpersonX_asXpersonX_localXbothE_label_groupCount_capX_asXrelationsX_select_byXnameX_by() {
+ }
+
+ @Override
+ Traversal<Vertex, Map<String, String>> get_g_VX1X_asXaX_outXknowsX_asXbX_select_byXnameX(Object v1Id) {
+ // override with nothing until the test itself is supported
+ return null
+ }
+
+ @Override
+ Traversal<Vertex, String> get_g_VX1X_asXaX_outXknowsX_asXbX_selectXaX_byXnameX(Object v1Id) {
+ // override with nothing until the test itself is supported
+ return null
+ }
+
+ @Override
+ Traversal<Vertex, Map<String, String>> get_g_V_asXaX_out_asXbX_select_byXnameX() {
+ // override with nothing until the test itself is supported
+ return null
+ }
+
+ @Override
+ Traversal<Vertex, Map<String, String>> get_g_V_asXaX_out_aggregate_asXbX_select_byXnameX() {
+ // override with nothing until the test itself is supported
+ return null
+ }
+
+ @Override
+ Traversal<Vertex, Map<String, String>> get_g_V_asXaX_name_order_asXbX_select_byXnameX_by_XitX() {
+ // override with nothing until the test itself is supported
+ return null
+ }
+
+ @Override
+ Traversal<Vertex, Map<String, Object>> get_g_V_hasXname_gremlinX_inEXusesX_order_byXskill_incrX_asXaX_outV_asXbX_select_byXskillX_byXnameX() {
+ // override with nothing until the test itself is supported
+ return null
+ }
+
+ @Override
+ Traversal<Vertex, Map<String, Object>> get_g_V_label_groupCount_cap_asXxX_select() {
+ // override with nothing until the test itself is supported
+ return null
}
@Override
Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXpersonX_asXpersonX_localXbothE_label_groupCount_capX_asXrelationsX_select_byXnameX_by() {
- g.engine(StandardTraversalEngine.standard);
- // TODO: should work in computer mode, but throws ClassCastException
- g.V().hasLabel('person').as('person').local(__.bothE().label().groupCount().cap()).as('relations').select().by('name').by()
- //ComputerTestHelper.compute("g.V().hasLabel('person').as('person').local(__.bothE().label().groupCount().cap()).as('relations').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/map/GroovySumTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovySumTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovySumTest.groovy
index f78bbc7..e78659f 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovySumTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovySumTest.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.__.sum
*/
public abstract class GroovySumTest {
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends SumTest {
@Override
@@ -44,6 +47,7 @@ public abstract class GroovySumTest {
}
}
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class ComputerTest extends SumTest {
@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/GroovyUnfoldTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyUnfoldTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyUnfoldTest.groovy
index 5be6c9f..a634a29 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyUnfoldTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyUnfoldTest.groovy
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map
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.Edge
import org.apache.tinkerpop.gremlin.structure.Vertex
@@ -29,6 +31,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyUnfoldTest {
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends UnfoldTest {
@Override
@@ -37,11 +40,12 @@ public abstract class GroovyUnfoldTest {
}
@Override
- public Traversal<Vertex, String> get_V_valueMap_unfold_mapXkeyX() {
+ public Traversal<Vertex, String> get_g_V_valueMap_unfold_mapXkeyX() {
g.V.valueMap.unfold.map { it.key }
}
}
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class ComputerTest extends UnfoldTest {
@Override
@@ -50,7 +54,7 @@ public abstract class GroovyUnfoldTest {
}
@Override
- public Traversal<Vertex, String> get_V_valueMap_unfold_mapXkeyX() {
+ public Traversal<Vertex, String> get_g_V_valueMap_unfold_mapXkeyX() {
ComputerTestHelper.compute("g.V.valueMap.unfold.map { it.key }", 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/map/GroovyValueMapTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyValueMapTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyValueMapTest.groovy
index fbd9e6e..718baf0 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyValueMapTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyValueMapTest.groovy
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map
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.ValueMapTest
import org.apache.tinkerpop.gremlin.structure.Vertex
@@ -28,6 +30,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyValueMapTest {
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends ValueMapTest {
@Override
public Traversal<Vertex, Map<String, List>> get_g_V_valueMap() {
@@ -45,6 +48,7 @@ public abstract class GroovyValueMapTest {
}
}
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class ComputerTest extends ValueMapTest {
@Override
public Traversal<Vertex, Map<String, List>> get_g_V_valueMap() {
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/GroovyVertexTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyVertexTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyVertexTest.groovy
index 576efb5..36639fe 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyVertexTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroovyVertexTest.groovy
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map
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.VertexTest
import org.apache.tinkerpop.gremlin.structure.Compare
import org.apache.tinkerpop.gremlin.structure.Direction
@@ -31,6 +33,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyVertexTest {
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends VertexTest {
@Override
@@ -160,6 +163,7 @@ public abstract class GroovyVertexTest {
}
}
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class ComputerTest extends VertexTest {
@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/sideEffect/GroovyAddEdgeTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyAddEdgeTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyAddEdgeTest.groovy
index 1256be9..8652625 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyAddEdgeTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyAddEdgeTest.groovy
@@ -19,6 +19,8 @@
package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect
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.sideEffect.AddEdgeTest
import org.apache.tinkerpop.gremlin.structure.Vertex
@@ -27,6 +29,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyAddEdgeTest {
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends AddEdgeTest {
@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/sideEffect/GroovyAggregateTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyAggregateTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyAggregateTest.groovy
index ccae548..cc4faed 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyAggregateTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyAggregateTest.groovy
@@ -21,6 +21,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect
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.sideEffect.AggregateTest
import org.apache.tinkerpop.gremlin.structure.Vertex
@@ -29,6 +31,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyAggregateTest {
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends AggregateTest {
@Override
@@ -47,6 +50,7 @@ public abstract class GroovyAggregateTest {
}
}
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class ComputerTest extends AggregateTest {
@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/sideEffect/GroovyGroupCountTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupCountTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupCountTest.groovy
index 8bd1af9..245e9fc 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupCountTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupCountTest.groovy
@@ -19,6 +19,8 @@
package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect
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.sideEffect.GroupCountTest
@@ -29,6 +31,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyGroupCountTest {
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends GroupCountTest {
@Override
@@ -64,6 +67,7 @@ public abstract class GroovyGroupCountTest {
}
}
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class ComputerTest extends GroupCountTest {
@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/sideEffect/GroovyGroupTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupTest.groovy
index 8d744f4..a02bb48 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupTest.groovy
@@ -21,6 +21,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect
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
@@ -29,6 +31,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyGroupTest {
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends GroupTest {
@Override
@@ -57,6 +60,7 @@ public abstract class GroovyGroupTest {
}
}
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class ComputerTest extends GroupTest {
@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/sideEffect/GroovyInjectTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyInjectTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyInjectTest.groovy
index 1f0e1d1..4b6b00d 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyInjectTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyInjectTest.groovy
@@ -18,17 +18,22 @@
*/
package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect
+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.step.sideEffect.InjectTest
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 GroovyInjectTest {
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends InjectTest {
@Override
public Traversal<Vertex, String> get_g_VX1X_out_injectXv2X_name(final Object v1Id, final Object v2Id) {
@@ -41,17 +46,32 @@ public abstract class GroovyInjectTest {
}
}
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class ComputerTest extends InjectTest {
@Override
- public Traversal<Vertex, String> get_g_VX1X_out_injectXv2X_name(final Object v1Id, final Object v2Id) {
- g.engine(StandardTraversalEngine.standard);
- g.V(v1Id).out.inject(g.V(v2Id).next()).name
+ @Test
+ @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+ void g_VX1X_out_injectXv2X_name() {
+ super.g_VX1X_out_injectXv2X_name()
}
@Override
- public Traversal<Vertex, Path> get_g_VX1X_out_name_injectXdanielX_asXaX_mapXlengthX_path(final Object v1Id) {
- g.engine(StandardTraversalEngine.standard);
- g.V(v1Id).out().name.inject('daniel').as('a').map { it.length() }.path
+ @Test
+ @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+ void g_VX1X_out_name_injectXdanielX_asXaX_mapXlengthX_path() {
+ super.g_VX1X_out_name_injectXdanielX_asXaX_mapXlengthX_path()
+ }
+
+ @Override
+ Traversal<Vertex, String> get_g_VX1X_out_injectXv2X_name(Object v1Id, Object v2Id) {
+ // override with nothing until the test itself is supported
+ return null
+ }
+
+ @Override
+ Traversal<Vertex, Path> get_g_VX1X_out_name_injectXdanielX_asXaX_mapXlengthX_path(Object v1Id) {
+ // 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/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 46963e1..73c47d8 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
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect
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.sideEffect.ProfileTest
import org.apache.tinkerpop.gremlin.process.util.metric.StandardTraversalMetrics
import org.apache.tinkerpop.gremlin.structure.Vertex
@@ -29,6 +31,7 @@ import org.apache.tinkerpop.gremlin.process.graph.traversal.__
*/
public abstract class GroovyProfileTest {
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends ProfileTest {
@Override
@@ -43,6 +46,7 @@ public abstract class GroovyProfileTest {
}
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class ComputerTest extends ProfileTest {
@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/sideEffect/GroovySackTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySackTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySackTest.groovy
index 1c7c3ce..10e8258 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySackTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySackTest.groovy
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect
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
@@ -30,6 +32,7 @@ import static org.apache.tinkerpop.gremlin.structure.Operator.sum
*/
public abstract class GroovySackTest {
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends SackTest {
@Override
@@ -48,6 +51,7 @@ public abstract class GroovySackTest {
}
}
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class ComputerTest extends SackTest {
@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/sideEffect/GroovySideEffectCapTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySideEffectCapTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySideEffectCapTest.groovy
index 33c771f..3fd5488 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySideEffectCapTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySideEffectCapTest.groovy
@@ -21,6 +21,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect
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.sideEffect.SideEffectCapTest
import org.apache.tinkerpop.gremlin.structure.Vertex
import org.apache.tinkerpop.gremlin.process.graph.traversal.__
@@ -29,6 +31,7 @@ import org.apache.tinkerpop.gremlin.process.graph.traversal.__
*/
public abstract class GroovySideEffectCapTest {
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends SideEffectCapTest {
@Override
public Traversal<Vertex, Map<String, Long>> get_g_V_hasXageX_groupCountXaX_byXnameX_out_capXaX() {
@@ -43,6 +46,7 @@ public abstract class GroovySideEffectCapTest {
}
}
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class ComputerTest extends SideEffectCapTest {
@Override
public Traversal<Vertex, Map<String, Long>> get_g_V_hasXageX_groupCountXaX_byXnameX_out_capXaX() {
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/sideEffect/GroovySideEffectTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySideEffectTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySideEffectTest.groovy
index 0a07265..f8f18ab 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySideEffectTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySideEffectTest.groovy
@@ -19,6 +19,8 @@
package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect
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.sideEffect.SideEffectTest
import org.apache.tinkerpop.gremlin.structure.Vertex
@@ -27,6 +29,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovySideEffectTest {
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends SideEffectTest {
@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/sideEffect/GroovyStoreTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyStoreTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyStoreTest.groovy
index 277b8d1..2bbab16 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyStoreTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyStoreTest.groovy
@@ -19,6 +19,8 @@
package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect
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.sideEffect.StoreTest
@@ -29,6 +31,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
*/
public abstract class GroovyStoreTest {
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends StoreTest {
@Override
@@ -54,6 +57,7 @@ public abstract class GroovyStoreTest {
}
}
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class ComputerTest extends StoreTest {
@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/sideEffect/GroovySubgraphTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySubgraphTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySubgraphTest.groovy
index 31a59e9..966862e 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySubgraphTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovySubgraphTest.groovy
@@ -19,6 +19,8 @@
package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect
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.sideEffect.SubgraphTest
import org.apache.tinkerpop.gremlin.structure.Graph
import org.apache.tinkerpop.gremlin.structure.Vertex
@@ -29,6 +31,7 @@ import org.apache.tinkerpop.gremlin.process.graph.traversal.__
*/
public abstract class GroovySubgraphTest {
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends SubgraphTest {
@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/sideEffect/GroovyTreeTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyTreeTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyTreeTest.groovy
index 0342c4e..9568ff6 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyTreeTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyTreeTest.groovy
@@ -18,18 +18,23 @@
*/
package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect
+import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest
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.sideEffect.TreeTest
import org.apache.tinkerpop.gremlin.process.graph.util.Tree
import org.apache.tinkerpop.gremlin.structure.Vertex
+import org.junit.Test
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public abstract class GroovyTreeTest {
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends TreeTest {
@Override
@@ -58,6 +63,7 @@ public abstract class GroovyTreeTest {
}
}
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class ComputerTest extends TreeTest {
@Override
@@ -71,20 +77,25 @@ public abstract class GroovyTreeTest {
}
@Override
- public Traversal<Vertex, Tree> get_g_VX1X_out_out_tree_byXnameX(final Object v1Id) {
- g.V(v1Id).out.out.tree.by('name');
- // TODO
+ public Traversal<Vertex, Tree> get_g_V_out_out_treeXaX() {
+ ComputerTestHelper.compute("g.V.out.out.tree('a')", g)
}
@Override
- public Traversal<Vertex, Tree> get_g_VX1X_out_out_treeXaX_byXnameX_both_both_capXaX(final Object v1Id) {
- g.V(v1Id).out.out.tree('a').by('name').both.both.cap('a');
- // TODO
+ @Test
+ @org.junit.Ignore("Traversal not supported by ComputerTraversalEngine.computer")
+ void g_VX1X_out_out_tree_byXnameX() {
+
}
@Override
- public Traversal<Vertex, Tree> get_g_V_out_out_treeXaX() {
- ComputerTestHelper.compute("g.V.out.out.tree('a')", g)
+ Traversal<Vertex, Tree> get_g_VX1X_out_out_tree_byXnameX(Object v1Id) {
+ return null
+ }
+
+ @Override
+ Traversal<Vertex, Tree> get_g_VX1X_out_out_treeXaX_byXnameX_both_both_capXaX(Object v1Id) {
+ return null
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
index 4fe5e4f..d49977d 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
@@ -100,8 +100,6 @@ public interface GraphProvider {
*/
default public Graph openTestGraph(final Configuration config, final GraphStrategy... strategies) {
final Graph g = GraphFactory.open(config);
- if (config.containsKey("computer") && (boolean) config.getProperty("computer"))
- g.engine(ComputerTraversalEngine.computer);
return null == strategies ? g : g.strategy(strategies);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
index c3c719e..ac598a3 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
@@ -19,6 +19,7 @@
package org.apache.tinkerpop.gremlin.process;
import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
+import org.apache.tinkerpop.gremlin.process.traversal.engine.ComputerTraversalEngine;
import org.apache.tinkerpop.gremlin.process.util.MapHelper;
import org.junit.Before;
@@ -38,11 +39,7 @@ import static org.junit.Assume.assumeTrue;
*/
public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
- /**
- * Determines if a test case implementation of a process test uses graph computer. This value should be
- * set in the constructor of the class that implements this.
- */
- protected boolean requiresGraphComputer;
+ protected static final String TRAVERSAL_NOT_SUPPORTED_BY_COMPUTER = "Traversal not supported by ComputerTraversalEngine.computer";
/**
* Determines if a graph meets requirements for execution. All gremlin process tests should check this
@@ -50,12 +47,22 @@ public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
* feature or if it does require the computer feature then ensure that the graph being tested supports it.
*/
protected boolean graphMeetsTestRequirements() {
- return !requiresGraphComputer || g.features().graph().supportsComputer();
+ return !hasGraphComputerRequirement() || g.features().graph().supportsComputer();
+ }
+
+ private boolean hasGraphComputerRequirement() {
+ final UseEngine useEngine = this.getClass().getAnnotation(UseEngine.class);
+ if (null == useEngine)
+ throw new RuntimeException(String.format("The %s expects all tests to be annotated with %s",
+ AbstractGremlinProcessTest.class.getName(), UseEngine.class.getName()));
+
+ return useEngine.value().equals(TraversalEngine.Type.COMPUTER);
}
@Before
public void setupTest() {
assumeTrue(graphMeetsTestRequirements());
+ if (hasGraphComputerRequirement()) g.engine(ComputerTraversalEngine.computer);
}
public <T> void checkResults(final List<T> expectedResults, final Traversal<?, T> traversal) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/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 a67f64b..51ef459 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
@@ -19,6 +19,7 @@
package org.apache.tinkerpop.gremlin.process;
import org.apache.tinkerpop.gremlin.AbstractGremlinSuite;
+import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
import org.apache.tinkerpop.gremlin.process.computer.GraphComputerTest;
import org.apache.tinkerpop.gremlin.process.computer.ranking.PageRankVertexProgramTest;
import org.apache.tinkerpop.gremlin.process.computer.util.ComputerDataStrategyTest;
@@ -239,4 +240,14 @@ public class ProcessComputerSuite extends AbstractGremlinSuite {
public ProcessComputerSuite(final Class<?> klass, final RunnerBuilder builder, final Class<?>[] testsToExecute, final Class<?>[] testsToEnforce) throws InitializationError {
super(klass, builder, testsToExecute, testsToEnforce);
}
+
+ @Override
+ public boolean beforeTestExecution(final Class<? extends AbstractGremlinTest> testClass) {
+ final UseEngine useEngine = testClass.getAnnotation(UseEngine.class);
+ if (null == useEngine || !useEngine.value().equals(TraversalEngine.Type.COMPUTER))
+ throw new RuntimeException(String.format("The %s expects all tests to be annotated with @UseEngine(%s) - check %s",
+ ProcessComputerSuite.class.getName(), TraversalEngine.Type.COMPUTER, testClass.getName()));
+
+ return super.beforeTestExecution(testClass);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
index 7445196..8fed6e6 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
@@ -19,6 +19,7 @@
package org.apache.tinkerpop.gremlin.process;
import org.apache.tinkerpop.gremlin.AbstractGremlinSuite;
+import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch.*;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter.*;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.*;
@@ -243,4 +244,14 @@ public class ProcessStandardSuite extends AbstractGremlinSuite {
public ProcessStandardSuite(final Class<?> klass, final RunnerBuilder builder, final Class<?>[] testsToExecute, final Class<?>[] testsToEnforce, final boolean gremlinFlavorSuite) throws InitializationError {
super(klass, builder, testsToExecute, testsToEnforce, gremlinFlavorSuite);
}
+
+ @Override
+ public boolean beforeTestExecution(final Class<? extends AbstractGremlinTest> testClass) {
+ final UseEngine useEngine = testClass.getAnnotation(UseEngine.class);
+
+ if (null == useEngine || !useEngine.value().equals(TraversalEngine.Type.STANDARD))
+ throw new RuntimeException(String.format("The %s expects all tests to be annotated with @UseEngine(%s) - check %s",
+ ProcessComputerSuite.class.getName(), TraversalEngine.Type.STANDARD, testClass.getName()));
+ return super.beforeTestExecution(testClass);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/UseEngine.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/UseEngine.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/UseEngine.java
new file mode 100644
index 0000000..9112991
--- /dev/null
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/UseEngine.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface UseEngine {
+ public TraversalEngine.Type value();
+}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index 64f0fd3..bc36db4 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@ -21,6 +21,8 @@ package org.apache.tinkerpop.gremlin.process.computer;
import org.apache.tinkerpop.gremlin.ExceptionCoverage;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
+import org.apache.tinkerpop.gremlin.process.TraversalEngine;
+import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.process.computer.lambda.LambdaMapReduce;
import org.apache.tinkerpop.gremlin.process.computer.lambda.LambdaVertexProgram;
import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram;
@@ -311,12 +313,8 @@ public abstract class GraphComputerTest extends AbstractGremlinProcessTest {
}
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class ComputerTest extends GraphComputerTest {
-
- public ComputerTest() {
- requiresGraphComputer = true;
- }
-
@Override
public GraphComputer get_g_compute() {
return g.compute();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/PageRankVertexProgramTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/PageRankVertexProgramTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/PageRankVertexProgramTest.java
index ca65f3e..1c5e473 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/PageRankVertexProgramTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/PageRankVertexProgramTest.java
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin.process.computer.ranking;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
+import org.apache.tinkerpop.gremlin.process.TraversalEngine;
+import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.process.computer.ComputerResult;
import org.apache.tinkerpop.gremlin.process.computer.util.DefaultComputerResult;
import org.apache.tinkerpop.gremlin.process.computer.ranking.pagerank.PageRankVertexProgram;
@@ -32,12 +34,9 @@ import static org.junit.Assert.*;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
+@UseEngine(TraversalEngine.Type.COMPUTER)
public class PageRankVertexProgramTest extends AbstractGremlinProcessTest {
- public PageRankVertexProgramTest() {
- requiresGraphComputer = true;
- }
-
@Test
@LoadGraphWith(MODERN)
public void shouldExecutePageRank() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ComputerDataStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ComputerDataStrategyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ComputerDataStrategyTest.java
index b7f325e..36d410e 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ComputerDataStrategyTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/ComputerDataStrategyTest.java
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin.process.computer.util;
import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
import org.apache.tinkerpop.gremlin.FeatureRequirement;
+import org.apache.tinkerpop.gremlin.process.TraversalEngine;
+import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
@@ -36,6 +38,7 @@ import static org.junit.Assert.*;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
+@UseEngine(TraversalEngine.Type.COMPUTER)
public class ComputerDataStrategyTest extends AbstractGremlinTest {
@Test
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/BranchTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/BranchTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/BranchTest.java
index f92d9fe..00d192b 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/BranchTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/BranchTest.java
@@ -21,6 +21,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
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;
@@ -52,7 +54,7 @@ public abstract class BranchTest extends AbstractGremlinProcessTest {
});
}
-
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends BranchTest {
@Override
@@ -72,22 +74,7 @@ public abstract class BranchTest extends AbstractGremlinProcessTest {
}
}
- public static class ComputerTest extends BranchTest {
-
- @Override
- public Traversal<Vertex, Object> get_g_V_branchXlabel_eq_person__a_bX_optionXa__ageX_optionXb__langX_optionXb__nameX() {
- return g.V().branch(label().is("person").count())
- .option(1L, values("age"))
- .option(0L, values("lang"))
- .option(0L, values("name"));
- }
-
- @Override
- public Traversal<Vertex, Object> get_g_V_branchXlabelX_optionXperson__ageX_optionXsoftware__langX_optionXsoftware__nameX() {
- return g.V().branch(label())
- .option("person", values("age"))
- .option("software", values("lang"))
- .option("software", values("name"));
- }
+ @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/58affa2f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/ChooseTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/ChooseTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/ChooseTest.java
index ff4e4df..e530ae1 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/ChooseTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/ChooseTest.java
@@ -21,6 +21,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
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.util.MapHelper;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
@@ -59,6 +61,7 @@ public abstract class ChooseTest extends AbstractGremlinProcessTest {
assertEquals(Long.valueOf(1), counts.get("josh"));
}
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends ChooseTest {
@Override
@@ -69,17 +72,7 @@ public abstract class ChooseTest extends AbstractGremlinProcessTest {
}
}
- public static class ComputerTest extends ChooseTest {
-
- public ComputerTest() {
- requiresGraphComputer = true;
- }
-
- @Override
- public Traversal<Vertex, Object> get_g_V_chooseXout_countX_optionX2L__nameX_optionX3L__valueMapX() {
- return g.V().choose(out().count())
- .option(2L, values("name"))
- .option(3L, valueMap());
- }
+ @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/58affa2f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/LocalTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/LocalTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/LocalTest.java
index ab360af..7a73bb6 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/LocalTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/LocalTest.java
@@ -22,6 +22,8 @@ import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
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.Edge;
import org.apache.tinkerpop.gremlin.structure.Order;
import org.apache.tinkerpop.gremlin.structure.Vertex;
@@ -194,10 +196,8 @@ public abstract class LocalTest extends AbstractGremlinProcessTest {
assertEquals(5, counter);
}
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends LocalTest {
- public StandardTest() {
- requiresGraphComputer = false;
- }
@Override
public Traversal<Vertex, String> get_g_V_localXpropertiesXlocationX_order_byXvalueX_limitX2XX_value() {
@@ -252,60 +252,7 @@ public abstract class LocalTest extends AbstractGremlinProcessTest {
}
- public static class ComputerTest extends LocalTest {
- public ComputerTest() {
- requiresGraphComputer = true;
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_localXpropertiesXlocationX_order_byXvalueX_limitX2XX_value() {
- return g.V().local(properties("location").order().by(T.value, Order.incr).range(0, 2)).<String>value();
- }
-
- @Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_hasXlabel_personX_asXaX_localXoutXcreatedX_asXbXX_selectXa_bX_byXnameX_byXidX() {
- return g.V().has(T.label, "person").as("a").local(out("created").as("b")).select("a", "b").by("name").by(T.id);
- }
-
- @Override
- public Traversal<Vertex, Long> get_g_V_localXoutE_countX() {
- return g.V().local(outE().count());
- }
-
- @Override
- public Traversal<Vertex, String> get_g_VX1X_localXoutEXknowsX_limitX1XX_inV_name(final Object v1Id) {
- return g.V(v1Id).local(outE("knows").limit(1)).inV().<String>values("name");
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_localXbothEXcreatedX_limitX1XX_otherV_name() {
- return g.V().local(bothE("created").limit(1)).otherV().<String>values("name");
- }
-
- @Override
- public Traversal<Vertex, String> get_g_VX4X_localXbothE_limitX1XX_otherV_name(final Object v4Id) {
- return g.V(v4Id).local(bothE().limit(1)).otherV().<String>values("name");
- }
-
- @Override
- public Traversal<Vertex, String> get_g_VX4X_localXbothE_limitX2XX_otherV_name(final Object v4Id) {
- return g.V(v4Id).local(bothE().limit(2)).otherV().<String>values("name");
- }
-
- @Override
- public Traversal<Vertex, Edge> get_g_VX4X_localXbothEX1_createdX_limitX1XX(final Object v4Id) {
- return g.V(v4Id).local(bothE("created").limit(1));
- }
-
- @Override
- public Traversal<Vertex, Edge> get_g_VX4X_localXbothEXknows_createdX_limitX1XX(final Object v4Id) {
- return g.V(v4Id).local(bothE("knows", "created").limit(1));
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_localXinEXknowsX_limitX2XX_outV_name() {
- return g.V().local(inE("knows").limit(2)).outV().<String>values("name");
- }
-
+ @UseEngine(TraversalEngine.Type.COMPUTER)
+ public static class ComputerTest extends StandardTest {
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatTest.java
index b81f6ae..61f35df 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatTest.java
@@ -23,6 +23,8 @@ import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
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.util.MapHelper;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
@@ -218,10 +220,8 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
});
}
+ @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() {
@@ -269,54 +269,7 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
}
}
- public static class ComputerTest extends RepeatTest {
- public ComputerTest() {
- requiresGraphComputer = true;
- }
-
- @Override
- public Traversal<Vertex, Path> get_g_V_repeatXoutX_timesX2X_emit_path() {
- return g.V().repeat(out()).times(2).emit().path();
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_repeatXoutX_timesX2X_repeatXinX_timesX2X_name() {
- return g.V().repeat(out()).times(2).repeat(in()).times(2).<String>values("name");
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_repeatXoutX_timesX2X() {
- return g.V().repeat(out()).times(2);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_repeatXoutX_timesX2X_emit() {
- return g.V().repeat(out()).times(2).emit();
- }
-
- @Override
- public Traversal<Vertex, String> get_g_VX1X_timesX2X_repeatXoutX_name(Object v1Id) {
- return g.V(v1Id).times(2).repeat(out()).<String>values("name");
- }
-
- @Override
- public Traversal<Vertex, Path> get_g_V_emit_repeatXoutX_timesX2X_path() {
- return g.V().emit().repeat(out()).times(2).path();
- }
-
- @Override
- public Traversal<Vertex, Path> get_g_V_emit_timesX2X_repeatXoutX_path() {
- return g.V().emit().times(2).repeat(out()).path();
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_emitXhasXlabel_personXX_repeatXoutX_name(final Object v1Id) {
- return g.V(v1Id).emit(has(T.label, "person")).repeat(out()).<String>values("name");
- }
-
- @Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXgroupCountXmX_byXnameX_outX_timesX2X_capXmX() {
- return g.V().repeat(groupCount("m").by("name").out()).times(2).<Map<String, Long>>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/58affa2f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/UnionTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/UnionTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/UnionTest.java
index a522c56..c289ebd 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/UnionTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/branch/UnionTest.java
@@ -21,6 +21,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.branch;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
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;
@@ -148,12 +150,9 @@ public abstract class UnionTest extends AbstractGremlinProcessTest {
assertFalse(traversal.hasNext());
}
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends UnionTest {
- public StandardTest() {
- requiresGraphComputer = false;
- }
-
@Override
public Traversal<Vertex, String> get_g_V_unionXout__inX_name() {
return g.V().union(out(), in()).values("name");
@@ -191,47 +190,14 @@ public abstract class UnionTest extends AbstractGremlinProcessTest {
}
}
- public static class ComputerTest extends UnionTest {
-
- public ComputerTest() {
- requiresGraphComputer = true;
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_unionXout__inX_name() {
- return g.V().union(out(), in()).<String>values("name");
- }
-
- @Override
- public Traversal<Vertex, String> get_g_VX1X_unionXrepeatXoutX_timesX2X__outX_name(final Object v1Id) {
- return g.V(v1Id).union(repeat(out()).times(2), out()).<String>values("name");
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_chooseXlabel_is_person__unionX__out_lang__out_nameX__in_labelX() {
- return g.V().choose(label().is("person"), union(out().values("lang"), out().values("name")), in().label());
- }
-
- @Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_chooseXlabel_is_person__unionX__out_lang__out_nameX__in_labelX_groupCount() {
- return (Traversal) g.V().choose(label().is("person"), union(out().values("lang"), out().values("name")), in().label()).groupCount();
- }
+ @UseEngine(TraversalEngine.Type.COMPUTER)
+ public static class ComputerTest extends StandardTest {
@Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_unionXrepeatXunionXoutXcreatedX__inXcreatedXX_timesX2X__repeatXunionXinXcreatedX__outXcreatedXX_timesX2XX_label_groupCount() {
- return (Traversal) g.V().union(
- repeat(union(
- out("created"),
- in("created"))).times(2),
- repeat(union(
- in("created"),
- out("created"))).times(2)).label().groupCount();
- }
-
- @Override
- public Traversal<Vertex, Number> get_g_VX1_2X_unionXoutE_count__inE_count__outE_weight_sumX(final Object v1Id, final Object v2Id) {
- g.engine(StandardTraversalEngine.standard);
- return g.V(v1Id, v2Id).union(outE().count(), inE().count(), (Traversal) outE().values("weight").sum()); // DOES NOT WORK IN OLAP
+ @Test
+ @org.junit.Ignore(TRAVERSAL_NOT_SUPPORTED_BY_COMPUTER)
+ public void g_VX1_2X_unionXoutE_count__inE_count__outE_weight_sumX() {
+ super.g_VX1_2X_unionXoutE_count__inE_count__outE_weight_sumX();
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/AndTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/AndTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/AndTest.java
index 8811260..7db6249 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/AndTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/AndTest.java
@@ -22,6 +22,8 @@ import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
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.Compare;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
@@ -59,11 +61,9 @@ public abstract class AndTest extends AbstractGremlinProcessTest {
checkResults(Arrays.asList("josh", "peter"), traversal);
}
- public static class StandardTest extends AndTest {
- public StandardTest() {
- requiresGraphComputer = false;
- }
+ @UseEngine(TraversalEngine.Type.STANDARD)
+ public static class StandardTest extends AndTest {
@Override
public Traversal<Vertex, String> get_g_V_andXhasXage_gt_27X__outE_count_gt_2X_name() {
@@ -76,19 +76,8 @@ public abstract class AndTest extends AbstractGremlinProcessTest {
}
}
- public static class ComputerTest extends AndTest {
- public ComputerTest() {
- requiresGraphComputer = true;
- }
- @Override
- public Traversal<Vertex, String> get_g_V_andXhasXage_gt_27X__outE_count_gt_2X_name() {
- return g.V().and(has("age", gt, 27), outE().count().is(gte, 2l)).<String>values("name");
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_andXoutE__hasXlabel_personX_and_hasXage_gte_32XX_name() {
- return g.V().and(outE(), has(T.label, "person").and().has("age", Compare.gte, 32)).<String>values("name");
- }
+ @UseEngine(TraversalEngine.Type.COMPUTER)
+ public static class ComputerTest extends StandardTest {
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/CoinTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/CoinTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/CoinTest.java
index 698af2b..5f8ceb0 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/CoinTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/CoinTest.java
@@ -21,6 +21,8 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
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;
@@ -65,12 +67,9 @@ public abstract class CoinTest extends AbstractGremlinProcessTest {
assertFalse(traversal.hasNext());
}
- public static class StandardTest extends CoinTest {
-
- public StandardTest() {
- requiresGraphComputer = false;
- }
+ @UseEngine(TraversalEngine.Type.STANDARD)
+ public static class StandardTest extends CoinTest {
@Override
public Traversal<Vertex, Vertex> get_g_V_coinX1X() {
return g.V().coin(1.0d);
@@ -82,19 +81,7 @@ public abstract class CoinTest extends AbstractGremlinProcessTest {
}
}
- public static class ComputerTest extends CoinTest {
- public ComputerTest() {
- requiresGraphComputer = true;
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_coinX1X() {
- return g.V().coin(1.0d);
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_V_coinX0X() {
- return g.V().coin(0.0d);
- }
+ @UseEngine(TraversalEngine.Type.COMPUTER)
+ public static class ComputerTest extends StandardTest {
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/CyclicPathTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/CyclicPathTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/CyclicPathTest.java
index 58f56b7..9eb859e 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/CyclicPathTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/CyclicPathTest.java
@@ -22,6 +22,8 @@ import org.apache.tinkerpop.gremlin.LoadGraphWith;
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.structure.Vertex;
import org.junit.Test;
@@ -68,6 +70,7 @@ public abstract class CyclicPathTest extends AbstractGremlinProcessTest {
assertFalse(traversal.hasNext());
}
+ @UseEngine(TraversalEngine.Type.STANDARD)
public static class StandardTest extends CyclicPathTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inXcreatedX_cyclicPath(final Object v1Id) {
@@ -80,20 +83,7 @@ public abstract class CyclicPathTest extends AbstractGremlinProcessTest {
}
}
- public static class ComputerTest extends CyclicPathTest {
-
- public ComputerTest() {
- requiresGraphComputer = true;
- }
-
- @Override
- public Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inXcreatedX_cyclicPath(final Object v1Id) {
- return g.V(v1Id).out("created").in("created").cyclicPath();
- }
-
- @Override
- public Traversal<Vertex, Path> get_g_VX1X_outXcreatedX_inXcreatedX_cyclicPath_path(final Object v1Id) {
- return g.V(v1Id).out("created").in("created").cyclicPath().path();
- }
+ @UseEngine(TraversalEngine.Type.COMPUTER)
+ public static class ComputerTest extends StandardTest {
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/58affa2f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupTest.java
index e8aa5f4..4b9e46a 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupTest.java
@@ -23,7 +23,8 @@ import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
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.traversal.engine.StandardTraversalEngine;
+import org.apache.tinkerpop.gremlin.process.TraversalEngine;
+import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.util.StreamFactory;
import org.junit.Test;
@@ -47,7 +48,7 @@ public abstract class DedupTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, String> get_g_V_both_hasXlabel_softwareX_dedup_byXlangX_name();
- public abstract Traversal<Vertex, String> get_g_V_both_propertiesXnameX_orderXa_bX_dedup_value();
+ public abstract Traversal<Vertex, String> get_g_V_both_name_orderXa_bX_dedup();
public abstract Traversal<Vertex, Map<String, Set<Double>>> get_g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXdedupXlocalXX_cap();
@@ -81,7 +82,7 @@ public abstract class DedupTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_both_name_orderXa_bX_dedup() {
- final Traversal<Vertex, String> traversal = get_g_V_both_propertiesXnameX_orderXa_bX_dedup_value();
+ final Traversal<Vertex, String> traversal = get_g_V_both_name_orderXa_bX_dedup();
printTraversalForm(traversal);
final List<String> names = StreamFactory.stream(traversal).collect(Collectors.toList());
assertEquals(6, names.size());
@@ -110,12 +111,9 @@ public abstract class DedupTest extends AbstractGremlinProcessTest {
assertEquals(new HashSet<>(Arrays.asList(0.2, 0.4, 0.5, 1.0)), map.get("person"));
}
- public static class StandardTest extends DedupTest {
-
- public StandardTest() {
- requiresGraphComputer = false;
- }
+ @UseEngine(TraversalEngine.Type.STANDARD)
+ public static class StandardTest extends DedupTest {
@Override
public Traversal<Vertex, String> get_g_V_both_dedup_name() {
return g.V().both().dedup().values("name");
@@ -127,7 +125,7 @@ public abstract class DedupTest extends AbstractGremlinProcessTest {
}
@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() {
return g.V().both().<String>properties("name").order().by((a, b) -> a.value().compareTo(b.value())).dedup().value();
}
@@ -137,28 +135,25 @@ public abstract class DedupTest extends AbstractGremlinProcessTest {
}
}
+ @UseEngine(TraversalEngine.Type.COMPUTER)
public static class ComputerTest extends StandardTest {
- public ComputerTest() {
- requiresGraphComputer = true;
- }
-
@Override
- public Traversal<Vertex, String> get_g_V_both_dedup_name() {
- g.engine(StandardTraversalEngine.standard); // TODO
- return super.get_g_V_both_dedup_name();
+ @Test
+ @org.junit.Ignore(TRAVERSAL_NOT_SUPPORTED_BY_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
- return super.get_g_V_both_hasXlabel_softwareX_dedup_byXlangX_name();
+ @Test
+ @org.junit.Ignore(TRAVERSAL_NOT_SUPPORTED_BY_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
- return super.get_g_V_both_propertiesXnameX_orderXa_bX_dedup_value();
+ @Test
+ @org.junit.Ignore(TRAVERSAL_NOT_SUPPORTED_BY_COMPUTER)
+ public void g_V_both_name_orderXa_bX_dedup() {
}
}
}