Revert "Merge pull request #23040 from vespa-engine/revert-23039-bratseth/weakand-by-default-take-2"

This reverts commit 4b3adbb89f52bb20f2f220fcf1480673cae0881d, reversing
changes made to d204179b218af2fdf4b251ede3a465ffabbf6557.

1 files changed, 7 insertions, 0 deletions

diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java
index ae4c8de6c3f..626c145875c 100644
--- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/QueryRewriteTestCase.java
@@ -25,6 +25,13 @@ import static org.junit.Assert.assertTrue;
 public class QueryRewriteTestCase {
 
     @Test
+    public void testOptimizeByRestrict() {
+        Query query = new Query("?query=sddocname:music");
+        query.getModel().setRestrict("music");
+        QueryRewrite.optimizeByRestrict(query);
+    }
+
+    @Test
     public void requireThatOptimizeByRestrictSimplifiesORItemsThatHaveFullRecallAndDontImpactRank() {
         assertRewritten("sddocname:foo OR sddocname:bar OR sddocname:baz", "foo", "sddocname:foo");
         assertRewritten("sddocname:foo OR sddocname:bar OR sddocname:baz", "bar", "sddocname:bar");