Better select grouping parsing

1 files changed, 7 insertions, 2 deletions

diff --git a/container-search/src/test/java/com/yahoo/select/SelectTestCase.java b/container-search/src/test/java/com/yahoo/select/SelectTestCase.java
index 261069ea1c3..96392a4f29b 100644
--- a/container-search/src/test/java/com/yahoo/select/SelectTestCase.java
+++ b/container-search/src/test/java/com/yahoo/select/SelectTestCase.java
@@ -652,7 +652,6 @@ public class SelectTestCase {
         assertGrouping(expected, parseGrouping(grouping));
     }
 
-
     @Test
     public void testMultipleGroupings() {
         String grouping = "[ { \"all\" : { \"group\" : \"a\", \"each\" : { \"output\" : \"count()\"}}}, { \"all\" : { \"group\" : \"b\", \"each\" : { \"output\" : \"count()\"}}} ]";
@@ -661,6 +660,13 @@ public class SelectTestCase {
         assertGrouping(expected, parseGrouping(grouping));
     }
 
+    @Test
+    public void testGroupingWithPredefinedBuckets() {
+        String grouping = "[ { \"all\" : { \"group\" : { \"predefined\" : [ \"foo\", { \"bucket\": [1,2]}, { \"bucket\": [3,4]} ] } } } ]";
+        String expected = "[[]all(group(predefined(foo, bucket[1, 2>, bucket[3, 4>)))]";
+        assertGrouping(expected, parseGrouping(grouping));
+    }
+
     //------------------------------------------------------------------- Other tests
 
     @Test
@@ -763,7 +769,6 @@ public class SelectTestCase {
     }
 
     private List<VespaGroupingStep> parseGrouping(String grouping) {
-
         return parser.getGroupingSteps(grouping);
     }