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/06/22 21:41:22 UTC
incubator-tinkerpop git commit: Test MatchStep over both algorithms
for all tests.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master a748204f0 -> f323d28f8
Test MatchStep over both algorithms for all tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/f323d28f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/f323d28f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/f323d28f
Branch: refs/heads/master
Commit: f323d28f881ce7ede2e516a3d183788bdb5a3545
Parents: a748204
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jun 22 15:41:01 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jun 22 15:41:01 2015 -0400
----------------------------------------------------------------------
.../traversal/step/map/GroovyMatchTest.groovy | 20 ++++++++++++-
.../process/GroovyProcessComputerSuite.java | 3 +-
.../process/GroovyProcessStandardSuite.java | 3 +-
.../gremlin/process/ProcessComputerSuite.java | 3 +-
.../gremlin/process/ProcessStandardSuite.java | 3 +-
.../process/traversal/step/map/MatchTest.java | 30 +++++++++++---------
6 files changed, 44 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f323d28f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMatchTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMatchTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMatchTest.groovy
index bf95cf2..425c278 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMatchTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMatchTest.groovy
@@ -19,15 +19,33 @@
package org.apache.tinkerpop.gremlin.process.traversal.step.map
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.finalization.MatchAlgorithmStrategy
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper
import org.apache.tinkerpop.gremlin.structure.Vertex
+import org.junit.Before
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public abstract class GroovyMatchTest {
- public static class Traversals extends MatchTest {
+ public static class GreedyMatchTraversals extends Traversals {
+ @Before
+ public void setupTest() {
+ super.setupTest();
+ g = graphProvider.traversal(graph, MatchAlgorithmStrategy.build().algorithm(MatchStep.GreedyMatchAlgorithm.class).create());
+ }
+ }
+
+ public static class CountMatchTraversals extends Traversals {
+ @Before
+ public void setupTest() {
+ super.setupTest();
+ g = graphProvider.traversal(graph, MatchAlgorithmStrategy.build().algorithm(MatchStep.CountMatchAlgorithm.class).create());
+ }
+ }
+
+ public abstract static class Traversals extends MatchTest {
@Override
public Traversal<Vertex, Map<String, Vertex>> get_g_V_matchXa_out_bX() {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f323d28f/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java
index 68c9e3e..64dfeee 100644
--- a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java
+++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java
@@ -123,7 +123,8 @@ public class GroovyProcessComputerSuite extends ProcessComputerSuite {
GroovyCountTest.Traversals.class,
GroovyFoldTest.Traversals.class,
GroovyMapTest.Traversals.class,
- GroovyMatchTest.Traversals.class,
+ GroovyMatchTest.CountMatchTraversals.class,
+ GroovyMatchTest.GreedyMatchTraversals.class,
GroovyMaxTest.Traversals.class,
GroovyMeanTest.Traversals.class,
GroovyMinTest.Traversals.class,
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f323d28f/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java
index 4acb17d..f097b78 100644
--- a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java
+++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java
@@ -123,7 +123,8 @@ public class GroovyProcessStandardSuite extends ProcessStandardSuite {
GroovyCountTest.Traversals.class,
GroovyFoldTest.Traversals.class,
GroovyMapTest.Traversals.class,
- GroovyMatchTest.Traversals.class,
+ GroovyMatchTest.CountMatchTraversals.class,
+ GroovyMatchTest.GreedyMatchTraversals.class,
GroovyMaxTest.Traversals.class,
GroovyMeanTest.Traversals.class,
GroovyMinTest.Traversals.class,
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f323d28f/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 e703577..6d98558 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
@@ -131,7 +131,8 @@ public class ProcessComputerSuite extends AbstractGremlinSuite {
MeanTest.Traversals.class,
MinTest.Traversals.class,
SumTest.Traversals.class,
- MatchTest.Traversals.class,
+ MatchTest.CountMatchTraversals.class,
+ MatchTest.GreedyMatchTraversals.class,
OrderTest.Traversals.class,
PathTest.Traversals.class,
PropertiesTest.Traversals.class,
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f323d28f/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 6422638..93d120b 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
@@ -128,7 +128,8 @@ public class ProcessStandardSuite extends AbstractGremlinSuite {
CountTest.Traversals.class,
FoldTest.Traversals.class,
MapTest.Traversals.class,
- MatchTest.Traversals.class,
+ MatchTest.CountMatchTraversals.class,
+ MatchTest.GreedyMatchTraversals.class,
MaxTest.Traversals.class,
MeanTest.Traversals.class,
MinTest.Traversals.class,
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f323d28f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
index 45ff443..e0e1b82 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
@@ -51,8 +51,6 @@ import static org.junit.Assert.*;
@RunWith(GremlinProcessRunner.class)
public abstract class MatchTest extends AbstractGremlinProcessTest {
- private static final Random RANDOM = new Random();
-
// very basic query
public abstract Traversal<Vertex, Map<String, Vertex>> get_g_V_matchXa_out_bX();
@@ -121,16 +119,6 @@ public abstract class MatchTest extends AbstractGremlinProcessTest {
// nested or with infix and and variable dependencies at different depths
public abstract Traversal<Vertex, Map<String, Object>> get_g_V_asXaX_out_asXbX_matchXa_out_count_c__orXa_knows_b__b_in_count_c__and__c_isXgtX2XXXX();
- ////////////////
- @Before
- public void setupTest() { // test different provided match algorithms
- super.setupTest();
- if (RANDOM.nextBoolean())
- g = graphProvider.traversal(graph, MatchAlgorithmStrategy.build().algorithm(MatchStep.GreedyMatchAlgorithm.class).create());
- }
- ////////////////
-
-
@Test
@LoadGraphWith(MODERN)
public void g_V_matchXa_out_bX() throws Exception {
@@ -395,7 +383,23 @@ public abstract class MatchTest extends AbstractGremlinProcessTest {
}
- public static class Traversals extends MatchTest {
+ public static class GreedyMatchTraversals extends Traversals {
+ @Before
+ public void setupTest() {
+ super.setupTest();
+ g = graphProvider.traversal(graph, MatchAlgorithmStrategy.build().algorithm(MatchStep.GreedyMatchAlgorithm.class).create());
+ }
+ }
+
+ public static class CountMatchTraversals extends Traversals {
+ @Before
+ public void setupTest() {
+ super.setupTest();
+ g = graphProvider.traversal(graph, MatchAlgorithmStrategy.build().algorithm(MatchStep.CountMatchAlgorithm.class).create());
+ }
+ }
+
+ public abstract static class Traversals extends MatchTest {
@Override
public Traversal<Vertex, Map<String, Vertex>> get_g_V_matchXa_out_bX() {
return g.V().match("a", as("a").out().as("b"));