This is an automated email from the ASF dual-hosted git repository. colegreer pushed a commit to branch 3.8-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 6c0459863758f5f4966631786985306ce8478532 Merge: 9c7a54c939 3a48401d83 Author: Cole-Greer <[email protected]> AuthorDate: Thu Jun 12 19:58:14 2025 -0700 Merge branch '3.7-dev' into 3.8-dev CHANGELOG.asciidoc | 1 + .../process/traversal/step/PopContaining.java | 103 +++++++++++++++++++++ .../gremlin/process/traversal/step/Scoping.java | 20 +++- .../process/traversal/step/TraversalParent.java | 16 +++- .../traversal/step/filter/DedupGlobalStep.java | 8 ++ .../traversal/step/filter/WherePredicateStep.java | 8 ++ .../traversal/step/filter/WhereTraversalStep.java | 8 ++ .../traversal/step/map/AddEdgeStartStep.java | 8 ++ .../process/traversal/step/map/AddEdgeStep.java | 8 ++ .../traversal/step/map/AddVertexStartStep.java | 8 ++ .../process/traversal/step/map/AddVertexStep.java | 8 ++ .../process/traversal/step/map/FormatStep.java | 9 ++ .../process/traversal/step/map/MatchStep.java | 8 ++ .../process/traversal/step/map/MathStep.java | 8 ++ .../process/traversal/step/map/SelectOneStep.java | 12 +++ .../process/traversal/step/map/SelectStep.java | 13 ++- .../traversal/step/map/TraversalSelectStep.java | 12 +++ .../traversal/step/sideEffect/AddPropertyStep.java | 9 ++ .../process/traversal/util/TraversalHelper.java | 20 +++- .../apache/tinkerpop/gremlin/TestDataBuilder.java | 48 ++++++++++ .../traversal/step/filter/DedupGlobalStepTest.java | 19 ++++ .../traversal/step/filter/WhereStepTest.java | 33 ++++++- .../traversal/step/map/AddEdgeStepTest.java | 30 ++++++ .../traversal/step/map/AddVertexStepTest.java | 27 ++++++ .../process/traversal/step/map/FormatStepTest.java | 17 ++++ .../process/traversal/step/map/MatchStepTest.java | 19 ++++ .../process/traversal/step/map/MathStepTest.java | 21 +++++ .../traversal/step/map/SelectOneStepTest.java | 48 ++++++++++ .../process/traversal/step/map/SelectStepTest.java | 50 ++++++++++ .../step/map/TraversalSelectStepTest.java | 56 +++++++++++ .../step/sideEffect/AddPropertyStepTest.java | 10 ++ .../traversal/util/TraversalHelperTest.java | 93 +++++++++++++++++++ 32 files changed, 753 insertions(+), 5 deletions(-) diff --cc gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupGlobalStepTest.java index d7beabe555,911fd72f4d..77c8522735 --- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupGlobalStepTest.java +++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupGlobalStepTest.java @@@ -18,14 -18,20 +18,21 @@@ */ package org.apache.tinkerpop.gremlin.process.traversal.step.filter; + import org.apache.tinkerpop.gremlin.TestDataBuilder; + import org.apache.tinkerpop.gremlin.process.traversal.Pop; import org.apache.tinkerpop.gremlin.process.traversal.Traversal; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; + import org.apache.tinkerpop.gremlin.process.traversal.step.PopContaining; import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest; + import org.junit.Test; import java.util.Arrays; + import java.util.HashSet; import java.util.List; +import org.junit.Test; + import static org.junit.Assert.assertEquals; + /** * @author Daniel Kuppitz (http://gremlin.guru) */ @@@ -39,8 -45,15 +46,20 @@@ public class DedupGlobalStepTest extend ); } + @Test(expected = IllegalStateException.class) + public void shouldThrowForMultipleByModulators() { + __.dedup().by("name").by("age"); + } ++ + @Test + public void shouldObtainPopInstructions() { + final DedupGlobalStep dedupGlobalStep = new DedupGlobalStep(__.identity().asAdmin(), "label1", "label2", "label1"); + + final HashSet<PopContaining.PopInstruction> popInstructionSet = TestDataBuilder.createPopInstructionSet( + new Object[]{"label1", Pop.last}, + new Object[]{"label2", Pop.last} + ); + + assertEquals(dedupGlobalStep.getPopInstructions(), popInstructionSet); + } }
