diff options
Diffstat (limited to 'container-search/src/test/java/com/yahoo/search/yql')
8 files changed, 501 insertions, 511 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/yql/FieldFilterTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/FieldFilterTestCase.java index 8a6a48afd9f..3d4f52472a8 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/FieldFilterTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/FieldFilterTestCase.java @@ -1,13 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.yql; -import static org.junit.Assert.*; - - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.yahoo.component.chain.Chain; import com.yahoo.prelude.fastsearch.FastHit; import com.yahoo.search.Query; @@ -31,7 +29,7 @@ public class FieldFilterTestCase { private Execution.Context context; private Execution execution; - @Before + @BeforeEach public void setUp() throws Exception { Query query = new Query("?query=test"); @@ -58,7 +56,7 @@ public class FieldFilterTestCase { return h; } - @After + @AfterEach public void tearDown() throws Exception { searchChain = null; context = null; @@ -66,7 +64,7 @@ public class FieldFilterTestCase { } @Test - public final void testBasic() { + final void testBasic() { final Query query = new Query("?query=test&presentation.summaryFields=" + FIELD_B); Result result = execution.search(query); execution.fill(result); @@ -77,7 +75,7 @@ public class FieldFilterTestCase { } @Test - public final void testNoFiltering() { + final void testNoFiltering() { final Query query = new Query("?query=test"); Result result = execution.search(query); execution.fill(result); diff --git a/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java index 1ef9fe5832f..1e6e29bb700 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java @@ -18,19 +18,17 @@ import com.yahoo.search.query.Sorting.UcaSorter; import com.yahoo.search.result.ErrorMessage; import com.yahoo.search.searchchain.Execution; import org.apache.http.client.utils.URIBuilder; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.*; /** * Smoke test for first generation YQL+ integration. @@ -41,14 +39,14 @@ public class MinimalQueryInserterTestCase { private Execution.Context context; private Execution execution; - @Before + @BeforeEach public void setUp() throws Exception { searchChain = new Chain<>(new MinimalQueryInserter()); context = Execution.Context.createContextStub(); execution = new Execution(searchChain, context); } - @After + @AfterEach public void tearDown() { searchChain = null; context = null; @@ -56,7 +54,7 @@ public class MinimalQueryInserterTestCase { } @Test - public void requireThatGroupingStepsAreAttachedToQuery() { + void requireThatGroupingStepsAreAttachedToQuery() { URIBuilder builder = new URIBuilder(); builder.setPath("search/"); @@ -70,24 +68,24 @@ public class MinimalQueryInserterTestCase { assertEquals("foo", query.getPresentation().getSummaryFields().toArray(new String[1])[0]); builder.setParameter("yql", "select foo from bar where baz contains 'cox' " + - "| all(group(a) each(output(count())))"); + "| all(group(a) each(output(count())))"); query = new Query(builder.toString()); execution.search(query); assertEquals("baz:cox", query.getModel().getQueryTree().toString()); assertGrouping("[[]all(group(a) each(output(count())))]", query); builder.setParameter("yql", "select foo from bar where baz contains 'cox' " + - "| all(group(a) each(output(count()))) " + - "| all(group(b) each(output(count())))"); + "| all(group(a) each(output(count()))) " + + "| all(group(b) each(output(count())))"); query = new Query(builder.toString()); execution.search(query); assertEquals("baz:cox", query.getModel().getQueryTree().toString()); assertGrouping("[[]all(group(a) each(output(count())))," + - " []all(group(b) each(output(count())))]", query); + " []all(group(b) each(output(count())))]", query); } @Test - public void requireThatGroupingContinuationsAreAttachedToQuery() { + void requireThatGroupingContinuationsAreAttachedToQuery() { URIBuilder builder = new URIBuilder(); builder.setPath("search/"); @@ -98,36 +96,36 @@ public class MinimalQueryInserterTestCase { assertGrouping("[]", query); builder.setParameter("yql", "select foo from bar where baz contains 'cox' " + - "| { continuations:['BCBCBCBEBG', 'BCBKCBACBKCCK'] }" + - "all(group(a) each(output(count())))"); + "| { continuations:['BCBCBCBEBG', 'BCBKCBACBKCCK'] }" + + "all(group(a) each(output(count())))"); query = new Query(builder.toString()); execution.search(query); assertEquals("baz:cox", query.getModel().getQueryTree().toString()); assertGrouping("[[BCBCBCBEBG, BCBKCBACBKCCK]all(group(a) each(output(count())))]", query); builder.setParameter("yql", "select foo from bar where baz contains 'cox' " + - "| { continuations:['BCBCBCBEBG', 'BCBKCBACBKCCK'] }" + - "all(group(a) each(output(count()))) " + - "| { continuations:['BCBBBBBDBF', 'BCBJBPCBJCCJ'] }" + - "all(group(b) each(output(count())))"); + "| { continuations:['BCBCBCBEBG', 'BCBKCBACBKCCK'] }" + + "all(group(a) each(output(count()))) " + + "| { continuations:['BCBBBBBDBF', 'BCBJBPCBJCCJ'] }" + + "all(group(b) each(output(count())))"); query = new Query(builder.toString()); execution.search(query); assertEquals("baz:cox", query.getModel().getQueryTree().toString()); assertGrouping("[[BCBCBCBEBG, BCBKCBACBKCCK]all(group(a) each(output(count())))," + - " [BCBBBBBDBF, BCBJBPCBJCCJ]all(group(b) each(output(count())))]", query); + " [BCBBBBBDBF, BCBJBPCBJCCJ]all(group(b) each(output(count())))]", query); } - @Test - @Ignore // TODO: YQL work in progress (jon) - public void testTmp() { + @Test + @Disabled + void testTmp() { Query query = new Query("search/?query=easilyRecognizedString&yql=select%20ignoredfield%20from%20ignoredsource%20where%20title%20contains%20%22madonna%22%20and%20userQuery()"); //execution.search(query); assertEquals("AND title:madonna easilyRecognizedString", query.getModel().getQueryTree().toString()); } @Test - public void testSearch() { + void testSearch() { Query query = new Query("search/?query=easilyRecognizedString&yql=select%20ignoredfield%20from%20ignoredsource%20where%20title%20contains%20%22madonna%22%20and%20userQuery()"); execution.search(query); assertEquals("AND title:madonna (WEAKAND(100) easilyRecognizedString)", query.getModel().getQueryTree().toString()); @@ -135,25 +133,25 @@ public class MinimalQueryInserterTestCase { } @Test - public void testExplicitLanguageIsHonoredWithVerbatimQuery() { + void testExplicitLanguageIsHonoredWithVerbatimQuery() { String japaneseWord = "\u30ab\u30bf\u30ab\u30ca"; Query query = new Query("search/?language=ja" + "&yql=select%20ignoredField%20from%20ignoredsource%20where%20title%20contains%20%22" + encode(japaneseWord) + "%22"); execution.search(query); assertEquals(Language.JAPANESE, query.getModel().getParsingLanguage()); - assertEquals("title:"+ japaneseWord, query.getModel().getQueryTree().toString()); + assertEquals("title:" + japaneseWord, query.getModel().getQueryTree().toString()); } @Test - public void testUserLanguageIsDetectedWithVerbatimQuery() { + void testUserLanguageIsDetectedWithVerbatimQuery() { String japaneseWord = "\u30ab\u30bf\u30ab\u30ca"; Query query = new Query("search/?yql=select%20ignoredField%20from%20ignoredsource%20where%20title%20contains%20%22" + encode(japaneseWord) + "%22"); execution.search(query); assertEquals(Language.JAPANESE, query.getModel().getParsingLanguage()); - assertEquals("title:"+ japaneseWord, query.getModel().getQueryTree().toString()); + assertEquals("title:" + japaneseWord, query.getModel().getQueryTree().toString()); } @Test - public void testUserLanguageIsDetectedWithUserInput() { + void testUserLanguageIsDetectedWithUserInput() { String japaneseWord = "\u30ab\u30bf\u30ab\u30ca"; Query query = new Query("search/?userString=" + encode(japaneseWord) + "&yql=select%20ignoredfield%20from%20ignoredsource%20where%20title%20contains%20%22madonna%22%20and%20userInput(@userString)"); execution.search(query); @@ -162,7 +160,7 @@ public class MinimalQueryInserterTestCase { } @Test - public void testUserLanguageIsDetectedWithUserQuery() { + void testUserLanguageIsDetectedWithUserQuery() { String japaneseWord = "\u30ab\u30bf\u30ab\u30ca"; Query query = new Query("search/?query=" + encode(japaneseWord) + "&yql=select%20ignoredfield%20from%20ignoredsource%20where%20title%20contains%20%22madonna%22%20and%20userQuery()"); execution.search(query); @@ -171,14 +169,14 @@ public class MinimalQueryInserterTestCase { } @Test - public void testUserQueryFailsWithoutArgument() { + void testUserQueryFailsWithoutArgument() { Query query = new Query("search/?query=easilyRecognizedString&yql=select%20ignoredfield%20from%20ignoredsource%20where%20title%20contains%20%22madonna%22%20and%20userQuery()"); execution.search(query); assertEquals("AND title:madonna (WEAKAND(100) easilyRecognizedString)", query.getModel().getQueryTree().toString()); } @Test - public void testSearchFromAllSourcesWithUserSource() { + void testSearchFromAllSourcesWithUserSource() { Query query = new Query("search/?query=easilyRecognizedString&sources=abc&yql=select%20ignoredfield%20from%20sources%20*%20where%20title%20contains%20%22madonna%22%20and%20userQuery()"); execution.search(query); assertEquals("AND title:madonna (WEAKAND(100) easilyRecognizedString)", query.getModel().getQueryTree().toString()); @@ -186,7 +184,7 @@ public class MinimalQueryInserterTestCase { } @Test - public void testSearchFromAllSourcesWithoutUserSource() { + void testSearchFromAllSourcesWithoutUserSource() { Query query = new Query("search/?query=easilyRecognizedString&yql=select%20ignoredfield%20from%20sources%20*%20where%20title%20contains%20%22madonna%22%20and%20userQuery()"); execution.search(query); assertEquals("AND title:madonna (WEAKAND(100) easilyRecognizedString)", query.getModel().getQueryTree().toString()); @@ -194,7 +192,7 @@ public class MinimalQueryInserterTestCase { } @Test - public void testSearchFromSomeSourcesWithoutUserSource() { + void testSearchFromSomeSourcesWithoutUserSource() { Query query = new Query("search/?query=easilyRecognizedString&yql=select%20ignoredfield%20from%20sources%20sourceA,%20sourceB%20where%20title%20contains%20%22madonna%22%20and%20userQuery()"); execution.search(query); assertEquals("AND title:madonna (WEAKAND(100) easilyRecognizedString)", query.getModel().getQueryTree().toString()); @@ -204,7 +202,7 @@ public class MinimalQueryInserterTestCase { } @Test - public void testSearchFromSomeSourcesWithUserSource() { + void testSearchFromSomeSourcesWithUserSource() { Query query = new Query("search/?query=easilyRecognizedString&sources=abc&yql=select%20ignoredfield%20from%20sources%20sourceA,%20sourceB%20where%20title%20contains%20%22madonna%22%20and%20userQuery()"); execution.search(query); assertEquals("AND title:madonna (WEAKAND(100) easilyRecognizedString)", query.getModel().getQueryTree().toString()); @@ -215,7 +213,7 @@ public class MinimalQueryInserterTestCase { } @Test - public final void testSearchFromSomeSourcesWithOverlappingUserSource() { + final void testSearchFromSomeSourcesWithOverlappingUserSource() { final Query query = new Query("search/?query=easilyRecognizedString&sources=abc,sourceA&yql=select%20ignoredfield%20from%20sources%20sourceA,%20sourceB%20where%20title%20contains%20%22madonna%22%20and%20userQuery()"); execution.search(query); assertEquals("AND title:madonna (WEAKAND(100) easilyRecognizedString)", query.getModel().getQueryTree().toString()); @@ -226,17 +224,17 @@ public class MinimalQueryInserterTestCase { } @Test - public void testLimitAndOffset() { + void testLimitAndOffset() { Query query = new Query("search/?yql=select%20*%20from%20sources%20*%20where%20title%20contains%20%22madonna%22%20limit%2031offset%207"); execution.search(query); assertEquals(7, query.getOffset()); assertEquals(24, query.getHits()); assertEquals("select * from sources * where title contains \"madonna\" limit 31 offset 7", - query.yqlRepresentation()); + query.yqlRepresentation()); } @Test - public void testMaxOffset() { + void testMaxOffset() { Query query = new Query("search/?yql=select%20*%20from%20sources%20*%20where%20title%20contains%20%22madonna%22%20limit%2040031offset%2040000"); Result r = execution.search(query); assertEquals(1, r.hits().getErrorHit().errors().size()); @@ -246,7 +244,7 @@ public class MinimalQueryInserterTestCase { } @Test - public void testMaxLimit() { + void testMaxLimit() { Query query = new Query("search/?yql=select%20*%20from%20sources%20*%20where%20title%20contains%20%22madonna%22%20limit%2040000offset%207"); Result r = execution.search(query); assertEquals(1, r.hits().getErrorHit().errors().size()); @@ -256,7 +254,7 @@ public class MinimalQueryInserterTestCase { } @Test - public void testTimeout() { + void testTimeout() { Query query = new Query("search/?yql=select%20*%20from%20sources%20*%20where%20title%20contains%20%22madonna%22%20timeout%2051"); execution.search(query); assertEquals(51L, query.getTimeout()); @@ -264,12 +262,12 @@ public class MinimalQueryInserterTestCase { } @Test - public void testTimeoutWithGrouping() { + void testTimeoutWithGrouping() { var select = "select x, y, z from sources * " + "where (x > 0 AND y contains \"foo\" AND z contains \"bar\") " + "order by x limit 20 offset 10 timeout 30 " + "| all(group(y) max(3) each(output(count())))"; - Query query = new Query("search/?yql="+ URLEncoder.encode(select, Charsets.UTF_8)); + Query query = new Query("search/?yql=" + URLEncoder.encode(select, Charsets.UTF_8)); execution.search(query); assertEquals(10, query.getHits()); @@ -281,7 +279,7 @@ public class MinimalQueryInserterTestCase { } @Test - public void testOrdering() { + void testOrdering() { { String yql = "select%20ignoredfield%20from%20ignoredsource%20where%20title%20contains%20%22madonna%22%20order%20by%20something%2C%20shoesize%20desc%20limit%20300%20timeout%203"; Query query = new Query("search/?yql=" + yql); @@ -335,28 +333,28 @@ public class MinimalQueryInserterTestCase { } @Test - public void testStringRepresentation() { + void testStringRepresentation() { String yql = "select%20ignoredfield%20from%20ignoredsource%20where%20title%20contains%20%22madonna%22%20order%20by%20something%2C%20shoesize%20desc%20limit%20300%20timeout%203"; Query query = new Query("search/?yql=" + yql); execution.search(query); assertEquals("select ignoredfield from ignoredsource where title contains \"madonna\" order by something, shoesize desc limit 300 timeout 3", - query.yqlRepresentation()); + query.yqlRepresentation()); } @Test - public void testAndSegmenting() { + void testAndSegmenting() { Query query = new Query("?yql=select%20%2A%20from%20sources%20%2A%20where%20%5B%7B%22defaultIndex%22%3A%20%22default%22%2C%22grammar%22%3A%20%22web%22%2C%22stem%22%3A%20true%2C%22allowEmpty%22%3A%20true%7D%5DuserInput%28%40animal%29%3B&animal=m%26m%27s&tracelevel=3"); execution.search(query); assertEquals("select * from sources * where (default contains \"m\" AND default contains ({origin: {original: \"m\\'s\", offset: 0, length: 3}, andSegmenting: true}phrase(\"m\", \"s\")))", - query.yqlRepresentation()); + query.yqlRepresentation()); } @Test - public void globalMaxGroupsIsCarriedOver() { + void globalMaxGroupsIsCarriedOver() { URIBuilder builder = new URIBuilder(); builder.setPath("search/"); builder.setParameter("yql", "select foo from bar where baz contains 'cox' " + - "| all(group(a) each(output(count())))"); + "| all(group(a) each(output(count())))"); Query query = new Query(builder.toString()); query.properties().set("grouping.globalMaxGroups", -1); execution.search(query); @@ -365,12 +363,12 @@ public class MinimalQueryInserterTestCase { } @Test - public void globalMaxGroupsCannotBeSetInRequest() { + void globalMaxGroupsCannotBeSetInRequest() { try { URIBuilder builder = new URIBuilder(); builder.setPath("search/"); builder.setParameter("yql", "select foo from bar where baz contains 'cox' " + - "| all(group(a) each(output(count())))"); + "| all(group(a) each(output(count())))"); builder.setParameter("grouping.globalMaxGroups", "-1"); Query query = new Query(builder.toString()); execution.search(query); @@ -382,7 +380,7 @@ public class MinimalQueryInserterTestCase { } @Test - public void verifyThatWarmupIsSane() { + void verifyThatWarmupIsSane() { assertTrue(MinimalQueryInserter.warmup()); } diff --git a/container-search/src/test/java/com/yahoo/search/yql/ParameterListParserTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/ParameterListParserTestCase.java index 44f784e96f3..8037ea097ab 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/ParameterListParserTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/ParameterListParserTestCase.java @@ -2,11 +2,11 @@ package com.yahoo.search.yql; import com.yahoo.prelude.query.WeightedSetItem; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author bratseth @@ -14,7 +14,7 @@ import static org.junit.Assert.assertEquals; public class ParameterListParserTestCase { @Test - public void testMapParsing() { + void testMapParsing() { assertParsed("{}", Map.of()); assertParsed("{a:12}", Map.of("a", 12)); assertParsed("{'a':12}", Map.of("a", 12)); @@ -27,7 +27,7 @@ public class ParameterListParserTestCase { } @Test - public void testArrayParsing() { + void testArrayParsing() { assertParsed("[]", Map.of()); assertParsed("[[0,12]]", Map.of(0L, 12)); assertParsed("[[0,12],[1,13]]", Map.of(0L, 12, 1L, 13)); @@ -39,9 +39,9 @@ public class ParameterListParserTestCase { WeightedSetItem item = new WeightedSetItem("test"); ParameterListParser.addItemsFromString(string, item); for (var entry : expected.entrySet()) { - assertEquals("Key '" + entry.getKey() + "'", entry.getValue(), item.getTokenWeight(entry.getKey())); + assertEquals(entry.getValue(), item.getTokenWeight(entry.getKey()), "Key '" + entry.getKey() + "'"); } - assertEquals("Token count is correct", expected.size(), item.getNumTokens()); + assertEquals(expected.size(), item.getNumTokens(), "Token count is correct"); } } diff --git a/container-search/src/test/java/com/yahoo/search/yql/TermListTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/TermListTestCase.java index 30254aa5738..3f04f36f64e 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/TermListTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/TermListTestCase.java @@ -6,12 +6,12 @@ import com.yahoo.search.Query; import com.yahoo.search.Result; import com.yahoo.search.searchchain.Execution; import org.apache.http.client.utils.URIBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; /** * Tests YQL expressions where a list of terms are supplied by indirection @@ -21,33 +21,33 @@ import static org.junit.Assert.assertNull; public class TermListTestCase { @Test - public void testTermListInWeightedSet() { + void testTermListInWeightedSet() { URIBuilder builder = searchUri(); builder.setParameter("myTerms", "{'1':1, '2':1, 3:1}"); builder.setParameter("yql", "select * from sources * where weightedSet(user_id, @myTerms)"); Query query = searchAndAssertNoErrors(builder); assertEquals("select * from sources * where weightedSet(user_id, {\"1\": 1, \"2\": 1, \"3\": 1})", - query.yqlRepresentation()); + query.yqlRepresentation()); } @Test - public void testTermListInWand() { + void testTermListInWand() { URIBuilder builder = searchUri(); builder.setParameter("myTerms", "{'1':1, 2:1, '3':1}"); builder.setParameter("yql", "select * from sources * where wand(user_id, @myTerms)"); Query query = searchAndAssertNoErrors(builder); assertEquals("select * from sources * where wand(user_id, {\"1\": 1, \"2\": 1, \"3\": 1})", - query.yqlRepresentation()); + query.yqlRepresentation()); } @Test - public void testTermListInDotProduct() { + void testTermListInDotProduct() { URIBuilder builder = searchUri(); builder.setParameter("myTerms", "{'1':1, '2':1, '3':1}"); builder.setParameter("yql", "select * from sources * where dotProduct(user_id, @myTerms)"); Query query = searchAndAssertNoErrors(builder); assertEquals("select * from sources * where dotProduct(user_id, {\"1\": 1, \"2\": 1, \"3\": 1})", - query.yqlRepresentation()); + query.yqlRepresentation()); } private Query searchAndAssertNoErrors(URIBuilder builder) { @@ -57,9 +57,9 @@ public class TermListTestCase { var execution = new Execution(searchChain, context); Result r = execution.search(query); var exception = exceptionOf(r); - assertNull(exception == null ? "No error": - exception.getMessage() + "\n" + Arrays.toString(exception.getStackTrace()), - r.hits().getError()); + assertNull(r.hits().getError(), + exception == null ? "No error": + exception.getMessage() + "\n" + Arrays.toString(exception.getStackTrace())); return query; } 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 4af29822a26..8fe451dd095 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 @@ -1,14 +1,13 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.yql; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import com.yahoo.search.query.QueryTree; import org.apache.http.client.utils.URIBuilder; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.yahoo.component.chain.Chain; import com.yahoo.search.Query; import com.yahoo.search.Result; @@ -30,14 +29,14 @@ public class UserInputTestCase { private Execution.Context context; private Execution execution; - @Before + @BeforeEach public void setUp() throws Exception { searchChain = new Chain<>(new MinimalQueryInserter()); context = Execution.Context.createContextStub(); execution = new Execution(searchChain, context); } - @After + @AfterEach public void tearDown() { searchChain = null; context = null; @@ -45,7 +44,7 @@ public class UserInputTestCase { } @Test - public void testSimpleUserInput() { + void testSimpleUserInput() { { URIBuilder builder = searchUri(); builder.setParameter("yql", "select * from sources * where userInput(\"nalle\")"); @@ -70,7 +69,7 @@ public class UserInputTestCase { } @Test - public void testRawUserInput() { + void testRawUserInput() { URIBuilder builder = searchUri(); builder.setParameter("yql", "select * from sources * where {grammar: \"raw\"}userInput(\"nal le\")"); Query query = searchAndAssertNoErrors(builder); @@ -78,7 +77,7 @@ public class UserInputTestCase { } @Test - public void testSegmentedUserInput() { + void testSegmentedUserInput() { URIBuilder builder = searchUri(); builder.setParameter("yql", "select * from sources * where {grammar: \"segment\"}userInput(\"nal le\")"); @@ -87,7 +86,7 @@ public class UserInputTestCase { } @Test - public void testSegmentedNoiseUserInput() { + void testSegmentedNoiseUserInput() { URIBuilder builder = searchUri(); builder.setParameter("yql", "select * from sources * where {grammar: \"segment\"}userInput(\"^^^^^^^^\")"); @@ -96,45 +95,45 @@ public class UserInputTestCase { } @Test - public void testAnyParsedUserInput() { + void testAnyParsedUserInput() { URIBuilder builder = searchUri(); builder.setParameter("yql", "select * from sources * where {grammar: \"any\"}userInput('foo bar')"); Query query = searchAndAssertNoErrors(builder); assertEquals("select * from sources * where (default contains \"foo\" OR default contains \"bar\")", - query.yqlRepresentation()); + query.yqlRepresentation()); } @Test - public void testAllParsedUserInput() { + void testAllParsedUserInput() { URIBuilder builder = searchUri(); builder.setParameter("yql", "select * from sources * where {grammar: \"all\"}userInput('foo bar')"); Query query = searchAndAssertNoErrors(builder); assertEquals("select * from sources * where (default contains \"foo\" AND default contains \"bar\")", - query.yqlRepresentation()); + query.yqlRepresentation()); } @Test - public void testWeakAndParsedUserInput() { + void testWeakAndParsedUserInput() { URIBuilder builder = searchUri(); builder.setParameter("yql", "select * from sources * where {grammar: \"weakAnd\"}userInput('foo bar')"); Query query = searchAndAssertNoErrors(builder); assertEquals("select * from sources * where weakAnd(default contains \"foo\", default contains \"bar\")", - query.yqlRepresentation()); + query.yqlRepresentation()); } @Test - public void testIllegalGrammar() { + void testIllegalGrammar() { URIBuilder builder = searchUri(); builder.setParameter("yql", "select * from sources * where {grammar: \"nonesuch\"}userInput('foo bar')"); Query query = new Query(builder.toString()); Result r = execution.search(query); assertNotNull(r.hits().getError()); assertEquals("Could not create query from YQL: No query type 'nonesuch'", - r.hits().getError().getDetailedMessage()); + r.hits().getError().getDetailedMessage()); } @Test - public void testCustomDefaultIndexUserInput() { + void testCustomDefaultIndexUserInput() { URIBuilder builder = searchUri(); builder.setParameter("yql", "select * from sources * where {defaultIndex: \"glompf\"}userInput(\"nalle\")"); @@ -143,7 +142,7 @@ public class UserInputTestCase { } @Test - public void testAnnotatedUserInputStemming() { + void testAnnotatedUserInputStemming() { URIBuilder builder = searchUri(); builder.setParameter("yql", "select * from sources * where {stem: false}userInput(\"nalle\")"); @@ -154,18 +153,18 @@ public class UserInputTestCase { } @Test - public void testNegativeNumberComparison() { + void testNegativeNumberComparison() { URIBuilder builder = searchUri(); builder.setParameter("myinput", "-5"); builder.setParameter("yql", - "select * from ecitem where rank(({defaultIndex:\"myfield\"}(userInput(@myinput))))"); + "select * from ecitem where rank(({defaultIndex:\"myfield\"}(userInput(@myinput))))"); Query query = searchAndAssertNoErrors(builder); assertEquals("select * from ecitem where rank(weakAnd(myfield = (-5)))", query.yqlRepresentation()); assertEquals("RANK (WEAKAND(100) myfield:-5)", query.getModel().getQueryTree().getRoot().toString()); } @Test - public void testAnnotatedUserInputUnrankedTerms() { + void testAnnotatedUserInputUnrankedTerms() { URIBuilder builder = searchUri(); builder.setParameter("yql", "select * from sources * where {ranked: false}userInput(\"nalle\")"); @@ -176,7 +175,7 @@ public class UserInputTestCase { } @Test - public void testAnnotatedUserInputFiltersTerms() { + void testAnnotatedUserInputFiltersTerms() { URIBuilder builder = searchUri(); builder.setParameter("yql", "select * from sources * where {filter: true}userInput(\"nalle\")"); @@ -187,7 +186,7 @@ public class UserInputTestCase { } @Test - public void testAnnotatedUserInputCaseNormalization() { + void testAnnotatedUserInputCaseNormalization() { URIBuilder builder = searchUri(); builder.setParameter( "yql", @@ -199,7 +198,7 @@ public class UserInputTestCase { } @Test - public void testAnnotatedUserInputAccentRemoval() { + void testAnnotatedUserInputAccentRemoval() { URIBuilder builder = searchUri(); builder.setParameter("yql", "select * from sources * where {accentDrop: false}userInput(\"nalle\")"); @@ -210,7 +209,7 @@ public class UserInputTestCase { } @Test - public void testAnnotatedUserInputPositionData() { + void testAnnotatedUserInputPositionData() { URIBuilder builder = searchUri(); builder.setParameter("yql", "select * from sources * where {usePositionData: false}userInput(\"nalle\")"); @@ -221,7 +220,7 @@ public class UserInputTestCase { } @Test - public void testQueryPropertiesAsStringArguments() { + void testQueryPropertiesAsStringArguments() { URIBuilder builder = searchUri(); builder.setParameter("nalle", "bamse"); builder.setParameter("meta", "syntactic"); @@ -232,7 +231,7 @@ public class UserInputTestCase { } @Test - public void testReferenceInComparison() { + void testReferenceInComparison() { URIBuilder builder = searchUri(); builder.setParameter("varref", "1980"); builder.setParameter("yql", "select * from sources * where year > @varref"); @@ -241,22 +240,22 @@ public class UserInputTestCase { } @Test - public void testReferenceInContinuation() { + void testReferenceInContinuation() { URIBuilder builder = searchUri(); builder.setParameter("continuation", "BCBCBCBEBG"); builder.setParameter("yql", - "select * from sources * where myfield contains 'token'" + - "| {'continuations':[@continuation, 'BCBKCBACBKCCK'] }all(group(f) each(output(count())))"); + "select * from sources * where myfield contains 'token'" + + "| {'continuations':[@continuation, 'BCBKCBACBKCCK'] }all(group(f) each(output(count())))"); Query query = searchAndAssertNoErrors(builder); assertEquals("select * from sources * where myfield contains \"token\" | { continuations:['BCBCBCBEBG', 'BCBKCBACBKCCK'] }all(group(f) each(output(count())))", query.yqlRepresentation()); } @Test - public void testReferenceInEquiv() { + void testReferenceInEquiv() { URIBuilder builder = searchUri(); builder.setParameter("term", "A"); builder.setParameter("yql", - "select foo from bar where fieldName contains equiv(@term,'B')"); + "select foo from bar where fieldName contains equiv(@term,'B')"); Query query = searchAndAssertNoErrors(builder); assertEquals("select foo from bar where fieldName contains equiv(\"A\", \"B\")", query.yqlRepresentation()); } @@ -264,7 +263,7 @@ public class UserInputTestCase { private Query searchAndAssertNoErrors(URIBuilder builder) { Query query = new Query(builder.toString()); Result r = execution.search(query); - assertNull(stackTraceIfAny(r), r.hits().getError()); + assertNull(r.hits().getError(), stackTraceIfAny(r)); return query; } @@ -281,14 +280,14 @@ public class UserInputTestCase { } @Test - public void testEmptyUserInput() { + void testEmptyUserInput() { URIBuilder builder = searchUri(); builder.setParameter("yql", "select * from sources * where userInput(\"\")"); assertQueryFails(builder); } @Test - public void testEmptyUserInputFromQueryProperty() { + void testEmptyUserInputFromQueryProperty() { URIBuilder builder = searchUri(); builder.setParameter("foo", ""); builder.setParameter("yql", "select * from sources * where userInput(@foo)"); @@ -296,7 +295,7 @@ public class UserInputTestCase { } @Test - public void testEmptyQueryProperty() { + void testEmptyQueryProperty() { URIBuilder builder = searchUri(); builder.setParameter("foo", ""); builder.setParameter("yql", "select * from sources * where bar contains \"a\" and nonEmpty(foo contains @foo)"); @@ -304,7 +303,7 @@ public class UserInputTestCase { } @Test - public void testEmptyQueryPropertyInsideExpression() { + void testEmptyQueryPropertyInsideExpression() { URIBuilder builder = searchUri(); builder.setParameter("foo", ""); builder.setParameter("yql", @@ -313,7 +312,7 @@ public class UserInputTestCase { } @Test - public void testCompositeWithoutArguments() { + void testCompositeWithoutArguments() { URIBuilder builder = searchUri(); builder.setParameter("yql", "select * from sources * where bar contains \"a\" and foo contains phrase()"); searchAndAssertNoErrors(builder); @@ -323,7 +322,7 @@ public class UserInputTestCase { } @Test - public void testAnnoyingPlacementOfNonEmpty() { + void testAnnoyingPlacementOfNonEmpty() { URIBuilder builder = searchUri(); builder.setParameter("yql", "select * from sources * where bar contains \"a\" and foo contains nonEmpty(phrase(\"a\", \"b\"))"); @@ -336,7 +335,7 @@ public class UserInputTestCase { } @Test - public void testAllowEmptyUserInput() { + void testAllowEmptyUserInput() { URIBuilder builder = searchUri(); builder.setParameter("foo", ""); builder.setParameter("yql", "select * from sources * where [{allowEmpty: true}]userInput(@foo)"); @@ -344,7 +343,7 @@ public class UserInputTestCase { } @Test - public void testAllowEmptyNullFromQueryParsing() { + void testAllowEmptyNullFromQueryParsing() { URIBuilder builder = searchUri(); builder.setParameter("foo", ",,,,,,,,"); builder.setParameter("yql", "select * from sources * where [{allowEmpty: true}]userInput(@foo)"); @@ -352,7 +351,7 @@ public class UserInputTestCase { } @Test - public void testDisallowEmptyNullFromQueryParsing() { + void testDisallowEmptyNullFromQueryParsing() { URIBuilder builder = searchUri(); builder.setParameter("foo", ",,,,,,,,"); builder.setParameter("yql", "select * from sources * where userInput(@foo)"); @@ -360,7 +359,7 @@ public class UserInputTestCase { } @Test - public void testUserInputWithEmptyRangeStart() { + void testUserInputWithEmptyRangeStart() { URIBuilder builder = searchUri(); builder.setParameter("wql", "[;boom]"); builder.setParameter("yql", "select * from sources * where ([{\"defaultIndex\": \"text_field\",\"grammar\": \"any\"}]userInput(@wql))"); diff --git a/container-search/src/test/java/com/yahoo/search/yql/VespaSerializerTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/VespaSerializerTestCase.java index 553c3a3e583..9e5cde76c82 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/VespaSerializerTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/VespaSerializerTestCase.java @@ -1,8 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.yql; -import static org.junit.Assert.*; - import com.yahoo.prelude.query.SameElementItem; import com.yahoo.search.Query; import com.yahoo.search.grouping.Continuation; @@ -12,10 +10,9 @@ import com.yahoo.search.grouping.request.AttributeFunction; import com.yahoo.search.grouping.request.CountAggregator; import com.yahoo.search.grouping.request.EachOperation; import com.yahoo.search.grouping.request.GroupingOperation; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.yahoo.prelude.query.AndSegmentItem; import com.yahoo.prelude.query.Item; import com.yahoo.prelude.query.MarkerWordItem; @@ -28,73 +25,75 @@ import com.yahoo.search.query.parser.ParserEnvironment; import java.util.Arrays; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class VespaSerializerTestCase { private static final String SELECT = "select ignoredfield from sourceA where "; private YqlParser parser; - @Before + @BeforeEach public void setUp() throws Exception { ParserEnvironment env = new ParserEnvironment(); parser = new YqlParser(env); } - @After + @AfterEach public void tearDown() throws Exception { parser = null; } @Test - public void requireThatGroupingRequestsAreSerialized() { + void requireThatGroupingRequestsAreSerialized() { Query query = new Query(); query.getModel().getQueryTree().setRoot(new WordItem("foo")); assertEquals("default contains ({implicitTransforms: false}\"foo\")", - VespaSerializer.serialize(query)); + VespaSerializer.serialize(query)); newGroupingRequest(query, new AllOperation().setGroupBy(new AttributeFunction("a")) - .addChild(new EachOperation().addOutput(new CountAggregator()))); + .addChild(new EachOperation().addOutput(new CountAggregator()))); assertEquals("default contains ({implicitTransforms: false}\"foo\") " + - "| all(group(attribute(a)) each(output(count())))", - VespaSerializer.serialize(query)); + "| all(group(attribute(a)) each(output(count())))", + VespaSerializer.serialize(query)); newGroupingRequest(query, new AllOperation().setGroupBy(new AttributeFunction("b")) - .addChild(new EachOperation().addOutput(new CountAggregator()))); + .addChild(new EachOperation().addOutput(new CountAggregator()))); assertEquals("default contains ({implicitTransforms: false}\"foo\") " + - "| all(group(attribute(a)) each(output(count()))) " + - "| all(group(attribute(b)) each(output(count())))", - VespaSerializer.serialize(query)); + "| all(group(attribute(a)) each(output(count()))) " + + "| all(group(attribute(b)) each(output(count())))", + VespaSerializer.serialize(query)); } @Test - public void requireThatGroupingContinuationsAreSerialized() { + void requireThatGroupingContinuationsAreSerialized() { Query query = new Query(); query.getModel().getQueryTree().setRoot(new WordItem("foo")); assertEquals("default contains ({implicitTransforms: false}\"foo\")", - VespaSerializer.serialize(query)); + VespaSerializer.serialize(query)); newGroupingRequest(query, new AllOperation().setGroupBy(new AttributeFunction("a")) - .addChild(new EachOperation().addOutput(new CountAggregator())), - Continuation.fromString("BCBCBCBEBG"), - Continuation.fromString("BCBKCBACBKCCK")); + .addChild(new EachOperation().addOutput(new CountAggregator())), + Continuation.fromString("BCBCBCBEBG"), + Continuation.fromString("BCBKCBACBKCCK")); assertEquals("default contains ({implicitTransforms: false}\"foo\") " + - "| { continuations:['BCBCBCBEBG', 'BCBKCBACBKCCK'] }" + - "all(group(attribute(a)) each(output(count())))", - VespaSerializer.serialize(query)); + "| { continuations:['BCBCBCBEBG', 'BCBKCBACBKCCK'] }" + + "all(group(attribute(a)) each(output(count())))", + VespaSerializer.serialize(query)); newGroupingRequest(query, new AllOperation().setGroupBy(new AttributeFunction("b")) - .addChild(new EachOperation().addOutput(new CountAggregator())), - Continuation.fromString("BCBBBBBDBF"), - Continuation.fromString("BCBJBPCBJCCJ")); + .addChild(new EachOperation().addOutput(new CountAggregator())), + Continuation.fromString("BCBBBBBDBF"), + Continuation.fromString("BCBJBPCBJCCJ")); assertEquals("default contains ({implicitTransforms: false}\"foo\") " + - "| { continuations:['BCBCBCBEBG', 'BCBKCBACBKCCK'] }" + - "all(group(attribute(a)) each(output(count()))) " + - "| { continuations:['BCBBBBBDBF', 'BCBJBPCBJCCJ'] }" + - "all(group(attribute(b)) each(output(count())))", - VespaSerializer.serialize(query)); + "| { continuations:['BCBCBCBEBG', 'BCBKCBACBKCCK'] }" + + "all(group(attribute(a)) each(output(count()))) " + + "| { continuations:['BCBBBBBDBF', 'BCBJBPCBJCCJ'] }" + + "all(group(attribute(b)) each(output(count())))", + VespaSerializer.serialize(query)); } @Test - public void testAnd() { + void testAnd() { parseAndConfirm("(description contains \"a\" AND title contains \"that\")"); } @@ -109,17 +108,17 @@ public class VespaSerializerTestCase { } @Test - public void testAndNot() { + void testAndNot() { parseAndConfirm("(description contains \"a\") AND !(title contains \"that\")"); } @Test - public void testEquiv() { + void testEquiv() { parseAndConfirm("title contains equiv(\"a\", \"b\")"); } @Test - public void testGeoLocation() { + void testGeoLocation() { parseAndConfirm("geoLocation(workplace, 63.418417, 10.433033, \"0.5 deg\")"); parseAndConfirm("geoLocation(headquarters, 37.41638, -122.024683, \"180.0 deg\")"); parseAndConfirm("geoLocation(home, -17.0, 42.0, \"0.0 deg\")"); @@ -127,13 +126,13 @@ public class VespaSerializerTestCase { } @Test - public void testNear() { + void testNear() { parseAndConfirm("title contains near(\"a\", \"b\")"); parseAndConfirm("title contains ({distance: 50}near(\"a\", \"b\"))"); } @Test - public void testNearestNeighbor() { + void testNearestNeighbor() { parseAndConfirm("{label: \"foo\", targetNumHits: 1000}nearestNeighbor(semantic_embedding, my_property)"); parseAndConfirm("{targetNumHits: 42}nearestNeighbor(semantic_embedding, my_property)"); parseAndConfirm("{targetNumHits: 1, hnsw.exploreAdditionalHits: 76}nearestNeighbor(semantic_embedding, my_property)"); @@ -143,26 +142,26 @@ public class VespaSerializerTestCase { } @Test - public void testTrueAndFalse() { + void testTrueAndFalse() { parseAndConfirm("true"); parseAndConfirm("false"); } @Test - public void testNumbers() { + void testNumbers() { parseAndConfirm("title = 500"); parseAndConfirm("title > 500"); parseAndConfirm("title < 500"); } @Test - public void testBoolean() { + void testBoolean() { parseAndConfirm("flag = true"); parseAndConfirm("flag = false"); } @Test - public void testAnnotatedNumbers() { + void testAnnotatedNumbers() { parseAndConfirm("title = ({filter: true}500)"); parseAndConfirm("title > ({filter: true}500)"); parseAndConfirm("title < ({filter: true}(-500))"); @@ -171,32 +170,32 @@ public class VespaSerializerTestCase { } @Test - public void testRange() { + void testRange() { parseAndConfirm("range(title, 1, 500)"); } @Test - public void testAnnotatedRange() { + void testAnnotatedRange() { parseAndConfirm("{filter: true}range(title, 1, 500)"); } @Test - public void testOrderedNear() { + void testOrderedNear() { parseAndConfirm("title contains onear(\"a\", \"b\")"); } @Test - public void testOr() { + void testOr() { parseAndConfirm("(description contains \"a\" OR title contains \"that\")"); } @Test - public void testDotProduct() { + void testDotProduct() { parseAndConfirm("dotProduct(description, {\"a\": 1, \"b\": 2})"); } @Test - public void testPredicate() { + void testPredicate() { parseAndConfirm("predicate(boolean,{\"gender\":\"male\"},{\"age\":25L})"); parseAndConfirm("predicate(boolean,{\"gender\":\"male\",\"hobby\":\"music\",\"hobby\":\"hiking\"}," + "{\"age\":25L})", @@ -204,37 +203,37 @@ public class VespaSerializerTestCase { parseAndConfirm("predicate(boolean,{\"0x3\":{\"gender\":\"male\"},\"0x1\":{\"hobby\":\"music\"},\"0x1\":{\"hobby\":\"hiking\"}},{\"0x80ffffffffffffff\":{\"age\":23L}})", "predicate(boolean,{\"0x3\":{\"gender\":\"male\"},\"0x1\":{\"hobby\":[\"music\",\"hiking\"]}},{\"0x80ffffffffffffff\":{\"age\":23L}})"); parseAndConfirm("predicate(boolean,0,0)"); - parseAndConfirm("predicate(boolean,0,0)","predicate(boolean,null,void)"); - parseAndConfirm("predicate(boolean,0,0)","predicate(boolean,{},{})"); + parseAndConfirm("predicate(boolean,0,0)", "predicate(boolean,null,void)"); + parseAndConfirm("predicate(boolean,0,0)", "predicate(boolean,{},{})"); } @Test - public void testPhrase() { + void testPhrase() { parseAndConfirm("description contains phrase(\"a\", \"b\")"); } @Test - public void testAnnotatedPhrase() { + void testAnnotatedPhrase() { parseAndConfirm("description contains ({id: 1}phrase(\"a\", \"b\"))"); } @Test - public void testAnnotatedNear() { + void testAnnotatedNear() { parseAndConfirm("description contains ({distance: 37}near(\"a\", \"b\"))"); } @Test - public void testAnnotatedOnear() { + void testAnnotatedOnear() { parseAndConfirm("description contains ({distance: 37}onear(\"a\", \"b\"))"); } @Test - public void testAnnotatedEquiv() { + void testAnnotatedEquiv() { parseAndConfirm("description contains ({id: 1}equiv(\"a\", \"b\"))"); } @Test - public void testAnnotatedPhraseSegment() { + void testAnnotatedPhraseSegment() { PhraseSegmentItem phraseSegment = new PhraseSegmentItem("abc", true, false); phraseSegment.addItem(new WordItem("a", "indexNamePlaceholder")); phraseSegment.addItem(new WordItem("b", "indexNamePlaceholder")); @@ -246,7 +245,7 @@ public class VespaSerializerTestCase { } @Test - public void testSameElement() { + void testSameElement() { SameElementItem sameElement = new SameElementItem("ss"); sameElement.addItem(new WordItem("a", "f1")); sameElement.addItem(new WordItem("b", "f2")); @@ -254,8 +253,9 @@ public class VespaSerializerTestCase { assertEquals("ss contains sameElement(f1 contains ({implicitTransforms: false}\"a\"), f2 contains ({implicitTransforms: false}\"b\"))", VespaSerializer.serialize(sameElement)); } + @Test - public void testAnnotatedAndSegment() { + void testAnnotatedAndSegment() { AndSegmentItem andSegment = new AndSegmentItem("abc", true, false); andSegment.addItem(new WordItem("a", "indexNamePlaceholder")); andSegment.addItem(new WordItem("b", "indexNamePlaceholder")); @@ -270,42 +270,42 @@ public class VespaSerializerTestCase { } @Test - public void testPhraseWithAnnotations() { + void testPhraseWithAnnotations() { parseAndConfirm("description contains phrase(({id: 15}\"a\"), \"b\")"); } @Test - public void testPhraseSegmentInPhrase() { + void testPhraseSegmentInPhrase() { parseAndConfirm("description contains phrase(\"a\", \"b\", ({origin: {original: \"c d\", offset: 0, length: 3}}phrase(\"c\", \"d\")))"); } @Test - public void testRank() { + void testRank() { parseAndConfirm("rank(a contains \"A\", b contains \"B\")"); } @Test - public void testWand() { + void testWand() { parseAndConfirm("wand(description, {\"a\": 1, \"b\": 2})"); } @Test - public void testWeakAnd() { + void testWeakAnd() { parseAndConfirm("weakAnd(a contains \"A\", b contains \"B\")"); } @Test - public void testAnnotatedWeakAnd() { + void testAnnotatedWeakAnd() { parseAndConfirm("({" + YqlParser.TARGET_NUM_HITS + ": 10}weakAnd(a contains \"A\", b contains \"B\"))"); } @Test - public void testWeightedSet() { + void testWeightedSet() { parseAndConfirm("weightedSet(description, {\"a\": 1, \"b\": 2})"); } @Test - public void testAnnotatedWord() { + void testAnnotatedWord() { parseAndConfirm("description contains ({andSegmenting: true}\"a\")"); parseAndConfirm("description contains ({weight: 37}\"a\")"); parseAndConfirm("description contains ({id: 37}\"a\")"); @@ -317,29 +317,29 @@ public class VespaSerializerTestCase { } @Test - public void testPrefix() { + void testPrefix() { parseAndConfirm("description contains ({prefix: true}\"a\")"); } @Test - public void testSuffix() { + void testSuffix() { parseAndConfirm("description contains ({suffix: true}\"a\")"); } @Test - public void testSubstring() { + void testSubstring() { parseAndConfirm("description contains ({substring: true}\"a\")"); } @Test - public void testExoticItemTypes() { + void testExoticItemTypes() { Item item = MarkerWordItem.createEndOfHost(); String q = VespaSerializer.serialize(item); assertEquals("default contains ({implicitTransforms: false}\"$\")", q); } @Test - public void testEmptyIndex() { + void testEmptyIndex() { Item item = new WordItem("nalle", true); String q = VespaSerializer.serialize(item); assertEquals("default contains \"nalle\"", q); @@ -347,7 +347,7 @@ public class VespaSerializerTestCase { @Test - public void testLongAndNot() { + void testLongAndNot() { NotItem item = new NotItem(); item.addItem(new WordItem("a")); item.addItem(new WordItem("b")); @@ -358,7 +358,7 @@ public class VespaSerializerTestCase { } @Test - public void testPhraseAsOperatorArgument() { + void testPhraseAsOperatorArgument() { // flattening phrases is a feature, not a bug parseAndConfirm("description contains phrase(\"a\", \"b\", \"c\")", "description contains phrase(\"a\", phrase(\"b\", \"c\"))"); @@ -372,7 +372,7 @@ public class VespaSerializerTestCase { } @Test - public void testNumberTypeInt() { + void testNumberTypeInt() { parseAndConfirm("title = 500"); parseAndConfirm("title > 500"); parseAndConfirm("title < (-500)"); @@ -382,7 +382,7 @@ public class VespaSerializerTestCase { } @Test - public void testNumberTypeLong() { + void testNumberTypeLong() { parseAndConfirm("title = 549755813888L"); parseAndConfirm("title > 549755813888L"); parseAndConfirm("title < (-549755813888L)"); @@ -392,7 +392,7 @@ public class VespaSerializerTestCase { } @Test - public void testNumberTypeFloat() { + void testNumberTypeFloat() { parseAndConfirm("title = 500.0"); // silly parseAndConfirm("title > 500.0"); parseAndConfirm("title < (-500.0)"); @@ -402,19 +402,19 @@ public class VespaSerializerTestCase { } @Test - public void testAnnotatedLong() { + void testAnnotatedLong() { parseAndConfirm("title >= ({id: 2014}(-549755813888L))"); } @Test - public void testHitLimit() { + void testHitLimit() { parseAndConfirm("title <= ({hitLimit: 89}(-500))"); parseAndConfirm("title <= ({hitLimit: 89}(-500))"); parseAndConfirm("{hitLimit: 89}range(title, 1, 500)"); } @Test - public void testOpenIntervals() { + void testOpenIntervals() { parseAndConfirm("range(title, 0.0, 500.0)"); parseAndConfirm("({bounds: \"open\"}range(title, 0.0, 500.0))"); parseAndConfirm("({bounds: \"leftOpen\"}range(title, 0.0, 500.0))"); @@ -423,18 +423,18 @@ public class VespaSerializerTestCase { } @Test - public void testRegExp() { + void testRegExp() { parseAndConfirm("foo matches \"a b\""); } @Test - public void testWordAlternatives() { + void testWordAlternatives() { parseAndConfirm("foo contains" + " ({origin: {original: \" trees \", offset: 1, length: 5}}" + "alternatives({\"trees\": 1.0, \"tree\": 0.7}))"); } @Test - public void testWordAlternativesInPhrase() { + void testWordAlternativesInPhrase() { parseAndConfirm("foo contains phrase(\"forest\"," + " ({origin: {original: \" trees \", offset: 1, length: 5}}" + "alternatives({\"trees\": 1.0, \"tree\": 0.7}))" @@ -442,12 +442,12 @@ public class VespaSerializerTestCase { } @Test - public void testFuzzy() { + void testFuzzy() { parseAndConfirm("foo contains fuzzy(\"a\")"); } @Test - public void testFuzzyAnnotations() { + void testFuzzyAnnotations() { parseAndConfirm("foo contains ({maxEditDistance:3,prefixLength:5}fuzzy(\"a\"))"); } diff --git a/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java index ee933a86578..cf3c7911d0e 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java @@ -1,9 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.yql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.*; import java.util.Arrays; import java.util.List; @@ -12,10 +10,9 @@ import java.util.Map; import com.yahoo.search.schema.DocumentSummary; import com.yahoo.search.schema.Schema; import com.yahoo.search.schema.SchemaInfo; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.yahoo.component.chain.Chain; import com.yahoo.search.Query; import com.yahoo.search.Result; @@ -41,7 +38,7 @@ public class YqlFieldAndSourceTestCase { private Execution.Context context; private Execution execution; - @Before + @BeforeEach public void setUp() throws Exception { Query query = new Query("?query=test"); @@ -80,7 +77,7 @@ public class YqlFieldAndSourceTestCase { return new SchemaInfo(List.of(schema.build()), Map.of()); } - @After + @AfterEach public void tearDown() throws Exception { searchChain = null; context = null; @@ -88,7 +85,7 @@ public class YqlFieldAndSourceTestCase { } @Test - public final void testTrivial() { + final void testTrivial() { final Query query = new Query("?query=test&presentation.summaryFields=" + FIELD1); Result result = execution.search(query); execution.fill(result); @@ -98,7 +95,7 @@ public class YqlFieldAndSourceTestCase { } @Test - public final void testWithOnlyAttribute() { + final void testWithOnlyAttribute() { final Query query = new Query("?query=test&presentation.summaryFields=" + FIELD2); Result result = execution.search(query); execution.fill(result, THIRD_OPTION); @@ -109,7 +106,7 @@ public class YqlFieldAndSourceTestCase { } @Test - public final void testWithOnlyDiskfieldCorrectClassRequested() { + final void testWithOnlyDiskfieldCorrectClassRequested() { final Query query = new Query("?query=test&presentation.summaryFields=" + FIELD3); Result result = execution.search(query); execution.fill(result, THIRD_OPTION); @@ -120,7 +117,7 @@ public class YqlFieldAndSourceTestCase { } @Test - public final void testTrivialCaseWithOnlyDiskfieldWrongClassRequested() { + final void testTrivialCaseWithOnlyDiskfieldWrongClassRequested() { final Query query = new Query("?query=test&presentation.summaryFields=" + FIELD1); Result result = execution.search(query); execution.fill(result, THIRD_OPTION); 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 299a7ff9d30..935b1aa62f9 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 @@ -44,19 +44,15 @@ import com.yahoo.search.query.Sorting.UcaSorter; import com.yahoo.search.query.parser.Parsable; import com.yahoo.search.query.parser.ParserEnvironment; import com.yahoo.search.searchchain.Execution; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.*; /** * Specification for the conversion of YQL+ expressions to Vespa search queries. @@ -68,286 +64,288 @@ public class YqlParserTestCase { private final YqlParser parser = new YqlParser(new ParserEnvironment()); - @Test(timeout = 120_000) - public void failsGracefullyOnMissingQuoteEscapingAndSubsequentUnicodeCharacter() { + @Test + @Timeout(120_000) + void failsGracefullyOnMissingQuoteEscapingAndSubsequentUnicodeCharacter() { assertParseFail("select * from bar where rank(ids contains 'http://en.wikipedia.org/wiki/Hors_d'œuvre') limit 10", new IllegalInputException("com.yahoo.search.yql.ProgramCompileException: query:L1:79 token recognition error at: 'œ'")); } @Test - public void testParserDefaults() { + void testParserDefaults() { assertTrue(parser.isQueryParser()); assertNull(parser.getDocTypes()); } - + @Test - public void testLanguageDetection() { + void testLanguageDetection() { // SimpleDetector used here can detect japanese and will set that as language at the root of the user input QueryTree tree = parse("select * from sources * where userInput(\"\u30ab\u30bf\u30ab\u30ca\")"); assertEquals(Language.JAPANESE, tree.getRoot().getLanguage()); } @Test - public void testGroupingStep() { + void testGroupingStep() { assertParse("select foo from bar where baz contains 'cox'", - "baz:cox"); + "baz:cox"); assertEquals("[]", - toString(parser.getGroupingSteps())); + toString(parser.getGroupingSteps())); assertParse("select foo from bar where baz contains 'cox' " + - "| all(group(a) each(output(count())))", - "baz:cox"); + "| all(group(a) each(output(count())))", + "baz:cox"); assertEquals("[[]all(group(a) each(output(count())))]", - toString(parser.getGroupingSteps())); + toString(parser.getGroupingSteps())); assertParse("select foo from bar where baz contains 'cox' " + - "| all(group(a) each(output(count()))) " + - "| all(group(b) each(output(count())))", - "baz:cox"); + "| all(group(a) each(output(count()))) " + + "| all(group(b) each(output(count())))", + "baz:cox"); assertEquals("[[]all(group(a) each(output(count())))," + - " []all(group(b) each(output(count())))]", - toString(parser.getGroupingSteps())); + " []all(group(b) each(output(count())))]", + toString(parser.getGroupingSteps())); } @Test - public void testGroupingContinuation() { + void testGroupingContinuation() { assertParse("select foo from bar where baz contains 'cox' " + - "| { 'continuations': ['BCBCBCBEBG', 'BCBKCBACBKCCK'] }all(group(a) each(output(count())))", - "baz:cox"); + "| { 'continuations': ['BCBCBCBEBG', 'BCBKCBACBKCCK'] }all(group(a) each(output(count())))", + "baz:cox"); assertEquals("[[BCBCBCBEBG, BCBKCBACBKCCK]all(group(a) each(output(count())))]", - toString(parser.getGroupingSteps())); + toString(parser.getGroupingSteps())); assertParse("select foo from bar where baz contains 'cox' " + - "| { 'continuations': ['BCBCBCBEBG', 'BCBKCBACBKCCK'] }all(group(a) each(output(count()))) " + - "| { 'continuations': ['BCBBBBBDBF', 'BCBJBPCBJCCJ'] }all(group(b) each(output(count())))", - "baz:cox"); + "| { 'continuations': ['BCBCBCBEBG', 'BCBKCBACBKCCK'] }all(group(a) each(output(count()))) " + + "| { 'continuations': ['BCBBBBBDBF', 'BCBJBPCBJCCJ'] }all(group(b) each(output(count())))", + "baz:cox"); assertEquals("[[BCBCBCBEBG, BCBKCBACBKCCK]all(group(a) each(output(count())))," + - " [BCBBBBBDBF, BCBJBPCBJCCJ]all(group(b) each(output(count())))]", - toString(parser.getGroupingSteps())); + " [BCBBBBBDBF, BCBJBPCBJCCJ]all(group(b) each(output(count())))]", + toString(parser.getGroupingSteps())); } @Test - public void testHitLimit() { + void testHitLimit() { assertParse("select artist_name, track_name, track_uri from sources * where (myField contains ({prefix:true}\"m\") and ({hitLimit: 5000, descending: true}range(static_score,0,Infinity))) limit 30 offset 0", - "AND myField:m* static_score:[0;;-5000]"); + "AND myField:m* static_score:[0;;-5000]"); } @Test - public void test() { + void test() { assertParse("select foo from bar where title contains \"madonna\"", - "title:madonna"); + "title:madonna"); } @Test - public void testKeywordAsFieldName() { + void testKeywordAsFieldName() { assertParse("select * from sources * where cast contains sameElement(id contains '16')", - "cast:{id:16}"); + "cast:{id:16}"); } @Test - public void testComplexExpression() { + void testComplexExpression() { String queryTreeYql = "rank((((filter contains ({origin: {original: \"filter:VideoAdsCappingTestCPM\", \"offset\": 7, length: 22}, normalizeCase: false, id: 1}\"videoadscappingtestcpm\") AND hasRankRestriction contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 2}\"0\") AND ((objective contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 3}\"install_app\") AND availableExtendedFields contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 4}\"cpiparams\")) OR (availableExtendedFields contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 5}\"appinstallinfo\") AND availableExtendedFields contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 6}\"appmetroplexinfo\")) OR (dummyField contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 7}\"default\")) AND !(objective contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 8}\"install_app\"))) AND advt_age = ({\"id\": 9}2147483647) AND advt_gender contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 10}\"all\") AND advt_all_segments = ({\"id\": 11}2147483647) AND advt_keywords contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 12}\"all\") AND advMobilePlatform = ({\"id\": 13}2147483647) AND advMobileDeviceType = ({\"id\": 14}2147483647) AND advMobileCon = ({\"id\": 15}2147483647) AND advMobileOSVersions = ({\"id\": 16}2147483647) AND advCarrier = ({\"id\": 17}2147483647) AND ({\"id\": 18}weightedSet(advt_supply, {\"all\": 1, \"pub223\": 1, \"sec223\": 1, \"site223\": 1})) AND (advt_day_parting contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 19, \"weight\": 1}\"adv_tuesday\") OR advt_day_parting contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 20, \"weight\": 1}\"adv_tuesday_17\") OR advt_day_parting contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 21, \"weight\": 1}\"adv_tuesday_17_forty_five\") OR advt_day_parting contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 22}\"all\")) AND isAppReengagementAd = ({\"id\": 23}0) AND dummyField contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 24}\"default\") AND serveWithPromotionOnly = ({\"id\": 26}0) AND budgetAdvertiserThrottleRateFilter = ({\"id\": 27}0) AND budgetResellerThrottleRateFilter = ({\"id\": 28}0) AND (isMystiqueRequired = ({\"id\": 29}0) OR (isMystiqueRequired = ({\"id\": 30}1) AND useBcFactorFilter = ({\"id\": 31}1))) AND (((budgetCampaignThrottleRateBits = ({\"id\": 32}55) AND dummyField contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 33}\"default\"))) AND !(useBcFactorFilter = ({\"id\": 34}1)) OR ((useBcFactorFilter = ({\"id\": 35}1) AND dummyField contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 36}\"default\") AND (bcFactorTiers = ({\"id\": 38}127) OR bcFactorTiers = ({\"id\": 39}0)) AND ((firstPriceEnforced = ({\"id\": 40}0) AND (secondPriceEnforced = ({\"id\": 41}1) OR isPrivateDeal = ({\"id\": 42}0) OR (dummyField contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 43}\"default\")) AND !(bcActiveTier = ({\"id\": 44}0)))) OR mystiqueCampaignThrottleRateBits = ({\"id\": 45}18)))) AND !(isOutOfDailyBudget = ({\"id\": 37}1))) AND testCreative = ({\"id\": 46}0) AND advt_geo = ({\"id\": 47}2147483647) AND ((adType contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 48}\"strm_video\") AND isPortraitVideo = ({\"id\": 49}0)) OR adType contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 50}\"stream_ad\")) AND ((isCPM = ({\"id\": 51}0) AND isOCPC = ({\"id\": 52}0) AND isECPC = ({\"id\": 53}0) AND ((priceType contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 54}\"cpcv\") AND bid >= ({\"id\": 55}0.005)) OR (priceType contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 56}\"cpv\") AND bid >= ({\"id\": 57}0.01)) OR (priceType contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 58}\"cpc\") AND bid >= ({\"id\": 59}0.05)) OR (objective contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 60}\"promote_content\") AND bid >= ({\"id\": 61}0.01)) OR hasFloorPriceUsd = ({\"id\": 62}1))) OR isECPC = ({\"id\": 63}1) OR (isCPM = ({\"id\": 64}1) AND isOCPM = ({\"id\": 65}0) AND (({\"id\": 66}range(bid, 0.25, Infinity)) OR hasFloorPriceUsd = ({\"id\": 67}1)))) AND start_date <= ({\"id\": 68}1572976776299L) AND end_date >= ({\"id\": 69}1572976776299L))) AND !(isHoldoutAd = ({\"id\": 25}1))) AND !((disclaimerExtensionsTypes contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 70}\"pharma\") OR ({\"id\": 71}weightedSet(exclusion_advt_supply, {\"extsite223\": 1, \"pub223\": 1, \"sec223\": 1, \"site223\": 1})) OR isPersonalized = ({\"id\": 72}1) OR blocked_section_ids contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 73}\"223\") OR blocked_publisher_ids contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 74}\"223\") OR blocked_site_ids contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 75}\"223\"))), {\"id\": 76, \"label\": \"ad_ocpc_max_cpc\"}dotProduct(ocpc_max_cpc, {\"0\": 1}), {\"id\": 77, \"label\": \"ad_ocpc_min_cpc\"}dotProduct(ocpc_min_cpc, {\"0\": 1}), {\"id\": 78, \"label\": \"ad_ocpc_max_alpha\"}dotProduct(ocpc_max_alpha, {\"0\": 1}), {\"id\": 79, \"label\": \"ad_ocpc_min_alpha\"}dotProduct(ocpc_min_alpha, {\"0\": 1}), {\"id\": 80, \"label\": \"ad_ocpc_alpha_0\"}dotProduct(ocpc_alpha_0, {\"0\": 1}), {\"id\": 81, \"label\": \"ad_ocpc_alpha_1\"}dotProduct(ocpc_alpha_1, {\"0\": 1}), (bidAdjustmentDayParting contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 82, \"weight\": 1}\"adv_tuesday\") OR bidAdjustmentDayParting contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 83, \"weight\": 1}\"adv_tuesday_17\") OR bidAdjustmentDayParting contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 84, \"weight\": 1}\"adv_tuesday_17_forty_five\") OR bidAdjustmentDayPartingForCostCap contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 85, \"weight\": 1}\"adv_tuesday\") OR bidAdjustmentDayPartingForCostCap contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 86, \"weight\": 1}\"adv_tuesday_17\") OR bidAdjustmentDayPartingForCostCap contains ({\"normalizeCase\": false, \"implicitTransforms\": false, \"id\": 87, \"weight\": 1}\"adv_tuesday_17_forty_five\")), bidAdjustmentForCpi = ({\"id\": 88, \"weight\": 1}223), {\"id\": 89, \"label\": \"boostingForBackfill\"}dotProduct(boostingForBackfill, {\"priority\": 1000})) limit 0 timeout 3980 | all(group(adTypeForGrouping) each(group(advertiser_id) max(11) output(count() as(groupingCounter)) each(max(1) each(output(summary())))))"; QueryTree parsed = assertParse("select * from sources * where " + queryTreeYql + ";", - "RANK (+(+(AND filter:VideoAdsCappingTestCPM hasRankRestriction:0 (OR (AND objective:install_app availableExtendedFields:cpiparams) (AND availableExtendedFields:appinstallinfo availableExtendedFields:appmetroplexinfo) (+dummyField:default -objective:install_app)) advt_age:2147483647 advt_gender:all advt_all_segments:2147483647 advt_keywords:all advMobilePlatform:2147483647 advMobileDeviceType:2147483647 advMobileCon:2147483647 advMobileOSVersions:2147483647 advCarrier:2147483647 WEIGHTEDSET advt_supply{[1]:\"site223\",[1]:\"pub223\",[1]:\"all\",[1]:\"sec223\"} (OR advt_day_parting:adv_tuesday!1 advt_day_parting:adv_tuesday_17!1 advt_day_parting:adv_tuesday_17_forty_five!1 advt_day_parting:all) isAppReengagementAd:0 dummyField:default serveWithPromotionOnly:0 budgetAdvertiserThrottleRateFilter:0 budgetResellerThrottleRateFilter:0 (OR isMystiqueRequired:0 (AND isMystiqueRequired:1 useBcFactorFilter:1)) (OR (+(AND budgetCampaignThrottleRateBits:55 dummyField:default) -useBcFactorFilter:1) (+(AND useBcFactorFilter:1 dummyField:default (OR bcFactorTiers:127 bcFactorTiers:0) (OR (AND firstPriceEnforced:0 (OR secondPriceEnforced:1 isPrivateDeal:0 (+dummyField:default -bcActiveTier:0))) mystiqueCampaignThrottleRateBits:18)) -isOutOfDailyBudget:1)) testCreative:0 advt_geo:2147483647 (OR (AND adType:strm_video isPortraitVideo:0) adType:stream_ad) (OR (AND isCPM:0 isOCPC:0 isECPC:0 (OR (AND priceType:cpcv bid:[0.005;]) (AND priceType:cpv bid:[0.01;]) (AND priceType:cpc bid:[0.05;]) (AND objective:promote_content bid:[0.01;]) hasFloorPriceUsd:1)) isECPC:1 (AND isCPM:1 isOCPM:0 (OR bid:[0.25;] hasFloorPriceUsd:1))) start_date:[;1572976776299] end_date:[1572976776299;]) -isHoldoutAd:1) -(OR disclaimerExtensionsTypes:pharma WEIGHTEDSET exclusion_advt_supply{[1]:\"extsite223\",[1]:\"site223\",[1]:\"pub223\",[1]:\"sec223\"} isPersonalized:1 blocked_section_ids:223 blocked_publisher_ids:223 blocked_site_ids:223)) DOTPRODUCT ocpc_max_cpc{[1]:\"0\"} DOTPRODUCT ocpc_min_cpc{[1]:\"0\"} DOTPRODUCT ocpc_max_alpha{[1]:\"0\"} DOTPRODUCT ocpc_min_alpha{[1]:\"0\"} DOTPRODUCT ocpc_alpha_0{[1]:\"0\"} DOTPRODUCT ocpc_alpha_1{[1]:\"0\"} (OR bidAdjustmentDayParting:adv_tuesday!1 bidAdjustmentDayParting:adv_tuesday_17!1 bidAdjustmentDayParting:adv_tuesday_17_forty_five!1 bidAdjustmentDayPartingForCostCap:adv_tuesday!1 bidAdjustmentDayPartingForCostCap:adv_tuesday_17!1 bidAdjustmentDayPartingForCostCap:adv_tuesday_17_forty_five!1) bidAdjustmentForCpi:223!1 DOTPRODUCT boostingForBackfill{[1000]:\"priority\"}"); + "RANK (+(+(AND filter:VideoAdsCappingTestCPM hasRankRestriction:0 (OR (AND objective:install_app availableExtendedFields:cpiparams) (AND availableExtendedFields:appinstallinfo availableExtendedFields:appmetroplexinfo) (+dummyField:default -objective:install_app)) advt_age:2147483647 advt_gender:all advt_all_segments:2147483647 advt_keywords:all advMobilePlatform:2147483647 advMobileDeviceType:2147483647 advMobileCon:2147483647 advMobileOSVersions:2147483647 advCarrier:2147483647 WEIGHTEDSET advt_supply{[1]:\"site223\",[1]:\"pub223\",[1]:\"all\",[1]:\"sec223\"} (OR advt_day_parting:adv_tuesday!1 advt_day_parting:adv_tuesday_17!1 advt_day_parting:adv_tuesday_17_forty_five!1 advt_day_parting:all) isAppReengagementAd:0 dummyField:default serveWithPromotionOnly:0 budgetAdvertiserThrottleRateFilter:0 budgetResellerThrottleRateFilter:0 (OR isMystiqueRequired:0 (AND isMystiqueRequired:1 useBcFactorFilter:1)) (OR (+(AND budgetCampaignThrottleRateBits:55 dummyField:default) -useBcFactorFilter:1) (+(AND useBcFactorFilter:1 dummyField:default (OR bcFactorTiers:127 bcFactorTiers:0) (OR (AND firstPriceEnforced:0 (OR secondPriceEnforced:1 isPrivateDeal:0 (+dummyField:default -bcActiveTier:0))) mystiqueCampaignThrottleRateBits:18)) -isOutOfDailyBudget:1)) testCreative:0 advt_geo:2147483647 (OR (AND adType:strm_video isPortraitVideo:0) adType:stream_ad) (OR (AND isCPM:0 isOCPC:0 isECPC:0 (OR (AND priceType:cpcv bid:[0.005;]) (AND priceType:cpv bid:[0.01;]) (AND priceType:cpc bid:[0.05;]) (AND objective:promote_content bid:[0.01;]) hasFloorPriceUsd:1)) isECPC:1 (AND isCPM:1 isOCPM:0 (OR bid:[0.25;] hasFloorPriceUsd:1))) start_date:[;1572976776299] end_date:[1572976776299;]) -isHoldoutAd:1) -(OR disclaimerExtensionsTypes:pharma WEIGHTEDSET exclusion_advt_supply{[1]:\"extsite223\",[1]:\"site223\",[1]:\"pub223\",[1]:\"sec223\"} isPersonalized:1 blocked_section_ids:223 blocked_publisher_ids:223 blocked_site_ids:223)) DOTPRODUCT ocpc_max_cpc{[1]:\"0\"} DOTPRODUCT ocpc_min_cpc{[1]:\"0\"} DOTPRODUCT ocpc_max_alpha{[1]:\"0\"} DOTPRODUCT ocpc_min_alpha{[1]:\"0\"} DOTPRODUCT ocpc_alpha_0{[1]:\"0\"} DOTPRODUCT ocpc_alpha_1{[1]:\"0\"} (OR bidAdjustmentDayParting:adv_tuesday!1 bidAdjustmentDayParting:adv_tuesday_17!1 bidAdjustmentDayParting:adv_tuesday_17_forty_five!1 bidAdjustmentDayPartingForCostCap:adv_tuesday!1 bidAdjustmentDayPartingForCostCap:adv_tuesday_17!1 bidAdjustmentDayPartingForCostCap:adv_tuesday_17_forty_five!1) bidAdjustmentForCpi:223!1 DOTPRODUCT boostingForBackfill{[1000]:\"priority\"}"); String serializedQueryTreeYql = VespaSerializer.serialize(parsed); // Note: All the details here are not verified assertEquals("rank((((filter contains ({normalizeCase: false, id: 1}\"VideoAdsCappingTestCPM\") AND hasRankRestriction contains ({normalizeCase: false, implicitTransforms: false, id: 2}\"0\") AND ((objective contains ({normalizeCase: false, implicitTransforms: false, id: 3}\"install_app\") AND availableExtendedFields contains ({normalizeCase: false, implicitTransforms: false, id: 4}\"cpiparams\")) OR (availableExtendedFields contains ({normalizeCase: false, implicitTransforms: false, id: 5}\"appinstallinfo\") AND availableExtendedFields contains ({normalizeCase: false, implicitTransforms: false, id: 6}\"appmetroplexinfo\")) OR (dummyField contains ({normalizeCase: false, implicitTransforms: false, id: 7}\"default\")) AND !(objective contains ({normalizeCase: false, implicitTransforms: false, id: 8}\"install_app\"))) AND advt_age = ({id: 9}2147483647) AND advt_gender contains ({normalizeCase: false, implicitTransforms: false, id: 10}\"all\") AND advt_all_segments = ({id: 11}2147483647) AND advt_keywords contains ({normalizeCase: false, implicitTransforms: false, id: 12}\"all\") AND advMobilePlatform = ({id: 13}2147483647) AND advMobileDeviceType = ({id: 14}2147483647) AND advMobileCon = ({id: 15}2147483647) AND advMobileOSVersions = ({id: 16}2147483647) AND advCarrier = ({id: 17}2147483647) AND ({id: 18}weightedSet(advt_supply, {\"all\": 1, \"pub223\": 1, \"sec223\": 1, \"site223\": 1})) AND (advt_day_parting contains ({normalizeCase: false, implicitTransforms: false, id: 19, weight: 1}\"adv_tuesday\") OR advt_day_parting contains ({normalizeCase: false, implicitTransforms: false, id: 20, weight: 1}\"adv_tuesday_17\") OR advt_day_parting contains ({normalizeCase: false, implicitTransforms: false, id: 21, weight: 1}\"adv_tuesday_17_forty_five\") OR advt_day_parting contains ({normalizeCase: false, implicitTransforms: false, id: 22}\"all\")) AND isAppReengagementAd = ({id: 23}0) AND dummyField contains ({normalizeCase: false, implicitTransforms: false, id: 24}\"default\") AND serveWithPromotionOnly = ({id: 26}0) AND budgetAdvertiserThrottleRateFilter = ({id: 27}0) AND budgetResellerThrottleRateFilter = ({id: 28}0) AND (isMystiqueRequired = ({id: 29}0) OR (isMystiqueRequired = ({id: 30}1) AND useBcFactorFilter = ({id: 31}1))) AND (((budgetCampaignThrottleRateBits = ({id: 32}55) AND dummyField contains ({normalizeCase: false, implicitTransforms: false, id: 33}\"default\"))) AND !(useBcFactorFilter = ({id: 34}1)) OR ((useBcFactorFilter = ({id: 35}1) AND dummyField contains ({normalizeCase: false, implicitTransforms: false, id: 36}\"default\") AND (bcFactorTiers = ({id: 38}127) OR bcFactorTiers = ({id: 39}0)) AND ((firstPriceEnforced = ({id: 40}0) AND (secondPriceEnforced = ({id: 41}1) OR isPrivateDeal = ({id: 42}0) OR (dummyField contains ({normalizeCase: false, implicitTransforms: false, id: 43}\"default\")) AND !(bcActiveTier = ({id: 44}0)))) OR mystiqueCampaignThrottleRateBits = ({id: 45}18)))) AND !(isOutOfDailyBudget = ({id: 37}1))) AND testCreative = ({id: 46}0) AND advt_geo = ({id: 47}2147483647) AND ((adType contains ({normalizeCase: false, implicitTransforms: false, id: 48}\"strm_video\") AND isPortraitVideo = ({id: 49}0)) OR adType contains ({normalizeCase: false, implicitTransforms: false, id: 50}\"stream_ad\")) AND ((isCPM = ({id: 51}0) AND isOCPC = ({id: 52}0) AND isECPC = ({id: 53}0) AND ((priceType contains ({normalizeCase: false, implicitTransforms: false, id: 54}\"cpcv\") AND bid >= ({id: 55}0.005)) OR (priceType contains ({normalizeCase: false, implicitTransforms: false, id: 56}\"cpv\") AND bid >= ({id: 57}0.01)) OR (priceType contains ({normalizeCase: false, implicitTransforms: false, id: 58}\"cpc\") AND bid >= ({id: 59}0.05)) OR (objective contains ({normalizeCase: false, implicitTransforms: false, id: 60}\"promote_content\") AND bid >= ({id: 61}0.01)) OR hasFloorPriceUsd = ({id: 62}1))) OR isECPC = ({id: 63}1) OR (isCPM = ({id: 64}1) AND isOCPM = ({id: 65}0) AND ({id: 66}range(bid, 0.25, Infinity) OR hasFloorPriceUsd = ({id: 67}1)))) AND start_date <= ({id: 68}1572976776299L) AND end_date >= ({id: 69}1572976776299L))) AND !(isHoldoutAd = ({id: 25}1))) AND !((disclaimerExtensionsTypes contains ({normalizeCase: false, implicitTransforms: false, id: 70}\"pharma\") OR ({id: 71}weightedSet(exclusion_advt_supply, {\"extsite223\": 1, \"pub223\": 1, \"sec223\": 1, \"site223\": 1})) OR isPersonalized = ({id: 72}1) OR blocked_section_ids contains ({normalizeCase: false, implicitTransforms: false, id: 73}\"223\") OR blocked_publisher_ids contains ({normalizeCase: false, implicitTransforms: false, id: 74}\"223\") OR blocked_site_ids contains ({normalizeCase: false, implicitTransforms: false, id: 75}\"223\"))), ({id: 76, label: \"ad_ocpc_max_cpc\"}dotProduct(ocpc_max_cpc, {\"0\": 1})), ({id: 77, label: \"ad_ocpc_min_cpc\"}dotProduct(ocpc_min_cpc, {\"0\": 1})), ({id: 78, label: \"ad_ocpc_max_alpha\"}dotProduct(ocpc_max_alpha, {\"0\": 1})), ({id: 79, label: \"ad_ocpc_min_alpha\"}dotProduct(ocpc_min_alpha, {\"0\": 1})), ({id: 80, label: \"ad_ocpc_alpha_0\"}dotProduct(ocpc_alpha_0, {\"0\": 1})), ({id: 81, label: \"ad_ocpc_alpha_1\"}dotProduct(ocpc_alpha_1, {\"0\": 1})), (bidAdjustmentDayParting contains ({normalizeCase: false, implicitTransforms: false, id: 82, weight: 1}\"adv_tuesday\") OR bidAdjustmentDayParting contains ({normalizeCase: false, implicitTransforms: false, id: 83, weight: 1}\"adv_tuesday_17\") OR bidAdjustmentDayParting contains ({normalizeCase: false, implicitTransforms: false, id: 84, weight: 1}\"adv_tuesday_17_forty_five\") OR bidAdjustmentDayPartingForCostCap contains ({normalizeCase: false, implicitTransforms: false, id: 85, weight: 1}\"adv_tuesday\") OR bidAdjustmentDayPartingForCostCap contains ({normalizeCase: false, implicitTransforms: false, id: 86, weight: 1}\"adv_tuesday_17\") OR bidAdjustmentDayPartingForCostCap contains ({normalizeCase: false, implicitTransforms: false, id: 87, weight: 1}\"adv_tuesday_17_forty_five\")), bidAdjustmentForCpi = ({id: 88, weight: 1}223), ({id: 89, label: \"boostingForBackfill\"}dotProduct(boostingForBackfill, {\"priority\": 1000})))", - serializedQueryTreeYql); + serializedQueryTreeYql); } @Test - public void testDottedFieldNames() { + void testDottedFieldNames() { assertParse("select foo from bar where my.nested.title contains \"madonna\"", "my.nested.title:madonna"); } + @Test - public void testDottedNestedFieldNames() { + void testDottedNestedFieldNames() { assertParse("select foo from bar where my.title contains \"madonna\"", "my.title:madonna"); } @Test - public void testOr() { + void testOr() { assertParse("select foo from bar where title contains \"madonna\" or title contains \"saint\"", - "OR title:madonna title:saint"); + "OR title:madonna title:saint"); assertParse("select foo from bar where title contains \"madonna\" or title contains \"saint\" or title " + - "contains \"angel\"", - "OR title:madonna title:saint title:angel"); + "contains \"angel\"", + "OR title:madonna title:saint title:angel"); } @Test - public void testAnd() { + void testAnd() { assertParse("select foo from bar where title contains \"madonna\" and title contains \"saint\"", - "AND title:madonna title:saint"); + "AND title:madonna title:saint"); assertParse("select foo from bar where title contains \"madonna\" and title contains \"saint\" and title " + - "contains \"angel\"", - "AND title:madonna title:saint title:angel"); + "contains \"angel\"", + "AND title:madonna title:saint title:angel"); } @Test - public void testAndNot() { + void testAndNot() { assertParse("select foo from bar where title contains \"madonna\" and !(title contains \"saint\")", - "+title:madonna -title:saint"); + "+title:madonna -title:saint"); } @Test - public void testSingleNot() { + void testSingleNot() { assertParse("select foo from bar where !(title contains \"saint\")", - "-title:saint"); + "-title:saint"); } @Test - public void testMultipleNot() { + void testMultipleNot() { assertParse("select foo from bar where !(title contains \"saint\") AND !(title contains \"etienne\")", - "-title:saint -title:etienne"); + "-title:saint -title:etienne"); } @Test - public void testLessThan() { + void testLessThan() { assertParse("select foo from bar where price < 500", "price:<500"); assertParse("select foo from bar where 500 < price", "price:>500"); } @Test - public void testGreaterThan() { + void testGreaterThan() { assertParse("select foo from bar where price > 500", "price:>500"); assertParse("select foo from bar where 500 > price", "price:<500"); } @Test - public void testLessThanOrEqual() { + void testLessThanOrEqual() { assertParse("select foo from bar where price <= 500", "price:[;500]"); assertParse("select foo from bar where 500 <= price", "price:[500;]"); } @Test - public void testGreaterThanOrEqual() { + void testGreaterThanOrEqual() { assertParse("select foo from bar where price >= 500", "price:[500;]"); assertParse("select foo from bar where 500 >= price", "price:[;500]"); } @Test - public void testEquality() { + void testEquality() { assertParse("select foo from bar where price = 500", "price:500"); assertParse("select foo from bar where 500 = price", "price:500"); } @Test - public void testNegativeLessThan() { + void testNegativeLessThan() { assertParse("select foo from bar where price < -500", "price:<-500"); assertParse("select foo from bar where -500 < price", "price:>-500"); } @Test - public void testNegativeGreaterThan() { + void testNegativeGreaterThan() { assertParse("select foo from bar where price > -500", "price:>-500"); assertParse("select foo from bar where -500 > price", "price:<-500"); } @Test - public void testNegativeLessThanOrEqual() { + void testNegativeLessThanOrEqual() { assertParse("select foo from bar where price <= -500", "price:[;-500]"); assertParse("select foo from bar where -500 <= price", "price:[-500;]"); } @Test - public void testNegativeGreaterThanOrEqual() { + void testNegativeGreaterThanOrEqual() { assertParse("select foo from bar where price >= -500", "price:[-500;]"); assertParse("select foo from bar where -500 >= price", "price:[;-500]"); } @Test - public void testNegativeEquality() { + void testNegativeEquality() { assertParse("select foo from bar where price = -500", "price:-500"); assertParse("select foo from bar where -500 = price", "price:-500"); } @Test - public void testAnnotatedLessThan() { + void testAnnotatedLessThan() { assertParse("select foo from bar where price < ({filter: true}(-500))", "|price:<-500"); assertParse("select foo from bar where ({filter: true}500) < price", "|price:>500"); } @Test - public void testAnnotatedGreaterThan() { + void testAnnotatedGreaterThan() { assertParse("select foo from bar where price > ({filter: true}500)", "|price:>500"); assertParse("select foo from bar where ({filter: true}(-500)) > price", "|price:<-500"); } @Test - public void testAnnotatedLessThanOrEqual() { + void testAnnotatedLessThanOrEqual() { assertParse("select foo from bar where price <= ({filter: true}(-500))", "|price:[;-500]"); assertParse("select foo from bar where ({filter: true}500) <= price", "|price:[500;]"); } @Test - public void testAnnotatedGreaterThanOrEqual() { + void testAnnotatedGreaterThanOrEqual() { assertParse("select foo from bar where price >= ({filter: true}500)", "|price:[500;]"); assertParse("select foo from bar where ({filter: true}(-500)) >= price", "|price:[;-500]"); } @Test - public void testAnnotatedEquality() { + void testAnnotatedEquality() { assertParse("select foo from bar where price = ({filter: true}(-500))", "|price:-500"); assertParse("select foo from bar where ({filter: true}500) = price", "|price:500"); } @Test - public void testBoolean() { + void testBoolean() { assertParse("select foo from bar where flag = true;", "flag:true"); QueryTree query = assertParse("select foo from bar where flag = false;", "flag:false"); assertEquals(BoolItem.class, query.getRoot().getClass()); - BoolItem item = (BoolItem)query.getRoot(); + BoolItem item = (BoolItem) query.getRoot(); assertEquals("flag", item.getIndexName()); assertEquals(false, item.value()); } @Test - public void testTermAnnotations() { + void testTermAnnotations() { assertEquals("merkelapp", - getRootWord("select foo from bar where baz contains " + - "({label: \"merkelapp\"}\"colors\")").getLabel()); + getRootWord("select foo from bar where baz contains " + + "({label: \"merkelapp\"}\"colors\")").getLabel()); assertEquals("another", - getRootWord("select foo from bar where baz contains " + - "({annotations: {cox: \"another\"}}\"colors\")").getAnnotation("cox")); + getRootWord("select foo from bar where baz contains " + + "({annotations: {cox: \"another\"}}\"colors\")").getAnnotation("cox")); assertEquals(23.0, getRootWord("select foo from bar where baz contains " + - "({significance: 23.0}\"colors\")").getSignificance(), 1E-6); + "({significance: 23.0}\"colors\")").getSignificance(), 1E-6); assertEquals(23, getRootWord("select foo from bar where baz contains " + - "({id: 23}\"colors\")").getUniqueID()); + "({id: 23}\"colors\")").getUniqueID()); assertEquals(150, getRootWord("select foo from bar where baz contains " + - "({weight: 150}\"colors\")").getWeight()); + "({weight: 150}\"colors\")").getWeight()); assertFalse(getRootWord("select foo from bar where baz contains " + - "({usePositionData: false}\"colors\")").usePositionData()); + "({usePositionData: false}\"colors\")").usePositionData()); assertTrue(getRootWord("select foo from bar where baz contains " + - "({filter: true}\"colors\")").isFilter()); + "({filter: true}\"colors\")").isFilter()); assertFalse(getRootWord("select foo from bar where baz contains " + - "({ranked: false}\"colors\")").isRanked()); + "({ranked: false}\"colors\")").isRanked()); Substring origin = getRootWord("select foo from bar where baz contains " + - "({origin: {original: \"abc\", offset: 1, length: 2}}" + - "\"colors\")").getOrigin(); + "({origin: {original: \"abc\", offset: 1, length: 2}}" + + "\"colors\")").getOrigin(); assertEquals("abc", origin.string); assertEquals(1, origin.start); assertEquals(3, origin.end); } @Test - public void testAnnotationsCanBeInBrackets() { + void testAnnotationsCanBeInBrackets() { assertEquals("merkelapp", - getRootWord("select foo from bar where baz contains " + - "([ {label: \"merkelapp\"} ]\"colors\")").getLabel()); + getRootWord("select foo from bar where baz contains " + + "([ {label: \"merkelapp\"} ]\"colors\")").getLabel()); } @Test - public void testValuesCanBeQuoted() { + void testValuesCanBeQuoted() { assertEquals("merkelapp", - getRootWord("select foo from bar where baz contains " + - "( {label: \"merkelapp\"} \"colors\")").getLabel()); + getRootWord("select foo from bar where baz contains " + + "( {label: \"merkelapp\"} \"colors\")").getLabel()); } @Test - public void testSameElement() { + void testSameElement() { assertParse("select foo from bar where baz contains sameElement(f1 contains \"a\", f2 contains \"b\")", "baz:{f1:a f2:b}"); assertParse("select foo from bar where baz contains sameElement(f1 contains \"a\", f2 = 10)", @@ -361,27 +359,27 @@ public class YqlParserTestCase { } @Test - public void testPhrase() { + void testPhrase() { assertParse("select foo from bar where baz contains phrase(\"a\", \"b\")", - "baz:\"a b\""); + "baz:\"a b\""); } @Test - public void testNestedPhrase() { + void testNestedPhrase() { assertParse("select foo from bar where baz contains phrase(\"a\", \"b\", phrase(\"c\", \"d\"))", - "baz:\"a b c d\""); + "baz:\"a b c d\""); } @Test - public void testNestedPhraseSegment() { + void testNestedPhraseSegment() { assertParse("select foo from bar where baz contains " + - "phrase(\"a\", \"b\", [ {origin: {original: \"c d\", offset: 0, length: 3}} ]" + - "phrase(\"c\", \"d\"));", - "baz:\"a b 'c d'\""); + "phrase(\"a\", \"b\", [ {origin: {original: \"c d\", offset: 0, length: 3}} ]" + + "phrase(\"c\", \"d\"));", + "baz:\"a b 'c d'\""); } @Test - public void testFuzzy() { + void testFuzzy() { QueryTree x = parse("select foo from bar where baz contains fuzzy(\"a b\")"); Item root = x.getRoot(); assertSame(FuzzyItem.class, root.getClass()); @@ -392,7 +390,7 @@ public class YqlParserTestCase { } @Test - public void testFuzzyAnnotations() { + void testFuzzyAnnotations() { QueryTree x = parse( "select foo from bar where baz contains ({maxEditDistance: 3, prefixLength: 10}fuzzy(\"a b\"))" ); @@ -405,17 +403,17 @@ public class YqlParserTestCase { } @Test - public void testStemming() { + void testStemming() { assertTrue(getRootWord("select foo from bar where baz contains " + - "([ {stem: false} ]\"colors\")").isStemmed()); + "([ {stem: false} ]\"colors\")").isStemmed()); assertFalse(getRootWord("select foo from bar where baz contains " + - "([ {stem: true} ]\"colors\")").isStemmed()); + "([ {stem: true} ]\"colors\")").isStemmed()); assertFalse(getRootWord("select foo from bar where baz contains " + - "\"colors\"").isStemmed()); + "\"colors\"").isStemmed()); } @Test - public void testRaw() { + void testRaw() { // Default: Not raw, for comparison Item root = parse("select foo from bar where baz contains (\"yoni jo dima\")").getRoot(); assertEquals("baz:'yoni jo dima'", root.toString()); @@ -426,7 +424,7 @@ public class YqlParserTestCase { assertEquals("baz:yoni jo dima", root.toString()); assertTrue(root instanceof WordItem); assertFalse(root instanceof ExactStringItem); - assertEquals("yoni jo dima", ((WordItem)root).getWord()); + assertEquals("yoni jo dima", ((WordItem) root).getWord()); root = parse("select foo from bar where {grammar:\"all\"}userInput(\"yoni jo dima\")").getRoot(); assertTrue(root instanceof AndItem); @@ -436,232 +434,232 @@ public class YqlParserTestCase { root = parse("select foo from bar where {grammar:\"raw\"}userInput(\"yoni jo dima\")").getRoot(); assertTrue(root instanceof WordItem); assertTrue(root instanceof ExactStringItem); - assertEquals("yoni jo dima", ((WordItem)root).getWord()); + assertEquals("yoni jo dima", ((WordItem) root).getWord()); } @Test - public void testAccentDropping() { + void testAccentDropping() { assertFalse(getRootWord("select foo from bar where baz contains " + - "( {accentDrop: false} \"colors\")").isNormalizable()); + "( {accentDrop: false} \"colors\")").isNormalizable()); assertTrue(getRootWord("select foo from bar where baz contains " + - "( {accentDrop: true} \"colors\")").isNormalizable()); + "( {accentDrop: true} \"colors\")").isNormalizable()); assertTrue(getRootWord("select foo from bar where baz contains " + - "\"colors\"").isNormalizable()); + "\"colors\"").isNormalizable()); } @Test - public void testCaseNormalization() { + void testCaseNormalization() { assertTrue(getRootWord("select foo from bar where baz contains " + - "( {normalizeCase: false} \"colors\")").isLowercased()); + "( {normalizeCase: false} \"colors\")").isLowercased()); assertFalse(getRootWord("select foo from bar where baz contains " + - "( {normalizeCase: true} \"colors\")").isLowercased()); + "( {normalizeCase: true} \"colors\")").isLowercased()); assertFalse(getRootWord("select foo from bar where baz contains " + - "\"colors\"").isLowercased()); + "\"colors\"").isLowercased()); } @Test - public void testSegmentingRule() { + void testSegmentingRule() { assertEquals(SegmentingRule.PHRASE, - getRootWord("select foo from bar where baz contains " + - "( {andSegmenting: false} \"colors\")").getSegmentingRule()); + getRootWord("select foo from bar where baz contains " + + "( {andSegmenting: false} \"colors\")").getSegmentingRule()); assertEquals(SegmentingRule.BOOLEAN_AND, - getRootWord("select foo from bar where baz contains " + - "( {andSegmenting: true} \"colors\")").getSegmentingRule()); + getRootWord("select foo from bar where baz contains " + + "( {andSegmenting: true} \"colors\")").getSegmentingRule()); assertEquals(SegmentingRule.LANGUAGE_DEFAULT, - getRootWord("select foo from bar where baz contains " + - "\"colors\"").getSegmentingRule()); + getRootWord("select foo from bar where baz contains " + + "\"colors\"").getSegmentingRule()); } @Test - public void testNfkc() { + void testNfkc() { assertEquals("a\u030a", - getRootWord("select foo from bar where baz contains " + - "( {nfkc: false} \"a\\u030a\")").getWord()); + getRootWord("select foo from bar where baz contains " + + "( {nfkc: false} \"a\\u030a\")").getWord()); assertEquals("\u00e5", - getRootWord("select foo from bar where baz contains " + - "( {nfkc: true} \"a\\u030a\")").getWord()); - assertEquals("No NKFC by default", - "a\u030a", - getRootWord("select foo from bar where baz contains " + - "(\"a\\u030a\")").getWord()); + getRootWord("select foo from bar where baz contains " + + "( {nfkc: true} \"a\\u030a\")").getWord()); + assertEquals("a\u030a", + getRootWord("select foo from bar where baz contains " + + "(\"a\\u030a\")").getWord(), + "No NKFC by default"); } @Test - public void testImplicitTransforms() { + void testImplicitTransforms() { assertFalse(getRootWord("select foo from bar where baz contains ({implicitTransforms: " + - "false} \"cox\")").isFromQuery()); + "false} \"cox\")").isFromQuery()); assertTrue(getRootWord("select foo from bar where baz contains ({implicitTransforms: " + - "true} \"cox\")").isFromQuery()); + "true} \"cox\")").isFromQuery()); assertTrue(getRootWord("select foo from bar where baz contains \"cox\"").isFromQuery()); } @Test - public void testConnectivity() { + void testConnectivity() { QueryTree parsed = parse("select foo from bar where " + - "title contains ({id: 1, connectivity: {\"id\": 3, weight: 7.0}}\"madonna\") " + - "and title contains ({id: 2}\"saint\") " + - "and title contains ({id: 3}\"angel\")"); + "title contains ({id: 1, connectivity: {\"id\": 3, weight: 7.0}}\"madonna\") " + + "and title contains ({id: 2}\"saint\") " + + "and title contains ({id: 3}\"angel\")"); assertEquals("AND title:madonna title:saint title:angel", - parsed.toString()); - AndItem root = (AndItem)parsed.getRoot(); - WordItem first = (WordItem)root.getItem(0); - WordItem second = (WordItem)root.getItem(1); - WordItem third = (WordItem)root.getItem(2); - assertTrue(first.getConnectedItem() == third); + parsed.toString()); + AndItem root = (AndItem) parsed.getRoot(); + WordItem first = (WordItem) root.getItem(0); + WordItem second = (WordItem) root.getItem(1); + WordItem third = (WordItem) root.getItem(2); + assertEquals(first.getConnectedItem(), third); assertEquals(first.getConnectivity(), 7.0d, 1E-6); assertNull(second.getConnectedItem()); assertParseFail("select foo from bar where " + - "title contains ({id: 1, connectivity: {id: 4, weight: 7.0}}\"madonna\") " + - "and title contains ({id: 2}\"saint\") " + - "and title contains ({id: 3}\"angel\")", - new IllegalArgumentException("Item 'title:madonna' was specified to connect to item with ID 4, " + - "which does not exist in the query.")); + "title contains ({id: 1, connectivity: {id: 4, weight: 7.0}}\"madonna\") " + + "and title contains ({id: 2}\"saint\") " + + "and title contains ({id: 3}\"angel\")", + new IllegalArgumentException("Item 'title:madonna' was specified to connect to item with ID 4, " + + "which does not exist in the query.")); } @Test - public void testAnnotatedPhrase() { + void testAnnotatedPhrase() { QueryTree parsed = parse("select foo from bar where baz contains ({label: \"hello world\"}phrase(\"a\", \"b\"))"); assertEquals("baz:\"a b\"", parsed.toString()); - PhraseItem phrase = (PhraseItem)parsed.getRoot(); + PhraseItem phrase = (PhraseItem) parsed.getRoot(); assertEquals("hello world", phrase.getLabel()); } @Test - public void testRange() { + void testRange() { QueryTree parsed = parse("select foo from bar where range(baz,1,8)"); assertEquals("baz:[1;8]", parsed.toString()); } @Test - public void testRangeWithEndInfinity() { + void testRangeWithEndInfinity() { QueryTree parsed = parse("select foo from bar where range(baz,1,Infinity)"); assertEquals("baz:[1;]", parsed.toString()); } @Test - public void testRangeWithStartInfinity() { + void testRangeWithStartInfinity() { QueryTree parsed = parse("select foo from bar where range(baz,-Infinity,8)"); assertEquals("baz:[;8]", parsed.toString()); } @Test - public void testNegativeRange() { + void testNegativeRange() { QueryTree parsed = parse("select foo from bar where range(baz,-8,-1)"); assertEquals("baz:[-8;-1]", parsed.toString()); } @Test - public void testRangeIllegalArguments() { + void testRangeIllegalArguments() { assertParseFail("select foo from bar where range(baz,cox,8)", - new IllegalArgumentException("Expected a numerical argument (or 'Infinity') to range but got 'cox'")); + new IllegalArgumentException("Expected a numerical argument (or 'Infinity') to range but got 'cox'")); } @Test - public void testNear() { + void testNear() { assertParse("select foo from bar where description contains near(\"a\", \"b\")", - "NEAR(2) description:a description:b"); + "NEAR(2) description:a description:b"); assertParse("select foo from bar where description contains ({distance: 100} near(\"a\", \"b\"))", - "NEAR(100) description:a description:b"); + "NEAR(100) description:a description:b"); } @Test - public void testOrderedNear() { + void testOrderedNear() { assertParse("select foo from bar where description contains onear(\"a\", \"b\");", - "ONEAR(2) description:a description:b"); + "ONEAR(2) description:a description:b"); assertParse("select foo from bar where description contains ({distance: 100} onear(\"a\", \"b\"))", - "ONEAR(100) description:a description:b"); + "ONEAR(100) description:a description:b"); } @Test - public void testWand() { + void testWand() { assertParse("select foo from bar where wand(description, {\"a\":1, \"b\":2});", "WAND(10,0.0,1.0) description{[1]:\"a\",[2]:\"b\"}"); assertParse("select foo from bar where {scoreThreshold : 13.3, targetHits: 7, " + - "thresholdBoostFactor: 2.3} wand(description, {\"a\":1, \"b\":2})", - "WAND(7,13.3,2.3) description{[1]:\"a\",[2]:\"b\"}"); + "thresholdBoostFactor: 2.3} wand(description, {\"a\":1, \"b\":2})", + "WAND(7,13.3,2.3) description{[1]:\"a\",[2]:\"b\"}"); } @Test - public void testQuotedAnnotations() { + void testQuotedAnnotations() { assertParse("select foo from bar where {\"scoreThreshold\": 13.3, \"targetHits\": 7, " + - "'thresholdBoostFactor': 2.3} wand(description, {\"a\":1})", - "WAND(7,13.3,2.3) description{[1]:\"a\"}"); + "'thresholdBoostFactor': 2.3} wand(description, {\"a\":1})", + "WAND(7,13.3,2.3) description{[1]:\"a\"}"); } @Test - public void testNumericWand() { + void testNumericWand() { String numWand = "WAND(10,0.0,1.0) description{[1]:\"11\",[2]:\"37\"}"; assertParse("select foo from bar where wand(description, [[11,1], [37,2]])", numWand); assertParse("select foo from bar where wand(description, [[11L,1], [37L,2]])", numWand); assertParseFail("select foo from bar where wand(description, 12);", - new IllegalArgumentException("Expected ARRAY or MAP, got LITERAL.")); + new IllegalArgumentException("Expected ARRAY or MAP, got LITERAL.")); } - @Test //This test is order dependent. Fix it! - public void testWeightedSet() { + @Test + void testWeightedSet() { assertParse("select foo from bar where weightedSet(description, {\"a\":1, \"b\":2})", - "WEIGHTEDSET description{[1]:\"a\",[2]:\"b\"}"); + "WEIGHTEDSET description{[1]:\"a\",[2]:\"b\"}"); assertParseFail("select foo from bar where weightedSet(description, {\"a\":g, \"b\":2})", - new IllegalInputException("com.yahoo.search.yql.ProgramCompileException: " + - "query:L1:56 no viable alternative at input 'weightedSet(description, {\"a\":g'")); + new IllegalInputException("com.yahoo.search.yql.ProgramCompileException: " + + "query:L1:56 no viable alternative at input 'weightedSet(description, {\"a\":g'")); assertParseFail("select foo from bar where weightedSet(description);", - new IllegalArgumentException("Expected 2 arguments, got 1.")); + new IllegalArgumentException("Expected 2 arguments, got 1.")); } //This test is order dependent. Fix it! @Test - public void testDotProduct() { + void testDotProduct() { assertParse("select foo from bar where dotProduct(description, {\"a\":1, \"b\":2})", - "DOTPRODUCT description{[1]:\"a\",[2]:\"b\"}"); + "DOTPRODUCT description{[1]:\"a\",[2]:\"b\"}"); assertParse("select foo from bar where dotProduct(description, {\"a\":2})", - "DOTPRODUCT description{[2]:\"a\"}"); + "DOTPRODUCT description{[2]:\"a\"}"); } @Test - public void testGeoLocation() { + void testGeoLocation() { assertParse("select foo from bar where geoLocation(workplace, 63.418417, 10.433033, \"0.5 deg\")", - "GEO_LOCATION workplace:(2,10433033,63418417,500000,0,1,0,1921876103)"); + "GEO_LOCATION workplace:(2,10433033,63418417,500000,0,1,0,1921876103)"); assertParse("select foo from bar where geoLocation(headquarters, \"37.416383\", \"-122.024683\", \"100 miles\")", - "GEO_LOCATION headquarters:(2,-122024683,37416383,1450561,0,1,0,3411238761)"); + "GEO_LOCATION headquarters:(2,-122024683,37416383,1450561,0,1,0,3411238761)"); assertParse("select foo from bar where geoLocation(home, \"E10.433033\", \"N63.418417\", \"5km\")", - "GEO_LOCATION home:(2,10433033,63418417,45066,0,1,0,1921876103)"); + "GEO_LOCATION home:(2,10433033,63418417,45066,0,1,0,1921876103)"); assertParseFail("select foo from bar where geoLocation(qux, 1, 2)", - new IllegalArgumentException("Expected 4 arguments, got 3.")); + new IllegalArgumentException("Expected 4 arguments, got 3.")); assertParseFail("select foo from bar where geoLocation(qux, 2.0, \"N5.0\", \"0.5 deg\");", - new IllegalArgumentException( - "Invalid geoLocation coordinates 'Latitude: 2.0 degrees' and 'Latitude: 5.0 degrees'")); + new IllegalArgumentException( + "Invalid geoLocation coordinates 'Latitude: 2.0 degrees' and 'Latitude: 5.0 degrees'")); assertParse("select foo from bar where geoLocation(workplace, -12, -34, \"-77 d\")", - "GEO_LOCATION workplace:(2,-34000000,-12000000,-1,0,1,0,4201111954)"); + "GEO_LOCATION workplace:(2,-34000000,-12000000,-1,0,1,0,4201111954)"); } @Test - public void testNearestNeighbor() { + void testNearestNeighbor() { assertParse("select foo from bar where nearestNeighbor(semantic_embedding, my_vector);", - "NEAREST_NEIGHBOR {field=semantic_embedding,queryTensorName=my_vector,hnsw.exploreAdditionalHits=0,distanceThreshold=Infinity,approximate=true,targetHits=0}"); + "NEAREST_NEIGHBOR {field=semantic_embedding,queryTensorName=my_vector,hnsw.exploreAdditionalHits=0,distanceThreshold=Infinity,approximate=true,targetHits=0}"); assertParse("select foo from bar where {targetHits: 37} nearestNeighbor(semantic_embedding, my_vector)", - "NEAREST_NEIGHBOR {field=semantic_embedding,queryTensorName=my_vector,hnsw.exploreAdditionalHits=0,distanceThreshold=Infinity,approximate=true,targetHits=37}"); + "NEAREST_NEIGHBOR {field=semantic_embedding,queryTensorName=my_vector,hnsw.exploreAdditionalHits=0,distanceThreshold=Infinity,approximate=true,targetHits=37}"); assertParse("select foo from bar where {approximate: false, hnsw.exploreAdditionalHits: 8, targetHits: 3} nearestNeighbor(semantic_embedding, my_vector)", - "NEAREST_NEIGHBOR {field=semantic_embedding,queryTensorName=my_vector,hnsw.exploreAdditionalHits=8,distanceThreshold=Infinity,approximate=false,targetHits=3}"); + "NEAREST_NEIGHBOR {field=semantic_embedding,queryTensorName=my_vector,hnsw.exploreAdditionalHits=8,distanceThreshold=Infinity,approximate=false,targetHits=3}"); assertParse("select foo from bar where {targetHits: 7, distanceThreshold: 100100.25} nearestNeighbor(semantic_embedding, my_vector)", - "NEAREST_NEIGHBOR {field=semantic_embedding,queryTensorName=my_vector,hnsw.exploreAdditionalHits=0,distanceThreshold=100100.25,approximate=true,targetHits=7}"); + "NEAREST_NEIGHBOR {field=semantic_embedding,queryTensorName=my_vector,hnsw.exploreAdditionalHits=0,distanceThreshold=100100.25,approximate=true,targetHits=7}"); } @Test - public void testTrueAndFalse() { + void testTrueAndFalse() { assertParse("select foo from bar where true", "TRUE"); assertParse("select foo from bar where false", "FALSE"); assertParse("select foo from bar where ((title contains \"foo\") AND true) AND !((title contains \"bar\") or false)", - "+(AND title:foo TRUE) -(OR title:bar FALSE)"); + "+(AND title:foo TRUE) -(OR title:bar FALSE)"); } @Test - public void testPredicate() { + void testPredicate() { assertParse("select foo from bar where predicate(predicate_field, " + "{\"gender\":\"male\", \"hobby\":[\"music\", \"hiking\"]}, {\"age\":23L})", "PREDICATE_QUERY_ITEM gender=male, hobby=music, hobby=hiking, age:23"); @@ -673,113 +671,113 @@ public class YqlParserTestCase { } @Test - public void testPredicateWithSubQueries() { + void testPredicateWithSubQueries() { assertParse("select foo from bar where predicate(predicate_field, " + "{\"0x03\":{\"gender\":\"male\"},\"0x01\":{\"hobby\":[\"music\", \"hiking\"]}}, {\"0x80ffffffffffffff\":{\"age\":23L}})", "PREDICATE_QUERY_ITEM gender=male[0x3], hobby=music[0x1], hobby=hiking[0x1], age:23[0x80ffffffffffffff]"); assertParseFail("select foo from bar where predicate(foo, null, {\"0x80000000000000000\":{\"age\":23}})", new NumberFormatException("Too long subquery string: 0x80000000000000000")); assertParse("select foo from bar where predicate(predicate_field, " + - "{\"[0,1]\":{\"gender\":\"male\"},\"[0]\":{\"hobby\":[\"music\", \"hiking\"]}}, {\"[62, 63]\":{\"age\":23L}})", + "{\"[0,1]\":{\"gender\":\"male\"},\"[0]\":{\"hobby\":[\"music\", \"hiking\"]}}, {\"[62, 63]\":{\"age\":23L}})", "PREDICATE_QUERY_ITEM gender=male[0x3], hobby=music[0x1], hobby=hiking[0x1], age:23[0xc000000000000000]"); } @Test - public void testRank() { + void testRank() { assertParse("select foo from bar where rank(a contains \"A\", b contains \"B\")", - "RANK a:A b:B"); + "RANK a:A b:B"); assertParse("select foo from bar where rank(a contains \"A\", b contains \"B\", c " + - "contains \"C\")", - "RANK a:A b:B c:C"); + "contains \"C\")", + "RANK a:A b:B c:C"); assertParse("select foo from bar where rank(a contains \"A\", b contains \"B\" or c " + - "contains \"C\")", - "RANK a:A (OR b:B c:C)"); + "contains \"C\")", + "RANK a:A (OR b:B c:C)"); } @Test @SuppressWarnings("deprecation") - public void testWeakAnd() { + void testWeakAnd() { assertParse("select foo from bar where weakAnd(a contains \"A\", b contains \"B\")", - "WEAKAND(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\")", - "WEAKAND(37) a:A b:B"); + "b contains \"B\")", + "WEAKAND(37) a:A b:B"); QueryTree tree = parse("select foo from bar where weakAnd(a " + - "contains \"A\", b contains \"B\")"); + "contains \"A\", b contains \"B\")"); assertEquals("WEAKAND(100) a:A b:B", tree.toString()); assertEquals(WeakAndItem.class, tree.getRoot().getClass()); } @Test - public void testEquiv() { + void testEquiv() { assertParse("select foo from bar where fieldName contains equiv(\"A\",\"B\")", - "EQUIV fieldName:A fieldName:B"); + "EQUIV fieldName:A fieldName:B"); assertParse("select foo from bar where fieldName contains " + - "equiv(\"ny\",phrase(\"new\",\"york\"));", - "EQUIV fieldName:ny fieldName:\"new york\""); + "equiv(\"ny\",phrase(\"new\",\"york\"));", + "EQUIV fieldName:ny fieldName:\"new york\""); assertParseFail("select foo from bar where fieldName contains equiv(\"ny\")", - new IllegalArgumentException("Expected 2 or more arguments, got 1.")); + new IllegalArgumentException("Expected 2 or more arguments, got 1.")); assertParseFail("select foo from bar where fieldName contains equiv(\"ny\", nalle(void))", - new IllegalArgumentException("Expected function 'phrase', got 'nalle'.")); + new IllegalArgumentException("Expected function 'phrase', got 'nalle'.")); assertParseFail("select foo from bar where fieldName contains equiv(\"ny\", 42)", - new ClassCastException("Cannot cast java.lang.Integer to java.lang.String")); + new ClassCastException("Cannot cast java.lang.Integer to java.lang.String")); } @Test - public void testAffixItems() { + void testAffixItems() { assertRootClass("select foo from bar where baz contains ({suffix: true}\"colors\")", - SuffixItem.class); + SuffixItem.class); assertRootClass("select foo from bar where baz contains ({prefix: true}\"colors\")", - PrefixItem.class); + PrefixItem.class); assertRootClass("select foo from bar where baz contains ({substring: true}\"colors\")", - SubstringItem.class); + SubstringItem.class); assertParseFail("select foo from bar where description contains ({suffix: true, " + - "prefix: true}\"colors\")", - new IllegalArgumentException("Only one of prefix, substring and suffix can be set.")); + "prefix: true}\"colors\")", + new IllegalArgumentException("Only one of prefix, substring and suffix can be set.")); assertParseFail("select foo from bar where description contains ({suffix: true, " + - "substring: true}\"colors\")", - new IllegalArgumentException("Only one of prefix, substring and suffix can be set.")); + "substring: true}\"colors\")", + new IllegalArgumentException("Only one of prefix, substring and suffix can be set.")); } @Test - public void testLongNumberInSimpleExpression() { + void testLongNumberInSimpleExpression() { assertParse("select foo from bar where price = 8589934592L", "price:8589934592"); assertParse("select foo from bar where price = 8589934592", "price:8589934592"); } @Test - public void testNegativeLongNumberInSimpleExpression() { + void testNegativeLongNumberInSimpleExpression() { assertParse("select foo from bar where price = -8589934592L", "price:-8589934592"); } @Test - public void testSources() { + void testSources() { assertSources("select foo from sourceA where price <= 500", List.of("sourceA")); } @Test - public void testQueryWithSemicolon() { + void testQueryWithSemicolon() { assertParse("select foo from bar where price = 1", "price:1"); } @Test - public void testSourcesWithDash() { + void testSourcesWithDash() { assertSources("select foo from source-a where price <= 500", List.of("source-a")); } @Test - public void testWildCardSources() { + void testWildCardSources() { assertSources("select foo from sources * where price <= 500", List.of()); } @Test - public void testMultiSources() { + void testMultiSources() { assertSources("select foo from sources sourceA, sourceB where price <= 500", List.of("sourceA", "sourceB")); } @Test - public void testFields() { + void testFields() { assertSummaryFields("select fieldA from bar where price <= 500", List.of("fieldA")); assertSummaryFields("select fieldA, fieldB from bar where price <= 500", List.of("fieldA", "fieldB")); assertSummaryFields("select fieldA, fieldB, fieldC from bar where price <= 500", List.of("fieldA", "fieldB", "fieldC")); @@ -787,37 +785,37 @@ public class YqlParserTestCase { } @Test - public void testFieldsRoot() { + void testFieldsRoot() { assertParse("select * from bar where price <= 500", "price:[;500]"); } @Test - public void testOffset() { + void testOffset() { assertParse("select foo from bar where title contains \"madonna\" offset 37", "title:madonna"); assertEquals(Integer.valueOf(37), parser.getOffset()); } @Test - public void testLimit() { + void testLimit() { assertParse("select foo from bar where title contains \"madonna\" limit 29", "title:madonna"); assertEquals(Integer.valueOf(29), parser.getHits()); } @Test - public void testOffsetAndLimit() { + void testOffsetAndLimit() { assertParse("select foo from bar where title contains \"madonna\" limit 31 offset 29", - "title:madonna"); + "title:madonna"); assertEquals(Integer.valueOf(29), parser.getOffset()); assertEquals(Integer.valueOf(2), parser.getHits()); assertParse("select * from bar where title contains \"madonna\" limit 41 offset 37", - "title:madonna"); + "title:madonna"); assertEquals(Integer.valueOf(37), parser.getOffset()); assertEquals(Integer.valueOf(4), parser.getHits()); } @Test - public void testTimeout() { + void testTimeout() { assertParse("select * from bar where title contains \"madonna\" timeout 7", "title:madonna"); assertEquals(Integer.valueOf(7), parser.getTimeout()); @@ -826,10 +824,10 @@ public class YqlParserTestCase { } @Test - public void testOrdering() { + void testOrdering() { assertParse("select foo from bar where title contains \"madonna\" order by something asc, " + - "shoesize desc limit 600 timeout 3", - "title:madonna"); + "shoesize desc limit 600 timeout 3", + "title:madonna"); assertEquals(2, parser.getSorting().fieldOrders().size()); assertEquals("something", parser.getSorting().fieldOrders().get(0).getFieldName()); assertEquals(Order.ASCENDING, parser.getSorting().fieldOrders().get(0).getSortOrder()); @@ -837,14 +835,14 @@ public class YqlParserTestCase { assertEquals(Order.DESCENDING, parser.getSorting().fieldOrders().get(1).getSortOrder()); assertParse("select foo from bar where title contains \"madonna\" order by other limit 600 " + - "timeout 3", - "title:madonna"); + "timeout 3", + "title:madonna"); assertEquals("other", parser.getSorting().fieldOrders().get(0).getFieldName()); assertEquals(Order.ASCENDING, parser.getSorting().fieldOrders().get(0).getSortOrder()); } @Test - public void testAnnotatedOrdering() { + void testAnnotatedOrdering() { assertParse( "select foo from bar where title contains \"madonna\"" + " order by {function: \"uca\", locale: \"en_US\", strength: \"IDENTICAL\"}other desc" @@ -860,7 +858,7 @@ public class YqlParserTestCase { } @Test - public void testMultipleAnnotatedOrdering() { + void testMultipleAnnotatedOrdering() { assertParse( "select foo from bar where title contains \"madonna\"" + " order by {\"function\": \"uca\", \"locale\": \"en_US\", \"strength\": \"IDENTICAL\"}other desc," @@ -886,40 +884,40 @@ public class YqlParserTestCase { } @Test - public void testSegmenting() { + void testSegmenting() { assertParse("select * from bar where title contains 'foo.bar'", "title:'foo bar'"); assertParse("select * from bar where title contains 'foo&123'", "title:'foo 123'"); } @Test - public void testNegativeHitLimit() { + void testNegativeHitLimit() { assertParse("select * from sources * where {hitLimit: -38}range(foo, 0, 1)", "foo:[0;1;-38]"); } @Test - public void testRangeSearchHitPopulationOrdering() { + void testRangeSearchHitPopulationOrdering() { assertParse("select * from sources * where {hitLimit: 38, ascending: true}range(foo, 0, 1)", - "foo:[0;1;38]"); + "foo:[0;1;38]"); assertParse("select * from sources * where {hitLimit: 38, ascending: false}range(foo, 0, 1)", - "foo:[0;1;-38]"); + "foo:[0;1;-38]"); assertParse("select * from sources * where {hitLimit: 38, descending: true}range(foo, 0, 1)", - "foo:[0;1;-38]"); + "foo:[0;1;-38]"); assertParse("select * from sources * where {hitLimit: 38, descending: false}range(foo, 0, 1)", - "foo:[0;1;38]"); + "foo:[0;1;38]"); boolean gotExceptionFromParse = false; try { parse("select * from sources * where {hitLimit: 38, ascending: true, descending: false}range(foo, 0, 1)"); } catch (IllegalArgumentException e) { - assertTrue("Expected information about abuse of settings.", - e.getMessage().contains("both ascending and descending ordering set")); + assertTrue(e.getMessage().contains("both ascending and descending ordering set"), + "Expected information about abuse of settings."); gotExceptionFromParse = true; } assertTrue(gotExceptionFromParse); } @Test - public void testOpenIntervals() { + void testOpenIntervals() { assertParse("select * from sources * where range(title, 0.0, 500.0)", "title:[0.0;500.0]"); assertParse( @@ -934,7 +932,7 @@ public class YqlParserTestCase { } @Test - public void testInheritedAnnotations() { + void testInheritedAnnotations() { { QueryTree x = parse("select * from sources * where ({ranked: false}(foo contains \"a\" and bar contains \"b\")) or foor contains ({ranked: false}\"c\")"); List<IndexedItem> terms = QueryTree.getPositiveTerms(x); @@ -954,12 +952,12 @@ public class YqlParserTestCase { } @Test - public void testMoreInheritedAnnotations() { + void testMoreInheritedAnnotations() { String yqlQuery = "select * from sources * where " + - "({ranked: false}(foo contains \"a\" " + - "and ({ranked: true}(bar contains \"b\" " + - "or ({ranked: false}(foo contains \"c\" " + - "and foo contains ({ranked: true}\"d\")))))))"; + "({ranked: false}(foo contains \"a\" " + + "and ({ranked: true}(bar contains \"b\" " + + "or ({ranked: false}(foo contains \"c\" " + + "and foo contains ({ranked: true}\"d\")))))))"; QueryTree x = parse(yqlQuery); List<IndexedItem> terms = QueryTree.getPositiveTerms(x); assertEquals(4, terms.size()); @@ -980,11 +978,11 @@ public class YqlParserTestCase { } @Test - public void testFieldAliases() { + void testFieldAliases() { IndexInfoConfig modelConfig = new IndexInfoConfig(new IndexInfoConfig.Builder().indexinfo(new Indexinfo.Builder() .name("music").command(new Command.Builder().indexname("title").command("index")) .alias(new Alias.Builder().alias("song").indexname("title")))); - IndexModel model = new IndexModel(modelConfig, (QrSearchersConfig)null); + IndexModel model = new IndexModel(modelConfig, (QrSearchersConfig) null); IndexFacts indexFacts = new IndexFacts(model); ParserEnvironment parserEnvironment = new ParserEnvironment().setIndexFacts(indexFacts); @@ -999,7 +997,7 @@ public class YqlParserTestCase { } @Test - public void testRegexp() { + void testRegexp() { QueryTree x = parse("select * from sources * where foo matches \"a b\""); Item root = x.getRoot(); assertSame(RegExpItem.class, root.getClass()); @@ -1007,7 +1005,7 @@ public class YqlParserTestCase { } @Test - public void testWordAlternatives() { + void testWordAlternatives() { QueryTree x = parse("select * from sources * where foo contains alternatives({trees: 1.0, \"tree\": 0.7})"); Item root = x.getRoot(); assertSame(WordAlternativesItem.class, root.getClass()); @@ -1016,10 +1014,10 @@ public class YqlParserTestCase { } @Test - public void testWordAlternativesWithOrigin() { + void testWordAlternativesWithOrigin() { QueryTree q = parse("select * from sources * where foo contains" + - " ({origin: {original: \" trees \", offset: 1, length: 5}}" + - "alternatives({trees: 1.0, tree: 0.7}))"); + " ({origin: {original: \" trees \", offset: 1, length: 5}}" + + "alternatives({trees: 1.0, tree: 0.7}))"); Item root = q.getRoot(); assertSame(WordAlternativesItem.class, root.getClass()); WordAlternativesItem alternatives = (WordAlternativesItem) root; @@ -1032,9 +1030,9 @@ public class YqlParserTestCase { } @Test - public void testWordAlternativesInPhrase() { + void testWordAlternativesInPhrase() { QueryTree q = parse("select * from sources * where" + - " foo contains phrase(\"forest\", alternatives({trees: 1.0, tree: 0.7}))"); + " foo contains phrase(\"forest\", alternatives({trees: 1.0, tree: 0.7}))"); Item root = q.getRoot(); assertSame(PhraseItem.class, root.getClass()); PhraseItem phrase = (PhraseItem) root; @@ -1046,7 +1044,7 @@ public class YqlParserTestCase { /** Verifies that we can search for a backslash */ @Test - public void testBackslash() { + void testBackslash() { { String queryString = "select * from testtype where title contains \"\\\\\""; // Java escaping * YQL escaping @@ -1063,7 +1061,7 @@ public class YqlParserTestCase { } @Test - public void testUrlHostSearchingDefaultAnchors() { + void testUrlHostSearchingDefaultAnchors() { // Simple query syntax, for reference assertUrlQuery("urlfield.hostname", new Query("?query=urlfield.hostname:google.com&type=all"), false, true, true); @@ -1074,7 +1072,7 @@ public class YqlParserTestCase { } @Test - public void testUrlHostSearchingNoAnchors() { + void testUrlHostSearchingNoAnchors() { // Simple query syntax, for reference assertUrlQuery("urlfield.hostname", new Query("?query=urlfield.hostname:google.com*&type=all"), false, false, true); @@ -1085,7 +1083,7 @@ public class YqlParserTestCase { } @Test - public void testUrlHostSearchingBothAnchors() { + void testUrlHostSearchingBothAnchors() { // Simple query syntax, for reference assertUrlQuery("urlfield.hostname", new Query("?query=urlfield.hostname:%5Egoogle.com&type=all"), true, true, true); // %5E = ^ @@ -1096,7 +1094,7 @@ public class YqlParserTestCase { } @Test - public void testUriNonHostDoesNotCreateAnchors() { + void testUriNonHostDoesNotCreateAnchors() { // Simple query syntax, for reference assertUrlQuery("urlfield", new Query("?query=urlfield:google.com&type=all"), false, false, false); @@ -1107,13 +1105,13 @@ public class YqlParserTestCase { } @Test - public void testReservedWordInSource() { + void testReservedWordInSource() { parse("select * from sources like where text contains \"test\""); // success: parsed without exception } @Test - public void testAndSegmenting() { + void testAndSegmenting() { parse("select * from sources * where (default contains ({stem: false}\"m\") AND default contains ({origin: {original: \"m\'s\", offset: 0, length: 3}, andSegmenting: true}phrase(\"m\", \"s\"))) timeout 472"); } @@ -1198,11 +1196,11 @@ public class YqlParserTestCase { assertEquals(2, alternatives.getAlternatives().size()); for (WordAlternativesItem.Alternative alternative : alternatives.getAlternatives()) { if (tree.equals(alternative.word)) { - assertFalse("Duplicate term introduced", seenTree); + assertFalse(seenTree, "Duplicate term introduced"); seenTree = true; assertEquals(.7d, alternative.exactness, 1e-15d); } else if (forest.equals(alternative.word)) { - assertFalse("Duplicate term introduced", seenForest); + assertFalse(seenForest, "Duplicate term introduced"); seenForest = true; assertEquals(1.0d, alternative.exactness, 1e-15d); } else { |