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 2016/01/12 13:15:08 UTC
incubator-tinkerpop git commit: Changed Neo4j GraphProviders to use
the test name in the data directory.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 23a31f7fe -> b02b9f827
Changed Neo4j GraphProviders to use the test name in the data directory.
This was important as some test cases might have the same test names thus resulting in conflicts.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/b02b9f82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b02b9f82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b02b9f82
Branch: refs/heads/master
Commit: b02b9f82728960c805b9a663e34fa9a71010a75f
Parents: 23a31f7
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jan 12 07:13:46 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jan 12 07:13:46 2016 -0500
----------------------------------------------------------------------
.../tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java | 4 ++--
.../tinkerpop/gremlin/neo4j/MultiMetaNeo4jGraphProvider.java | 1 +
.../tinkerpop/gremlin/neo4j/NoMultiNoMetaNeo4jGraphProvider.java | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b02b9f82/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
index c59ad3f..82a9801 100644
--- a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
+++ b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
@@ -62,9 +62,9 @@ public abstract class AbstractNeo4jGraphProvider extends AbstractGraphProvider {
graph.close();
}
- if (configuration.containsKey("gremlin.neo4j.directory")) {
+ if (configuration.containsKey(Neo4jGraph.CONFIG_DIRECTORY)) {
// this is a non-in-sideEffects configuration so blow away the directory
- final File graphDirectory = new File(configuration.getString("gremlin.neo4j.directory"));
+ final File graphDirectory = new File(configuration.getString(Neo4jGraph.CONFIG_DIRECTORY));
deleteDirectory(graphDirectory);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b02b9f82/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/MultiMetaNeo4jGraphProvider.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/MultiMetaNeo4jGraphProvider.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/MultiMetaNeo4jGraphProvider.java
index 11e0cc7..b3572ae 100644
--- a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/MultiMetaNeo4jGraphProvider.java
+++ b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/MultiMetaNeo4jGraphProvider.java
@@ -35,6 +35,7 @@ public class MultiMetaNeo4jGraphProvider extends AbstractNeo4jGraphProvider {
public Map<String, Object> getBaseConfiguration(final String graphName, final Class<?> test, final String testMethodName, final LoadGraphWith.GraphData graphData) {
final String directory = getWorkingDirectory() + File.separator
+ TestHelper.cleanPathSegment(this.getClass().getSimpleName()) + File.separator
+ + TestHelper.cleanPathSegment(test.getSimpleName()) + File.separator
+ TestHelper.cleanPathSegment(graphName) + File.separator
+ cleanParameters(TestHelper.cleanPathSegment(testMethodName));
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b02b9f82/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/NoMultiNoMetaNeo4jGraphProvider.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/NoMultiNoMetaNeo4jGraphProvider.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/NoMultiNoMetaNeo4jGraphProvider.java
index 8de7c2e..233d681 100644
--- a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/NoMultiNoMetaNeo4jGraphProvider.java
+++ b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/NoMultiNoMetaNeo4jGraphProvider.java
@@ -35,6 +35,7 @@ public class NoMultiNoMetaNeo4jGraphProvider extends AbstractNeo4jGraphProvider
public Map<String, Object> getBaseConfiguration(final String graphName, final Class<?> test, final String testMethodName, final LoadGraphWith.GraphData graphData) {
final String directory = getWorkingDirectory() + File.separator
+ TestHelper.cleanPathSegment(this.getClass().getSimpleName()) + File.separator
+ + TestHelper.cleanPathSegment(test.getSimpleName()) + File.separator
+ TestHelper.cleanPathSegment(graphName) + File.separator
+ cleanParameters(TestHelper.cleanPathSegment(testMethodName));