diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-11-02 10:35:48 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2022-11-02 10:35:48 +0100 |
commit | 122437e086376bcc6e44cf13ec071825519852c9 (patch) | |
tree | 75eb02aaef341b44b01c16e7cb619a3fc352dd43 /container-search/src/test/java/com | |
parent | 82a57bbed60b624999da93f18eb05746d0ede3f7 (diff) |
Propagate targetHits in tokenize
Diffstat (limited to 'container-search/src/test/java/com')
-rw-r--r-- | container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java | 7 | ||||
-rw-r--r-- | container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java index 858d5a16352..d3c77d2ba66 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java @@ -91,9 +91,14 @@ public class UserInputTestCase { @Test void testUserInputSettingTargetHits() { + assertTargetHitsIsPropagatedInUserInput("weakAnd"); + assertTargetHitsIsPropagatedInUserInput("tokenize"); + } + + private void assertTargetHitsIsPropagatedInUserInput(String grammar) { URIBuilder builder = searchUri(); builder.setParameter("yql", - "select * from sources * where {grammar: \"weakAnd\", targetHits: 17, defaultIndex: \"f\"}userInput(\"a test\")"); + "select * from sources * where {grammar: \"" + grammar + "\", targetHits: 17, defaultIndex: \"f\"}userInput(\"a test\")"); Query query = searchAndAssertNoErrors(builder); assertEquals("select * from sources * where ({targetNumHits: 17}weakAnd(f contains \"a\", f contains \"test\"))", query.yqlRepresentation()); WeakAndItem weakAnd = (WeakAndItem)query.getModel().getQueryTree().getRoot(); diff --git a/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java index a1dad201958..c15c3b2c5ea 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java @@ -446,12 +446,6 @@ public class YqlParserTestCase { } @Test - void testTokenizeGrammar() { - Item root = parse("select foo from bar where ({grammar: \"tokenize\", targetHits: 10, defaultIndex: \"default\"}userInput(\"this is a test\"))").getRoot(); - assertEquals("WEAKAND(100) default:this default:is default:a default:test", root.toString()); - } - - @Test void testAccentDropping() { assertFalse(getRootWord("select foo from bar where baz contains " + "( {accentDrop: false} \"colors\")").isNormalizable()); |