You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/11/18 16:21:16 UTC
incubator-tinkerpop git commit: ExplainTest should make sure the
strategies to check are actually there just in case the provider doesn't use
those strategies. CTR.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 678a1a372 -> cb597ace0
ExplainTest should make sure the strategies to check are actually there just in case the provider doesn't use those strategies. CTR.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/cb597ace
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/cb597ace
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/cb597ace
Branch: refs/heads/master
Commit: cb597ace07c2baaeb18d37aed2e6cb11eafbac1f
Parents: 678a1a3
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Nov 18 08:21:02 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Nov 18 08:21:12 2015 -0700
----------------------------------------------------------------------
.../traversal/step/sideEffect/ExplainTest.java | 34 +++++++++++---------
1 file changed, 18 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cb597ace/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ExplainTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ExplainTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ExplainTest.java
index 97a9a23..ce0d04f 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ExplainTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ExplainTest.java
@@ -50,27 +50,29 @@ public abstract class ExplainTest extends AbstractGremlinProcessTest {
public void g_V_outE_identity_inV_explain() {
final TraversalExplanation explanation = get_g_V_outE_identity_inV_explain();
printTraversalForm(explanation.getOriginalTraversal());
- boolean beforeIncident = true;
- boolean beforeIdentity = true;
- for (final Pair<TraversalStrategy, Traversal.Admin<?, ?>> pair : explanation.getStrategyTraversals()) {
- if (pair.getValue0().getClass().equals(IncidentToAdjacentStrategy.class))
- beforeIncident = false;
- if (pair.getValue0().getClass().equals(IdentityRemovalStrategy.class))
- beforeIdentity = false;
+ if (explanation.getStrategyTraversals().stream().map(Pair::getValue0).filter(s -> s.equals(IdentityRemovalStrategy.class) || s.equals(IncidentToAdjacentStrategy.class)).count() == 2) {
+ boolean beforeIncident = true;
+ boolean beforeIdentity = true;
+ for (final Pair<TraversalStrategy, Traversal.Admin<?, ?>> pair : explanation.getStrategyTraversals()) {
+ if (pair.getValue0().getClass().equals(IncidentToAdjacentStrategy.class))
+ beforeIncident = false;
+ if (pair.getValue0().getClass().equals(IdentityRemovalStrategy.class))
+ beforeIdentity = false;
- if (beforeIdentity)
- assertEquals(1, TraversalHelper.getStepsOfClass(IdentityStep.class, pair.getValue1()).size());
+ if (beforeIdentity)
+ assertEquals(1, TraversalHelper.getStepsOfClass(IdentityStep.class, pair.getValue1()).size());
- if (beforeIncident)
- assertEquals(1, TraversalHelper.getStepsOfClass(EdgeVertexStep.class, pair.getValue1()).size());
+ if (beforeIncident)
+ assertEquals(1, TraversalHelper.getStepsOfClass(EdgeVertexStep.class, pair.getValue1()).size());
- if (!beforeIdentity)
- assertEquals(0, TraversalHelper.getStepsOfClass(IdentityStep.class, pair.getValue1()).size());
+ if (!beforeIdentity)
+ assertEquals(0, TraversalHelper.getStepsOfClass(IdentityStep.class, pair.getValue1()).size());
- if (!beforeIncident)
- assertEquals(0, TraversalHelper.getStepsOfClass(EdgeVertexStep.class, pair.getValue1()).size());
+ if (!beforeIncident)
+ assertEquals(0, TraversalHelper.getStepsOfClass(EdgeVertexStep.class, pair.getValue1()).size());
+ }
+ assertFalse(beforeIncident);
}
- assertFalse(beforeIncident);
}
public static class Traversals extends ExplainTest {