This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch TINKERPOP-2681
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from f19c3bc allow id for in/out and other code review items
add c758fe5 More tests and argument validation
No new revisions were added by this update.
Summary of changes:
.../traversal/dsl/graph/GraphTraversal.java | 5 +-
.../traversal/dsl/graph/GraphTraversalSource.java | 2 +
.../gremlin/process/traversal/dsl/graph/__.java | 2 +-
.../process/traversal/step/map/MergeEdgeStep.java | 89 +++++++++++++-----
.../traversal/step/map/MergeVertexStep.java | 46 ++++++++-
.../dsl/graph/GraphTraversalSourceTest.java | 12 +++
.../traversal/dsl/graph/GraphTraversalTest.java | 11 +++
.../traversal/step/map/MergeEdgeStepTest.java | 103 +++++++++++++++++++++
.../traversal/step/map/MergeVertexStepTest.java | 78 ++++++++++++++++
.../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 1 +
.../gremlin-javascript/test/cucumber/gremlin.js | 1 +
gremlin-python/src/main/python/radish/gremlin.py | 1 +
gremlin-test/features/map/MergeEdge.feature | 26 +++++-
13 files changed, 348 insertions(+), 29 deletions(-)
create mode 100644
gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeStepTest.java
create mode 100644
gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStepTest.java
