[tinkerpop] 08/14: Fixed rebase conflicts and added missing Gherkin tests

[sp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch TINKERPOP-1682
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit dd1be69d02075ddf13019a712b4ebb789036149c
Author: Daniel Kuppitz <da...@hotmail.com>
AuthorDate: Tue Mar 20 08:41:40 2018 -0700

    Fixed rebase conflicts and added missing Gherkin tests
---
 gremlin-test/features/sideEffect/Group.feature     | 22 ++++++++++++++++++++++
 .../process/traversal/step/map/OrderTest.java      |  1 +
 2 files changed, 23 insertions(+)

diff --git a/gremlin-test/features/sideEffect/Group.feature b/gremlin-test/features/sideEffect/Group.feature
index 44705cf..a4a5500 100644
--- a/gremlin-test/features/sideEffect/Group.feature
+++ b/gremlin-test/features/sideEffect/Group.feature
@@ -273,3 +273,25 @@ Feature: Step - group()
       | result |
       | m[{"ripple":"d[32].l", "lop":"d[96].l"}] |
 
+
+  Scenario: g_V_group_byXlabelX_byXlabel_countX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().group().by(__.label()).by(__.label().count())
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | m[{"software":"d[2].l", "person":"d[4].l"}] |
+
+  Scenario: g_V_groupXmX_byXlabelX_byXlabel_countX_capXmX
+    Given the modern graph
+    And the traversal of
+      """
+      g.V().group("m").by(__.label()).by(__.label().count()).cap("m")
+      """
+    When iterated to list
+    Then the result should be unordered
+      | result |
+      | m[{"software":"d[2].l", "person":"d[4].l"}] |
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
index 9f82579..e8f343d 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
@@ -408,6 +408,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
         entry = iterator.next();
         assertEquals("marko", entry.getKey());
         assertEquals(1.9, entry.getValue().doubleValue(), 0.0001);
+    }
 
     public void g_V_order_byXlabelX() {
         final Traversal<Vertex, Vertex> traversal = get_g_V_order_byXlabelX();