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/03/11 19:26:53 UTC
[37/50] [abbrv] incubator-tinkerpop git commit: Test suites now set
the TraversalEngine.Type rather than the TraversalEngine itself.
Test suites now set the TraversalEngine.Type rather than the TraversalEngine itself.
The TraversalEngine is supplied by the vendor via the GraphProvider. The setting for the suite is only to inform on the intention of the suite itself to require a specific type of engine for its work.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/506b1479
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/506b1479
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/506b1479
Branch: refs/heads/master
Commit: 506b1479f238666ff2c7d0b617a8289f5e676ce6
Parents: d0a2b37
Author: Stephen Mallette <sp...@apache.org>
Authored: Tue Mar 10 12:05:42 2015 -0400
Committer: Stephen Mallette <sp...@apache.org>
Committed: Tue Mar 10 12:05:42 2015 -0400
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/AbstractGremlinSuite.java | 7 +++----
.../org/apache/tinkerpop/gremlin/GraphManager.java | 12 ++++++------
.../gremlin/process/AbstractGremlinProcessTest.java | 13 ++++++-------
.../gremlin/process/ProcessComputerSuite.java | 6 +++---
.../gremlin/process/ProcessStandardSuite.java | 2 +-
5 files changed, 19 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/506b1479/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java
index 77818b1..a7b5ec1 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java
@@ -19,7 +19,6 @@
package org.apache.tinkerpop.gremlin;
import org.apache.tinkerpop.gremlin.process.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -106,11 +105,11 @@ public abstract class AbstractGremlinSuite extends Suite {
public AbstractGremlinSuite(final Class<?> klass, final RunnerBuilder builder, final Class<?>[] testsToExecute, final Class<?>[] testsToEnforce,
final boolean gremlinFlavorSuite) throws InitializationError {
- this(klass, builder, testsToExecute, testsToEnforce, gremlinFlavorSuite, StandardTraversalEngine.instance());
+ this(klass, builder, testsToExecute, testsToEnforce, gremlinFlavorSuite, TraversalEngine.Type.STANDARD);
}
public AbstractGremlinSuite(final Class<?> klass, final RunnerBuilder builder, final Class<?>[] testsToExecute, final Class<?>[] testsToEnforce,
- final boolean gremlinFlavorSuite, TraversalEngine traversalEngine) throws InitializationError {
+ final boolean gremlinFlavorSuite, TraversalEngine.Type traversalEngineType) throws InitializationError {
super(builder, klass, enforce(testsToExecute, testsToEnforce));
this.gremlinFlavorSuite = gremlinFlavorSuite;
@@ -131,7 +130,7 @@ public abstract class AbstractGremlinSuite extends Suite {
validateHelpersNotImplemented(graphProvider);
GraphManager.setGraphProvider(graphProvider);
- GraphManager.setTraversalEngine(traversalEngine);
+ GraphManager.setTraversalEngineType(traversalEngineType);
} catch (Exception ex) {
throw new InitializationError(ex);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/506b1479/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphManager.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphManager.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphManager.java
index 4090336..d5a0c94 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphManager.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphManager.java
@@ -27,7 +27,7 @@ import org.apache.tinkerpop.gremlin.process.TraversalEngine;
*/
public class GraphManager {
private static GraphProvider graphProvider;
- private static TraversalEngine traversalEngine;
+ private static TraversalEngine.Type traversalEngineType;
public static GraphProvider setGraphProvider(final GraphProvider graphProvider) {
final GraphProvider old = GraphManager.graphProvider;
@@ -39,13 +39,13 @@ public class GraphManager {
return graphProvider;
}
- public static TraversalEngine setTraversalEngine(final TraversalEngine traversalEngine) {
- final TraversalEngine old = GraphManager.traversalEngine;
- GraphManager.traversalEngine = traversalEngine;
+ public static TraversalEngine.Type setTraversalEngineType(final TraversalEngine.Type traversalEngine) {
+ final TraversalEngine.Type old = GraphManager.traversalEngineType;
+ GraphManager.traversalEngineType = traversalEngine;
return old;
}
- public static TraversalEngine getTraversalEngine() {
- return traversalEngine;
+ public static TraversalEngine.Type getTraversalEngineType() {
+ return traversalEngineType;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/506b1479/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 4cc7800..6e16efd 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
@@ -20,8 +20,6 @@ package org.apache.tinkerpop.gremlin.process;
import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
import org.apache.tinkerpop.gremlin.GraphManager;
-import org.apache.tinkerpop.gremlin.process.traversal.engine.ComputerTraversalEngine;
-import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine;
import org.apache.tinkerpop.gremlin.process.util.MapHelper;
import org.junit.Before;
@@ -50,9 +48,12 @@ public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
return !hasGraphComputerRequirement() || graph.features().graph().supportsComputer();
}
+ /**
+ * Determines if this test suite has "computer" requirements.
+ */
private boolean hasGraphComputerRequirement() {
- // do the negation of STANDARD as we expect a type of REASONING that would infer computer support
- return !GraphManager.getTraversalEngine().getType().equals(TraversalEngine.Type.STANDARD);
+ // do the negation of STANDARD as we expect a future type of REASONING that would infer COMPUTER support
+ return !GraphManager.getTraversalEngineType().equals(TraversalEngine.Type.STANDARD);
}
@Before
@@ -63,12 +64,10 @@ public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
// ignore tests that aren't supported by a specific TraversalEngine
final IgnoreEngine ignoreEngine = this.getClass().getMethod(name.getMethodName()).getAnnotation(IgnoreEngine.class);
if (ignoreEngine != null)
- assumeTrue(String.format("This test is ignored for %s", ignoreEngine.value()), !ignoreEngine.value().equals(GraphManager.getTraversalEngine().getType()));
+ assumeTrue(String.format("This test is ignored for %s", ignoreEngine.value()), !ignoreEngine.value().equals(GraphManager.getTraversalEngineType()));
} catch (NoSuchMethodException nsme) {
throw new RuntimeException(String.format("Could not find test method %s in test case %s", name.getMethodName(), this.getClass().getName()));
}
-
- // TODO: g.engine(GraphManager.getTraversalEngine());
}
public <T> void checkResults(final List<T> expectedResults, final Traversal<?, T> traversal) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/506b1479/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 2f2bdcd..2b7f444 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
@@ -196,15 +196,15 @@ public class ProcessComputerSuite extends AbstractGremlinSuite {
}
public ProcessComputerSuite(final Class<?> klass, final RunnerBuilder builder) throws InitializationError {
- super(klass, builder, testsToExecute, testsToExecute, false, StandardTraversalEngine.instance());
+ super(klass, builder, testsToExecute, testsToExecute, false, TraversalEngine.Type.COMPUTER);
}
public ProcessComputerSuite(final Class<?> klass, final RunnerBuilder builder, final Class<?>[] testsToExecute, final Class<?>[] testsToEnforce) throws InitializationError {
- super(klass, builder, testsToExecute, testsToEnforce, false, StandardTraversalEngine.instance());
+ super(klass, builder, testsToExecute, testsToEnforce, false, TraversalEngine.Type.COMPUTER);
}
public ProcessComputerSuite(final Class<?> klass, final RunnerBuilder builder, final Class<?>[] testsToExecute, final Class<?>[] testsToEnforce, final boolean gremlinFlavorSuite) throws InitializationError {
- super(klass, builder, testsToExecute, testsToEnforce, gremlinFlavorSuite, StandardTraversalEngine.instance());
+ super(klass, builder, testsToExecute, testsToEnforce, gremlinFlavorSuite, TraversalEngine.Type.COMPUTER);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/506b1479/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 562bbe0..a295437 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
@@ -168,7 +168,7 @@ 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, StandardTraversalEngine.instance());
+ super(klass, builder, testsToExecute, testsToEnforce, gremlinFlavorSuite, TraversalEngine.Type.STANDARD);
}
@Override