diff options
Diffstat (limited to 'container-search/src/test/java/com/yahoo/prelude/test/QueryTestCase.java')
-rw-r--r-- | container-search/src/test/java/com/yahoo/prelude/test/QueryTestCase.java | 114 |
1 files changed, 57 insertions, 57 deletions
diff --git a/container-search/src/test/java/com/yahoo/prelude/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/prelude/test/QueryTestCase.java index eaab7e12f33..95ecf3c2dba 100644 --- a/container-search/src/test/java/com/yahoo/prelude/test/QueryTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/test/QueryTestCase.java @@ -14,12 +14,12 @@ import com.yahoo.search.Query; import com.yahoo.search.query.Sorting; import com.yahoo.search.searchchain.Execution; import com.yahoo.yolean.Exceptions; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * Tests for query class @@ -29,7 +29,7 @@ import static org.junit.Assert.*; public class QueryTestCase { @Test - public void testBoolItem() { + void testBoolItem() { var original = new BoolItem(false); var cloned = original.clone(); assertNotSame(original, cloned); @@ -37,7 +37,7 @@ public class QueryTestCase { } @Test - public void testSimpleQueryParsing () { + void testSimpleQueryParsing() { Query q = newQuery("/search?query=foobar&offset=10&hits=20&type=all"); assertEquals("foobar", ((WordItem) q.getModel().getQueryTree().getRoot()).getWord()); assertEquals(10, q.getOffset()); @@ -45,7 +45,7 @@ public class QueryTestCase { } @Test - public void testAdvancedQueryParsing () { + void testAdvancedQueryParsing() { Query q = newQuery("/search?query=fOObar and kanoo&offset=10&hits=20&filter=-foo +bar&type=adv&suggestonly=true"); assertEquals("AND (+(AND fOObar kanoo) -|foo) |bar", q.getModel().getQueryTree().getRoot().toString()); assertEquals(10, q.getOffset()); @@ -54,7 +54,7 @@ public class QueryTestCase { } @Test - public void testAnyQueryParsing () { + void testAnyQueryParsing() { Query q = newQuery("/search?query=foobar and kanoo&offset=10&hits=10&type=any&suggestonly=true&filter=-fast.type:offensive&encoding=latin1"); assertEquals("+(OR foobar and kanoo) -|fast.type:offensive", q.getModel().getQueryTree().getRoot().toString()); assertEquals(10, q.getOffset()); @@ -64,13 +64,13 @@ public class QueryTestCase { } @Test - public void testLongQueryParsing() { + void testLongQueryParsing() { Query q = newQuery("/p13n?query=news" - +"interest:cnn!254+interest:cnnfn!171+interest:cnn+" - +"financial!96+interest:" - +"yahoo+com!253+interest:www+yahoo!138+" - +"interest:www+yahoo+com!136" - +"&hits=20&offset=0&vectorranking=queryrank"); + + "interest:cnn!254+interest:cnnfn!171+interest:cnn+" + + "financial!96+interest:" + + "yahoo+com!253+interest:www+yahoo!138+" + + "interest:www+yahoo+com!136" + + "&hits=20&offset=0&vectorranking=queryrank"); assertEquals("/p13n", q.getHttpRequest().getUri().getPath()); assertEquals(0, q.getOffset()); assertEquals(20, q.getHits()); @@ -83,9 +83,9 @@ public class QueryTestCase { * is not a number. */ @Test - public void testGetParamInt() { + void testGetParamInt() { Query q = newQuery("/search?query=foo%20bar&someint=10¬int=hello"); - assertEquals(10, (int)q.properties().getInteger("someint")); + assertEquals(10, (int) q.properties().getInteger("someint")); // provoke an exception. if exception is not triggered // we fail the test. @@ -98,13 +98,13 @@ public class QueryTestCase { } @Test - public void testUtf8Decoding() { + void testUtf8Decoding() { Query q = new Query("/?query=beyonc%C3%A9&type=all"); assertEquals("beyonc\u00e9", ((WordItem) q.getModel().getQueryTree().getRoot()).getWord()); } @Test - public void testSortSpec() { + void testSortSpec() { Query q = newQuery("?query=test&sortspec=+a -b c +[rank]"); assertNotNull(q.getRanking().getSorting()); List<Sorting.FieldOrder> sortSpec = q.getRanking().getSorting().fieldOrders(); @@ -120,13 +120,13 @@ public class QueryTestCase { } @Test - public void testSortSpecLowerCase() { + void testSortSpecLowerCase() { Query q = newQuery("?query=test&sortspec=-lowercase(name)"); assertNotNull(q.getRanking().getSorting()); List<Sorting.FieldOrder> sortSpec = q.getRanking().getSorting().fieldOrders(); assertEquals(sortSpec.size(), 1); assertEquals(Sorting.Order.DESCENDING, - sortSpec.get(0).getSortOrder()); + sortSpec.get(0).getSortOrder()); assertEquals("name", sortSpec.get(0).getFieldName()); assertTrue(sortSpec.get(0).getSorter() instanceof Sorting.LowerCaseSorter); } @@ -143,7 +143,7 @@ public class QueryTestCase { } @Test - public void testSortSpecUca() { + void testSortSpecUca() { checkUcaUS("?query=test&sortspec=-uca(name,en_US)"); checkUcaUS("?query=test&sortspec=-UCA(name,en_US)"); checkSortSpecUcaUSOptional("?query=test&sortspec=-uca(name,en_US,tertiary)"); @@ -151,21 +151,21 @@ public class QueryTestCase { } @Test - public void testInvalidSortFunction() { + void testInvalidSortFunction() { assertQueryError( "?query=test&sortspec=-ucca(name,en_US)", "Could not set 'ranking.sorting' to '-ucca(name,en_US)': Unknown sort function 'ucca'"); } @Test - public void testMissingSortFunction() { + void testMissingSortFunction() { assertQueryError( "?query=test&sortspec=-(name)", "Could not set 'ranking.sorting' to '-(name)': No sort function specified"); } @Test - public void testInvalidUcaStrength() { + void testInvalidUcaStrength() { assertQueryError( "?query=test&sortspec=-uca(name,en_US,tertary)", "Could not set 'ranking.sorting' to '-uca(name,en_US,tertary)': Unknown collation strength: 'tertary'"); @@ -189,7 +189,7 @@ public class QueryTestCase { * Extremely simple for now, will be used for pathological cases. */ @Test - public void testHashCode() { + void testHashCode() { Query p = newQuery("?query=foo&type=any"); Query q = newQuery("?query=foo&type=all"); assertTrue(p.hashCode() != q.hashCode()); @@ -197,17 +197,17 @@ public class QueryTestCase { /** Test using the defauultindex feature */ @Test - public void testDefaultIndex() { + void testDefaultIndex() { Query q = newQuery("?query=hi hello keyword:kanoo " + - "default:munkz \"phrases too\"&default-index=def"); + "default:munkz \"phrases too\"&default-index=def"); assertEquals("WEAKAND(100) def:hi def:hello keyword:kanoo " + - "default:munkz def:\"phrases too\"", - q.getModel().getQueryTree().getRoot().toString()); + "default:munkz def:\"phrases too\"", + q.getModel().getQueryTree().getRoot().toString()); } - /** Test that GET parameter names are case in-sensitive */ - @Test - public void testGETParametersCase() { + /** Test that GET parameter names are case in-sensitive */ + @Test + void testGETParametersCase() { Query q = newQuery("?QUERY=testing&hits=10&oFfSeT=10"); assertEquals("testing", q.getModel().getQueryString()); @@ -217,108 +217,108 @@ public class QueryTestCase { @Test - public void testNegativeHitValue() { + void testNegativeHitValue() { assertQueryError( "?query=test&hits=-1", "Could not set 'hits' to '-1': Must be a positive number"); } @Test - public void testNaNHitValue() { + void testNaNHitValue() { assertQueryError( "?query=test&hits=NaN", "Could not set 'hits' to 'NaN': 'NaN' is not a valid integer"); } @Test - public void testNoneHitValue() { + void testNoneHitValue() { assertQueryError( "?query=test&hits=(none)", "Could not set 'hits' to '(none)': '(none)' is not a valid integer"); } @Test - public void testNegativeOffsetValue() { + void testNegativeOffsetValue() { assertQueryError( "?query=test&offset=-1", "Could not set 'offset' to '-1': Must be a positive number"); } @Test - public void testNaNOffsetValue() { + void testNaNOffsetValue() { assertQueryError( "?query=test&offset=NaN", "Could not set 'offset' to 'NaN': 'NaN' is not a valid integer"); } @Test - public void testNoneOffsetValue() { + void testNoneOffsetValue() { assertQueryError( "?query=test&offset=(none)", "Could not set 'offset' to '(none)': '(none)' is not a valid integer"); } @Test - public void testNoneHitsNegativeOffsetValue() { + void testNoneHitsNegativeOffsetValue() { assertQueryError( "?query=test&hits=(none)&offset=-10", "Could not set 'hits' to '(none)': '(none)' is not a valid integer"); } @Test - public void testFeedbackIsTransferredToResult() { + void testFeedbackIsTransferredToResult() { assertQueryError( "?query=test&hits=(none)&offset=-10", "Could not set 'hits' to '(none)': '(none)' is not a valid integer"); } @Test - public void testUnicodeNormalization() { + void testUnicodeNormalization() { Linguistics linguistics = new SimpleLinguistics(); Query query = newQueryFromEncoded("?query=content:%EF%BC%B3%EF%BC%AF%EF%BC%AE%EF%BC%B9&type=all", Language.ENGLISH, - linguistics); + linguistics); assertEquals("SONY", ((WordItem) query.getModel().getQueryTree().getRoot()).getWord()); query = newQueryFromEncoded("?query=foo&filter=+%EF%BC%B3%EF%BC%AF%EF%BC%AE%EF%BC%B9&type=all", Language.ENGLISH, - linguistics); + linguistics); assertEquals("RANK foo |SONY", query.getModel().getQueryTree().getRoot().toString()); query = newQueryFromEncoded("?query=foo+AND+%EF%BC%B3%EF%BC%AF%EF%BC%AE%EF%BC%B9)&type=adv", - Language.ENGLISH, linguistics); + Language.ENGLISH, linguistics); assertEquals("AND foo SONY", query.getModel().getQueryTree().getRoot().toString()); } /** Test a vertical specific patch, see Tokenizer */ @Test - @Ignore - public void testPrivateUseCharacterParsing() { + @Disabled + void testPrivateUseCharacterParsing() { Query query = newQuery("?query=%EF%89%AB"); assertEquals(Character.UnicodeBlock.PRIVATE_USE_AREA, - Character.UnicodeBlock.of(query.getModel().getQueryTree().getRoot().toString().charAt(0))); + Character.UnicodeBlock.of(query.getModel().getQueryTree().getRoot().toString().charAt(0))); } /** Test a vertical specific patch, see Tokenizer */ @Test - @Ignore - public void testOtherCharactersParsing() { + @Disabled + void testOtherCharactersParsing() { Query query = newQuery(com.yahoo.search.test.QueryTestCase.httpEncode("?query=\u3007\u2e80\u2eff\u2ed0")); assertEquals(Character.UnicodeBlock.CJK_SYMBOLS_AND_PUNCTUATION, - Character.UnicodeBlock.of(query.getModel().getQueryTree().getRoot().toString().charAt(0))); + Character.UnicodeBlock.of(query.getModel().getQueryTree().getRoot().toString().charAt(0))); assertEquals(Character.UnicodeBlock.CJK_RADICALS_SUPPLEMENT, - Character.UnicodeBlock.of(query.getModel().getQueryTree().getRoot().toString().charAt(1))); + Character.UnicodeBlock.of(query.getModel().getQueryTree().getRoot().toString().charAt(1))); assertEquals(Character.UnicodeBlock.CJK_RADICALS_SUPPLEMENT, - Character.UnicodeBlock.of(query.getModel().getQueryTree().getRoot().toString().charAt(2))); + Character.UnicodeBlock.of(query.getModel().getQueryTree().getRoot().toString().charAt(2))); assertEquals(Character.UnicodeBlock.CJK_RADICALS_SUPPLEMENT, - Character.UnicodeBlock.of(query.getModel().getQueryTree().getRoot().toString().charAt(3))); + Character.UnicodeBlock.of(query.getModel().getQueryTree().getRoot().toString().charAt(3))); } @Test - public void testFreshness() { + void testFreshness() { Query query = newQuery("?query=test&datetime=103"); - assertTrue(query.getRanking().getFreshness().getRefTime()==103); + assertEquals(query.getRanking().getFreshness().getRefTime(), 103); query.getRanking().setFreshness("193"); - assertTrue(query.getRanking().getFreshness().getRefTime()==193); + assertEquals(query.getRanking().getFreshness().getRefTime(), 193); query.getRanking().setFreshness("now"); assertTrue(query.getRanking().getFreshness().getSystemTimeInSecondsSinceEpoch() >= query.getRanking().getFreshness().getRefTime()); @@ -330,10 +330,10 @@ public class QueryTestCase { } @Test - public void testCopy() { + void testCopy() { Query qs = newQuery("?query=test&rankfeature.something=2"); assertEquals("WEAKAND(100) test", qs.getModel().getQueryTree().toString()); - assertEquals((int)qs.properties().getInteger("rankfeature.something"),2); + assertEquals((int) qs.properties().getInteger("rankfeature.something"), 2); Query qp = new Query(qs); assertEquals("WEAKAND(100) test", qp.getModel().getQueryTree().getRoot().toString()); assertFalse(qp.getRanking().getFeatures().isEmpty()); |