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/03/23 16:37:36 UTC

incubator-tinkerpop git commit: by(T) is not a lambda step. Added LambdaRestrictionStrategyTest using the @spmallette mock-model. Moved some gremlin-core/tests around that were in the wrong package.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master c41b5c96e -> 8024accd0


by(T) is not a lambda step. Added LambdaRestrictionStrategyTest using the @spmallette mock-model. Moved some gremlin-core/tests around that were in the wrong package.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/8024accd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/8024accd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/8024accd

Branch: refs/heads/master
Commit: 8024accd0abce09eb75c817c3ce196b0cb919c56
Parents: c41b5c9
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Mar 23 09:37:31 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Mar 23 09:37:31 2015 -0600

----------------------------------------------------------------------
 .../traversal/dsl/graph/GraphTraversal.java     |   3 +-
 .../dsl/graph/GraphTraversalSource.java         |   9 +-
 .../traversal/lambda/TokenTraversal.java        |  51 +++++
 .../step/filter/ConjunctionStepTest.java        |  69 -------
 .../strategy/RangeByIsCountStrategyTest.java    | 187 -------------------
 .../gremlin/process/graph/util/TreeTest.java    |  97 ----------
 .../step/filter/ConjunctionStepTest.java        |  69 +++++++
 .../process/traversal/step/util/TreeTest.java   |  96 ++++++++++
 .../LambdaRestrictionStrategyTest.java          |  67 +++++++
 .../RangeByIsCountStrategyTest.java             | 187 +++++++++++++++++++
 10 files changed, 474 insertions(+), 361 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8024accd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 1b5ad03..c43677e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -31,6 +31,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.lambda.LoopTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.lambda.MapTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.lambda.MapTraverserTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.TokenTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.lambda.TrueTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.step.ComparatorHolder;
 import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
