1 files changed, 19 insertions, 14 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/grouping/GroupingRequestTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/GroupingRequestTestCase.java
index 8b1bbb6842e..494602be7b3 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/GroupingRequestTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/GroupingRequestTestCase.java
@@ -10,10 +10,8 @@ import com.yahoo.search.result.Hit;
 import org.junit.Test;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.List;
 
 import static org.junit.Assert.*;
 
@@ -28,10 +26,7 @@ public class GroupingRequestTestCase {
         assertTrue(req.continuations().isEmpty());
 
         Continuation foo = new Continuation() {
-            @Override
-            public Continuation copy() {
-                return null;
-            }
+
         };
         req.continuations().add(foo);
         assertEquals(Arrays.asList(foo), req.continuations());
@@ -110,22 +105,32 @@ public class GroupingRequestTestCase {
     @Test
     public void requireThatGetRequestsReturnsAllRequests() {
         Query query = new Query();
-        assertEquals(Collections.emptyList(), query.getSelect().getGrouping());
+        assertEquals(Collections.emptyList(), GroupingRequest.getRequests(query));
 
         GroupingRequest foo = GroupingRequest.newInstance(query);
-        assertEquals(Arrays.asList(foo), query.getSelect().getGrouping());
+        assertEquals(Arrays.asList(foo), GroupingRequest.getRequests(query));
 
         GroupingRequest bar = GroupingRequest.newInstance(query);
-        assertEquals(Arrays.asList(foo, bar), query.getSelect().getGrouping());
+        assertEquals(Arrays.asList(foo, bar), GroupingRequest.getRequests(query));
+    }
+
+    @Test
+    public void requireThatGetRequestThrowsIllegalArgumentOnBadProperty() throws Exception {
+        Query query = new Query();
+        Field propName = GroupingRequest.class.getDeclaredField("PROP_REQUEST");
+        propName.setAccessible(true);
+        query.properties().set((CompoundName)propName.get(null), new Object());
+        try {
+            GroupingRequest.getRequests(query);
+            fail();
+        } catch (IllegalArgumentException e) {
+
+        }
     }
-    
 
     private static RootGroup newRootGroup(int id) {
         return new RootGroup(id, new Continuation() {
-            @Override
-            public Continuation copy() {
-                return null;
-            }
+
         });
     }
 }