diff options
Diffstat (limited to 'container-search/src/test/java/com/yahoo/prelude')
21 files changed, 148 insertions, 145 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 a662afcd51c..02af6618953 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("WEAKAND(100) testexact:a/b testexact:foo.com", q.getModel().getQueryTree().getRoot().toString()); + assertEquals("AND testexact:a/b testexact:foo.com", q.getModel().getQueryTree().getRoot().toString()); q = new Query("?query=" + enc("a/b foo.com")); - assertEquals("WEAKAND(100) (AND a b) (AND foo com)", q.getModel().getQueryTree().getRoot().toString()); + assertEquals("AND a b foo com", q.getModel().getQueryTree().getRoot().toString()); } @Test public void testDefaultIndexSpecialChars() { Query q = new Query("?query=" + enc("dog & cat") + "&default-index=textsearch"); - assertEquals("WEAKAND(100) textsearch:dog textsearch:cat", q.getModel().getQueryTree().getRoot().toString()); + assertEquals("AND 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 e7d938e6bd8..ab59221e0b5 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 Steinar Knutsen + * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ public class SubstringTestCase { @Test public final void testTokenLengthAndLowercasing() { Query q = new Query("/?query=\u0130"); - WordItem root = (WordItem) ((CompositeItem)q.getModel().getQueryTree().getRoot()).getItem(0); + WordItem root = (WordItem) q.getModel().getQueryTree().getRoot(); 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 28cf5008417..b447b4b0242 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,7 +3,6 @@ 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; @@ -19,7 +18,7 @@ public class IntItemTestCase { Query q1 = new Query("/?query=123%20456%20789"); Query q2 = new Query("/?query=123%20456"); - WeakAndItem andItem = (WeakAndItem) q2.getModel().getQueryTree().getRoot(); + AndItem andItem = (AndItem) 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 cd8691d9db0..f0c29e64839 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&type=all")); + assertCanonicalized("word", null, new Query("?query=word")); } @Test diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CollapsePhraseSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CollapsePhraseSearcherTestCase.java index 498d6ca2980..c57799c7d3e 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CollapsePhraseSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/CollapsePhraseSearcherTestCase.java @@ -65,12 +65,12 @@ public class CollapsePhraseSearcherTestCase { @Test public void testNegative1() { - assertEquals("WEAKAND(100) \"abc def\"", transformQuery("?query=" + enc("\"abc def\""))); + assertEquals("\"abc def\"", transformQuery("?query=" + enc("\"abc def\""))); } @Test public void testNegative2() { - assertEquals("WEAKAND(100) a \"abc def\" b", transformQuery("?query=" + enc("a \"abc def\" b"))); + assertEquals("AND a \"abc def\" b", transformQuery("?query=" + enc("a \"abc def\" b"))); } private String enc(String s) { diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/LiteralBoostSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/LiteralBoostSearcherTestCase.java index a434fbd9949..a15e8d2c7b5 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/LiteralBoostSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/LiteralBoostSearcherTestCase.java @@ -19,31 +19,31 @@ import static org.junit.Assert.assertEquals; /** * Tests the complete field match query transformer * - * @author Steinar Knutsen + * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ public class LiteralBoostSearcherTestCase { @Test public void testSimpleQueryWithBoost() { - assertEquals("RANK (WEAKAND(100) abc) default_literal:abc", + assertEquals("RANK abc default_literal:abc", transformQuery("?query=abc&source=cluster1&restrict=type1")); } @Test public void testSimpleQueryNoBoost() { - assertEquals("WEAKAND(100) abc", + assertEquals("abc", transformQuery("?query=abc&source=cluster1&restrict=type2")); } @Test public void testQueryWithExplicitIndex() { - assertEquals("RANK (WEAKAND(100) absolute:abc) absolute_literal:abc", + assertEquals("RANK absolute:abc absolute_literal:abc", transformQuery("?query=absolute:abc&source=cluster1&restrict=type1")); } @Test public void testQueryWithExplicitIndexNoBoost() { - assertEquals("WEAKAND(100) absolute:abc", + assertEquals("absolute:abc", transformQuery("?query=absolute:abc&source=cluster1&restrict=type2")); } @@ -64,7 +64,7 @@ public class LiteralBoostSearcherTestCase { @Test public void testTermindexQuery() { - assertEquals("RANK (+(WEAKAND(100) a b d) -c) default_literal:a "+ + assertEquals("RANK (+(AND a b d) -c) default_literal:a "+ "default_literal:b default_literal:d", transformQuery("?query=a b -c d&source=cluster1&restrict=type1")); } @@ -72,7 +72,7 @@ public class LiteralBoostSearcherTestCase { @Test public void testQueryWithoutBoost() { assertEquals("RANK (AND nonexistant a nonexistant b) default_literal:nonexistant default_literal:a default_literal:nonexistant default_literal:b", - transformQuery("?query=nonexistant:a nonexistant:b&source=cluster1&restrict=type1&type=all")); + transformQuery("?query=nonexistant:a nonexistant:b&source=cluster1&restrict=type1")); } private String transformQuery(String rawQuery) { diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NonPhrasingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NonPhrasingSearcherTestCase.java index 462e57a2b37..25a2a476b6e 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NonPhrasingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NonPhrasingSearcherTestCase.java @@ -28,7 +28,7 @@ public class NonPhrasingSearcherTestCase { Query query=new Query("?query=void+aword+kanoo"); new Execution(searcher, Execution.Context.createContextStub()).search(query); - assertEquals("WEAKAND(100) void kanoo", query.getModel().getQueryTree().getRoot().toString()); + assertEquals("AND void kanoo", query.getModel().getQueryTree().getRoot().toString()); } @Test diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NormalizingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NormalizingSearcherTestCase.java index 0694c1a7e55..dbdd3345719 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NormalizingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/NormalizingSearcherTestCase.java @@ -41,35 +41,35 @@ public class NormalizingSearcherTestCase { public void testNoNormalizingNecssary() { Query query = new Query("/search?query=bilen&search=cluster1&restrict=type1"); createExecution().search(query); - assertEquals("WEAKAND(100) bilen", query.getModel().getQueryTree().getRoot().toString()); + assertEquals("bilen", query.getModel().getQueryTree().getRoot().toString()); } @Test public void testAttributeQuery() { Query query = new Query("/search?query=attribute:" + enc("b\u00e9yonc\u00e8 b\u00e9yonc\u00e8") + "&search=cluster1&restrict=type1"); createExecution().search(query); - assertEquals("WEAKAND(100) attribute:b\u00e9yonc\u00e8 beyonce", query.getModel().getQueryTree().getRoot().toString()); + assertEquals("AND attribute:b\u00e9yonc\u00e8 beyonce", query.getModel().getQueryTree().getRoot().toString()); } @Test public void testOneTermNormalizing() { Query query = new Query("/search?query=b\u00e9yonc\u00e8&search=cluster1&restrict=type1"); createExecution().search(query); - assertEquals("WEAKAND(100) beyonce", query.getModel().getQueryTree().getRoot().toString()); + assertEquals("beyonce", query.getModel().getQueryTree().getRoot().toString()); } @Test public void testOneTermNoNormalizingDifferentSearchDef() { Query query = new Query("/search?query=b\u00e9yonc\u00e8&search=cluster1&restrict=type2"); createExecution().search(query); - assertEquals("WEAKAND(100) béyoncè", query.getModel().getQueryTree().getRoot().toString()); + assertEquals("béyoncè", query.getModel().getQueryTree().getRoot().toString()); } @Test public void testTwoTermQuery() throws UnsupportedEncodingException { Query query = new Query("/search?query=" + enc("b\u00e9yonc\u00e8 beyonc\u00e9") + "&search=cluster1&restrict=type1"); createExecution().search(query); - assertEquals("WEAKAND(100) beyonce beyonce", query.getModel().getQueryTree().getRoot().toString()); + assertEquals("AND beyonce beyonce", query.getModel().getQueryTree().getRoot().toString()); } private String enc(String s) { @@ -86,7 +86,7 @@ public class NormalizingSearcherTestCase { Query query = new Query("/search?query=" + enc("\"b\u00e9yonc\u00e8 beyonc\u00e9\"") + "&search=cluster1&restrict=type1"); query.setTraceLevel(2); createExecution().search(query); - assertEquals("WEAKAND(100) \"beyonce beyonce\"", query.getModel().getQueryTree().getRoot().toString()); + assertEquals("\"beyonce beyonce\"", query.getModel().getQueryTree().getRoot().toString()); } @Test diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java index 55ce7ed4e99..6bb216e1d10 100644 --- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/StemmingSearcherTestCase.java @@ -34,7 +34,7 @@ public class StemmingSearcherTestCase { @Test public void testStemOnlySomeTerms() { assertStem("/search?query=Holes in CVS and Subversion nostem:Found", - "WEAKAND(100) hole in cvs and subversion nostem:Found"); + "AND hole in cvs and subversion nostem:Found"); } @Test @@ -78,7 +78,7 @@ public class StemmingSearcherTestCase { @Test public void testDontStemPrefixes() { - assertStem("/search?query=ist*&language=de", "WEAKAND(100) ist*"); + assertStem("/search?query=ist*&language=de", "ist*"); } @Test @@ -91,9 +91,9 @@ public class StemmingSearcherTestCase { @Test public void testNounStemming() { assertStem("/search?query=noun:towers noun:tower noun:tow", - "WEAKAND(100) noun:tower noun:tower noun:tow"); + "AND noun:tower noun:tower noun:tow"); assertStem("/search?query=notnoun:towers notnoun:tower notnoun:tow", - "WEAKAND(100) notnoun:tower notnoun:tower notnoun:tow"); + "AND notnoun:tower notnoun:tower notnoun:tow"); } @Test @@ -107,7 +107,7 @@ public class StemmingSearcherTestCase { Query q = new Query(QueryTestCase.httpEncode("?query=cars")); new Execution(new Chain<Searcher>(new StemmingSearcher(linguistics)), Execution.Context.createContextStub(indexFacts, linguistics)).search(q); - assertEquals("WEAKAND(100) cars", q.getModel().getQueryTree().getRoot().toString()); + assertEquals("cars", q.getModel().getQueryTree().getRoot().toString()); } @Test @@ -132,11 +132,16 @@ public class StemmingSearcherTestCase { @Test public void testMultipleStemming() { + try { Query q = new Query(QueryTestCase.httpEncode("/search?language=en&search=four&query=trees \"nouns girls\" flowers \"a verbs a\" girls&default-index=foobar")); executeStemming(q); - assertEquals("WEAKAND(100) WORD_ALTERNATIVES foobar:[ tree(0.7) trees(1.0) ] "+ + assertEquals("AND WORD_ALTERNATIVES foobar:[ tree(0.7) trees(1.0) ] "+ "foobar:\"noun girl\" WORD_ALTERNATIVES foobar:[ flower(0.7) flowers(1.0) ] "+ "foobar:\"a verb a\" WORD_ALTERNATIVES foobar:[ girl(0.7) girls(1.0) ]", q.getModel().getQueryTree().getRoot().toString()); + } catch (Exception e) { + System.err.println("got exception: "+ e); + e.printStackTrace(); + } } private Execution.Context newExecutionContext() { diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java index de6a55354fd..3ac8de93f2b 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/FieldCollapsingSearcherTestCase.java @@ -272,7 +272,7 @@ public class FieldCollapsingSearcherTestCase { chained.put(messUp, docsource); // Caveat: Collapse is set to false, because that's what the collapser asks for - Query q = new Query("?query=%22test%20collapse%22+b&collapsefield=amid&type=all"); + Query q = new Query("?query=%22test%20collapse%22+b&collapsefield=amid"); // The searcher turns off collapsing further on in the chain q.properties().set("collapse", "0"); @@ -289,7 +289,7 @@ public class FieldCollapsingSearcherTestCase { docsource.addResult(q, r); // Test basic collapsing on mid - q = new Query("?query=%22test%20collapse%22&collapsefield=amid&type=all"); + q = new Query("?query=%22test%20collapse%22&collapsefield=amid"); r = doSearch(collapse, q, 0, 2, chained); assertEquals(2, docsource.getQueryCount()); diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataTestCase.java index 71e36e45acc..43e8e0a30cf 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/AutomataTestCase.java @@ -31,14 +31,14 @@ public class AutomataTestCase extends RuleBaseAbstractTestCase { Query query=new Query("?query=sony+digital+camera"); ruleBase.analyze(query,0); - assertEquals("RANK (WEAKAND(100) sony digital camera) dsp1:sony dsp5:digicamera", query.getModel().getQueryTree().getRoot().toString()); + assertEquals("RANK (AND sony digital camera) dsp1:sony dsp5:digicamera", query.getModel().getQueryTree().getRoot().toString()); query=new Query("?query=sony+digital+camera&rules.reload"); ruleBase=searcher.getDefaultRuleBase(); assertTrue(ruleBase.getSource().endsWith(root + "automatarules.sr")); assertEquals(root + "semantics.fsa",ruleBase.getAutomataFile()); ruleBase.analyze(query,0); - assertEquals("RANK (WEAKAND(100) sony digital camera) dsp1:sony dsp5:digicamera", query.getModel().getQueryTree().getRoot().toString()); + assertEquals("RANK (AND sony digital camera) dsp1:sony dsp5:digicamera", query.getModel().getQueryTree().getRoot().toString()); } @Test diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/BacktrackingTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/BacktrackingTestCase.java index 06f7112f851..394752f8aa1 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/BacktrackingTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/BacktrackingTestCase.java @@ -51,45 +51,45 @@ public class BacktrackingTestCase { @Test public void testMultilevelBacktrackingLiteralTerms() { - assertSemantics("WEAKAND(100) replaced","word1 word2 word5 word8"); + assertSemantics("replaced","word1 word2 word5 word8"); } @Test public void testMultilevelBacktrackingWontReorderOthertermsLiteralTerms() { - assertSemantics("WEAKAND(100) other1 other2 other3 replaced","other1 other2 other3 word1 word2 word5 word8"); + assertSemantics("AND other1 other2 other3 replaced","other1 other2 other3 word1 word2 word5 word8"); } @Test public void testMultilevelBacktrackingWithMulticompoundMatchLiteralTerms() { - assertSemantics("WEAKAND(100) other1 other2 other3 replaced","other1 other2 other3 word1 word2 word5-word8"); + assertSemantics("AND other1 other2 other3 replaced","other1 other2 other3 word1 word2 word5-word8"); } @Test public void testMultilevelBacktrackingPreservePartialMatchBeforeLiteralTerms() { - assertSemantics("WEAKAND(100) word1 word2 word5 replaced","word1 word2 word5 word1 word2 word5 word8"); + assertSemantics("AND word1 word2 word5 replaced","word1 word2 word5 word1 word2 word5 word8"); } @Test public void testMultilevelBacktrackingPreservePartialMatchAfterLiteralTerms() { - assertSemantics("WEAKAND(100) replaced word1 word2 word5","word1 word2 word5 word8 word1 word2 word5 "); + assertSemantics("AND replaced word1 word2 word5","word1 word2 word5 word8 word1 word2 word5 "); } // reference terms --------------- @Test public void testMultilevelBacktrackingReferenceTerms() { - assertSemantics("WEAKAND(100) ref:ref1 ref:ref2 ref:ref5 ref:ref8","ref1 ref2 ref5 ref8"); + assertSemantics("AND ref:ref1 ref:ref2 ref:ref5 ref:ref8","ref1 ref2 ref5 ref8"); } @Test public void testMultilevelBacktrackingPreservePartialMatchBeforeReferenceTerms() { - assertSemantics("WEAKAND(100) ref1 ref2 ref5 ref:ref1 ref:ref2 ref:ref5 ref:ref8", + assertSemantics("AND ref1 ref2 ref5 ref:ref1 ref:ref2 ref:ref5 ref:ref8", "ref1 ref2 ref5 ref1 ref2 ref5 ref8"); } @Test public void testMultilevelBacktrackingPreservePartialMatchAfterReferenceTerms() { - assertSemantics("WEAKAND(100) ref:ref1 ref:ref2 ref:ref5 ref:ref8 ref1 ref2 ref5", + assertSemantics("AND ref:ref1 ref:ref2 ref:ref5 ref:ref8 ref1 ref2 ref5", "ref1 ref2 ref5 ref8 ref1 ref2 ref5"); } diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConfigurationTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConfigurationTestCase.java index 0515417f515..6d5b9459833 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConfigurationTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConfigurationTestCase.java @@ -62,63 +62,63 @@ public class ConfigurationTestCase { @Test public void testParent() { - assertSemantics("WEAKAND(100) vehiclebrand:audi", "audi cars", "parent"); - assertSemantics("WEAKAND(100) vehiclebrand:alfa", "alfa bus", "parent"); - assertSemantics("AND (WEAKAND(100) vehiclebrand:bmw) expensivetv", "bmw motorcycle", "parent.sr"); - assertSemantics("WEAKAND(100) vw car", "vw cars", "parent"); - assertSemantics("WEAKAND(100) skoda car", "skoda cars", "parent.sr"); + assertSemantics("vehiclebrand:audi", "audi cars", "parent"); + assertSemantics("vehiclebrand:alfa", "alfa bus", "parent"); + assertSemantics("AND vehiclebrand:bmw expensivetv", "bmw motorcycle", "parent.sr"); + assertSemantics("AND vw car", "vw cars", "parent"); + assertSemantics("AND skoda car", "skoda cars", "parent.sr"); } @Test public void testChild1() { - assertSemantics("WEAKAND(100) vehiclebrand:skoda", "audi cars", "child1.sr"); - assertSemantics("WEAKAND(100) vehiclebrand:alfa", "alfa bus", "child1"); - assertSemantics("AND (WEAKAND(100) vehiclebrand:bmw) expensivetv", "bmw motorcycle", "child1"); - assertSemantics("WEAKAND(100) vehiclebrand:skoda", "vw cars", "child1"); - assertSemantics("WEAKAND(100) skoda car", "skoda cars", "child1"); + assertSemantics("vehiclebrand:skoda", "audi cars", "child1.sr"); + assertSemantics("vehiclebrand:alfa", "alfa bus", "child1"); + assertSemantics("AND vehiclebrand:bmw expensivetv", "bmw motorcycle", "child1"); + assertSemantics("vehiclebrand:skoda", "vw cars", "child1"); + assertSemantics("AND skoda car", "skoda cars", "child1"); } @Test public void testChild2() { - assertSemantics("WEAKAND(100) vehiclebrand:audi", "audi cars", "child2"); - assertSemantics("WEAKAND(100) vehiclebrand:alfa", "alfa bus", "child2.sr"); - assertSemantics("AND (WEAKAND(100) vehiclebrand:bmw) expensivetv", "bmw motorcycle", "child2.sr"); - assertSemantics("WEAKAND(100) vw car", "vw cars", "child2"); - assertSemantics("WEAKAND(100) vehiclebrand:skoda", "skoda cars", "child2"); + assertSemantics("vehiclebrand:audi", "audi cars", "child2"); + assertSemantics("vehiclebrand:alfa", "alfa bus", "child2.sr"); + assertSemantics("AND vehiclebrand:bmw expensivetv", "bmw motorcycle", "child2.sr"); + assertSemantics("AND vw car", "vw cars", "child2"); + assertSemantics("vehiclebrand:skoda", "skoda cars", "child2"); } @Test public void testGrandchild() { - assertSemantics("WEAKAND(100) vehiclebrand:skoda", "audi cars", "grandchild.sr"); - assertSemantics("WEAKAND(100) vehiclebrand:alfa", "alfa bus", "grandchild"); - assertSemantics("AND (WEAKAND(100) vehiclebrand:bmw) expensivetv", "bmw motorcycle", "grandchild"); - assertSemantics("WEAKAND(100) vehiclebrand:skoda", "vw cars", "grandchild"); - assertSemantics("WEAKAND(100) vehiclebrand:skoda", "skoda cars", "grandchild"); + assertSemantics("vehiclebrand:skoda", "audi cars", "grandchild.sr"); + assertSemantics("vehiclebrand:alfa", "alfa bus", "grandchild"); + assertSemantics("AND vehiclebrand:bmw expensivetv", "bmw motorcycle", "grandchild"); + assertSemantics("vehiclebrand:skoda", "vw cars", "grandchild"); + assertSemantics("vehiclebrand:skoda", "skoda cars", "grandchild"); } @Test public void testSearcher() { - assertSemantics("WEAKAND(100) vehiclebrand:skoda", "vw cars", "grandchild"); - assertSemantics("WEAKAND(100) vehiclebrand:skoda", "vw cars", "grandchild.sd"); + assertSemantics("vehiclebrand:skoda", "vw cars", "grandchild"); + assertSemantics("vehiclebrand:skoda", "vw cars", "grandchild.sd"); try { - assertSemantics("WEAKAND(100) vw cars", "vw cars", "doesntexist"); + assertSemantics("AND vw cars", "vw cars", "doesntexist"); fail("No exception on missing rule base"); } catch (RuleBaseException e) { // Success } - assertSemantics("WEAKAND(100) vw cars", "vw cars", "grandchild.sd&rules.off"); - assertSemanticsRulesOff("WEAKAND(100) vw cars", "vw cars"); + assertSemantics("AND vw cars", "vw cars", "grandchild.sd&rules.off"); + assertSemanticsRulesOff("AND vw cars", "vw cars"); - assertSemantics("WEAKAND(100) vw car", "vw cars", "child2"); - assertSemantics("WEAKAND(100) vehiclebrand:skoda","skoda cars","child2"); + assertSemantics("AND vw car", "vw cars", "child2"); + assertSemantics("vehiclebrand:skoda","skoda cars","child2"); - assertSemantics("WEAKAND(100) vehiclebrand:skoda","audi cars", "child1"); - assertSemantics("WEAKAND(100) vehiclebrand:skoda","vw cars", "child1"); - assertSemantics("WEAKAND(100) skoda car", "skoda cars","child1"); + assertSemantics("vehiclebrand:skoda","audi cars", "child1"); + assertSemantics("vehiclebrand:skoda","vw cars", "child1"); + assertSemantics("AND skoda car", "skoda cars","child1"); - assertSemantics("WEAKAND(100) vw car", "vw cars", "parent"); - assertSemantics("WEAKAND(100) skoda car", "skoda cars","parent"); + assertSemantics("AND vw car", "vw cars", "parent"); + assertSemantics("AND skoda car", "skoda cars","parent"); } private Result doSearch(Searcher searcher, Query query, int offset, int hits) { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/InheritanceTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/InheritanceTestCase.java index baec0066fb3..e9364074281 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/InheritanceTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/InheritanceTestCase.java @@ -89,38 +89,38 @@ public class InheritanceTestCase { @Test public void testParent() { - assertSemantics("WEAKAND(100) vehiclebrand:audi", "audi cars", parent); - assertSemantics("WEAKAND(100) vehiclebrand:alfa", "alfa bus", parent); - assertSemantics("AND (WEAKAND(100) vehiclebrand:bmw) expensivetv", "bmw motorcycle", parent); - assertSemantics("WEAKAND(100) vw car", "vw cars", parent); - assertSemantics("WEAKAND(100) skoda car", "skoda cars", parent); + assertSemantics("vehiclebrand:audi", "audi cars", parent); + assertSemantics("vehiclebrand:alfa", "alfa bus", parent); + assertSemantics("AND vehiclebrand:bmw expensivetv", "bmw motorcycle", parent); + assertSemantics("AND vw car", "vw cars", parent); + assertSemantics("AND skoda car", "skoda cars", parent); } @Test public void testChild1() { - assertSemantics("WEAKAND(100) vehiclebrand:skoda", "audi cars", child1); - assertSemantics("WEAKAND(100) vehiclebrand:alfa", "alfa bus", child1); - assertSemantics("AND (WEAKAND(100) vehiclebrand:bmw) expensivetv", "bmw motorcycle", child1); - assertSemantics("WEAKAND(100) vehiclebrand:skoda", "vw cars", child1); - assertSemantics("WEAKAND(100) skoda car", "skoda cars", child1); + assertSemantics("vehiclebrand:skoda", "audi cars", child1); + assertSemantics("vehiclebrand:alfa", "alfa bus", child1); + assertSemantics("AND vehiclebrand:bmw expensivetv", "bmw motorcycle", child1); + assertSemantics("vehiclebrand:skoda", "vw cars", child1); + assertSemantics("AND skoda car", "skoda cars", child1); } @Test public void testChild2() { - assertSemantics("WEAKAND(100) vehiclebrand:audi","audi cars", child2); - assertSemantics("WEAKAND(100) vehiclebrand:alfa","alfa bus", child2); - assertSemantics("AND (WEAKAND(100) vehiclebrand:bmw) expensivetv","bmw motorcycle", child2); - assertSemantics("WEAKAND(100) vw car","vw cars", child2); - assertSemantics("WEAKAND(100) vehiclebrand:skoda","skoda cars", child2); + assertSemantics("vehiclebrand:audi","audi cars", child2); + assertSemantics("vehiclebrand:alfa","alfa bus", child2); + assertSemantics("AND vehiclebrand:bmw expensivetv","bmw motorcycle", child2); + assertSemantics("AND vw car","vw cars", child2); + assertSemantics("vehiclebrand:skoda","skoda cars", child2); } @Test public void testGrandchild() { - assertSemantics("WEAKAND(100) vehiclebrand:skoda","audi cars", grandchild); - assertSemantics("WEAKAND(100) vehiclebrand:alfa","alfa bus", grandchild); - assertSemantics("AND (WEAKAND(100) vehiclebrand:bmw) expensivetv","bmw motorcycle", grandchild); - assertSemantics("WEAKAND(100) vehiclebrand:skoda","vw cars", grandchild); - assertSemantics("WEAKAND(100) vehiclebrand:skoda","skoda cars", grandchild); + assertSemantics("vehiclebrand:skoda","audi cars", grandchild); + assertSemantics("vehiclebrand:alfa","alfa bus", grandchild); + assertSemantics("AND vehiclebrand:bmw expensivetv","bmw motorcycle", grandchild); + assertSemantics("vehiclebrand:skoda","vw cars", grandchild); + assertSemantics("vehiclebrand:skoda","skoda cars", grandchild); } @Test @@ -133,28 +133,28 @@ public class InheritanceTestCase { @Test public void testSearcher() { - assertSemantics("WEAKAND(100) vehiclebrand:skoda","vw cars", ""); - assertSemantics("WEAKAND(100) vehiclebrand:skoda","vw cars", "&rules.rulebase=grandchild"); - assertSemantics("WEAKAND(100) vehiclebrand:skoda","vw cars", "&rules.rulebase=grandchild.sd"); + assertSemantics("vehiclebrand:skoda","vw cars", ""); + assertSemantics("vehiclebrand:skoda","vw cars", "&rules.rulebase=grandchild"); + assertSemantics("vehiclebrand:skoda","vw cars", "&rules.rulebase=grandchild.sd"); try { - assertSemantics("WEAKAND(100) vw cars", "vw cars", "&rules.rulebase=doesntexist"); + assertSemantics("AND vw cars", "vw cars", "&rules.rulebase=doesntexist"); fail("No exception on missing rule base"); } catch (RuleBaseException e) { // Success } - assertSemantics("WEAKAND(100) vw cars", "vw cars", "&rules.rulebase=grandchild.sd&rules.off"); - assertSemantics("WEAKAND(100) vw cars", "vw cars", "&rules.off"); + assertSemantics("AND vw cars", "vw cars", "&rules.rulebase=grandchild.sd&rules.off"); + assertSemantics("AND vw cars", "vw cars", "&rules.off"); - assertSemantics("WEAKAND(100) vw car", "vw cars", "&rules.rulebase=child2"); - assertSemantics("WEAKAND(100) vehiclebrand:skoda","skoda cars","&rules.rulebase=child2"); + assertSemantics("AND vw car", "vw cars", "&rules.rulebase=child2"); + assertSemantics("vehiclebrand:skoda","skoda cars","&rules.rulebase=child2"); - assertSemantics("WEAKAND(100) vehiclebrand:skoda","audi cars", "&rules.rulebase=child1"); - assertSemantics("WEAKAND(100) vehiclebrand:skoda","vw cars", "&rules.rulebase=child1"); - assertSemantics("WEAKAND(100) skoda car", "skoda cars","&rules.rulebase=child1"); + assertSemantics("vehiclebrand:skoda","audi cars", "&rules.rulebase=child1"); + assertSemantics("vehiclebrand:skoda","vw cars", "&rules.rulebase=child1"); + assertSemantics("AND skoda car", "skoda cars","&rules.rulebase=child1"); - assertSemantics("WEAKAND(100) vw car", "vw cars", "&rules.rulebase=parent"); - assertSemantics("WEAKAND(100) skoda car", "skoda cars","&rules.rulebase=parent"); + assertSemantics("AND vw car", "vw cars", "&rules.rulebase=parent"); + assertSemantics("AND skoda car", "skoda cars","&rules.rulebase=parent"); } protected void assertSemantics(String result,String input,String ruleSelection) { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/Parameter2TestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/Parameter2TestCase.java index 5b1c38b7752..66ceccc1c47 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/Parameter2TestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/Parameter2TestCase.java @@ -20,7 +20,7 @@ public class Parameter2TestCase extends RuleBaseAbstractTestCase { /** Tests parameter production */ @Test public void testParameterProduction() { - assertRankParameterSemantics("WEAKAND(100) a","a&ranking=usrank","date",0); + assertRankParameterSemantics("a","a&ranking=usrank","date",0); } private void assertRankParameterSemantics(String producedQuery,String inputQuery, diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ParameterTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ParameterTestCase.java index b597443d1d3..376da065f4d 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ParameterTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ParameterTestCase.java @@ -55,12 +55,12 @@ public class ParameterTestCase extends RuleBaseAbstractTestCase { @Test public void testMultipleAlternativeParameterValuesInCondition() { - assertInputRankParameterSemantics("WEAKAND(100) one", "foo", "cat"); - assertInputRankParameterSemantics("WEAKAND(100) one", "foo", "cat0"); - assertInputRankParameterSemantics("WEAKAND(100) one", "bar", "cat"); - assertInputRankParameterSemantics("WEAKAND(100) one", "bar", "cat0"); - assertInputRankParameterSemantics("WEAKAND(100) one one", "foo+bar", "cat0"); - assertInputRankParameterSemantics("WEAKAND(100) fuki sushi", "fuki+sushi", "cat0"); + assertInputRankParameterSemantics("one", "foo", "cat"); + assertInputRankParameterSemantics("one", "foo", "cat0"); + assertInputRankParameterSemantics("one", "bar", "cat"); + assertInputRankParameterSemantics("one", "bar", "cat0"); + assertInputRankParameterSemantics("AND one one", "foo+bar", "cat0"); + assertInputRankParameterSemantics("AND fuki sushi", "fuki+sushi", "cat0"); } private void assertInputRankParameterSemantics(String producedQuery,String inputQuery, String rankParameterValue) { diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ProductionRuleTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ProductionRuleTestCase.java index e892adc3b1c..bafb2cb6a73 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ProductionRuleTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ProductionRuleTestCase.java @@ -52,7 +52,7 @@ public class ProductionRuleTestCase { RuleEvaluation e = new Evaluation(query, null).freshRuleEvaluation(); assertTrue(rule.matches(e)); rule.produce(e); - assertEquals("WEAKAND(100) brand:sony", query.getModel().getQueryTree().getRoot().toString()); + assertEquals("AND brand:sony", query.getModel().getQueryTree().getRoot().toString()); } } diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/StopwordTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/StopwordTestCase.java index a0c2cf4545c..6b1e551edfa 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/StopwordTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/StopwordTestCase.java @@ -18,19 +18,19 @@ public class StopwordTestCase extends RuleBaseAbstractTestCase { @Test public void testStopwords() { - assertSemantics("WEAKAND(100) mlr:ve mlr:heard mlr:beautiful mlr:world", + assertSemantics("AND mlr:ve mlr:heard mlr:beautiful mlr:world", new Query(QueryTestCase.httpEncode("?query=i don't know if you've heard, but it's a beautiful world&default-index=mlr&tracelevel.rules=0"))); } /** If the query contains nothing but stopwords, we won't remove them */ @Test public void testOnlyStopwords() { - assertSemantics("WEAKAND(100) mlr:the", new Query(QueryTestCase.httpEncode("?query=the the&default-index=mlr&tracelevel.rules=0"))); + assertSemantics("mlr:the", new Query(QueryTestCase.httpEncode("?query=the the&default-index=mlr&tracelevel.rules=0"))); } @Test public void testStopwordsInPhrase() { - assertSemantics("WEAKAND(100) mlr:\"ve heard\" mlr:beautiful mlr:world", + assertSemantics("AND mlr:\"ve heard\" mlr:beautiful mlr:world", new Query(QueryTestCase.httpEncode("?query=\"i don't know if you've heard\", but it's a beautiful world&default-index=mlr&tracelevel.rules=0"))); } 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 9ed84298838..6c500604a81 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,26 +17,25 @@ public class GetRawWordTestCase { @Test public void testGetRawWord() { - Query query = new Query("?query=%C4%B0%C5%9EBANKASI%20GAZ%C4%B0EM%C4%B0R&type=all&searchChain=vespa"); + Query query = new Query("?query=%C4%B0%C5%9EBANKASI%20GAZ%C4%B0EM%C4%B0R&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 0f7c9526533..eb53ab4bf86 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("WEAKAND(100) a:b", q.getModel().getQueryTree().getRoot().toString()); + assertEquals("a:b", q.getModel().getQueryTree().getRoot().toString()); q = newQuery("?query=notarealindex:b", indexFacts); - assertEquals("WEAKAND(100) (AND notarealindex b)", q.getModel().getQueryTree().getRoot().toString()); + assertEquals("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&type=all", indexFacts); + Query q = newQuery("?query=" + indexName + ":foo...&search=artist", 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&type=all", indexFacts); + Query q = newQuery("?query=" + u_name + ":foo...&search=foobar", 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("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()); + assertEquals("AND url:https url:foo url:bar", query1.getModel().getQueryTree().toString()); + assertEquals("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 eaab7e12f33..d5efd3992b2 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&type=all"); - assertEquals("foobar", ((WordItem) q.getModel().getQueryTree().getRoot()).getWord()); + Query q = newQuery("/search?query=foobar&offset=10&hits=20"); + 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&type=all"); + Query q = new Query("/?query=beyonc%C3%A9"); 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("WEAKAND(100) def:hi def:hello keyword:kanoo " + + assertEquals("AND 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&type=all", Language.ENGLISH, + Query query = newQueryFromEncoded("?query=content:%EF%BC%B3%EF%BC%AF%EF%BC%AE%EF%BC%B9", 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&type=all", Language.ENGLISH, + query = newQueryFromEncoded("?query=foo&filter=+%EF%BC%B3%EF%BC%AF%EF%BC%AE%EF%BC%B9", 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("WEAKAND(100) test", qs.getModel().getQueryTree().toString()); + assertEquals("test", qs.getModel().getQueryTree().toString()); assertEquals((int)qs.properties().getInteger("rankfeature.something"),2); Query qp = new Query(qs); - assertEquals("WEAKAND(100) test", qp.getModel().getQueryTree().getRoot().toString()); + assertEquals("test", qp.getModel().getQueryTree().getRoot().toString()); assertFalse(qp.getRanking().getFeatures().isEmpty()); assertEquals(2.0, qp.getRanking().getFeatures().getDouble("something").getAsDouble(), 0.000001); } |