aboutsummaryrefslogtreecommitdiffstats
path: root/container-search/src/test/java/com/yahoo/select
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2022-06-09 21:54:18 +0200
committerJon Bratseth <bratseth@gmail.com>2022-06-09 21:54:18 +0200
commit2a256fc1481f8460d519ccf3d9db6ed6e59ca452 (patch)
treeea720725870244490b161b6a5482bc4043922e90 /container-search/src/test/java/com/yahoo/select
parentd3bfcc0fa1d52abd65be6025a20e4595119c179e (diff)
Revert "Merge pull request #23036 from vespa-engine/revert-23032-bratseth/weakand-by-default"
This reverts commit 1b00635b293901abaef45aca022647c01e840b6b, reversing changes made to 0fd0ba6d04f642095e35ff828e6d7ee334a4bdb8.
Diffstat (limited to 'container-search/src/test/java/com/yahoo/select')
-rw-r--r--container-search/src/test/java/com/yahoo/select/SelectTestCase.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/container-search/src/test/java/com/yahoo/select/SelectTestCase.java b/container-search/src/test/java/com/yahoo/select/SelectTestCase.java
index 8ede243d3ca..6ebcc3a1aae 100644
--- a/container-search/src/test/java/com/yahoo/select/SelectTestCase.java
+++ b/container-search/src/test/java/com/yahoo/select/SelectTestCase.java
@@ -719,8 +719,8 @@ public class SelectTestCase {
@Test
public void testOverridingOtherQueryTree() {
Query query = new Query("?query=default:query");
- assertEquals("default:query", query.getModel().getQueryTree().toString());
- assertEquals(Query.Type.ALL, query.getModel().getType());
+ assertEquals("WEAKAND(100) default:query", query.getModel().getQueryTree().toString());
+ assertEquals(Query.Type.WEAKAND, query.getModel().getType());
query.getSelect().setWhereString("{\"contains\" : [\"default\", \"select\"] }");
assertEquals("default:select", query.getModel().getQueryTree().toString());