Merge branch 'tp32' into tp33
Conflicts:
gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy
gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPeerPressureTest.groovy
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b12a3fdd
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b12a3fdd
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b12a3fdd
Branch: refs/heads/master
Commit: b12a3fdd01f0505773d865538e987de66c74d044
Parents: fa7a7f6 a533878
Author: Stephen Mallette
Authored: Thu Aug 9 10:12:44 2018 -0400
Committer: Stephen Mallette
Committed: Thu Aug 9 10:12:44 2018 -0400
--
.../gremlin/process/remote/RemoteGraph.java | 17 ---
.../io/graphson/TraversalSerializersV2d0.java | 4 -
.../ModernGraphTypeInformation.cs | 4 +
.../DriverRemoteTraversalSideEffects.java | 3 +-
.../test/cucumber/feature-steps.js | 14 +-
.../glv/GraphTraversalSource.template | 2 +-
.../gremlin_python/process/graph_traversal.py | 2 +-
.../RemoteGraphGroovyTranslatorProvider.java| 3 +-
gremlin-test/features/map/PageRank.feature | 132 +++
gremlin-test/features/map/PeerPressure.feature | 60 +
.../process/AbstractGremlinProcessTest.java | 26 ++--
.../traversal/step/map/PageRankTest.java| 37 +++---
.../traversal/step/map/PeerPressureTest.java| 25 ++--
.../TranslationStrategyProcessTest.java | 3 +
.../gremlin/process/FeatureCoverageTest.java| 6 +-
15 files changed, 266 insertions(+), 72 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b12a3fdd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b12a3fdd/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b12a3fdd/gremlin-python/glv/GraphTraversalSource.template
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b12a3fdd/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b12a3fdd/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/RemoteGraphGroovyTranslatorProvider.java
--
diff --cc
gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/RemoteGraphGroovyTranslatorProvider.java
index 6949426,e170cb1..38935a0
---
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/RemoteGraphGroovyTranslatorProvider.java
+++
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/RemoteGraphGroovyTranslatorProvider.java
@@@ -35,28 -29,9 +35,29 @@@ import java.util.Set
*/
public class RemoteGraphGroovyTranslatorProvider extends RemoteGraphProvider {
+private static boolean SKIP = false;
+
+private static Set SKIP_TESTS = new HashSet<>(Arrays.asList(
- "g_injectXg_VX1X_propertiesXnameX_nextX_value"));
++"g_injectXg_VX1X_propertiesXnameX_nextX_value",
++"shouldNotHaveAnonymousTraversalMixups"));
+
+
+@Override
+public Map getBaseConfiguration(final String graphName,
final Class test, final String testMethodName,
+final
LoadGraphWith.GraphData loadGraphWith) {
+
+final Map config =
super.getBaseConfiguration(graphName, test, testMethodName, loadGraphWith);
+SKIP = SKIP_TESTS.contains(testMethodName) ||
SKIP_TESTS.contains(test.getCanonicalName());
+return config;
+}
+
@Override
public GraphTraversalSource traversal(final Graph graph) {
-final GraphTraversalSource g = graph.traversal();
-return g.withStrategies(new TranslationStrategy(g,
GroovyTranslator.of("g")));
+if (SKIP)
+return super.traversal(graph);
+else {
+final GraphTraversalSource g = super.traversal(graph);
+return g.withStrategies(new TranslationStrategy(g,
