diff options
author | Jon Bratseth <bratseth@gmail.com> | 2021-04-14 15:15:06 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2021-04-14 15:15:06 +0200 |
commit | 8eec45ee768dfc9b810eba7904e9116d6a0cfa17 (patch) | |
tree | 4b7a33392f6f8605f6e1ea33c8b1615887bae1a9 /container-search/src/test | |
parent | acc1a51015dc24ad3de9e99c9c067d49a517b8c1 (diff) |
Change WAND to WEAKAND in debug output format
Diffstat (limited to 'container-search/src/test')
5 files changed, 13 insertions, 13 deletions
diff --git a/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java index 204ccff7fb3..02175425808 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java @@ -192,7 +192,7 @@ public class ItemsCommonStuffTestCase { assertEquals("SAND", i.getName()); i = new WeakAndItem(); assertEquals(ItemType.WEAK_AND, i.getItemType()); - assertEquals("WAND", i.getName()); + assertEquals("WEAKAND", i.getName()); } @Test diff --git a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParseTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParseTestCase.java index f221cbb63b1..6afea895f3a 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParseTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParseTestCase.java @@ -2480,17 +2480,17 @@ public class ParseTestCase { @Test public void testSimpleWandAdvanced() { - tester.assertParsed("WAND(100) foo bar baz", "foo wand bar wand baz", Query.Type.ADVANCED); + tester.assertParsed("WEAKAND(100) foo bar baz", "foo wand bar wand baz", Query.Type.ADVANCED); } @Test public void testSimpleWandAdvancedWithNonDefaultN() { - tester.assertParsed("WAND(32) foo bar baz", "foo wand(32) bar wand(32) baz", Query.Type.ADVANCED); + tester.assertParsed("WEAKAND(32) foo bar baz", "foo weakand(32) bar weakand(32) baz", Query.Type.ADVANCED); } @Test public void testSimpleWandAdvancedWithNonDefaultNAndWeights() { - tester.assertParsed("WAND(32) foo!32 bar!64 baz", "foo!32 wand(32) bar!64 wand(32) baz", Query.Type.ADVANCED); + tester.assertParsed("WEAKAND(32) foo!32 bar!64 baz", "foo!32 weakand(32) bar!64 weakand(32) baz", Query.Type.ADVANCED); } @Test 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 c10e2dcb3ad..e7a2a4f3ef8 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 @@ -29,7 +29,7 @@ public class QueryCanonicalizerTestCase { CompositeItem root = new WeakAndItem(); root.addItem(new WordItem("word")); - assertCanonicalized("WAND(100) word", null, root); + assertCanonicalized("WEAKAND(100) word", null, root); } @Test @@ -128,7 +128,7 @@ public class QueryCanonicalizerTestCase { l4.addItem(new WordItem("l4")); - assertCanonicalized("WAND(100) l4 l3 l2 l1", null, root); + assertCanonicalized("WEAKAND(100) l4 l3 l2 l1", null, root); } @Test @@ -145,7 +145,7 @@ public class QueryCanonicalizerTestCase { l2.addItem(new WordItem("l2")); - assertCanonicalized("WAND(10) (WAND(100) (WAND(100) l2) l1)", null, root); + assertCanonicalized("WEAKAND(10) (WEAKAND(100) (WEAKAND(100) l2) l1)", null, root); } @Test 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 24c8e040051..dd2d27eb66c 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 @@ -631,14 +631,14 @@ public class YqlParserTestCase { @SuppressWarnings("deprecation") public void testWeakAnd() { assertParse("select foo from bar where weakAnd(a contains \"A\", b contains \"B\");", - "WAND(100) a:A b:B"); + "WEAKAND(100) a:A b:B"); assertParse("select foo from bar where [{\"targetHits\": 37}]weakAnd(a contains \"A\", " + "b contains \"B\");", - "WAND(37) a:A b:B"); + "WEAKAND(37) a:A b:B"); QueryTree tree = parse("select foo from bar where [{\"scoreThreshold\": 41}]weakAnd(a " + "contains \"A\", b contains \"B\");"); - assertEquals("WAND(100) a:A b:B", tree.toString()); + assertEquals("WEAKAND(100) a:A b:B", tree.toString()); assertEquals(WeakAndItem.class, tree.getRoot().getClass()); assertEquals(41, ((WeakAndItem)tree.getRoot()).getScoreThreshold()); } diff --git a/container-search/src/test/java/com/yahoo/select/SelectTestCase.java b/container-search/src/test/java/com/yahoo/select/SelectTestCase.java index 7549c67d0ae..d1e46a6a8c2 100644 --- a/container-search/src/test/java/com/yahoo/select/SelectTestCase.java +++ b/container-search/src/test/java/com/yahoo/select/SelectTestCase.java @@ -555,12 +555,12 @@ public class SelectTestCase { @SuppressWarnings("deprecation") public void testWeakAnd() { assertParse("{ \"weakAnd\": [{ \"contains\": [\"a\", \"A\"] }, { \"contains\": [\"b\", \"B\"] } ] }", - "WAND(100) a:A b:B"); + "WEAKAND(100) a:A b:B"); assertParse("{ \"weakAnd\": { \"children\" : [{ \"contains\": [\"a\", \"A\"] }, { \"contains\": [\"b\", \"B\"] } ], \"attributes\" : {\"targetHits\": 37} }}", - "WAND(37) a:A b:B"); + "WEAKAND(37) a:A b:B"); QueryTree tree = parseWhere("{ \"weakAnd\": { \"children\" : [{ \"contains\": [\"a\", \"A\"] }, { \"contains\": [\"b\", \"B\"] } ], \"attributes\" : {\"scoreThreshold\": 41}}}"); - assertEquals("WAND(100) a:A b:B", tree.toString()); + assertEquals("WEAKAND(100) a:A b:B", tree.toString()); assertEquals(WeakAndItem.class, tree.getRoot().getClass()); assertEquals(41, ((WeakAndItem)tree.getRoot()).getScoreThreshold()); } |