Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controller

1 files changed, 10 insertions, 1 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
index 450239f7b12..6a310180eab 100644
--- a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
@@ -1,4 +1,4 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.test;
 
 import com.yahoo.component.chain.Chain;
@@ -623,6 +623,15 @@ public class QueryTestCase {
     }
 
     @Test
+    void globalphase_parameters_are_resolved() {
+        var q = new Query("?query=foo");
+        assertNull(q.getRanking().getGlobalPhase().getRerankCount());
+        q = new Query("?query=foo&" +
+                      "ranking.globalPhase.rerankCount=42");
+        assertEquals(42, q.getRanking().getGlobalPhase().getRerankCount());
+    }
+
+    @Test
     void testQueryPropertyResolveTracing() {
         QueryProfile testProfile = new QueryProfile("test");
         testProfile.setOverridable("u", false, DimensionValues.empty);