diff options
Diffstat (limited to 'predicate-search/src/test/java/com/yahoo/search/predicate/index')
11 files changed, 148 insertions, 126 deletions
diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/index/BoundsPostingListTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/index/BoundsPostingListTest.java index ad9f5b8cdd1..2bde0401c51 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/index/BoundsPostingListTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/index/BoundsPostingListTest.java @@ -2,15 +2,13 @@ package com.yahoo.search.predicate.index; import com.google.common.primitives.Ints; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; import static java.util.stream.Collectors.toList; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * This test lies in com.yahoo.search.predicate to get access to some methods of PredicateIndex. @@ -20,7 +18,7 @@ import static org.junit.Assert.assertTrue; public class BoundsPostingListTest { @Test - public void requireThatPostingListChecksBounds() { + void requireThatPostingListChecksBounds() { PredicateIntervalStore.Builder builder = new PredicateIntervalStore.Builder(); List<Integer> docIds = new ArrayList<>(); List<Integer> dataRefs = new ArrayList<>(); @@ -72,13 +70,13 @@ public class BoundsPostingListTest { } private void checkNext(BoundsPostingList postingList, int movePast, int docId, int intervalCount) { - assertTrue("Unable to move past " + movePast, postingList.nextDocument(movePast)); + assertTrue(postingList.nextDocument(movePast), "Unable to move past " + movePast); assertEquals(intervalCount > 0, postingList.prepareIntervals()); assertEquals(docId, postingList.getDocId()); for (int i = 0; i < intervalCount - 1; ++i) { - assertTrue("Too few intervals, expected " + intervalCount, postingList.nextInterval()); + assertTrue(postingList.nextInterval(), "Too few intervals, expected " + intervalCount); } - assertFalse("Too many intervals, expected " + intervalCount, postingList.nextInterval()); + assertFalse(postingList.nextInterval(), "Too many intervals, expected " + intervalCount); } } diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/index/CachedPostingListCounterTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/index/CachedPostingListCounterTest.java index 21691a47f3e..71cbff6ab3f 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/index/CachedPostingListCounterTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/index/CachedPostingListCounterTest.java @@ -3,14 +3,14 @@ package com.yahoo.search.predicate.index; import com.google.common.primitives.Ints; import org.eclipse.collections.impl.map.mutable.primitive.ObjectIntHashMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -20,7 +20,7 @@ import static org.mockito.Mockito.when; public class CachedPostingListCounterTest { @Test - public void require_that_docids_are_counted_correctly() { + void require_that_docids_are_counted_correctly() { int nDocuments = 4; byte[] nPostingListsPerDocument = new byte[nDocuments]; CachedPostingListCounter c = new CachedPostingListCounter(nDocuments); @@ -35,7 +35,7 @@ public class CachedPostingListCounterTest { } @Test - public void require_that_most_costly_posting_lists_are_first_in_bit_vector() { + void require_that_most_costly_posting_lists_are_first_in_bit_vector() { int nDocuments = 5; CachedPostingListCounter c = new CachedPostingListCounter(nDocuments); List<PostingList> list = new ArrayList<>(); @@ -43,7 +43,10 @@ public class CachedPostingListCounterTest { PostingList p2 = postingList(0, 1, 2, 3, 4); PostingList p3 = postingList(1, 2, 3, 4); PostingList p4 = postingList(3, 4); - list.add(p1); list.add(p2); list.add(p3); list.add(p4); + list.add(p1); + list.add(p2); + list.add(p3); + list.add(p4); for (int i = 0; i < 100; i++) { list.add(postingList(0)); } @@ -64,7 +67,7 @@ public class CachedPostingListCounterTest { } @Test - public void require_that_cached_docids_are_counted_correctly() { + void require_that_cached_docids_are_counted_correctly() { int nDocuments = 4; byte[] nPostingListsPerDocument = new byte[nDocuments]; CachedPostingListCounter c = new CachedPostingListCounter(nDocuments); @@ -82,7 +85,7 @@ public class CachedPostingListCounterTest { } @Test - public void require_that_cache_rebuilding_behaves_correctly_for_large_amount_of_posting_lists() { + void require_that_cache_rebuilding_behaves_correctly_for_large_amount_of_posting_lists() { int nDocuments = 4; byte[] nPostingListsPerDocument = new byte[nDocuments]; CachedPostingListCounter c = new CachedPostingListCounter(nDocuments); diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/index/IntervalPostingListTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/index/IntervalPostingListTest.java index 6cf8821c5f4..755cf39afff 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/index/IntervalPostingListTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/index/IntervalPostingListTest.java @@ -2,24 +2,22 @@ package com.yahoo.search.predicate.index; import com.yahoo.search.predicate.SubqueryBitmap; -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.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class IntervalPostingListTest { @Test - public void requireThatPostingListCanIterate() { + void requireThatPostingListCanIterate() { PredicateIntervalStore.Builder builder = new PredicateIntervalStore.Builder(); int ref1 = builder.insert(Arrays.asList(0x1ffff)); int ref2 = builder.insert(Arrays.asList(0x1ffff)); int ref3 = builder.insert(Arrays.asList(0x10001, 0x2ffff)); IntervalPostingList postingList = new IntervalPostingList( - builder.build(), new int[]{2, 4, 6}, new int[] {ref1, ref2, ref3}, SubqueryBitmap.ALL_SUBQUERIES); + builder.build(), new int[]{2, 4, 6}, new int[]{ref1, ref2, ref3}, SubqueryBitmap.ALL_SUBQUERIES); assertEquals(-1, postingList.getDocId()); assertEquals(0, postingList.getInterval()); assertEquals(0xffffffffffffffffL, postingList.getSubquery()); diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateIntervalStoreTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateIntervalStoreTest.java index c12817fbcf6..95ce3116fdf 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateIntervalStoreTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateIntervalStoreTest.java @@ -2,7 +2,7 @@ package com.yahoo.search.predicate.index; import com.google.common.primitives.Ints; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.ArrayList; @@ -10,44 +10,44 @@ import java.util.Arrays; import java.util.List; import static com.yahoo.search.predicate.serialization.SerializationTestHelper.assertSerializationDeserializationMatches; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author bjorncs */ public class PredicateIntervalStoreTest { - @Test(expected = IllegalArgumentException.class) - public void requireThatEmptyIntervalListThrows() { - PredicateIntervalStore.Builder builder = new PredicateIntervalStore.Builder(); - builder.insert(new ArrayList<>()); + @Test + void requireThatEmptyIntervalListThrows() { + assertThrows(IllegalArgumentException.class, () -> { + PredicateIntervalStore.Builder builder = new PredicateIntervalStore.Builder(); + builder.insert(new ArrayList<>()); + }); } @Test - public void requireThatSingleIntervalCanBeInserted() { + void requireThatSingleIntervalCanBeInserted() { testInsertAndRetrieve(0x0001ffff); } @Test - public void requireThatMultiIntervalEntriesCanBeInserted() { + void requireThatMultiIntervalEntriesCanBeInserted() { testInsertAndRetrieve(0x00010001, 0x00020002, 0x0003ffff); testInsertAndRetrieve(0x00010001, 0x00020002, 0x00030003, 0x00040004, 0x00050005, 0x00060006, 0x00070007, 0x00080008, 0x00090009, 0x000a000a); } @Test - public void requireThatDifferentSizeIntervalArraysCanBeInserted() { + void requireThatDifferentSizeIntervalArraysCanBeInserted() { PredicateIntervalStore.Builder builder = new PredicateIntervalStore.Builder(); - int intervals1[] = new int[] {0x00010001, 0x00020002}; - int intervals2[] = new int[] {0x00010001, 0x00020002, 0x00030003}; + int intervals1[] = new int[]{0x00010001, 0x00020002}; + int intervals2[] = new int[]{0x00010001, 0x00020002, 0x00030003}; assertEquals(0, builder.insert(Ints.asList(intervals1))); assertEquals(1, builder.insert(Ints.asList(intervals2))); } @Test - public void requireThatSerializationAndDeserializationRetainIntervals() throws IOException { + void requireThatSerializationAndDeserializationRetainIntervals() throws IOException { PredicateIntervalStore.Builder builder = new PredicateIntervalStore.Builder(); builder.insert(Arrays.asList(0x00010001, 0x00020002)); builder.insert(Arrays.asList(0x00010001, 0x00020002, 0x00030003)); @@ -58,7 +58,7 @@ public class PredicateIntervalStoreTest { } @Test - public void requireThatEqualIntervalListsReturnsSameReference() { + void requireThatEqualIntervalListsReturnsSameReference() { PredicateIntervalStore.Builder builder = new PredicateIntervalStore.Builder(); List<Integer> intervals1 = Arrays.asList(0x00010001, 0x00020002); List<Integer> intervals2 = Arrays.asList(0x00010001, 0x00020002); @@ -67,7 +67,7 @@ public class PredicateIntervalStoreTest { PredicateIntervalStore store = builder.build(); int[] a1 = store.get(ref1); int[] a2 = store.get(ref2); - assertTrue(a1 == a2); + assertEquals(a1, a2); } private static void testInsertAndRetrieve(int... intervals) { diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateRangeTermExpanderTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateRangeTermExpanderTest.java index 90db2aea89b..9d43893864d 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateRangeTermExpanderTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateRangeTermExpanderTest.java @@ -2,21 +2,19 @@ package com.yahoo.search.predicate.index; import com.yahoo.document.predicate.PredicateHash; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Iterator; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.*; /** * @author <a href="mailto:magnarn@yahoo-inc.com">Magnar Nedland</a> */ public class PredicateRangeTermExpanderTest { @Test - public void requireThatSmallRangeIsExpanded() { + void requireThatSmallRangeIsExpanded() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(10); Iterator<String> expectedLabels = Arrays.asList( "key=40-49", @@ -38,12 +36,15 @@ public class PredicateRangeTermExpanderTest { "key=0-99999999999999999", "key=0-999999999999999999").iterator(); expander.expand("key", 42, range -> assertEquals(PredicateHash.hash64(expectedLabels.next()), range), - (edge, value) -> { assertEquals(PredicateHash.hash64("key=40"), edge); assertEquals(2, value); }); + (edge, value) -> { + assertEquals(PredicateHash.hash64("key=40"), edge); + assertEquals(2, value); + }); assertFalse(expectedLabels.hasNext()); } @Test - public void requireThatLargeRangeIsExpanded() { + void requireThatLargeRangeIsExpanded() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(10); Iterator<String> expectedLabels = Arrays.asList( "key=123456789012345670-123456789012345679", @@ -65,12 +66,15 @@ public class PredicateRangeTermExpanderTest { "key=100000000000000000-199999999999999999", "key=0-999999999999999999").iterator(); expander.expand("key", 123456789012345678L, range -> assertEquals(PredicateHash.hash64(expectedLabels.next()), range), - (edge, value) -> { assertEquals(PredicateHash.hash64("key=123456789012345670"), edge); assertEquals(8, value); }); + (edge, value) -> { + assertEquals(PredicateHash.hash64("key=123456789012345670"), edge); + assertEquals(8, value); + }); assertFalse(expectedLabels.hasNext()); } @Test - public void requireThatMaxRangeIsExpanded() { + void requireThatMaxRangeIsExpanded() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(10); expander.expand("key", 9223372036854775807L, range -> fail(), (edge, value) -> { @@ -80,7 +84,7 @@ public class PredicateRangeTermExpanderTest { } @Test - public void requireThatSmallNegativeRangeIsExpanded() { + void requireThatSmallNegativeRangeIsExpanded() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(10); Iterator<String> expectedLabels = Arrays.asList( "key=-49-40", @@ -102,12 +106,15 @@ public class PredicateRangeTermExpanderTest { "key=-99999999999999999-0", "key=-999999999999999999-0").iterator(); expander.expand("key", -42, range -> assertEquals(PredicateHash.hash64(expectedLabels.next()), range), - (edge, value) -> { assertEquals(PredicateHash.hash64("key=-40"), edge); assertEquals(2, value); }); + (edge, value) -> { + assertEquals(PredicateHash.hash64("key=-40"), edge); + assertEquals(2, value); + }); assertFalse(expectedLabels.hasNext()); } @Test - public void requireThatMinRangeIsExpanded() { + void requireThatMinRangeIsExpanded() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(10); expander.expand("key", -9223372036854775808L, range -> fail(), (edge, value) -> { @@ -117,18 +124,21 @@ public class PredicateRangeTermExpanderTest { } @Test - public void requireThatMinRangeMinus9IsExpanded() { + void requireThatMinRangeMinus9IsExpanded() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(10); Iterator<String> expectedLabels = Arrays.asList( "key=-9223372036854775799-9223372036854775790", "key=-9223372036854775799-9223372036854775700").iterator(); expander.expand("key", -9223372036854775799L, range -> assertEquals(PredicateHash.hash64(expectedLabels.next()), range), - (edge, value) -> { assertEquals(PredicateHash.hash64("key=-9223372036854775790"), edge); assertEquals(9, value); }); + (edge, value) -> { + assertEquals(PredicateHash.hash64("key=-9223372036854775790"), edge); + assertEquals(9, value); + }); assertFalse(expectedLabels.hasNext()); } @Test - public void requireThatMinRangeIsExpandedWithArity8() { + void requireThatMinRangeIsExpandedWithArity8() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(8); expander.expand("key", -9223372036854775808L, range -> fail(), (edge, value) -> { @@ -138,7 +148,7 @@ public class PredicateRangeTermExpanderTest { } @Test - public void requireThatSmallRangeIsExpandedInArity2() { + void requireThatSmallRangeIsExpandedInArity2() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(2); Iterator<String> expectedLabels = Arrays.asList( "key=42-43", @@ -205,12 +215,15 @@ public class PredicateRangeTermExpanderTest { "key=0-4611686018427387903", "key=0-9223372036854775807").iterator(); expander.expand("key", 42, range -> assertEquals(PredicateHash.hash64(expectedLabels.next()), range), - (edge, value) -> { assertEquals(PredicateHash.hash64("key=42"), edge); assertEquals(0, value); }); + (edge, value) -> { + assertEquals(PredicateHash.hash64("key=42"), edge); + assertEquals(0, value); + }); assertFalse(expectedLabels.hasNext()); } @Test - public void requireThatSmallNegativeRangeIsExpandedInArity2() { + void requireThatSmallNegativeRangeIsExpandedInArity2() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(2); Iterator<String> expectedLabels = Arrays.asList( "key=-43-42", @@ -277,12 +290,15 @@ public class PredicateRangeTermExpanderTest { "key=-4611686018427387903-0", "key=-9223372036854775807-0").iterator(); expander.expand("key", -42, range -> assertEquals(PredicateHash.hash64(expectedLabels.next()), range), - (edge, value) -> { assertEquals(PredicateHash.hash64("key=-42"), edge); assertEquals(0, value); }); + (edge, value) -> { + assertEquals(PredicateHash.hash64("key=-42"), edge); + assertEquals(0, value); + }); assertFalse(expectedLabels.hasNext()); } @Test - public void requireThatUpperBoundIsUsed() { + void requireThatUpperBoundIsUsed() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(10, -99, 9999); Iterator<String> expectedLabels = Arrays.asList( "key=40-49", @@ -290,12 +306,15 @@ public class PredicateRangeTermExpanderTest { "key=0-999", "key=0-9999").iterator(); expander.expand("key", 42, range -> assertEquals(PredicateHash.hash64(expectedLabels.next()), range), - (edge, value) -> { assertEquals(PredicateHash.hash64("key=40"), edge); assertEquals(2, value); }); + (edge, value) -> { + assertEquals(PredicateHash.hash64("key=40"), edge); + assertEquals(2, value); + }); assertFalse(expectedLabels.hasNext()); } @Test - public void requireThatLowerBoundIsUsed() { + void requireThatLowerBoundIsUsed() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(10, -9999, 99); Iterator<String> expectedLabels = Arrays.asList( "key=-49-40", @@ -303,19 +322,22 @@ public class PredicateRangeTermExpanderTest { "key=-999-0", "key=-9999-0").iterator(); expander.expand("key", -42, range -> assertEquals(PredicateHash.hash64(expectedLabels.next()), range), - (edge, value) -> { assertEquals(PredicateHash.hash64("key=-40"), edge); assertEquals(2, value); }); + (edge, value) -> { + assertEquals(PredicateHash.hash64("key=-40"), edge); + assertEquals(2, value); + }); assertFalse(expectedLabels.hasNext()); } @Test - public void requireThatSearchesOutsideBoundsGenerateNoLabels() { + void requireThatSearchesOutsideBoundsGenerateNoLabels() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(10, 0, 200); - expander.expand("key", -10, x -> fail(), (x,y) -> fail()); + expander.expand("key", -10, x -> fail(), (x, y) -> fail()); expander.expand("key", 210, x -> fail(), (x, y) -> fail()); } @Test - public void requireThatUpperAndLowerBoundGreaterThan0Works() { + void requireThatUpperAndLowerBoundGreaterThan0Works() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(10, 100, 9999); Iterator<String> expectedLabels = Arrays.asList( "key=140-149", @@ -323,12 +345,15 @@ public class PredicateRangeTermExpanderTest { "key=0-999", "key=0-9999").iterator(); expander.expand("key", 142, range -> assertEquals(PredicateHash.hash64(expectedLabels.next()), range), - (edge, value) -> { assertEquals(PredicateHash.hash64("key=140"), edge); assertEquals(2, value); }); + (edge, value) -> { + assertEquals(PredicateHash.hash64("key=140"), edge); + assertEquals(2, value); + }); assertFalse(expectedLabels.hasNext()); } @Test - public void requireThatSearchCloseToUnevenUpperBoundIsSensible() { + void requireThatSearchCloseToUnevenUpperBoundIsSensible() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(10, -99, 1234); Iterator<String> expectedLabels = Arrays.asList( "key=40-49", @@ -336,19 +361,25 @@ public class PredicateRangeTermExpanderTest { "key=0-999", "key=0-9999").iterator(); expander.expand("key", 42, range -> assertEquals(PredicateHash.hash64(expectedLabels.next()), range), - (edge, value) -> { assertEquals(PredicateHash.hash64("key=40"), edge); assertEquals(2, value); }); + (edge, value) -> { + assertEquals(PredicateHash.hash64("key=40"), edge); + assertEquals(2, value); + }); assertFalse(expectedLabels.hasNext()); } @Test - public void requireThatSearchCloseToMaxUnevenUpperBoundIsSensible() { + void requireThatSearchCloseToMaxUnevenUpperBoundIsSensible() { PredicateRangeTermExpander expander = new PredicateRangeTermExpander(10, 0, 9223372036854771234L); Iterator<String> expectedLabels = Arrays.asList( "key=9223372036854770000-9223372036854770009", "key=9223372036854770000-9223372036854770099", "key=9223372036854770000-9223372036854770999").iterator(); expander.expand("key", 9223372036854770000L, range -> assertEquals(PredicateHash.hash64(expectedLabels.next()), range), - (edge, value) -> { assertEquals(PredicateHash.hash64("key=9223372036854770000"), edge); assertEquals(0, value); }); + (edge, value) -> { + assertEquals(PredicateHash.hash64("key=9223372036854770000"), edge); + assertEquals(0, value); + }); assertFalse(expectedLabels.hasNext()); } } diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateSearchTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateSearchTest.java index 654b944fb3f..433d69e88a2 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateSearchTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateSearchTest.java @@ -3,14 +3,14 @@ package com.yahoo.search.predicate.index; import com.yahoo.search.predicate.Hit; import com.yahoo.search.predicate.SubqueryBitmap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import static java.util.stream.Collectors.toList; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author <a href="mailto:magnarn@yahoo-inc.com">Magnar Nedland</a> @@ -19,13 +19,13 @@ import static org.junit.Assert.assertEquals; public class PredicateSearchTest { @Test - public void requireThatNoStreamsReturnNoResults() { + void requireThatNoStreamsReturnNoResults() { PredicateSearch search = new PredicateSearch(new ArrayList<>(), new byte[0], new byte[0], new short[0], 1); assertEquals(0, search.stream().count()); } @Test - public void requireThatSingleStreamFiltersOnConstructedCompleteIntervals() { + void requireThatSingleStreamFiltersOnConstructedCompleteIntervals() { PredicateSearch search = createPredicateSearch( new byte[]{1, 1, 1}, postingList( @@ -37,7 +37,7 @@ public class PredicateSearchTest { } @Test - public void requireThatMinFeatureIsUsedToPruneResults() { + void requireThatMinFeatureIsUsedToPruneResults() { PredicateSearch search = createPredicateSearch( new byte[]{3, 1}, postingList( @@ -48,7 +48,7 @@ public class PredicateSearchTest { } @Test - public void requireThatAHighKCanYieldResults() { + void requireThatAHighKCanYieldResults() { PredicateSearch search = createPredicateSearch( new byte[]{2}, postingList(SubqueryBitmap.ALL_SUBQUERIES, @@ -59,9 +59,9 @@ public class PredicateSearchTest { } @Test - public void requireThatPostingListsAreSortedAfterAdvancing() { + void requireThatPostingListsAreSortedAfterAdvancing() { PredicateSearch search = createPredicateSearch( - new byte[] {2, 1, 1, 1}, + new byte[]{2, 1, 1, 1}, postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(0, 0x000100ff), entry(3, 0x000100ff)), @@ -72,7 +72,7 @@ public class PredicateSearchTest { } @Test - public void requireThatEmptyPostingListsWork() { + void requireThatEmptyPostingListsWork() { PredicateSearch search = createPredicateSearch( new byte[0], postingList(SubqueryBitmap.ALL_SUBQUERIES)); @@ -80,7 +80,7 @@ public class PredicateSearchTest { } @Test - public void requireThatShorterPostingListEndingIsOk() { + void requireThatShorterPostingListEndingIsOk() { PredicateSearch search = createPredicateSearch( new byte[]{1, 1, 1}, postingList(SubqueryBitmap.ALL_SUBQUERIES, @@ -92,7 +92,7 @@ public class PredicateSearchTest { } @Test - public void requireThatSortingWorksForManyPostingLists() { + void requireThatSortingWorksForManyPostingLists() { PredicateSearch search = createPredicateSearch( new byte[]{1, 5, 2, 2}, postingList(SubqueryBitmap.ALL_SUBQUERIES, @@ -116,7 +116,7 @@ public class PredicateSearchTest { } @Test - public void requireThatInsufficientIntervalCoveragePreventsMatch() { + void requireThatInsufficientIntervalCoveragePreventsMatch() { PredicateSearch search = createPredicateSearch( new byte[]{1, 1}, postingList(SubqueryBitmap.ALL_SUBQUERIES, @@ -126,7 +126,7 @@ public class PredicateSearchTest { } @Test - public void requireThatIntervalsAreSorted() { + void requireThatIntervalsAreSorted() { PredicateSearch search = createPredicateSearch( new byte[]{1}, postingList(SubqueryBitmap.ALL_SUBQUERIES, @@ -139,7 +139,7 @@ public class PredicateSearchTest { } @Test - public void requireThatThereCanBeManyIntervals() { + void requireThatThereCanBeManyIntervals() { PredicateSearch search = createPredicateSearch( new byte[]{1}, postingList(SubqueryBitmap.ALL_SUBQUERIES, @@ -148,7 +148,7 @@ public class PredicateSearchTest { } @Test - public void requireThatNotIsSupported_NoMatch() { + void requireThatNotIsSupported_NoMatch() { PredicateSearch search = createPredicateSearch( new byte[]{1}, postingList(SubqueryBitmap.ALL_SUBQUERIES, @@ -159,7 +159,7 @@ public class PredicateSearchTest { } @Test - public void requireThatNotIsSupported_Match() { + void requireThatNotIsSupported_Match() { PredicateSearch search = createPredicateSearch( new byte[]{1}, postingList(SubqueryBitmap.ALL_SUBQUERIES, @@ -168,7 +168,7 @@ public class PredicateSearchTest { } @Test - public void requireThatNotIsSupported_NoMatchBecauseOfPreviousTerm() { + void requireThatNotIsSupported_NoMatchBecauseOfPreviousTerm() { PredicateSearch search = createPredicateSearch( new byte[]{1}, postingList(SubqueryBitmap.ALL_SUBQUERIES, @@ -177,7 +177,7 @@ public class PredicateSearchTest { } @Test - public void requireThatIntervalSortingWorksAsUnsigned() { + void requireThatIntervalSortingWorksAsUnsigned() { PredicateSearch search = createPredicateSearch( new byte[]{1}, postingList(SubqueryBitmap.ALL_SUBQUERIES, @@ -188,7 +188,7 @@ public class PredicateSearchTest { } @Test - public void requireThatMatchCanRequireMultiplePostingLists() { + void requireThatMatchCanRequireMultiplePostingLists() { PredicateSearch search = createPredicateSearch( new byte[]{6}, postingList(SubqueryBitmap.ALL_SUBQUERIES, diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/index/SimpleIndexTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/index/SimpleIndexTest.java index b0ff62e33fb..6d416eade9f 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/index/SimpleIndexTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/index/SimpleIndexTest.java @@ -1,13 +1,13 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate.index; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import static com.yahoo.search.predicate.serialization.SerializationTestHelper.assertSerializationDeserializationMatches; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author <a href="mailto:magnarn@yahoo-inc.com">Magnar Nedland</a> @@ -19,7 +19,7 @@ public class SimpleIndexTest { private static final int DOC_ID = 42; @Test - public void requireThatValuesCanBeInserted() { + void requireThatValuesCanBeInserted() { SimpleIndex.Builder builder = new SimpleIndex.Builder(); builder.insert(KEY, new Posting(DOC_ID, 10)); SimpleIndex index = builder.build(); @@ -38,7 +38,7 @@ public class SimpleIndexTest { } @Test - public void requireThatEntriesAreSortedOnId() { + void requireThatEntriesAreSortedOnId() { SimpleIndex.Builder builder = new SimpleIndex.Builder(); builder.insert(KEY, new Posting(DOC_ID, 10)); builder.insert(KEY, new Posting(DOC_ID - 1, 20)); // Out of order @@ -52,7 +52,7 @@ public class SimpleIndexTest { } @Test - public void requireThatSerializationAndDeserializationRetainDictionary() throws IOException { + void requireThatSerializationAndDeserializationRetainDictionary() throws IOException { SimpleIndex.Builder builder = new SimpleIndex.Builder(); builder.insert(KEY, new Posting(DOC_ID, 10)); builder.insert(KEY, new Posting(DOC_ID + 1, 20)); diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/index/ZeroConstraintPostingListTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/index/ZeroConstraintPostingListTest.java index bade49aaeca..c218e9e5474 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/index/ZeroConstraintPostingListTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/index/ZeroConstraintPostingListTest.java @@ -1,11 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate.index; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author <a href="mailto:magnarn@yahoo-inc.com">Magnar Nedland</a> @@ -13,9 +11,9 @@ import static org.junit.Assert.assertTrue; public class ZeroConstraintPostingListTest { @Test - public void requireThatPostingListCanIterate() { + void requireThatPostingListCanIterate() { ZeroConstraintPostingList postingList = - new ZeroConstraintPostingList(new int[] {2, 4, 6, 8}); + new ZeroConstraintPostingList(new int[]{2, 4, 6, 8}); assertEquals(-1, postingList.getDocId()); assertEquals(Interval.fromBoundaries(1, Interval.ZERO_CONSTRAINT_RANGE), postingList.getInterval()); assertEquals(0xffffffffffffffffL, postingList.getSubquery()); diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/index/ZstarCompressedPostingListTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/index/ZstarCompressedPostingListTest.java index e0378bdb7e9..f1d7d0b308a 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/index/ZstarCompressedPostingListTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/index/ZstarCompressedPostingListTest.java @@ -1,20 +1,18 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate.index; -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.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author <a href="mailto:magnarn@yahoo-inc.com">Magnar Nedland</a> */ public class ZstarCompressedPostingListTest { @Test - public void requireThatPostingListCanIterate() { + void requireThatPostingListCanIterate() { PredicateIntervalStore.Builder builder = new PredicateIntervalStore.Builder(); int ref1 = builder.insert(Arrays.asList(0x10000)); int ref2 = builder.insert(Arrays.asList(0x10000, 0x0ffff)); diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/index/conjunction/ConjunctionIdIteratorTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/index/conjunction/ConjunctionIdIteratorTest.java index 56c6721fe76..23068097f83 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/index/conjunction/ConjunctionIdIteratorTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/index/conjunction/ConjunctionIdIteratorTest.java @@ -2,11 +2,9 @@ package com.yahoo.search.predicate.index.conjunction; import com.yahoo.search.predicate.SubqueryBitmap; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author bjorncs @@ -15,7 +13,7 @@ public class ConjunctionIdIteratorTest { @SuppressWarnings("PointlessBitwiseExpression") @Test - public void require_that_next_returns_skips_to_correct_value() { + void require_that_next_returns_skips_to_correct_value() { // NOTE: LST bit represents the conjunction sign: 0 => negative, 1 => positive. int[] conjunctionIds = new int[]{ 0 | 1, @@ -49,7 +47,7 @@ public class ConjunctionIdIteratorTest { } @Test - public void require_that_subquery_is_correct() { + void require_that_subquery_is_correct() { ConjunctionIdIterator iterator = new ConjunctionIdIterator(0b1111, new int[]{1}); assertEquals(0b1111, iterator.getSubqueryBitmap()); } diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/index/conjunction/ConjunctionIndexTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/index/conjunction/ConjunctionIndexTest.java index 07bcf83776a..9f040553a83 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/index/conjunction/ConjunctionIndexTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/index/conjunction/ConjunctionIndexTest.java @@ -4,7 +4,7 @@ package com.yahoo.search.predicate.index.conjunction; import com.yahoo.document.predicate.FeatureConjunction; import com.yahoo.document.predicate.Predicate; import com.yahoo.search.predicate.PredicateQuery; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Arrays; @@ -14,14 +14,12 @@ import java.util.List; import static com.yahoo.document.predicate.Predicates.feature; import static com.yahoo.document.predicate.Predicates.not; import static com.yahoo.search.predicate.serialization.SerializationTestHelper.assertSerializationDeserializationMatches; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class ConjunctionIndexTest { @Test - public void require_that_single_conjunction_can_be_indexed() { + void require_that_single_conjunction_can_be_indexed() { ConjunctionIndexBuilder builder = new ConjunctionIndexBuilder(); builder.indexConjunction(indexableConj(conj(feature("a").inSet("1"), feature("b").inSet("2")))); assertEquals(2, builder.calculateFeatureCount()); @@ -29,7 +27,7 @@ public class ConjunctionIndexTest { } @Test - public void require_that_large_conjunction_can_be_indexed() { + void require_that_large_conjunction_can_be_indexed() { ConjunctionIndexBuilder builder = new ConjunctionIndexBuilder(); builder.indexConjunction(indexableConj( conj( @@ -41,7 +39,7 @@ public class ConjunctionIndexTest { } @Test - public void require_that_multiple_conjunctions_can_be_indexed() { + void require_that_multiple_conjunctions_can_be_indexed() { ConjunctionIndexBuilder builder = new ConjunctionIndexBuilder(); builder.indexConjunction(indexableConj( conj( @@ -70,7 +68,7 @@ public class ConjunctionIndexTest { } @Test - public void require_that_search_for_simple_conjunctions_work() { + void require_that_search_for_simple_conjunctions_work() { ConjunctionIndexBuilder builder = new ConjunctionIndexBuilder(); IndexableFeatureConjunction c1 = indexableConj( @@ -105,7 +103,7 @@ public class ConjunctionIndexTest { @Test - public void require_that_conjunction_with_not_is_indexed() { + void require_that_conjunction_with_not_is_indexed() { ConjunctionIndexBuilder builder = new ConjunctionIndexBuilder(); builder.indexConjunction(indexableConj( conj( @@ -121,7 +119,7 @@ public class ConjunctionIndexTest { } @Test - public void require_that_not_works_when_k_is_0() { + void require_that_not_works_when_k_is_0() { ConjunctionIndexBuilder builder = new ConjunctionIndexBuilder(); IndexableFeatureConjunction c1 = indexableConj( conj( @@ -161,7 +159,7 @@ public class ConjunctionIndexTest { } @Test - public void require_that_not_works_when_k_is_1() { + void require_that_not_works_when_k_is_1() { ConjunctionIndexBuilder builder = new ConjunctionIndexBuilder(); IndexableFeatureConjunction c1 = indexableConj( conj( @@ -197,7 +195,7 @@ public class ConjunctionIndexTest { } @Test - public void require_that_not_works_when_k_is_2() { + void require_that_not_works_when_k_is_2() { ConjunctionIndexBuilder builder = new ConjunctionIndexBuilder(); IndexableFeatureConjunction c1 = indexableConj( conj( @@ -236,7 +234,7 @@ public class ConjunctionIndexTest { } @Test - public void require_that_multi_term_queries_are_supported() { + void require_that_multi_term_queries_are_supported() { ConjunctionIndexBuilder builder = new ConjunctionIndexBuilder(); IndexableFeatureConjunction c1 = indexableConj( conj( @@ -255,7 +253,7 @@ public class ConjunctionIndexTest { } @Test - public void require_that_subqueries_are_supported() { + void require_that_subqueries_are_supported() { ConjunctionIndexBuilder builder = new ConjunctionIndexBuilder(); IndexableFeatureConjunction c1 = indexableConj( conj( @@ -328,7 +326,7 @@ public class ConjunctionIndexTest { } @Test - public void require_that_serialization_and_deserialization_retain_data() throws IOException { + void require_that_serialization_and_deserialization_retain_data() throws IOException { ConjunctionIndexBuilder builder = new ConjunctionIndexBuilder(); builder.indexConjunction(indexableConj( conj( |