1 files changed, 12 insertions, 0 deletions
diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerTestCase.java
index 1d2f92063fe..a5ff92294e8 100644
--- a/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerTestCase.java
@@ -490,6 +490,18 @@ public class QueryCanonicalizerTestCase {
         assertFalse(shoe.usePositionData());
     }
 
+    @Test
+    public void queryTreeExceedsAllowedSize() {
+        Query query = new Query();
+        QueryTree tree = query.getModel().getQueryTree();
+        tree.setRoot(new WordItem("A"));
+        tree.and(new WordItem("B"));
+
+        assertNull(QueryCanonicalizer.canonicalize(query));
+        query.properties().set("maxQueryItems", 2);
+        assertEquals("Query tree exceeds allowed item count", QueryCanonicalizer.canonicalize(query));
+    }
+
     private void assertCanonicalized(String canonicalForm, String expectedError, Item root) {
         Query query = new Query();
         query.getModel().getQueryTree().setRoot(root);