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 2018/07/17 10:04:38 UTC
[1/2] tinkerpop git commit: TINKERPOP-1365 Refactored use of Random
in tests
Repository: tinkerpop
Updated Branches:
refs/heads/tp32 6fd30366e -> 6c6ab324b
TINKERPOP-1365 Refactored use of Random in tests
Each test suite now uses the same instance of Random which prints the seed given to it so that if there is a failure, we can easily try to recreate it by taking the seed and passing it in as a system property with -DtestSeed.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/38f40369
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/38f40369
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/38f40369
Branch: refs/heads/tp32
Commit: 38f403696c985b47289951419620192e205ca284
Parents: 7c7dddb
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jun 21 10:11:58 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jun 25 10:55:37 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/dev/developer/development-environment.asciidoc | 1 +
.../src/test/resources/log4j-silent.properties | 5 ++++-
giraph-gremlin/src/test/resources/log4j-test.properties | 5 ++++-
gremlin-core/src/test/resources/log4j-silent.properties | 5 ++++-
gremlin-core/src/test/resources/log4j-test.properties | 5 ++++-
.../java/org/apache/tinkerpop/gremlin/TestHelper.java | 11 ++++++++++-
.../tinkerpop/gremlin/structure/io/IoIntegrateTest.java | 2 +-
.../structure/util/detached/DetachedGraphTest.java | 2 +-
.../gremlin/structure/util/star/StarGraphTest.java | 2 +-
gremlin-test/src/test/resources/log4j-silent.properties | 5 ++++-
gremlin-test/src/test/resources/log4j-test.properties | 5 ++++-
.../tinkerpop/gremlin/hadoop/HadoopGraphProvider.java | 2 +-
.../src/test/resources/log4j-silent.properties | 5 ++++-
hadoop-gremlin/src/test/resources/log4j-test.properties | 5 ++++-
.../gremlin/neo4j/AbstractNeo4jGraphProvider.java | 3 ++-
neo4j-gremlin/src/test/resources/log4j-silent.properties | 5 ++++-
neo4j-gremlin/src/test/resources/log4j-test.properties | 5 ++++-
spark-gremlin/src/test/resources/log4j-silent.properties | 5 ++++-
spark-gremlin/src/test/resources/log4j-test.properties | 5 ++++-
.../tinkergraph/process/TinkerGraphComputerProvider.java | 4 ++--
.../src/test/resources/log4j-silent.properties | 5 ++++-
.../src/test/resources/log4j-test.properties | 5 ++++-
23 files changed, 76 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 05b74da..4099411 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -32,6 +32,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Added `createGratefulDead()`to `TinkerFactory` to help make it easier to try to instantiate that toy graph.
* Added identifiers to edges in the Kitchen Sink toy graph.
* Refactored the Gremlin Server integration testing framework and streamlined that infrastructure.
+* Logged the seed used in initializing `Random` for tests.
* Fixed bug in `GroovyTranslator` that didn't properly handle empty `Map` objects.
* Added concrete configuration methods to `SparkGraphComputer` to make a more clear API for configuring it.
* Fixed a bug in `TinkerGraphCountStrategy`, which didn't consider that certain map steps may not emit an element.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index 0cf06f6..cde81c1 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -238,6 +238,7 @@ mvn -Dmaven.javadoc.skip=true --projects tinkergraph-gremlin test
** Process a single AsciiDoc file: +pass:[docs/preprocessor/preprocess-file.sh `pwd`/gremlin-console/target/apache-tinkerpop-gremlin-console-*-standalone "" "*" `pwd`/docs/src/xyz.asciidoc]+
* Build JavaDocs: `mvn process-resources -Djavadoc`
* Check for Apache License headers: `mvn apache-rat:check`
+* Specify the seed used for `Random` in tests `mvn clean install -DtestSeed` - useful when a test fails, the seed will be printed in the build output so that the test can run with the same version of random (look for "TestHelper" logger in output)
* Check for newer dependencies: `mvn versions:display-dependency-updates` or `mvn versions:display-plugin-updates`
* Check the effective `pom.xml`: `mvn -pl gremlin-python -Pglv-python help:effective-pom -Doutput=withProfilePom.xml`
* Deploy JavaDocs/AsciiDocs: `bin/publish-docs.sh svn-username`
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/giraph-gremlin/src/test/resources/log4j-silent.properties
----------------------------------------------------------------------
diff --git a/giraph-gremlin/src/test/resources/log4j-silent.properties b/giraph-gremlin/src/test/resources/log4j-silent.properties
index 1825bb0..7c312f7 100644
--- a/giraph-gremlin/src/test/resources/log4j-silent.properties
+++ b/giraph-gremlin/src/test/resources/log4j-silent.properties
@@ -20,4 +20,7 @@
log4j.rootLogger=OFF, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
\ No newline at end of file
+log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
+
+# need to turn this on so that we know the test seed
+log4j.logger.org.apache.tinkerpop.gremlin.TestHelper=INFO
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/giraph-gremlin/src/test/resources/log4j-test.properties
----------------------------------------------------------------------
diff --git a/giraph-gremlin/src/test/resources/log4j-test.properties b/giraph-gremlin/src/test/resources/log4j-test.properties
index a3e679c..766bfab 100644
--- a/giraph-gremlin/src/test/resources/log4j-test.properties
+++ b/giraph-gremlin/src/test/resources/log4j-test.properties
@@ -20,4 +20,7 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
-log4j.logger.org.apache.hadoop=ERROR
\ No newline at end of file
+log4j.logger.org.apache.hadoop=ERROR
+
+# need to turn this on so that we know the test seed
+log4j.logger.org.apache.tinkerpop.gremlin.TestHelper=INFO
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/gremlin-core/src/test/resources/log4j-silent.properties
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/resources/log4j-silent.properties b/gremlin-core/src/test/resources/log4j-silent.properties
index 1825bb0..2b06ae8 100644
--- a/gremlin-core/src/test/resources/log4j-silent.properties
+++ b/gremlin-core/src/test/resources/log4j-silent.properties
@@ -20,4 +20,7 @@
log4j.rootLogger=OFF, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
\ No newline at end of file
+log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
+
+# need to turn this on so that we know the test seed
+log4j.logger.org.apache.tinkerpop.gremlin.TestHelper=INFO
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/gremlin-core/src/test/resources/log4j-test.properties
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/resources/log4j-test.properties b/gremlin-core/src/test/resources/log4j-test.properties
index ef436fe..e2e2465 100644
--- a/gremlin-core/src/test/resources/log4j-test.properties
+++ b/gremlin-core/src/test/resources/log4j-test.properties
@@ -18,4 +18,7 @@
log4j.rootLogger=WARN, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
\ No newline at end of file
+log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
+
+# need to turn this on so that we know the test seed
+log4j.logger.org.apache.tinkerpop.gremlin.TestHelper=INFO
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/TestHelper.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/TestHelper.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/TestHelper.java
index 833a383..38d9a25 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/TestHelper.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/TestHelper.java
@@ -18,7 +18,6 @@
*/
package org.apache.tinkerpop.gremlin;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -28,6 +27,8 @@ import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.util.Comparators;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.FileOutputStream;
@@ -51,11 +52,19 @@ import static org.junit.Assume.assumeThat;
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public final class TestHelper {
+ private static final Logger logger = LoggerFactory.getLogger(TestHelper.class);
+ public static final Random RANDOM;
private static final String SEP = File.separator;
private static final char URL_SEP = '/';
public static final String TEST_DATA_RELATIVE_DIR = "test-case-data";
+ static {
+ final long seed = Long.parseLong(System.getProperty("testSeed", String.valueOf(System.currentTimeMillis())));
+ logger.info("*** THE RANDOM TEST SEED IS {} ***", seed);
+ RANDOM = new Random(seed);
+ }
+
private TestHelper() {
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoIntegrateTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoIntegrateTest.java
index ebfeee0..c9ad223 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoIntegrateTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoIntegrateTest.java
@@ -56,7 +56,7 @@ public class IoIntegrateTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_PROPERTY)
public void shouldHaveSizeOfStarGraphLessThanDetached() throws Exception {
- final Random random = new Random(95746498l);
+ final Random random = TestHelper.RANDOM;
final Vertex vertex = graph.addVertex("person");
for (int i = 0; i < 100; i++) { // vertex properties and meta properties
vertex.property(VertexProperty.Cardinality.list, UUID.randomUUID().toString(), random.nextDouble(),
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedGraphTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedGraphTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedGraphTest.java
index 21789e8..01b5061 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedGraphTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedGraphTest.java
@@ -69,7 +69,7 @@ public class DetachedGraphTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_PROPERTY)
public void testAttachableCreateMethod() {
- final Random random = new Random(234335l);
+ final Random random = TestHelper.RANDOM;
StarGraph starGraph = StarGraph.open();
Vertex starVertex = starGraph.addVertex(T.label, "person", "name", "stephen", "name", "spmallete");
starVertex.property("acl", true, "timestamp", random.nextLong(), "creator", "marko");
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphTest.java
index c49dab0..68b5d97 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphTest.java
@@ -152,7 +152,7 @@ public class StarGraphTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_PROPERTY)
public void shouldAttachWithCreateMethod() {
- final Random random = new Random(234335l);
+ final Random random = TestHelper.RANDOM;
StarGraph starGraph = StarGraph.open();
Vertex starVertex = starGraph.addVertex(T.label, "person", "name", "stephen", "name", "spmallete");
starVertex.property("acl", true, "timestamp", random.nextLong(), "creator", "marko");
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/gremlin-test/src/test/resources/log4j-silent.properties
----------------------------------------------------------------------
diff --git a/gremlin-test/src/test/resources/log4j-silent.properties b/gremlin-test/src/test/resources/log4j-silent.properties
index ce0647e..98d9e2a 100644
--- a/gremlin-test/src/test/resources/log4j-silent.properties
+++ b/gremlin-test/src/test/resources/log4j-silent.properties
@@ -23,4 +23,7 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
# need to turn this on as this test actually tests "logging" - needs INFO at minimum for tests to pass
-log4j.logger.org.apache.tinkerpop.gremlin.util.Log4jRecordingAppenderTest=INFO
\ No newline at end of file
+log4j.logger.org.apache.tinkerpop.gremlin.util.Log4jRecordingAppenderTest=INFO
+
+# need to turn this on so that we know the test seed
+log4j.logger.org.apache.tinkerpop.gremlin.TestHelper=INFO
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/gremlin-test/src/test/resources/log4j-test.properties
----------------------------------------------------------------------
diff --git a/gremlin-test/src/test/resources/log4j-test.properties b/gremlin-test/src/test/resources/log4j-test.properties
index 3d02711..0517b4c 100644
--- a/gremlin-test/src/test/resources/log4j-test.properties
+++ b/gremlin-test/src/test/resources/log4j-test.properties
@@ -21,4 +21,7 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
# need to turn this on as this test actually tests "logging" - needs INFO at minimum for tests to pass
-log4j.logger.org.apache.tinkerpop.gremlin.util.Log4jRecordingAppenderTest=INFO
\ No newline at end of file
+log4j.logger.org.apache.tinkerpop.gremlin.util.Log4jRecordingAppenderTest=INFO
+
+# need to turn this on so that we know the test seed
+log4j.logger.org.apache.tinkerpop.gremlin.TestHelper=INFO
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
index 0ad3637..b2b87ec 100644
--- a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
+++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
@@ -54,7 +54,7 @@ import static org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShimSe
*/
public class HadoopGraphProvider extends AbstractGraphProvider {
- protected static final Random RANDOM = new Random();
+ protected static final Random RANDOM = TestHelper.RANDOM;
private boolean graphSONInput = false;
public static Map<String, String> PATHS = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/hadoop-gremlin/src/test/resources/log4j-silent.properties
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/test/resources/log4j-silent.properties b/hadoop-gremlin/src/test/resources/log4j-silent.properties
index 1825bb0..4e9f465 100644
--- a/hadoop-gremlin/src/test/resources/log4j-silent.properties
+++ b/hadoop-gremlin/src/test/resources/log4j-silent.properties
@@ -20,4 +20,7 @@
log4j.rootLogger=OFF, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
\ No newline at end of file
+log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
+
+# need to turn this on so that we know the test seed
+log4j.logger.org.apache.tinkerpop.gremlin.TestHelper=INFO
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/hadoop-gremlin/src/test/resources/log4j-test.properties
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/test/resources/log4j-test.properties b/hadoop-gremlin/src/test/resources/log4j-test.properties
index 4b5af31..7f7a284 100644
--- a/hadoop-gremlin/src/test/resources/log4j-test.properties
+++ b/hadoop-gremlin/src/test/resources/log4j-test.properties
@@ -18,4 +18,7 @@
log4j.rootLogger=WARN, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
+log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
+
+# need to turn this on so that we know the test seed
+log4j.logger.org.apache.tinkerpop.gremlin.TestHelper=INFO
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/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 9226822..701c85c 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
@@ -21,6 +21,7 @@ package org.apache.tinkerpop.gremlin.neo4j;
import org.apache.commons.configuration.Configuration;
import org.apache.tinkerpop.gremlin.AbstractGraphProvider;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
+import org.apache.tinkerpop.gremlin.TestHelper;
import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jEdge;
import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jElement;
import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph;
@@ -98,7 +99,7 @@ public abstract class AbstractNeo4jGraphProvider extends AbstractGraphProvider {
}
private void createIndices(final Neo4jGraph graph, final LoadGraphWith.GraphData graphData) {
- final Random random = new Random();
+ final Random random = TestHelper.RANDOM;
final boolean pick = random.nextBoolean();
if (graphData.equals(LoadGraphWith.GraphData.GRATEFUL)) {
if (pick) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/neo4j-gremlin/src/test/resources/log4j-silent.properties
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/test/resources/log4j-silent.properties b/neo4j-gremlin/src/test/resources/log4j-silent.properties
index 1825bb0..7c312f7 100644
--- a/neo4j-gremlin/src/test/resources/log4j-silent.properties
+++ b/neo4j-gremlin/src/test/resources/log4j-silent.properties
@@ -20,4 +20,7 @@
log4j.rootLogger=OFF, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
\ No newline at end of file
+log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
+
+# need to turn this on so that we know the test seed
+log4j.logger.org.apache.tinkerpop.gremlin.TestHelper=INFO
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/neo4j-gremlin/src/test/resources/log4j-test.properties
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/test/resources/log4j-test.properties b/neo4j-gremlin/src/test/resources/log4j-test.properties
index ef436fe..067fa7b 100644
--- a/neo4j-gremlin/src/test/resources/log4j-test.properties
+++ b/neo4j-gremlin/src/test/resources/log4j-test.properties
@@ -18,4 +18,7 @@
log4j.rootLogger=WARN, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
\ No newline at end of file
+log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
+
+# need to turn this on so that we know the test seed
+log4j.logger.org.apache.tinkerpop.gremlin.TestHelper=INFO
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/spark-gremlin/src/test/resources/log4j-silent.properties
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/test/resources/log4j-silent.properties b/spark-gremlin/src/test/resources/log4j-silent.properties
index 1825bb0..7c312f7 100644
--- a/spark-gremlin/src/test/resources/log4j-silent.properties
+++ b/spark-gremlin/src/test/resources/log4j-silent.properties
@@ -20,4 +20,7 @@
log4j.rootLogger=OFF, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
\ No newline at end of file
+log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
+
+# need to turn this on so that we know the test seed
+log4j.logger.org.apache.tinkerpop.gremlin.TestHelper=INFO
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/spark-gremlin/src/test/resources/log4j-test.properties
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/test/resources/log4j-test.properties b/spark-gremlin/src/test/resources/log4j-test.properties
index fe1cb1e..1a84d2c 100644
--- a/spark-gremlin/src/test/resources/log4j-test.properties
+++ b/spark-gremlin/src/test/resources/log4j-test.properties
@@ -22,4 +22,7 @@ log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
log4j.logger.org.apache.spark=ERROR
log4j.logger.org.spark-project=ERROR
-log4j.logger.org.apache.hadoop=ERROR
\ No newline at end of file
+log4j.logger.org.apache.hadoop=ERROR
+
+# need to turn this on so that we know the test seed
+log4j.logger.org.apache.tinkerpop.gremlin.TestHelper=INFO
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphComputerProvider.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphComputerProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphComputerProvider.java
index 8902b1f..e11adf1 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphComputerProvider.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphComputerProvider.java
@@ -20,7 +20,7 @@ package org.apache.tinkerpop.gremlin.tinkergraph.process;
import org.apache.commons.configuration.MapConfiguration;
import org.apache.tinkerpop.gremlin.GraphProvider;
-import org.apache.tinkerpop.gremlin.process.computer.Computer;
+import org.apache.tinkerpop.gremlin.TestHelper;
import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
@@ -37,7 +37,7 @@ import java.util.Random;
@GraphProvider.Descriptor(computer = TinkerGraphComputer.class)
public class TinkerGraphComputerProvider extends TinkerGraphProvider {
- private static final Random RANDOM = new Random();
+ private static final Random RANDOM = TestHelper.RANDOM;
@Override
public GraphTraversalSource traversal(final Graph graph) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/tinkergraph-gremlin/src/test/resources/log4j-silent.properties
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/resources/log4j-silent.properties b/tinkergraph-gremlin/src/test/resources/log4j-silent.properties
index 1825bb0..7c312f7 100644
--- a/tinkergraph-gremlin/src/test/resources/log4j-silent.properties
+++ b/tinkergraph-gremlin/src/test/resources/log4j-silent.properties
@@ -20,4 +20,7 @@
log4j.rootLogger=OFF, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
\ No newline at end of file
+log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
+
+# need to turn this on so that we know the test seed
+log4j.logger.org.apache.tinkerpop.gremlin.TestHelper=INFO
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/38f40369/tinkergraph-gremlin/src/test/resources/log4j-test.properties
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/resources/log4j-test.properties b/tinkergraph-gremlin/src/test/resources/log4j-test.properties
index ef436fe..067fa7b 100644
--- a/tinkergraph-gremlin/src/test/resources/log4j-test.properties
+++ b/tinkergraph-gremlin/src/test/resources/log4j-test.properties
@@ -18,4 +18,7 @@
log4j.rootLogger=WARN, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
\ No newline at end of file
+log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
+
+# need to turn this on so that we know the test seed
+log4j.logger.org.apache.tinkerpop.gremlin.TestHelper=INFO
\ No newline at end of file
[2/2] tinkerpop git commit: Merge branch 'TINKERPOP-1365' into tp32
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1365' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6c6ab324
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6c6ab324
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6c6ab324
Branch: refs/heads/tp32
Commit: 6c6ab324b62d66b15393e22d6f77b5628dd2d564
Parents: 6fd3036 38f4036
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jul 16 15:58:41 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jul 16 15:58:41 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/dev/developer/development-environment.asciidoc | 1 +
.../src/test/resources/log4j-silent.properties | 5 ++++-
giraph-gremlin/src/test/resources/log4j-test.properties | 5 ++++-
gremlin-core/src/test/resources/log4j-silent.properties | 5 ++++-
gremlin-core/src/test/resources/log4j-test.properties | 5 ++++-
.../java/org/apache/tinkerpop/gremlin/TestHelper.java | 11 ++++++++++-
.../tinkerpop/gremlin/structure/io/IoIntegrateTest.java | 2 +-
.../structure/util/detached/DetachedGraphTest.java | 2 +-
.../gremlin/structure/util/star/StarGraphTest.java | 2 +-
gremlin-test/src/test/resources/log4j-silent.properties | 5 ++++-
gremlin-test/src/test/resources/log4j-test.properties | 5 ++++-
.../tinkerpop/gremlin/hadoop/HadoopGraphProvider.java | 2 +-
.../src/test/resources/log4j-silent.properties | 5 ++++-
hadoop-gremlin/src/test/resources/log4j-test.properties | 5 ++++-
.../gremlin/neo4j/AbstractNeo4jGraphProvider.java | 3 ++-
neo4j-gremlin/src/test/resources/log4j-silent.properties | 5 ++++-
neo4j-gremlin/src/test/resources/log4j-test.properties | 5 ++++-
spark-gremlin/src/test/resources/log4j-silent.properties | 5 ++++-
spark-gremlin/src/test/resources/log4j-test.properties | 5 ++++-
.../tinkergraph/process/TinkerGraphComputerProvider.java | 4 ++--
.../src/test/resources/log4j-silent.properties | 5 ++++-
.../src/test/resources/log4j-test.properties | 5 ++++-
23 files changed, 76 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6c6ab324/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index a25e7a5,4099411..f50b9ec
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -30,12 -29,10 +30,13 @@@ image::https://raw.githubusercontent.co
* Fixed bug in `branch()` where reducing steps as options would produce incorrect results.
* Removed recursive handling of streaming results from Gremlin-Python driver to avoid max recursion depth errors.
* Improved performance of `TraversalVertexProgram` and related infrastructure.
+* Deprecated `BulkLoaderVertexProgram` and related infrastructure.
+* Deprecated `BulkDumperVertexProgram` with the more aptly named `CloneVertexProgram`.
* Added `createGratefulDead()`to `TinkerFactory` to help make it easier to try to instantiate that toy graph.
* Added identifiers to edges in the Kitchen Sink toy graph.
+* Ordered the loading of plugins in the Gremlin Console by their position in the configuration file.
* Refactored the Gremlin Server integration testing framework and streamlined that infrastructure.
+ * Logged the seed used in initializing `Random` for tests.
* Fixed bug in `GroovyTranslator` that didn't properly handle empty `Map` objects.
* Added concrete configuration methods to `SparkGraphComputer` to make a more clear API for configuring it.
* Fixed a bug in `TinkerGraphCountStrategy`, which didn't consider that certain map steps may not emit an element.