diff options
Diffstat (limited to 'container-search/src/test/java/com/yahoo/prelude/semantics')
8 files changed, 86 insertions, 86 deletions
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 43e8e0a30cf..71e36e45acc 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 (AND sony digital camera) dsp1:sony dsp5:digicamera", query.getModel().getQueryTree().getRoot().toString()); + assertEquals("RANK (WEAKAND(100) 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 (AND sony digital camera) dsp1:sony dsp5:digicamera", query.getModel().getQueryTree().getRoot().toString()); + assertEquals("RANK (WEAKAND(100) 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 394752f8aa1..06f7112f851 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("replaced","word1 word2 word5 word8"); + assertSemantics("WEAKAND(100) replaced","word1 word2 word5 word8"); } @Test public void testMultilevelBacktrackingWontReorderOthertermsLiteralTerms() { - assertSemantics("AND other1 other2 other3 replaced","other1 other2 other3 word1 word2 word5 word8"); + assertSemantics("WEAKAND(100) other1 other2 other3 replaced","other1 other2 other3 word1 word2 word5 word8"); } @Test public void testMultilevelBacktrackingWithMulticompoundMatchLiteralTerms() { - assertSemantics("AND other1 other2 other3 replaced","other1 other2 other3 word1 word2 word5-word8"); + assertSemantics("WEAKAND(100) other1 other2 other3 replaced","other1 other2 other3 word1 word2 word5-word8"); } @Test public void testMultilevelBacktrackingPreservePartialMatchBeforeLiteralTerms() { - assertSemantics("AND word1 word2 word5 replaced","word1 word2 word5 word1 word2 word5 word8"); + assertSemantics("WEAKAND(100) word1 word2 word5 replaced","word1 word2 word5 word1 word2 word5 word8"); } @Test public void testMultilevelBacktrackingPreservePartialMatchAfterLiteralTerms() { - assertSemantics("AND replaced word1 word2 word5","word1 word2 word5 word8 word1 word2 word5 "); + assertSemantics("WEAKAND(100) replaced word1 word2 word5","word1 word2 word5 word8 word1 word2 word5 "); } // reference terms --------------- @Test public void testMultilevelBacktrackingReferenceTerms() { - assertSemantics("AND ref:ref1 ref:ref2 ref:ref5 ref:ref8","ref1 ref2 ref5 ref8"); + assertSemantics("WEAKAND(100) ref:ref1 ref:ref2 ref:ref5 ref:ref8","ref1 ref2 ref5 ref8"); } @Test public void testMultilevelBacktrackingPreservePartialMatchBeforeReferenceTerms() { - assertSemantics("AND ref1 ref2 ref5 ref:ref1 ref:ref2 ref:ref5 ref:ref8", + assertSemantics("WEAKAND(100) ref1 ref2 ref5 ref:ref1 ref:ref2 ref:ref5 ref:ref8", "ref1 ref2 ref5 ref1 ref2 ref5 ref8"); } @Test public void testMultilevelBacktrackingPreservePartialMatchAfterReferenceTerms() { - assertSemantics("AND ref:ref1 ref:ref2 ref:ref5 ref:ref8 ref1 ref2 ref5", + assertSemantics("WEAKAND(100) 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 6d5b9459833..0515417f515 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("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"); + 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"); } @Test public void testChild1() { - 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"); + 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"); } @Test public void testChild2() { - 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"); + 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"); } @Test public void testGrandchild() { - 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"); + 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"); } @Test public void testSearcher() { - assertSemantics("vehiclebrand:skoda", "vw cars", "grandchild"); - assertSemantics("vehiclebrand:skoda", "vw cars", "grandchild.sd"); + assertSemantics("WEAKAND(100) vehiclebrand:skoda", "vw cars", "grandchild"); + assertSemantics("WEAKAND(100) vehiclebrand:skoda", "vw cars", "grandchild.sd"); try { - assertSemantics("AND vw cars", "vw cars", "doesntexist"); + assertSemantics("WEAKAND(100) vw cars", "vw cars", "doesntexist"); fail("No exception on missing rule base"); } catch (RuleBaseException e) { // Success } - assertSemantics("AND vw cars", "vw cars", "grandchild.sd&rules.off"); - assertSemanticsRulesOff("AND vw cars", "vw cars"); + assertSemantics("WEAKAND(100) vw cars", "vw cars", "grandchild.sd&rules.off"); + assertSemanticsRulesOff("WEAKAND(100) vw cars", "vw cars"); - assertSemantics("AND vw car", "vw cars", "child2"); - assertSemantics("vehiclebrand:skoda","skoda cars","child2"); + assertSemantics("WEAKAND(100) vw car", "vw cars", "child2"); + assertSemantics("WEAKAND(100) vehiclebrand:skoda","skoda cars","child2"); - assertSemantics("vehiclebrand:skoda","audi cars", "child1"); - assertSemantics("vehiclebrand:skoda","vw cars", "child1"); - assertSemantics("AND skoda car", "skoda cars","child1"); + 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("AND vw car", "vw cars", "parent"); - assertSemantics("AND skoda car", "skoda cars","parent"); + assertSemantics("WEAKAND(100) vw car", "vw cars", "parent"); + assertSemantics("WEAKAND(100) 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 e9364074281..baec0066fb3 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("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); + 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); } @Test public void testChild1() { - 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); + 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); } @Test public void testChild2() { - 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); + 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); } @Test public void testGrandchild() { - 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); + 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); } @Test @@ -133,28 +133,28 @@ public class InheritanceTestCase { @Test public void testSearcher() { - assertSemantics("vehiclebrand:skoda","vw cars", ""); - assertSemantics("vehiclebrand:skoda","vw cars", "&rules.rulebase=grandchild"); - assertSemantics("vehiclebrand:skoda","vw cars", "&rules.rulebase=grandchild.sd"); + 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"); try { - assertSemantics("AND vw cars", "vw cars", "&rules.rulebase=doesntexist"); + assertSemantics("WEAKAND(100) vw cars", "vw cars", "&rules.rulebase=doesntexist"); fail("No exception on missing rule base"); } catch (RuleBaseException e) { // Success } - assertSemantics("AND vw cars", "vw cars", "&rules.rulebase=grandchild.sd&rules.off"); - assertSemantics("AND vw cars", "vw cars", "&rules.off"); + 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 car", "vw cars", "&rules.rulebase=child2"); - assertSemantics("vehiclebrand:skoda","skoda cars","&rules.rulebase=child2"); + assertSemantics("WEAKAND(100) vw car", "vw cars", "&rules.rulebase=child2"); + assertSemantics("WEAKAND(100) vehiclebrand:skoda","skoda cars","&rules.rulebase=child2"); - 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) 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("AND vw car", "vw cars", "&rules.rulebase=parent"); - assertSemantics("AND skoda car", "skoda cars","&rules.rulebase=parent"); + assertSemantics("WEAKAND(100) vw car", "vw cars", "&rules.rulebase=parent"); + assertSemantics("WEAKAND(100) 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 66ceccc1c47..5b1c38b7752 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("a","a&ranking=usrank","date",0); + assertRankParameterSemantics("WEAKAND(100) 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 376da065f4d..b597443d1d3 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("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"); + 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"); } 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 bafb2cb6a73..e892adc3b1c 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("AND brand:sony", query.getModel().getQueryTree().getRoot().toString()); + assertEquals("WEAKAND(100) 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 6b1e551edfa..a0c2cf4545c 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("AND mlr:ve mlr:heard mlr:beautiful mlr:world", + assertSemantics("WEAKAND(100) 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("mlr:the", new Query(QueryTestCase.httpEncode("?query=the the&default-index=mlr&tracelevel.rules=0"))); + assertSemantics("WEAKAND(100) mlr:the", new Query(QueryTestCase.httpEncode("?query=the the&default-index=mlr&tracelevel.rules=0"))); } @Test public void testStopwordsInPhrase() { - assertSemantics("AND mlr:\"ve heard\" mlr:beautiful mlr:world", + assertSemantics("WEAKAND(100) 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"))); } |