@@ -769,7 +770,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
     }
 
     public default GraphTraversal<S, E> by(final T tokenProjection) {
-        ((TraversalParent) this.asAdmin().getEndStep()).addLocalChild(new MapTraversal<>(tokenProjection));
+        ((TraversalParent) this.asAdmin().getEndStep()).addLocalChild(new TokenTraversal<>(tokenProjection));
         return this;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8024accd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
index d25b775..d9b5baa 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
@@ -53,19 +53,14 @@ public class GraphTraversalSource implements TraversalSource {
         return builder;
     }
 
-    public static Builder computer(final Class<? extends GraphComputer> graphComputerClass) {
-        return GraphTraversalSource.build().engine(ComputerTraversalEngine.build().computer(graphComputerClass));
-    }
-
-    public static Builder standard(final Class<? extends GraphComputer> graphComputerClass, final TraversalStrategy... strategies) {
-        final Builder builder = GraphTraversalSource.computer(graphComputerClass);
+    public static Builder computer(final Class<? extends GraphComputer> graphComputerClass, final TraversalStrategy... strategies) {
+        final Builder builder = GraphTraversalSource.build().engine(ComputerTraversalEngine.build().computer(graphComputerClass));
         for (final TraversalStrategy strategy : strategies) {
             builder.strategy(strategy);
         }
         return builder;
     }
 
-
     ////
 
     private final transient Graph graph;

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8024accd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/TokenTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/TokenTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/TokenTraversal.java
new file mode 100644
index 0000000..10334ab
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/TokenTraversal.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.lambda;
+
+import org.apache.tinkerpop.gremlin.process.traversal.T;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.structure.Element;
+
+/**
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ */
+public class TokenTraversal<S extends Element, E> extends AbstractLambdaTraversal<S, E> {
+
+    private E e;
+    private final T t;
+
+    public TokenTraversal(final T t) {
+        this.t = t;
+    }
+
+    @Override
+    public E next() {
+        return this.e;
+    }
+
+    @Override
+    public void addStart(final Traverser<S> start) {
+        this.e = (E) this.t.apply(start.get());
+    }
+
+    @Override
+    public String toString() {
+        return this.t.toString();
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8024accd/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/ConjunctionStepTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/ConjunctionStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/ConjunctionStepTest.java
deleted file mode 100644
index b3ac93d..0000000
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/ConjunctionStepTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.process.graph.traversal.step.filter;
-
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ConjunctionStep;
-import org.apache.tinkerpop.gremlin.structure.Compare;
-import org.junit.Test;
-
-import java.util.Iterator;
-
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.*;
-import static org.junit.Assert.*;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public class ConjunctionStepTest {
-
-    @Test
-    public void shouldGetHasContainers() {
-        final GraphTraversal.Admin<?, ?> traversal = and(has("name"), has("age", Compare.gt, 30).or(has("lang", "java"))).asAdmin();
-        assertTrue(((ConjunctionStep) traversal.getStartStep()).isConjunctionHasTree());
-        final ConjunctionStep.ConjunctionTree conjunctionTree = (((ConjunctionStep<?>) traversal.getStartStep()).getConjunctionHasTree());
-        final Iterator<ConjunctionStep.ConjunctionTree.Entry> iterator = conjunctionTree.iterator();
-        //System.out.println(conjunctionTree);
-        ConjunctionStep.ConjunctionTree.Entry entry = iterator.next();
-        assertTrue(entry.isHasContainer());
-        assertEquals("name", entry.<HasContainer>getValue().key);
-        //
-        entry = iterator.next();
-        assertTrue(entry.isHasContainer());
-        assertEquals("age", entry.<HasContainer>getValue().key);
-        assertEquals(Compare.gt, entry.<HasContainer>getValue().predicate);
-        assertEquals(30, entry.<HasContainer>getValue().value);
-        //
-        entry = iterator.next();
-        assertTrue(entry.isConjunctionTree());
-        assertFalse(entry.<ConjunctionStep.ConjunctionTree>getValue().isAnd());
-        entry = entry.<ConjunctionStep.ConjunctionTree>getValue().iterator().next();
-        assertTrue(entry.isHasContainer());
-        assertEquals("lang", entry.<HasContainer>getValue().key);
-        assertEquals(Compare.eq, entry.<HasContainer>getValue().predicate);
-        assertEquals("java", entry.<HasContainer>getValue().value);
-    }
-
-    @Test
-    public void shouldNotGetHasContainers() {
-        final GraphTraversal.Admin<?, ?> traversal = and(has("name"), has("age", Compare.gt, 30).or(has("lang", "java"), out().has("name","josh"))).asAdmin();
-        assertFalse(((ConjunctionStep) traversal.getStartStep()).isConjunctionHasTree());
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8024accd/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/RangeByIsCountStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/RangeByIsCountStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/RangeByIsCountStrategyTest.java
deleted file mode 100644
index d44f197..0000000
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/RangeByIsCountStrategyTest.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.process.graph.traversal.strategy;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTraversalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.RangeByIsCountStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
-import org.apache.tinkerpop.gremlin.structure.Compare;
-import org.apache.tinkerpop.gremlin.structure.Contains;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.BiPredicate;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.*;
-
-/**
- * @author Daniel Kuppitz (http://gremlin.guru)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@RunWith(Enclosed.class)
-public class RangeByIsCountStrategyTest {
-
-    @RunWith(Parameterized.class)
-    public static class StandardTest extends AbstractRangeByIsCountStrategyTest {
-
-        @Parameterized.Parameters(name = "{0}")
-        public static Iterable<Object[]> data() {
-            return generateTestParameters();
-        }
-
-        @Parameterized.Parameter(value = 0)
-        public String name;
-
-        @Parameterized.Parameter(value = 1)
-        public BiPredicate predicate;
-
-        @Parameterized.Parameter(value = 2)
-        public Object value;
-
-        @Parameterized.Parameter(value = 3)
-        public long expectedHighRange;
-
-        @Before
-        public void setup() {
-            this.traversalEngine = mock(TraversalEngine.class);
-            when(this.traversalEngine.getType()).thenReturn(TraversalEngine.Type.STANDARD);
-        }
-
-        @Test
-        public void shouldApplyStrategy() {
-            doTest(predicate, value, expectedHighRange);
-        }
-    }
-
-    @RunWith(Parameterized.class)
-    public static class ComputerTest extends AbstractRangeByIsCountStrategyTest {
-
-        @Parameterized.Parameters(name = "{0}")
-        public static Iterable<Object[]> data() {
-            return generateTestParameters();
-        }
-
-        @Parameterized.Parameter(value = 0)
-        public String name;
-
-        @Parameterized.Parameter(value = 1)
-        public BiPredicate predicate;
-
-        @Parameterized.Parameter(value = 2)
-        public Object value;
-
-        @Parameterized.Parameter(value = 3)
-        public long expectedHighRange;
-
-        @Before
-        public void setup() {
-            this.traversalEngine = mock(TraversalEngine.class);
-            when(this.traversalEngine.getType()).thenReturn(TraversalEngine.Type.COMPUTER);
-        }
-
-        @Test
-        public void shouldApplyStrategy() {
-            doTest(predicate, value, expectedHighRange);
-        }
-    }
-
-    public static class SpecificComputerTest extends AbstractRangeByIsCountStrategyTest {
-
-        @Before
-        public void setup() {
-            this.traversalEngine = mock(TraversalEngine.class);
-            when(this.traversalEngine.getType()).thenReturn(TraversalEngine.Type.COMPUTER);
-        }
-
-        @Test
-        public void nestedCountEqualsNullShouldLimitToOne() {
-            final AtomicInteger counter = new AtomicInteger(0);
-            final Traversal traversal = __.out().has(__.outE("created").count().is(0));
-            applyRangeByIsCountStrategy(traversal);
-
-            final HasTraversalStep hasStep = TraversalHelper.getStepsOfClass(HasTraversalStep.class, traversal.asAdmin()).stream().findFirst().get();
-            final Traversal nestedTraversal = (Traversal) hasStep.getLocalChildren().get(0);
-            TraversalHelper.getStepsOfClass(RangeGlobalStep.class, nestedTraversal.asAdmin()).stream().forEach(step -> {
-                assertEquals(0, step.getLowRange());
-                assertEquals(1, step.getHighRange());
-                counter.incrementAndGet();
-            });
-            assertEquals(1, counter.get());
-        }
-    }
-
-    private static abstract class AbstractRangeByIsCountStrategyTest {
-
-        protected TraversalEngine traversalEngine;
-
-        void applyRangeByIsCountStrategy(final Traversal traversal) {
-            final TraversalStrategies strategies = new DefaultTraversalStrategies();
-            strategies.addStrategies(RangeByIsCountStrategy.instance());
-
-            traversal.asAdmin().setStrategies(strategies);
-            traversal.asAdmin().applyStrategies();
-            traversal.asAdmin().setEngine(traversalEngine);
-        }
-
-        public void doTest(final BiPredicate predicate, final Object value, final long expectedHighRange) {
-            final AtomicInteger counter = new AtomicInteger(0);
-            final Traversal traversal = __.out().count().is(predicate, value);
-            applyRangeByIsCountStrategy(traversal);
-
-            final List<RangeGlobalStep> steps = TraversalHelper.getStepsOfClass(RangeGlobalStep.class, traversal.asAdmin());
-            assertEquals(1, steps.size());
-
-            steps.forEach(step -> {
-                assertEquals(0, step.getLowRange());
-                assertEquals(expectedHighRange, step.getHighRange());
-                counter.incrementAndGet();
-            });
-
-            assertEquals(1, counter.intValue());
-        }
-
-        static Iterable<Object[]> generateTestParameters() {
-
-            return Arrays.asList(new Object[][]{
-                    {"countEqualsNullShouldLimitToOne", Compare.eq, 0l, 1l},
-                    {"countNotEqualsFourShouldLimitToFive", Compare.neq, 4l, 5l},
-                    {"countLessThanOrEqualThreeShouldLimitToFour", Compare.lte, 3l, 4l},
-                    {"countLessThanThreeShouldLimitToThree", Compare.lt, 3l, 3l},
-                    {"countGreaterThanTwoShouldLimitToThree", Compare.gt, 2l, 3l},
-                    {"countGreaterThanOrEqualTwoShouldLimitToTwo", Compare.gte, 2l, 2l},
-                    {"countInsideTwoAndFourShouldLimitToFour", Compare.inside, Arrays.asList(2l, 4l), 4l},
-                    {"countOutsideTwoAndFourShouldLimitToFive", Compare.outside, Arrays.asList(2l, 4l), 5l},
-                    {"countWithinTwoSixFourShouldLimitToSeven", Contains.within, Arrays.asList(2l, 6l, 4l), 7l},
-                    {"countWithoutTwoSixFourShouldLimitToSix", Contains.without, Arrays.asList(2l, 6l, 4l), 6l}});
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8024accd/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/graph/util/TreeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/graph/util/TreeTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/graph/util/TreeTest.java
deleted file mode 100644
index 9b7ef10..0000000
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/graph/util/TreeTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.process.graph.util;
-
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.junit.Test;
-
-import java.util.AbstractMap;
-import java.util.Arrays;
-import java.util.Map;
-
-import static org.junit.Assert.*;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public class TreeTest {
-
-    @Test
-    public void shouldProvideValidDepths() {
-        Tree<String> tree = new Tree<String>();
-        tree.put("marko", new Tree<String>(TreeTest.createTree("a", new Tree<String>("a1", "a2")), TreeTest.createTree("b", new Tree<String>("b1", "b2", "b3"))));
-        tree.put("josh", new Tree<String>("1", "2"));
-
-        assertEquals(0, tree.getObjectsAtDepth(0).size());
-        assertEquals(2, tree.getObjectsAtDepth(1).size());
-        assertEquals(4, tree.getObjectsAtDepth(2).size());
-        assertEquals(5, tree.getObjectsAtDepth(3).size());
-        assertEquals(0, tree.getObjectsAtDepth(4).size());
-        assertEquals(0, tree.getObjectsAtDepth(5).size());
-
-        assertEquals(2, tree.get("josh").size());
-        assertEquals(0, tree.get("marko").get("b").get("b1").size());
-        assertEquals(3, tree.get("marko").get("b").size());
-        assertNull(tree.get("marko").get("c"));
-    }
-
-    @Test
-    public void shouldProvideValidLeaves() {
-        Tree<String> tree = new Tree<String>();
-        tree.put("marko", new Tree<String>(TreeTest.createTree("a", new Tree<String>("a1", "a2")), TreeTest.createTree("b", new Tree<String>("b1", "b2", "b3"))));
-        tree.put("josh", new Tree<String>("1", "2"));
-
-        assertEquals(7, tree.getLeafTrees().size());
-        for (Tree<String> t : tree.getLeafTrees()) {
-            assertEquals(1, t.keySet().size());
-            final String key = t.keySet().iterator().next();
-            assertTrue(Arrays.asList("a1", "a2", "b1", "b2", "b3", "1", "2").contains(key));
-        }
-
-        assertEquals(7, tree.getLeafObjects().size());
-        for (String s : tree.getLeafObjects()) {
-            assertTrue(Arrays.asList("a1", "a2", "b1", "b2", "b3", "1", "2").contains(s));
-        }
-    }
-
-    @Test
-    public void shouldMergeTreesCorrectly() {
-        Tree<String> tree1 = new Tree<>();
-        tree1.put("1", new Tree<String>(TreeTest.createTree("1_1", new Tree<String>("1_1_1")), TreeTest.createTree("1_2", new Tree<String>("1_2_1"))));
-        Tree<String> tree2 = new Tree<>();
-        tree2.put("1", new Tree<String>(TreeTest.createTree("1_1", new Tree<String>("1_1_1")), TreeTest.createTree("1_2", new Tree<String>("1_2_2"))));
-
-        Tree<String> mergeTree = new Tree<>();
-        mergeTree.addTree(tree1);
-        mergeTree.addTree(tree2);
-
-        assertEquals(1, mergeTree.size());
-        assertEquals(0, mergeTree.getObjectsAtDepth(0).size());
-        assertEquals(1, mergeTree.getObjectsAtDepth(1).size());
-        assertEquals(2, mergeTree.getObjectsAtDepth(2).size());
-        assertEquals(3, mergeTree.getObjectsAtDepth(3).size());
-        assertTrue(mergeTree.getObjectsAtDepth(3).contains("1_1_1"));
-        assertTrue(mergeTree.getObjectsAtDepth(3).contains("1_2_1"));
-        assertTrue(mergeTree.getObjectsAtDepth(3).contains("1_2_2"));
-    }
-
-    private static <T> Map.Entry<T, Tree<T>> createTree(T key, Tree<T> tree) {
-        return new AbstractMap.SimpleEntry<>(key, tree);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8024accd/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ConjunctionStepTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ConjunctionStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ConjunctionStepTest.java
new file mode 100644
index 0000000..d982e7f
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ConjunctionStepTest.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.filter;
+
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ConjunctionStep;
+import org.apache.tinkerpop.gremlin.structure.Compare;
+import org.junit.Test;
+
+import java.util.Iterator;
+
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.*;
+import static org.junit.Assert.*;
+
+/**
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ */
+public class ConjunctionStepTest {
+
+    @Test
+    public void shouldGetHasContainers() {
+        final GraphTraversal.Admin<?, ?> traversal = and(has("name"), has("age", Compare.gt, 30).or(has("lang", "java"))).asAdmin();
+        assertTrue(((ConjunctionStep) traversal.getStartStep()).isConjunctionHasTree());
+        final ConjunctionStep.ConjunctionTree conjunctionTree = (((ConjunctionStep<?>) traversal.getStartStep()).getConjunctionHasTree());
+        final Iterator<ConjunctionStep.ConjunctionTree.Entry> iterator = conjunctionTree.iterator();
+        //System.out.println(conjunctionTree);
+        ConjunctionStep.ConjunctionTree.Entry entry = iterator.next();
+        assertTrue(entry.isHasContainer());
+        assertEquals("name", entry.<HasContainer>getValue().key);
+        //
+        entry = iterator.next();
+        assertTrue(entry.isHasContainer());
+        assertEquals("age", entry.<HasContainer>getValue().key);
+        assertEquals(Compare.gt, entry.<HasContainer>getValue().predicate);
+        assertEquals(30, entry.<HasContainer>getValue().value);
+        //
+        entry = iterator.next();
+        assertTrue(entry.isConjunctionTree());
+        assertFalse(entry.<ConjunctionStep.ConjunctionTree>getValue().isAnd());
+        entry = entry.<ConjunctionStep.ConjunctionTree>getValue().iterator().next();
+        assertTrue(entry.isHasContainer());
+        assertEquals("lang", entry.<HasContainer>getValue().key);
+        assertEquals(Compare.eq, entry.<HasContainer>getValue().predicate);
+        assertEquals("java", entry.<HasContainer>getValue().value);
+    }
+
+    @Test
+    public void shouldNotGetHasContainers() {
+        final GraphTraversal.Admin<?, ?> traversal = and(has("name"), has("age", Compare.gt, 30).or(has("lang", "java"), out().has("name","josh"))).asAdmin();
+        assertFalse(((ConjunctionStep) traversal.getStartStep()).isConjunctionHasTree());
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8024accd/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/TreeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/TreeTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/TreeTest.java
new file mode 100644
index 0000000..2f7cde3
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/TreeTest.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.step.util;
+
+import org.junit.Test;
+
+import java.util.AbstractMap;
+import java.util.Arrays;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
+/**
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ */
+public class TreeTest {
+
+    @Test
+    public void shouldProvideValidDepths() {
+        Tree<String> tree = new Tree<String>();
+        tree.put("marko", new Tree<String>(TreeTest.createTree("a", new Tree<String>("a1", "a2")), TreeTest.createTree("b", new Tree<String>("b1", "b2", "b3"))));
+        tree.put("josh", new Tree<String>("1", "2"));
+
+        assertEquals(0, tree.getObjectsAtDepth(0).size());
+        assertEquals(2, tree.getObjectsAtDepth(1).size());
+        assertEquals(4, tree.getObjectsAtDepth(2).size());
+        assertEquals(5, tree.getObjectsAtDepth(3).size());
+        assertEquals(0, tree.getObjectsAtDepth(4).size());
+        assertEquals(0, tree.getObjectsAtDepth(5).size());
+
+        assertEquals(2, tree.get("josh").size());
+        assertEquals(0, tree.get("marko").get("b").get("b1").size());
+        assertEquals(3, tree.get("marko").get("b").size());
+        assertNull(tree.get("marko").get("c"));
+    }
+
+    @Test
+    public void shouldProvideValidLeaves() {
+        Tree<String> tree = new Tree<String>();
+        tree.put("marko", new Tree<String>(TreeTest.createTree("a", new Tree<String>("a1", "a2")), TreeTest.createTree("b", new Tree<String>("b1", "b2", "b3"))));
+        tree.put("josh", new Tree<String>("1", "2"));
+
+        assertEquals(7, tree.getLeafTrees().size());
+        for (Tree<String> t : tree.getLeafTrees()) {
+            assertEquals(1, t.keySet().size());
+            final String key = t.keySet().iterator().next();
+            assertTrue(Arrays.asList("a1", "a2", "b1", "b2", "b3", "1", "2").contains(key));
+        }
+
+        assertEquals(7, tree.getLeafObjects().size());
+        for (String s : tree.getLeafObjects()) {
+            assertTrue(Arrays.asList("a1", "a2", "b1", "b2", "b3", "1", "2").contains(s));
+        }
+    }
+
+    @Test
+    public void shouldMergeTreesCorrectly() {
+        Tree<String> tree1 = new Tree<>();
+        tree1.put("1", new Tree<String>(TreeTest.createTree("1_1", new Tree<String>("1_1_1")), TreeTest.createTree("1_2", new Tree<String>("1_2_1"))));
+        Tree<String> tree2 = new Tree<>();
+        tree2.put("1", new Tree<String>(TreeTest.createTree("1_1", new Tree<String>("1_1_1")), TreeTest.createTree("1_2", new Tree<String>("1_2_2"))));
+
+        Tree<String> mergeTree = new Tree<>();
+        mergeTree.addTree(tree1);
+        mergeTree.addTree(tree2);
+
+        assertEquals(1, mergeTree.size());
+        assertEquals(0, mergeTree.getObjectsAtDepth(0).size());
+        assertEquals(1, mergeTree.getObjectsAtDepth(1).size());
+        assertEquals(2, mergeTree.getObjectsAtDepth(2).size());
+        assertEquals(3, mergeTree.getObjectsAtDepth(3).size());
+        assertTrue(mergeTree.getObjectsAtDepth(3).contains("1_1_1"));
+        assertTrue(mergeTree.getObjectsAtDepth(3).contains("1_2_1"));
+        assertTrue(mergeTree.getObjectsAtDepth(3).contains("1_2_2"));
+    }
+
+    private static <T> Map.Entry<T, Tree<T>> createTree(T key, Tree<T> tree) {
+        return new AbstractMap.SimpleEntry<>(key, tree);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8024accd/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/LambdaRestrictionStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/LambdaRestrictionStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/LambdaRestrictionStrategyTest.java
new file mode 100644
index 0000000..cd330d9
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/LambdaRestrictionStrategyTest.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+/**
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ */
+@RunWith(Parameterized.class)
+public class LambdaRestrictionStrategyTest {
+
+    @Parameterized.Parameters(name = "{0}")
+    public static Iterable<Object[]> data() {
+        return Arrays.asList(new Object[][]{
+                {"filter(x->true)", __.filter(x -> true)},
+                {"map(Traverser::get)", __.map(Traverser::get)},
+                {"sideEffect(x -> {int i= 1+1;})", __.sideEffect(x -> {
+                    int i = 1 + 1;
+                })},
+                {"select().by(Object::toString)", __.select().by(Object::toString)},
+                //{"order().by((a,b)->a.compareTo(b))", __.order().by((a, b) -> ((Integer) a).compareTo((Integer) b))},
+        });
+    }
+
+    @Parameterized.Parameter(value = 0)
+    public String name;
+
+    @Parameterized.Parameter(value = 1)
+    public Traversal traversal;
+
+    @Test
+    public void shouldNotAllowLambdaSteps() {
+        try {
+            LambdaRestrictionStrategy.instance().apply(traversal.asAdmin());
+            fail("The strategy should not allow lambdas.");
+        } catch (IllegalStateException ise) {
+            assertTrue(ise.getMessage().contains("lambda"));
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8024accd/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategyTest.java
new file mode 100644
index 0000000..8c29505
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategyTest.java
@@ -0,0 +1,187 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTraversalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.RangeByIsCountStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
+import org.apache.tinkerpop.gremlin.structure.Compare;
+import org.apache.tinkerpop.gremlin.structure.Contains;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.BiPredicate;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.*;
+
+/**
+ * @author Daniel Kuppitz (http://gremlin.guru)
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+@RunWith(Enclosed.class)
+public class RangeByIsCountStrategyTest {
+
+    @RunWith(Parameterized.class)
+    public static class StandardTest extends AbstractRangeByIsCountStrategyTest {
+
+        @Parameterized.Parameters(name = "{0}")
+        public static Iterable<Object[]> data() {
+            return generateTestParameters();
+        }
+
+        @Parameterized.Parameter(value = 0)
+        public String name;
+
+        @Parameterized.Parameter(value = 1)
+        public BiPredicate predicate;
+
+        @Parameterized.Parameter(value = 2)
+        public Object value;
+
+        @Parameterized.Parameter(value = 3)
+        public long expectedHighRange;
+
+        @Before
+        public void setup() {
+            this.traversalEngine = mock(TraversalEngine.class);
+            when(this.traversalEngine.getType()).thenReturn(TraversalEngine.Type.STANDARD);
+        }
+
+        @Test
+        public void shouldApplyStrategy() {
+            doTest(predicate, value, expectedHighRange);
+        }
+    }
+
+    @RunWith(Parameterized.class)
+    public static class ComputerTest extends AbstractRangeByIsCountStrategyTest {
+
+        @Parameterized.Parameters(name = "{0}")
+        public static Iterable<Object[]> data() {
+            return generateTestParameters();
+        }
+
+        @Parameterized.Parameter(value = 0)
+        public String name;
+
+        @Parameterized.Parameter(value = 1)
+        public BiPredicate predicate;
+
+        @Parameterized.Parameter(value = 2)
+        public Object value;
+
+        @Parameterized.Parameter(value = 3)
+        public long expectedHighRange;
+
+        @Before
+        public void setup() {
+            this.traversalEngine = mock(TraversalEngine.class);
+            when(this.traversalEngine.getType()).thenReturn(TraversalEngine.Type.COMPUTER);
+        }
+
+        @Test
+        public void shouldApplyStrategy() {
+            doTest(predicate, value, expectedHighRange);
+        }
+    }
+
+    public static class SpecificComputerTest extends AbstractRangeByIsCountStrategyTest {
+
+        @Before
+        public void setup() {
+            this.traversalEngine = mock(TraversalEngine.class);
+            when(this.traversalEngine.getType()).thenReturn(TraversalEngine.Type.COMPUTER);
+        }
+
+        @Test
+        public void nestedCountEqualsNullShouldLimitToOne() {
+            final AtomicInteger counter = new AtomicInteger(0);
+            final Traversal traversal = __.out().has(__.outE("created").count().is(0));
+            applyRangeByIsCountStrategy(traversal);
+
+            final HasTraversalStep hasStep = TraversalHelper.getStepsOfClass(HasTraversalStep.class, traversal.asAdmin()).stream().findFirst().get();
+            final Traversal nestedTraversal = (Traversal) hasStep.getLocalChildren().get(0);
+            TraversalHelper.getStepsOfClass(RangeGlobalStep.class, nestedTraversal.asAdmin()).stream().forEach(step -> {
+                assertEquals(0, step.getLowRange());
+                assertEquals(1, step.getHighRange());
+                counter.incrementAndGet();
+            });
+            assertEquals(1, counter.get());
+        }
+    }
+
+    private static abstract class AbstractRangeByIsCountStrategyTest {
+
+        protected TraversalEngine traversalEngine;
+
+        void applyRangeByIsCountStrategy(final Traversal traversal) {
+            final TraversalStrategies strategies = new DefaultTraversalStrategies();
+            strategies.addStrategies(RangeByIsCountStrategy.instance());
+
+            traversal.asAdmin().setStrategies(strategies);
+            traversal.asAdmin().applyStrategies();
+            traversal.asAdmin().setEngine(traversalEngine);
+        }
+
+        public void doTest(final BiPredicate predicate, final Object value, final long expectedHighRange) {
+            final AtomicInteger counter = new AtomicInteger(0);
+            final Traversal traversal = __.out().count().is(predicate, value);
+            applyRangeByIsCountStrategy(traversal);
+
+            final List<RangeGlobalStep> steps = TraversalHelper.getStepsOfClass(RangeGlobalStep.class, traversal.asAdmin());
+            assertEquals(1, steps.size());
+
+            steps.forEach(step -> {
+                assertEquals(0, step.getLowRange());
+                assertEquals(expectedHighRange, step.getHighRange());
+                counter.incrementAndGet();
+            });
+
+            assertEquals(1, counter.intValue());
+        }
+
+        static Iterable<Object[]> generateTestParameters() {
+
+            return Arrays.asList(new Object[][]{
+                    {"countEqualsNullShouldLimitToOne", Compare.eq, 0l, 1l},
+                    {"countNotEqualsFourShouldLimitToFive", Compare.neq, 4l, 5l},
+                    {"countLessThanOrEqualThreeShouldLimitToFour", Compare.lte, 3l, 4l},
+                    {"countLessThanThreeShouldLimitToThree", Compare.lt, 3l, 3l},
+                    {"countGreaterThanTwoShouldLimitToThree", Compare.gt, 2l, 3l},
+                    {"countGreaterThanOrEqualTwoShouldLimitToTwo", Compare.gte, 2l, 2l},
+                    {"countInsideTwoAndFourShouldLimitToFour", Compare.inside, Arrays.asList(2l, 4l), 4l},
+                    {"countOutsideTwoAndFourShouldLimitToFive", Compare.outside, Arrays.asList(2l, 4l), 5l},
+                    {"countWithinTwoSixFourShouldLimitToSeven", Contains.within, Arrays.asList(2l, 6l, 4l), 7l},
+                    {"countWithoutTwoSixFourShouldLimitToSix", Contains.without, Arrays.asList(2l, 6l, 4l), 6l}});
+        }
+    }
+}