This is an automated email from the ASF dual-hosted git repository. spmallette pushed a change to branch tp34 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from c8d63b4 Fixed changelog merge error CTR add 1088cd9 [TINKERPOP-2274] Fixed the issues revealed while compiling and running tests under Windows add 9cd001b [TINKERPOP-2274] Changed back the default persistent use of Spark Context for tests, still making it non-periststent for the tests that are reveal locks under Windows. This should speed up the integration tests back too. add ec62bae Update pom.xml add 26a2dfd Merge branch 'TINKERPOP-2274-clean' of https://github.com/rpopov/tinkerpop into TINKERPOP-2274-clean add e061038 [TINKERPOP-2274] Made the FileSystemCheck tests use non-persistent Spark context this way avoiding locks in the file system. add eeb7e11 [TINKERPOP-2274] Fixed the use of a directory in place of file that had failed the integration tests. Fixed. add d339ba3 [TINKERPOP-2274] Split the TestHelper from gremlin-core/test into two classes - CoreTestHelper in the gremlin-core/main, so that it poublishes common methods, available to be inherited, whereas the only duplicated code is left in core/test TestHelper not published, thus avoiding name conflict with TestHelper from gremlin-test add 954f1a5 [TINKERPOP-2274] Removed references to CoreTestHelper outsde the gremlin-core project add 5c4cace Squashed commit of the following: add ff071b6 Merge branch 'pr-1188' into tp33 add 5a3535d Minor syntax error caused :install command to fail CTR add 88578a8 Updated javadoc for the CoreTestHelper add 5e43fdc Aligned maven version to what was previously enforced - 3.3.9 add a40bc3d TestHelper.RANDOM should be used in all tests so the seed gets captured add ef941e3 Merge branch 'tp33' into tp34 No new revisions were added by this update. Summary of changes: docs/preprocessor/install-plugins.groovy | 2 +- gremlin-archetype/pom.xml | 1 + .../tinkerpop/gremlin/console/ConsoleFs.groovy | 8 +- .../console/commands/UninstallCommand.groovy | 12 +- .../jsr223/DriverRemoteAcceptorIntegrateTest.java | 25 +-- .../console/jsr223/DriverRemoteAcceptorTest.java | 4 +- gremlin-core/pom.xml | 6 + .../tinkerpop/gremlin/structure/io/Storage.java | 101 +++++++++-- .../tinkerpop/gremlin/util/CoreTestHelper.java | 188 +++++++++++++++++++++ .../org/apache/tinkerpop/gremlin/AssertHelper.java | 20 ++- .../org/apache/tinkerpop/gremlin/TestHelper.java | 147 ---------------- .../jsr223/DefaultScriptCustomizerTest.java | 6 +- .../gremlin/jsr223/ScriptEngineCacheTest.java | 8 +- .../jsr223/ScriptFileGremlinPluginTest.java | 11 +- .../gremlin/process/traversal/OrderTest.java | 3 +- .../optimization/EarlyLimitStrategyTest.java | 4 +- .../optimization/OrderLimitStrategyTest.java | 2 +- .../StandardVerificationStrategyTest.java | 6 +- .../gremlin/structure/io/GraphMigratorTest.java | 4 +- .../tinkerpop/gremlin/structure/io/IoCoreTest.java | 4 +- .../structure/io/graphson/GraphSONTokensTest.java | 4 +- .../structure/io/graphson/GraphSONUtilTest.java | 4 +- .../gremlin/structure/util/ComparatorsTest.java | 4 +- .../gremlin/structure/util/ElementHelperTest.java | 4 +- .../gremlin/structure/util/GraphFactoryTest.java | 32 ++-- .../structure/util/GraphVariableHelperTest.java | 4 +- .../gremlin/structure/util/StringFactoryTest.java | 4 +- .../apache/tinkerpop/gremlin/util/GremlinTest.java | 4 +- .../tinkerpop/gremlin/util/SerializerTest.java | 4 +- .../tinkerpop/gremlin/util/TimeUtilTest.java | 4 +- .../gremlin/util/function/FunctionUtilsTest.java | 5 +- .../gremlin/util/iterator/IteratorUtilsTest.java | 4 +- .../tinkerpop/gremlin/util/tools/MultiMapTest.java | 5 +- .../gremlin/groovy/util/DependencyGrabber.groovy | 74 ++++---- .../gremlin/groovy/engine/GremlinExecutorTest.java | 4 +- .../GremlinGroovyScriptEngineFileSandboxTest.java | 5 +- .../util/DependencyGrabberIntegrateTest.java | 76 +++++---- .../gremlin/util/TinkerGraphProvider.java | 4 +- .../apache/tinkerpop/gremlin/server/Settings.java | 8 +- .../gremlin/server/util/GremlinServerInstall.java | 7 +- .../gremlin/server/GremlinDriverIntegrateTest.java | 6 +- .../gremlin/server/ResponseHandlerContextTest.java | 6 +- .../tinkerpop/gremlin/server/ServerTestHelper.java | 57 +++++-- .../gremlin/util/Log4jRecordingAppender.java | 17 +- .../gremlin/AbstractFileGraphProvider.java | 12 +- .../apache/tinkerpop/gremlin/GraphProvider.java | 3 +- .../org/apache/tinkerpop/gremlin/TestHelper.java | 142 ++-------------- .../gremlin/jsr223/BindingsScriptEngineTest.java | 3 +- .../bulkloading/BulkLoaderVertexProgramTest.java | 2 +- .../gremlin/structure/io/IoGraphTest.java | 8 +- .../tinkerpop/gremlin/structure/io/IoTest.java | 31 ++-- hadoop-gremlin/README.md | 52 ++++++ hadoop-gremlin/pom.xml | 29 ++++ .../apache/tinkerpop/gremlin/hadoop/Constants.java | 22 +++ .../computer/AbstractHadoopGraphComputer.java | 12 +- .../hadoop/structure/io/FileSystemStorage.java | 101 ++++++----- .../hadoop/structure/io/InputOutputHelper.java | 2 +- .../computer/AbstractHadoopGraphComputerTest.java | 59 ++++--- .../structure/io/RecordReaderWriterTest.java | 5 +- pom.xml | 18 +- .../tinkerpop/gremlin/spark/structure/Spark.java | 7 +- .../spark/structure/io/SparkContextStorage.java | 107 +++++++++--- .../structure/io/AbstractIoRegistryCheck.java | 7 +- .../hadoop/structure/io/AbstractStorageCheck.java | 48 +++--- .../structure/io/FileSystemStorageCheck.java | 24 ++- .../spark/process/computer/LocalPropertyTest.java | 2 +- .../SparkHadoopGraphGryoSerializerProvider.java | 1 + .../gremlin/spark/structure/SparkTest.java | 3 +- .../io/PersistedInputOutputRDDIntegrateTest.java | 8 +- .../structure/io/SparkContextStorageCheck.java | 26 +-- .../io/gryo/GryoSerializerIntegrateTest.java | 4 +- .../gremlin/tinkergraph/TinkerGraphProvider.java | 4 +- .../tinkergraph/TinkerGraphUUIDProvider.java | 4 +- .../structure/IoDataGenerationTest.java | 127 +++++++------- .../tinkergraph/structure/TinkerGraphTest.java | 13 +- 75 files changed, 1045 insertions(+), 749 deletions(-) create mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/CoreTestHelper.java copy gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/TokensTest.java => gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/AssertHelper.java (77%) delete mode 100644 gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/TestHelper.java create mode 100644 hadoop-gremlin/README.md