aboutsummaryrefslogtreecommitdiffstats
path: root/container-search/src/test/java/com/yahoo/search/query/profile
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2022-06-09 15:00:48 +0200
committerJon Bratseth <bratseth@gmail.com>2022-06-09 15:00:48 +0200
commit0b1da738e231afe80c6d7fe76f2cf47efca70071 (patch)
treec5ab6ff7942f958361fa201aca6dbf994e7fcd0d /container-search/src/test/java/com/yahoo/search/query/profile
parent4538fa9c4075cb3c39f61246e2e9606b73a9a9f1 (diff)
Change user query default from ALL to WEAKAND on Vespa 8
Diffstat (limited to 'container-search/src/test/java/com/yahoo/search/query/profile')
-rw-r--r--container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileIntegrationTestCase.java12
-rw-r--r--container-search/src/test/java/com/yahoo/search/query/profile/test/QueryFromProfileTestCase.java6
2 files changed, 9 insertions, 9 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileIntegrationTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileIntegrationTestCase.java
index a89ef8c1b2b..c64d5df64f9 100644
--- a/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileIntegrationTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/profile/config/test/QueryProfileIntegrationTestCase.java
@@ -57,20 +57,20 @@ public class QueryProfileIntegrationTestCase {
// Tests a profile setting hits and offset
request = HttpRequest.createTestRequest("search?queryProfile=hitsoffset", Method.GET);
response = (HttpSearchResponse)searchHandler.handle(request); // Cast to access content directly
- assertEquals(20,response.getQuery().getHits());
- assertEquals(80,response.getQuery().getOffset());
+ assertEquals(20, response.getQuery().getHits());
+ assertEquals(80, response.getQuery().getOffset());
// Tests a non-resolved profile request
request = HttpRequest.createTestRequest("search?queryProfile=none", Method.GET);
response = (HttpSearchResponse)searchHandler.handle(request); // Cast to access content directly
- assertNotNull("Got an error",response.getResult().hits().getError());
- assertEquals("Could not resolve query profile 'none'",response.getResult().hits().getError().getDetailedMessage());
+ assertNotNull("Got an error", response.getResult().hits().getError());
+ assertEquals("Could not resolve query profile 'none'", response.getResult().hits().getError().getDetailedMessage());
// Tests that properties in objects owned by query is handled correctly
request = HttpRequest.createTestRequest("search?query=word&queryProfile=test", Method.GET);
response = (HttpSearchResponse)searchHandler.handle(request); // Cast to access content directly
- assertEquals("index",response.getQuery().getModel().getDefaultIndex());
- assertEquals("index:word",response.getQuery().getModel().getQueryTree().toString());
+ assertEquals("index" ,response.getQuery().getModel().getDefaultIndex());
+ assertEquals("WEAKAND(100) index:word", response.getQuery().getModel().getQueryTree().toString());
configurer.shutdown();
}
diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryFromProfileTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryFromProfileTestCase.java
index 3ce91719874..7a92aa8081b 100644
--- a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryFromProfileTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryFromProfileTestCase.java
@@ -35,7 +35,7 @@ public class QueryFromProfileTestCase {
Query query = new Query(HttpRequest.createTestRequest("?model=querybest", Method.GET), cRegistry.getComponent("topLevel"));
assertEquals("best", query.properties().get("model.queryString"));
- assertEquals("best", query.getModel().getQueryTree().toString());
+ assertEquals("WEAKAND(100) best", query.getModel().getQueryTree().toString());
}
@Test
@@ -58,7 +58,7 @@ public class QueryFromProfileTestCase {
Query query = new Query(HttpRequest.createTestRequest("?query=overrides&model=querybest", Method.GET), cRegistry.getComponent("root"));
assertEquals("overrides", query.properties().get("model.queryString"));
- assertEquals("overrides", query.getModel().getQueryTree().toString());
+ assertEquals("WEAKAND(100) overrides", query.getModel().getQueryTree().toString());
}
@Test
@@ -81,7 +81,7 @@ public class QueryFromProfileTestCase {
Query query = new Query(HttpRequest.createTestRequest("?query=overrides&model=querybest", Method.GET), cRegistry.getComponent("root"));
assertEquals("overrides", query.properties().get("model.queryString"));
- assertEquals("overrides", query.getModel().getQueryTree().toString());
+ assertEquals("WEAKAND(100) overrides", query.getModel().getQueryTree().toString());
}
}