aboutsummaryrefslogtreecommitdiffstats
path: root/container-search/src/test/java/com/yahoo/search/test
diff options
context:
space:
mode:
Diffstat (limited to 'container-search/src/test/java/com/yahoo/search/test')
-rw-r--r--container-search/src/test/java/com/yahoo/search/test/QueryBenchmark.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java11
-rw-r--r--container-search/src/test/java/com/yahoo/search/test/QueryWithFilterTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/test/RequestParameterPreservationTestCase.java2
-rw-r--r--container-search/src/test/java/com/yahoo/search/test/ResultBenchmark.java2
5 files changed, 14 insertions, 5 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/test/QueryBenchmark.java b/container-search/src/test/java/com/yahoo/search/test/QueryBenchmark.java
index 39954b00e8b..e0c1d8f7ee8 100644
--- a/container-search/src/test/java/com/yahoo/search/test/QueryBenchmark.java
+++ b/container-search/src/test/java/com/yahoo/search/test/QueryBenchmark.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.search.Query;
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);
diff --git a/container-search/src/test/java/com/yahoo/search/test/QueryWithFilterTestCase.java b/container-search/src/test/java/com/yahoo/search/test/QueryWithFilterTestCase.java
index 3920a95bd98..35827ddd85b 100644
--- a/container-search/src/test/java/com/yahoo/search/test/QueryWithFilterTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/test/QueryWithFilterTestCase.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.language.Language;
diff --git a/container-search/src/test/java/com/yahoo/search/test/RequestParameterPreservationTestCase.java b/container-search/src/test/java/com/yahoo/search/test/RequestParameterPreservationTestCase.java
index a1f3a3a5a1c..167d3fe7d23 100644
--- a/container-search/src/test/java/com/yahoo/search/test/RequestParameterPreservationTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/test/RequestParameterPreservationTestCase.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.search.Query;
diff --git a/container-search/src/test/java/com/yahoo/search/test/ResultBenchmark.java b/container-search/src/test/java/com/yahoo/search/test/ResultBenchmark.java
index 1ead583730d..41176cc43cf 100644
--- a/container-search/src/test/java/com/yahoo/search/test/ResultBenchmark.java
+++ b/container-search/src/test/java/com/yahoo/search/test/ResultBenchmark.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.search.Query;