diff options
Diffstat (limited to 'container-search/src/test/java/com/yahoo/prelude/query')
4 files changed, 8 insertions, 7 deletions
diff --git a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ExactMatchAndDefaultIndexTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ExactMatchAndDefaultIndexTestCase.java index 02af6618953..a662afcd51c 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ExactMatchAndDefaultIndexTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ExactMatchAndDefaultIndexTestCase.java @@ -33,15 +33,15 @@ public class ExactMatchAndDefaultIndexTestCase { Query q = new Query("?query=" + enc("a/b foo.com") + "&default-index=testexact"); q.getModel().setExecution(new Execution(Execution.Context.createContextStub(facts))); - assertEquals("AND testexact:a/b testexact:foo.com", q.getModel().getQueryTree().getRoot().toString()); + assertEquals("WEAKAND(100) testexact:a/b testexact:foo.com", q.getModel().getQueryTree().getRoot().toString()); q = new Query("?query=" + enc("a/b foo.com")); - assertEquals("AND a b foo com", q.getModel().getQueryTree().getRoot().toString()); + assertEquals("WEAKAND(100) (AND a b) (AND foo com)", q.getModel().getQueryTree().getRoot().toString()); } @Test public void testDefaultIndexSpecialChars() { Query q = new Query("?query=" + enc("dog & cat") + "&default-index=textsearch"); - assertEquals("AND textsearch:dog textsearch:cat", q.getModel().getQueryTree().getRoot().toString()); + assertEquals("WEAKAND(100) textsearch:dog textsearch:cat", q.getModel().getQueryTree().getRoot().toString()); } private String enc(String s) { diff --git a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/SubstringTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/SubstringTestCase.java index ab59221e0b5..e7d938e6bd8 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/SubstringTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/SubstringTestCase.java @@ -14,14 +14,14 @@ import java.net.URLEncoder; /** * Check Substring in conjunction with query tokenization and parsing behaves properly. * - * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> + * @author Steinar Knutsen */ public class SubstringTestCase { @Test public final void testTokenLengthAndLowercasing() { Query q = new Query("/?query=\u0130"); - WordItem root = (WordItem) q.getModel().getQueryTree().getRoot(); + WordItem root = (WordItem) ((CompositeItem)q.getModel().getQueryTree().getRoot()).getItem(0); assertEquals("\u0130", root.getRawWord()); } diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/IntItemTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/IntItemTestCase.java index b447b4b0242..28cf5008417 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/test/IntItemTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/test/IntItemTestCase.java @@ -3,6 +3,7 @@ package com.yahoo.prelude.query.test; import com.yahoo.prelude.query.AndItem; import com.yahoo.prelude.query.IntItem; +import com.yahoo.prelude.query.WeakAndItem; import com.yahoo.search.Query; import org.junit.Test; @@ -18,7 +19,7 @@ public class IntItemTestCase { Query q1 = new Query("/?query=123%20456%20789"); Query q2 = new Query("/?query=123%20456"); - AndItem andItem = (AndItem) q2.getModel().getQueryTree().getRoot(); + WeakAndItem andItem = (WeakAndItem) q2.getModel().getQueryTree().getRoot(); var item = new IntItem(789L, ""); item.setFromQuery(true); andItem.addItem(item); diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerTestCase.java index f0c29e64839..cd8691d9db0 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/test/QueryCanonicalizerTestCase.java @@ -104,7 +104,7 @@ public class QueryCanonicalizerTestCase { and22.addItem(and31); and22.addItem(and32); and22.addItem(new WordItem("word")); - assertCanonicalized("word", null, new Query("?query=word")); + assertCanonicalized("word", null, new Query("?query=word&type=all")); } @Test |