Merge branch 'tp33'
Conflicts:
gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/23b766ad
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/23b766ad
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/23b766ad
Branch: refs/heads/master
Commit: 23b766ad83f2877d6affee638d7718be6d85e00f
Parents: 5d6873e f2e74ff
Author: Stephen Mallette <[email protected]>
Authored: Fri Jun 1 07:47:24 2018 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Fri Jun 1 07:47:24 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 3 +
data/tinkerpop-sink.json | 6 +-
data/tinkerpop-sink.kryo | Bin 234 -> 240 bytes
.../the-gremlin-console/index.asciidoc | 5 +-
.../upgrade/release-3.2.x-incubating.asciidoc | 8 +
.../Gherkin/GherkinTestRunner.cs | 3 +-
.../Gherkin/IgnoreException.cs | 6 +-
.../ModernGraphTypeInformation.cs | 3 +-
gremlin-dotnet/test/pom.xml | 2 +-
gremlin-javascript/pom.xml | 2 +-
.../test/cucumber/feature-steps.js | 3 +-
.../test/integration/remote-connection-tests.js | 2 +-
.../test/integration/traversal-test.js | 2 +-
gremlin-python/pom.xml | 2 +-
.../src/main/jython/radish/feature_steps.py | 2 +-
.../src/main/jython/tests/conftest.py | 8 +-
.../src/main/jython/tests/driver/test_client.py | 18 +-
.../driver/test_driver_remote_connection.py | 4 +-
.../test_driver_remote_connection_threaded.py | 4 +-
gremlin-server/scripts/generate-all.groovy | 63 -----
gremlin-server/src/assembly/standalone.xml | 3 -
.../driver/remote/RemoteGraphProvider.java | 2 +-
.../server/GremlinResultSetIntegrateTest.java | 36 ++-
.../server/GremlinServerHttpIntegrateTest.java | 14 +-
.../gremlin/server/ServerTestHelper.java | 20 +-
.../server/util/DefaultGraphManagerTest.java | 32 ++-
.../remote/gremlin-server-integration.yaml | 56 -----
.../server/gremlin-server-integration.yaml | 11 +-
.../src/test/scripts/generate-all.groovy | 31 ++-
.../src/test/scripts/neo4j-empty.properties | 33 +++
gremlin-test/features/map/AddVertex.feature | 1 +
gremlin-test/features/map/Match.feature | 134 +++++++++++
gremlin-test/features/map/Order.feature | 13 +
gremlin-test/features/map/Properties.feature | 28 +++
gremlin-test/features/map/Select.feature | 151 ++++++++++++
gremlin-test/features/map/Vertex.feature | 45 +++-
gremlin-test/features/sideEffect/Group.feature | 1 -
gremlin-test/features/sideEffect/Sack.feature | 24 +-
.../process/traversal/step/map/SelectTest.java | 240 ++++++++++++++++---
.../process/traversal/step/map/VertexTest.java | 27 +--
.../io/graphson/tinkerpop-sink-typed-v1d0.json | 6 +-
.../io/graphson/tinkerpop-sink-typed-v2d0.json | 6 +-
.../io/graphson/tinkerpop-sink-v1d0.json | 6 +-
.../io/graphson/tinkerpop-sink-v2d0.json | 6 +-
.../io/graphson/tinkerpop-sink-v3d0.json | 6 +-
.../structure/io/gryo/tinkerpop-sink-v1d0.kryo | Bin 234 -> 240 bytes
.../structure/io/gryo/tinkerpop-sink-v3d0.kryo | Bin 234 -> 240 bytes
.../gremlin/process/FeatureCoverageTest.java | 44 +---
tinkergraph-gremlin/pom.xml | 19 ++
.../tinkergraph/structure/TinkerFactory.java | 64 ++++-
.../tinkergraph/structure/grateful-dead.kryo | Bin 0 -> 332226 bytes
51 files changed, 883 insertions(+), 322 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/23b766ad/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/23b766ad/docs/src/tutorials/the-gremlin-console/index.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/23b766ad/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/23b766ad/gremlin-dotnet/test/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/23b766ad/gremlin-javascript/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/23b766ad/gremlin-python/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/23b766ad/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/23b766ad/gremlin-test/features/map/Order.feature
----------------------------------------------------------------------
diff --cc gremlin-test/features/map/Order.feature
index a13102f,1d4331f..207675a
--- a/gremlin-test/features/map/Order.feature
+++ b/gremlin-test/features/map/Order.feature
@@@ -354,3 -355,16 +354,16 @@@ Feature: Step - order(
| result |
| m[{"3":"d[87].i","2":"d[58].i","1":"d[29].i","4":"d[29].i"}] |
+ Scenario:
g_V_hasXsong_name_OHBOYX_outXfollowedByX_outXfollowedByX_order_byXperformancesX_byXsongType_descX
+ Given an unsupported test
+ Then nothing should happen because
+ """
+ TODO
+ """
+
+ Scenario:
g_V_hasLabelXsongX_order_byXperformances_descX_byXnameX_rangeX110_120X_name
+ Given an unsupported test
+ Then nothing should happen because
+ """
+ TODO
- """
++ """
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/23b766ad/gremlin-test/features/map/Select.feature
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/23b766ad/gremlin-test/features/sideEffect/Group.feature
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/23b766ad/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/23b766ad/tinkergraph-gremlin/pom.xml
----------------------------------------------------------------------
