diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-06-09 21:54:18 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2022-06-09 21:54:18 +0200 |
commit | 2a256fc1481f8460d519ccf3d9db6ed6e59ca452 (patch) | |
tree | ea720725870244490b161b6a5482bc4043922e90 /container-search/src/test/java/com/yahoo/prelude/test | |
parent | d3bfcc0fa1d52abd65be6025a20e4595119c179e (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/prelude/test')
3 files changed, 27 insertions, 26 deletions
diff --git a/container-search/src/test/java/com/yahoo/prelude/test/GetRawWordTestCase.java b/container-search/src/test/java/com/yahoo/prelude/test/GetRawWordTestCase.java index 6c500604a81..9ed84298838 100644 --- a/container-search/src/test/java/com/yahoo/prelude/test/GetRawWordTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/test/GetRawWordTestCase.java @@ -17,25 +17,26 @@ public class GetRawWordTestCase { @Test public void testGetRawWord() { - Query query = new Query("?query=%C4%B0%C5%9EBANKASI%20GAZ%C4%B0EM%C4%B0R&searchChain=vespa"); + Query query = new Query("?query=%C4%B0%C5%9EBANKASI%20GAZ%C4%B0EM%C4%B0R&type=all&searchChain=vespa"); assertEquals("AND \u0130\u015EBANKASI GAZ\u0130EM\u0130R", query.getModel().getQueryTree().toString()); - AndItem root=(AndItem)query.getModel().getQueryTree().getRoot(); + AndItem root = (AndItem)query.getModel().getQueryTree().getRoot(); { - WordItem word=(WordItem)root.getItem(0); - assertEquals("\u0130\u015EBANKASI",word.getRawWord()); - assertEquals(0,word.getOrigin().start); - assertEquals(9,word.getOrigin().end); + WordItem word = (WordItem)root.getItem(0); + assertEquals("\u0130\u015EBANKASI", word.getRawWord()); + assertEquals(0, word.getOrigin().start); + assertEquals(9, word.getOrigin().end); } { - WordItem word=(WordItem)root.getItem(1); - assertEquals("GAZ\u0130EM\u0130R",word.getRawWord()); - assertEquals(10,word.getOrigin().start); - assertEquals(18,word.getOrigin().end); + WordItem word = (WordItem)root.getItem(1); + assertEquals("GAZ\u0130EM\u0130R", word.getRawWord()); + assertEquals(10, word.getOrigin().start); + assertEquals(18, word.getOrigin().end); } - assertEquals("Total string is just these words",18,((WordItem)root.getItem(0)).getOrigin().getSuperstring().length()); + assertEquals("Total string is just these words",18, + ((WordItem)root.getItem(0)).getOrigin().getSuperstring().length()); } } diff --git a/container-search/src/test/java/com/yahoo/prelude/test/IndexFactsTestCase.java b/container-search/src/test/java/com/yahoo/prelude/test/IndexFactsTestCase.java index eb53ab4bf86..0f7c9526533 100644 --- a/container-search/src/test/java/com/yahoo/prelude/test/IndexFactsTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/test/IndexFactsTestCase.java @@ -71,9 +71,9 @@ public class IndexFactsTestCase { // First check default behavior IndexFacts indexFacts = createIndexFacts(); Query q = newQuery("?query=a:b", indexFacts); - assertEquals("a:b", q.getModel().getQueryTree().getRoot().toString()); + assertEquals("WEAKAND(100) a:b", q.getModel().getQueryTree().getRoot().toString()); q = newQuery("?query=notarealindex:b", indexFacts); - assertEquals("AND notarealindex b", q.getModel().getQueryTree().getRoot().toString()); + assertEquals("WEAKAND(100) (AND notarealindex b)", q.getModel().getQueryTree().getRoot().toString()); } @Test @@ -144,7 +144,7 @@ public class IndexFactsTestCase { Query query = new Query(); query.getModel().getSources().add("artist"); assertTrue(indexFacts.newSession(query).getIndex(indexName).isExact()); - Query q = newQuery("?query=" + indexName + ":foo...&search=artist", indexFacts); + Query q = newQuery("?query=" + indexName + ":foo...&search=artist&type=all", indexFacts); assertEquals(indexName + ":foo...", q.getModel().getQueryTree().getRoot().toString()); } @@ -193,7 +193,7 @@ public class IndexFactsTestCase { IndexFacts.Session session = indexFacts.newSession(query); assertFalse(session.getIndex("bar").isExact()); assertTrue(session.getIndex(u_name).isExact()); - Query q = newQuery("?query=" + u_name + ":foo...&search=foobar", indexFacts); + Query q = newQuery("?query=" + u_name + ":foo...&search=foobar&type=all", indexFacts); assertEquals(u_name + ":foo...", q.getModel().getQueryTree().getRoot().toString()); } @@ -302,8 +302,8 @@ public class IndexFactsTestCase { IndexFacts.Session session2 = indexFacts.newSession(query2.getModel().getSources(), query2.getModel().getRestrict()); assertTrue(session1.getIndex("url").isUriIndex()); assertTrue(session2.getIndex("url").isUriIndex()); - assertEquals("AND url:https url:foo url:bar", query1.getModel().getQueryTree().toString()); - assertEquals("AND url:https url:foo url:bar", query2.getModel().getQueryTree().toString()); + assertEquals("WEAKAND(100) (AND url:https url:foo url:bar)", query1.getModel().getQueryTree().toString()); + assertEquals("WEAKAND(100) (AND url:https url:foo url:bar)", query2.getModel().getQueryTree().toString()); } @Test diff --git a/container-search/src/test/java/com/yahoo/prelude/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/prelude/test/QueryTestCase.java index d5efd3992b2..eaab7e12f33 100644 --- a/container-search/src/test/java/com/yahoo/prelude/test/QueryTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/test/QueryTestCase.java @@ -38,8 +38,8 @@ public class QueryTestCase { @Test public void testSimpleQueryParsing () { - Query q = newQuery("/search?query=foobar&offset=10&hits=20"); - assertEquals("foobar",((WordItem) q.getModel().getQueryTree().getRoot()).getWord()); + Query q = newQuery("/search?query=foobar&offset=10&hits=20&type=all"); + assertEquals("foobar", ((WordItem) q.getModel().getQueryTree().getRoot()).getWord()); assertEquals(10, q.getOffset()); assertEquals(20, q.getHits()); } @@ -99,7 +99,7 @@ public class QueryTestCase { @Test public void testUtf8Decoding() { - Query q = new Query("/?query=beyonc%C3%A9"); + Query q = new Query("/?query=beyonc%C3%A9&type=all"); assertEquals("beyonc\u00e9", ((WordItem) q.getModel().getQueryTree().getRoot()).getWord()); } @@ -200,7 +200,7 @@ public class QueryTestCase { public void testDefaultIndex() { Query q = newQuery("?query=hi hello keyword:kanoo " + "default:munkz \"phrases too\"&default-index=def"); - assertEquals("AND def:hi def:hello keyword:kanoo " + + assertEquals("WEAKAND(100) def:hi def:hello keyword:kanoo " + "default:munkz def:\"phrases too\"", q.getModel().getQueryTree().getRoot().toString()); } @@ -275,11 +275,11 @@ public class QueryTestCase { @Test public void testUnicodeNormalization() { Linguistics linguistics = new SimpleLinguistics(); - Query query = newQueryFromEncoded("?query=content:%EF%BC%B3%EF%BC%AF%EF%BC%AE%EF%BC%B9", Language.ENGLISH, + Query query = newQueryFromEncoded("?query=content:%EF%BC%B3%EF%BC%AF%EF%BC%AE%EF%BC%B9&type=all", Language.ENGLISH, linguistics); - assertEquals("SONY",((WordItem) query.getModel().getQueryTree().getRoot()).getWord()); + assertEquals("SONY", ((WordItem) query.getModel().getQueryTree().getRoot()).getWord()); - query = newQueryFromEncoded("?query=foo&filter=+%EF%BC%B3%EF%BC%AF%EF%BC%AE%EF%BC%B9", Language.ENGLISH, + query = newQueryFromEncoded("?query=foo&filter=+%EF%BC%B3%EF%BC%AF%EF%BC%AE%EF%BC%B9&type=all", Language.ENGLISH, linguistics); assertEquals("RANK foo |SONY", query.getModel().getQueryTree().getRoot().toString()); @@ -332,10 +332,10 @@ public class QueryTestCase { @Test public void testCopy() { Query qs = newQuery("?query=test&rankfeature.something=2"); - assertEquals("test", qs.getModel().getQueryTree().toString()); + assertEquals("WEAKAND(100) test", qs.getModel().getQueryTree().toString()); assertEquals((int)qs.properties().getInteger("rankfeature.something"),2); Query qp = new Query(qs); - assertEquals("test", qp.getModel().getQueryTree().getRoot().toString()); + assertEquals("WEAKAND(100) test", qp.getModel().getQueryTree().getRoot().toString()); assertFalse(qp.getRanking().getFeatures().isEmpty()); assertEquals(2.0, qp.getRanking().getFeatures().getDouble("something").getAsDouble(), 0.000001); } |