diff options
Diffstat (limited to 'predicate-search/src/test/java')
21 files changed, 236 insertions, 218 deletions
diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/PredicateIndexBuilderTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/PredicateIndexBuilderTest.java index bed1228c8b8..b6e4de3a6b8 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/PredicateIndexBuilderTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/PredicateIndexBuilderTest.java @@ -3,24 +3,27 @@ package com.yahoo.search.predicate; import com.yahoo.document.predicate.BooleanPredicate; import com.yahoo.document.predicate.Predicate; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * @author bjorncs */ public class PredicateIndexBuilderTest { - @Test(expected = IllegalArgumentException.class) - public void requireThatIndexingMultiDocumentsWithSameIdThrowsException() { - PredicateIndexBuilder builder = new PredicateIndexBuilder(2); - builder.indexDocument(1, Predicate.fromString("a in ['b']")); - builder.indexDocument(1, Predicate.fromString("c in ['d']")); + @Test + void requireThatIndexingMultiDocumentsWithSameIdThrowsException() { + assertThrows(IllegalArgumentException.class, () -> { + PredicateIndexBuilder builder = new PredicateIndexBuilder(2); + builder.indexDocument(1, Predicate.fromString("a in ['b']")); + builder.indexDocument(1, Predicate.fromString("c in ['d']")); + }); } @Test - public void requireThatEmptyDocumentsCanBeIndexed() { + void requireThatEmptyDocumentsCanBeIndexed() { PredicateIndexBuilder builder = new PredicateIndexBuilder(10); assertEquals(0, builder.getZeroConstraintDocCount()); builder.indexDocument(2, new BooleanPredicate(true)); @@ -29,7 +32,7 @@ public class PredicateIndexBuilderTest { } @Test - public void requireThatMultipleDocumentsCanBeIndexed() { + void requireThatMultipleDocumentsCanBeIndexed() { PredicateIndexBuilder builder = new PredicateIndexBuilder(10); builder.indexDocument(1, Predicate.fromString("a in ['b']")); builder.indexDocument(2, Predicate.fromString("a in ['b']")); diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/PredicateIndexTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/PredicateIndexTest.java index 5ed04418664..a8aef273f3c 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/PredicateIndexTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/PredicateIndexTest.java @@ -2,13 +2,13 @@ package com.yahoo.search.predicate; import com.yahoo.document.predicate.Predicate; -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 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,7 +19,7 @@ public class PredicateIndexTest { private static final int DOC_ID = 42; @Test - public void requireThatPredicateIndexCanSearch() { + void requireThatPredicateIndexCanSearch() { PredicateIndexBuilder builder = new PredicateIndexBuilder(10); builder.indexDocument(1, Predicate.fromString("country in ['no', 'se'] and gender in ['male']")); builder.indexDocument(0x3fffffe, Predicate.fromString("country in ['no'] and gender in ['female']")); @@ -34,7 +34,7 @@ public class PredicateIndexTest { } @Test - public void requireThatPredicateIndexCanSearchWithNotExpression() { + void requireThatPredicateIndexCanSearchWithNotExpression() { { PredicateIndexBuilder builder = new PredicateIndexBuilder(10); builder.indexDocument(1, Predicate.fromString("country in ['no'] and gender not in ['male']")); @@ -77,7 +77,7 @@ public class PredicateIndexTest { } @Test - public void requireThatSearchesCanUseSubqueries() { + void requireThatSearchesCanUseSubqueries() { PredicateIndexBuilder builder = new PredicateIndexBuilder(10); builder.indexDocument(DOC_ID, Predicate.fromString("country in [no] and gender in [male]")); PredicateIndex index = builder.build(); @@ -91,7 +91,7 @@ public class PredicateIndexTest { } @Test - public void requireThatPredicateIndexCanSearchWithRange() { + void requireThatPredicateIndexCanSearchWithRange() { PredicateIndexBuilder builder = new PredicateIndexBuilder(10); builder.indexDocument(1, Predicate.fromString("gender in ['male'] and age in [20..40]")); builder.indexDocument(2, Predicate.fromString("gender in ['female'] and age in [20..40]")); @@ -106,7 +106,7 @@ public class PredicateIndexTest { } @Test - public void requireThatPredicateIndexCanSearchWithEmptyDocuments() { + void requireThatPredicateIndexCanSearchWithEmptyDocuments() { PredicateIndexBuilder builder = new PredicateIndexBuilder(10); builder.indexDocument(1, Predicate.fromString("true")); builder.indexDocument(2, Predicate.fromString("false")); @@ -117,7 +117,7 @@ public class PredicateIndexTest { } @Test - public void requireThatPredicatesHavingMultipleIdenticalConjunctionsAreSupported() { + void requireThatPredicatesHavingMultipleIdenticalConjunctionsAreSupported() { PredicateIndexBuilder builder = new PredicateIndexBuilder(10); builder.indexDocument(DOC_ID, Predicate.fromString( "((a in ['b'] and c in ['d']) or x in ['y']) and ((a in ['b'] and c in ['d']) or z in ['w'])")); @@ -130,7 +130,7 @@ public class PredicateIndexTest { } @Test - public void require_that_serialization_and_deserialization_retain_data() throws IOException { + void require_that_serialization_and_deserialization_retain_data() throws IOException { PredicateIndexBuilder builder = new PredicateIndexBuilder(10); builder.indexDocument(1, Predicate.fromString("country in ['no', 'se'] and gender in ['male']")); builder.indexDocument(0x3fffffe, Predicate.fromString("country in ['no'] and gender in ['female']")); diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnalyzerTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnalyzerTest.java index 789a8e0a7f4..bde9891895b 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnalyzerTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnalyzerTest.java @@ -4,7 +4,7 @@ package com.yahoo.search.predicate.annotator; import com.yahoo.document.predicate.FeatureConjunction; import com.yahoo.document.predicate.Predicate; import com.yahoo.document.predicate.PredicateOperator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -12,14 +12,12 @@ import static com.yahoo.document.predicate.Predicates.and; import static com.yahoo.document.predicate.Predicates.feature; import static com.yahoo.document.predicate.Predicates.not; import static com.yahoo.document.predicate.Predicates.or; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class PredicateTreeAnalyzerTest { @Test - public void require_that_minfeature_is_1_for_simple_term() { + void require_that_minfeature_is_1_for_simple_term() { Predicate p = feature("foo").inSet("bar"); PredicateTreeAnalyzerResult r = PredicateTreeAnalyzer.analyzePredicateTree(p); assertEquals(1, r.minFeature); @@ -28,14 +26,14 @@ public class PredicateTreeAnalyzerTest { } @Test - public void require_that_minfeature_is_1_for_simple_negative_term() { + void require_that_minfeature_is_1_for_simple_negative_term() { Predicate p = not(feature("foo").inSet("bar")); PredicateTreeAnalyzerResult r = PredicateTreeAnalyzer.analyzePredicateTree(p); assertEquals(1, r.minFeature); } @Test - public void require_that_minfeature_is_sum_for_and() { + void require_that_minfeature_is_sum_for_and() { Predicate p = and( feature("foo").inSet("bar"), @@ -51,7 +49,7 @@ public class PredicateTreeAnalyzerTest { } @Test - public void require_that_minfeature_is_min_for_or() { + void require_that_minfeature_is_min_for_or() { Predicate p = or( and( @@ -73,7 +71,7 @@ public class PredicateTreeAnalyzerTest { } @Test - public void require_that_minfeature_rounds_up() { + void require_that_minfeature_rounds_up() { Predicate p = or( feature("foo").inSet("bar"), @@ -85,7 +83,7 @@ public class PredicateTreeAnalyzerTest { } @Test - public void require_that_minvalue_feature_set_considers_all_values() { + void require_that_minvalue_feature_set_considers_all_values() { { Predicate p = and( @@ -107,7 +105,7 @@ public class PredicateTreeAnalyzerTest { } @Test - public void require_that_not_features_dont_count_towards_minfeature_calculation() { + void require_that_not_features_dont_count_towards_minfeature_calculation() { Predicate p = and( feature("foo").inSet("A"), @@ -120,7 +118,7 @@ public class PredicateTreeAnalyzerTest { } @Test - public void require_that_multilevel_and_stores_size() { + void require_that_multilevel_and_stores_size() { Predicate p = and( and( @@ -144,7 +142,7 @@ public class PredicateTreeAnalyzerTest { } @Test - public void require_that_not_ranges_dont_count_towards_minfeature_calculation() { + void require_that_not_ranges_dont_count_towards_minfeature_calculation() { Predicate p = and( feature("foo").inRange(0, 10), @@ -157,7 +155,7 @@ public class PredicateTreeAnalyzerTest { } @Test - public void require_that_featureconjunctions_contribute_as_one_feature() { + void require_that_featureconjunctions_contribute_as_one_feature() { Predicate p = conj( feature("foo").inSet("bar"), @@ -168,7 +166,7 @@ public class PredicateTreeAnalyzerTest { } @Test - public void require_that_featureconjunctions_count_as_leaf_in_subtree_calculation() { + void require_that_featureconjunctions_count_as_leaf_in_subtree_calculation() { Predicate p = and( and( @@ -189,7 +187,7 @@ public class PredicateTreeAnalyzerTest { } @Test - public void require_that_multiple_indentical_feature_conjunctions_does_not_contribute_more_than_one() { + void require_that_multiple_indentical_feature_conjunctions_does_not_contribute_more_than_one() { Predicate p = and( or( diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnnotatorTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnnotatorTest.java index 6414104f996..2ab5ec6505b 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnnotatorTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/annotator/PredicateTreeAnnotatorTest.java @@ -11,7 +11,7 @@ import com.yahoo.document.predicate.RangePartition; import com.yahoo.search.predicate.index.Feature; import com.yahoo.search.predicate.index.IntervalWithBounds; import com.yahoo.search.predicate.index.conjunction.IndexableFeatureConjunction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; @@ -21,14 +21,12 @@ import static com.yahoo.document.predicate.Predicates.and; import static com.yahoo.document.predicate.Predicates.feature; import static com.yahoo.document.predicate.Predicates.not; import static com.yahoo.document.predicate.Predicates.or; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.*; public class PredicateTreeAnnotatorTest { @Test - public void require_that_or_intervals_are_the_same() { + void require_that_or_intervals_are_the_same() { Predicate p = or( feature("key1").inSet("value1"), @@ -42,7 +40,7 @@ public class PredicateTreeAnnotatorTest { } @Test - public void require_that_ands_below_ors_get_different_intervals() { + void require_that_ands_below_ors_get_different_intervals() { Predicate p = or( and( @@ -62,7 +60,7 @@ public class PredicateTreeAnnotatorTest { } @Test - public void require_that_nots_get_correct_intervals() { + void require_that_nots_get_correct_intervals() { Predicate p = and( feature("key").inSet("value"), @@ -78,7 +76,7 @@ public class PredicateTreeAnnotatorTest { } @Test - public void require_that_final_first_not_interval_is_extended() { + void require_that_final_first_not_interval_is_extended() { Predicate p = not(feature("key").inSet("A")); PredicateTreeAnnotations r = PredicateTreeAnnotator.createPredicateTreeAnnotations(p); assertEquals(1, r.minFeature); @@ -89,7 +87,7 @@ public class PredicateTreeAnnotatorTest { } @Test - public void show_different_types_of_not_intervals() { + void show_different_types_of_not_intervals() { { Predicate p = and( @@ -151,7 +149,7 @@ public class PredicateTreeAnnotatorTest { } @Test - public void require_that_hashed_ranges_get_correct_intervals() { + void require_that_hashed_ranges_get_correct_intervals() { Predicate p = and( range("key", @@ -183,7 +181,7 @@ public class PredicateTreeAnnotatorTest { } @Test - public void require_that_extreme_ranges_works() { + void require_that_extreme_ranges_works() { Predicate p = and( range("max range", partition("max range=9223372036854775806-9223372036854775807")), @@ -202,7 +200,7 @@ public class PredicateTreeAnnotatorTest { } @Test - public void require_that_featureconjunctions_are_registered_and_given_an_interval() { + void require_that_featureconjunctions_are_registered_and_given_an_interval() { Predicate p = and( or( 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( diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/optimization/FeatureConjunctionTransformerTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/optimization/FeatureConjunctionTransformerTest.java index 88b8bf005a4..6bdb3d1e415 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/optimization/FeatureConjunctionTransformerTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/optimization/FeatureConjunctionTransformerTest.java @@ -5,14 +5,14 @@ import com.yahoo.document.predicate.FeatureConjunction; import com.yahoo.document.predicate.FeatureRange; import com.yahoo.document.predicate.FeatureSet; import com.yahoo.document.predicate.Predicate; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import static com.yahoo.document.predicate.Predicates.and; import static com.yahoo.document.predicate.Predicates.not; import static com.yahoo.document.predicate.Predicates.or; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author bjorncs @@ -21,7 +21,7 @@ public class FeatureConjunctionTransformerTest { private static final FeatureConjunctionTransformer transformer = new FeatureConjunctionTransformer(true); @Test - public void require_that_simple_ands_are_converted() { + void require_that_simple_ands_are_converted() { assertConvertedPredicateEquals( conj(not(featureSet(1)), featureSet(2)), and(not(featureSet(1)), featureSet(2)) @@ -29,7 +29,7 @@ public class FeatureConjunctionTransformerTest { } @Test - public void require_that_featureranges_are_split_into_separate_and() { + void require_that_featureranges_are_split_into_separate_and() { assertConvertedPredicateEquals( and(featureRange(2), conj(not(featureSet(1)), featureSet(3))), and(not(featureSet(1)), featureRange(2), featureSet(3)) @@ -37,7 +37,7 @@ public class FeatureConjunctionTransformerTest { } @Test - public void require_that_ors_are_split_into_separate_and() { + void require_that_ors_are_split_into_separate_and() { assertConvertedPredicateEquals( and(or(featureSet(1), featureSet(2)), conj(featureSet(3), featureSet(4))), and(or(featureSet(1), featureSet(2)), featureSet(3), featureSet(4)) @@ -45,7 +45,7 @@ public class FeatureConjunctionTransformerTest { } @Test - public void require_that_ands_must_have_more_than_one_featureset_to_be_converted() { + void require_that_ands_must_have_more_than_one_featureset_to_be_converted() { assertConvertedPredicateEquals( and(featureSet(1), featureRange(2)), and(featureSet(1), featureRange(2)) @@ -53,7 +53,7 @@ public class FeatureConjunctionTransformerTest { } @Test - public void require_that_ordering_of_and_operands_are_preserved() { + void require_that_ordering_of_and_operands_are_preserved() { assertConvertedPredicateEquals( and(not(featureRange(1)), featureRange(4), conj(not(featureSet(2)), featureSet(3))), and(not(featureRange(1)), not(featureSet(2)), featureSet(3), featureRange(4)) @@ -61,7 +61,7 @@ public class FeatureConjunctionTransformerTest { } @Test - public void require_that_nested_ands_are_converted() { + void require_that_nested_ands_are_converted() { assertConvertedPredicateEquals( and(conj(featureSet(1), featureSet(2)), conj(featureSet(3), featureSet(4))), and(and(featureSet(1), featureSet(2)), and(featureSet(3), featureSet(4))) @@ -69,7 +69,7 @@ public class FeatureConjunctionTransformerTest { } @Test - public void require_that_featureset_with_common_key_is_not_converted() { + void require_that_featureset_with_common_key_is_not_converted() { assertConvertedPredicateEquals( and(not(featureSet(1)), featureSet(1)), and(not(featureSet(1)), featureSet(1)) @@ -77,7 +77,7 @@ public class FeatureConjunctionTransformerTest { } @Test - public void require_that_nonunique_featureset_are_split_into_separate_conjunctions() { + void require_that_nonunique_featureset_are_split_into_separate_conjunctions() { assertConvertedPredicateEquals( and(conj(not(featureSet(1)), featureSet(2)), featureSet(1)), and(not(featureSet(1)), featureSet(1), featureSet(2)) @@ -93,7 +93,7 @@ public class FeatureConjunctionTransformerTest { } @Test - public void require_that_featuresets_in_conjunction_may_only_have_a_single_value() { + void require_that_featuresets_in_conjunction_may_only_have_a_single_value() { assertConvertedPredicateEquals( and(featureSet(1, "a", "b"), featureSet(4, "c", "d"), conj(featureSet(2), featureSet(3))), and(featureSet(1, "a", "b"), featureSet(2), featureSet(3), featureSet(4, "c", "d")) diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/serialization/PredicateQuerySerializerTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/serialization/PredicateQuerySerializerTest.java index 0bd9a1cda01..f6a44caf130 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/serialization/PredicateQuerySerializerTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/serialization/PredicateQuerySerializerTest.java @@ -3,11 +3,11 @@ package com.yahoo.search.predicate.serialization; import com.yahoo.search.predicate.PredicateQuery; import com.yahoo.search.predicate.SubqueryBitmap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author bjorncs @@ -15,15 +15,15 @@ import static org.junit.Assert.assertEquals; public class PredicateQuerySerializerTest { @Test - public void require_that_query_is_correctly_parsed_and_written_back_to_json() throws Exception { + void require_that_query_is_correctly_parsed_and_written_back_to_json() throws Exception { String json = "{\"features\":[" + - "{\"k\":\"k1\",\"v\":\"value1\",\"s\":\"0x1\"}," + - "{\"k\":\"k2\",\"v\":\"value2\",\"s\":\"0x3\"}" + - "],\"rangeFeatures\":[" + - "{\"k\":\"range1\",\"v\":123456789123,\"s\":\"0xffff\"}," + - "{\"k\":\"range2\",\"v\":0}" + - "]}"; + "{\"k\":\"k1\",\"v\":\"value1\",\"s\":\"0x1\"}," + + "{\"k\":\"k2\",\"v\":\"value2\",\"s\":\"0x3\"}" + + "],\"rangeFeatures\":[" + + "{\"k\":\"range1\",\"v\":123456789123,\"s\":\"0xffff\"}," + + "{\"k\":\"range2\",\"v\":0}" + + "]}"; PredicateQuerySerializer serializer = new PredicateQuerySerializer(); PredicateQuery query = serializer.fromJSON(json); List<PredicateQuery.Feature> features = query.getFeatures(); diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/serialization/SerializationHelperTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/serialization/SerializationHelperTest.java index fa8fbb1e77d..1a2df01b248 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/serialization/SerializationHelperTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/serialization/SerializationHelperTest.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate.serialization; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; @@ -13,28 +13,28 @@ import static com.yahoo.search.predicate.serialization.SerializationTestHelper.* public class SerializationHelperTest { @Test - public void require_that_long_serialization_works() throws IOException { + void require_that_long_serialization_works() throws IOException { long[] longs = {1, 2, 3, 4}; assertSerializationDeserializationMatches( longs, SerializationHelper::writeLongArray, SerializationHelper::readLongArray); } @Test - public void require_that_int_serialization_works() throws IOException { + void require_that_int_serialization_works() throws IOException { int[] ints = {1, 2, 3, 4}; assertSerializationDeserializationMatches( ints, SerializationHelper::writeIntArray, SerializationHelper::readIntArray); } @Test - public void require_that_byte_serialization_works() throws IOException { + void require_that_byte_serialization_works() throws IOException { byte[] bytes = {1, 2, 3, 4}; assertSerializationDeserializationMatches( bytes, SerializationHelper::writeByteArray, SerializationHelper::readByteArray); } @Test - public void require_that_short_serialization_works() throws IOException { + void require_that_short_serialization_works() throws IOException { short[] shorts = {1, 2, 3, 4}; assertSerializationDeserializationMatches( shorts, SerializationHelper::writeShortArray, SerializationHelper::readShortArray); diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/serialization/SerializationTestHelper.java b/predicate-search/src/test/java/com/yahoo/search/predicate/serialization/SerializationTestHelper.java index 42cfa861f34..608ed0b1a52 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/serialization/SerializationTestHelper.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/serialization/SerializationTestHelper.java @@ -7,7 +7,7 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import static org.junit.Assert.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; /** * @author bjorncs diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/utils/PostingListSearchTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/utils/PostingListSearchTest.java index a1bb225fb9f..2b452ad6536 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/utils/PostingListSearchTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/utils/PostingListSearchTest.java @@ -1,9 +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.utils; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author bjorncs @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; public class PostingListSearchTest { @Test - public void require_that_search_find_index_of_first_element_higher() { + void require_that_search_find_index_of_first_element_higher() { int[] values = {2, 8, 4000, 4001, 4100, 10000, 10000000}; int length = values.length; assertEquals(0, PostingListSearch.interpolationSearch(values, 0, length, 1)); @@ -24,7 +24,7 @@ public class PostingListSearchTest { } @Test - public void require_that_search_is_correct_for_one_size_arrays() { + void require_that_search_is_correct_for_one_size_arrays() { int[] values = {100}; assertEquals(0, PostingListSearch.interpolationSearch(values, 0, 1, 0)); assertEquals(0, PostingListSearch.interpolationSearch(values, 0, 1, 99)); @@ -34,7 +34,7 @@ public class PostingListSearchTest { } @Test - public void require_that_search_is_correct_for_sub_arrays() { + void require_that_search_is_correct_for_sub_arrays() { int[] values = {0, 2, 8, 4000, 4001, 4100}; assertEquals(1, PostingListSearch.interpolationSearch(values, 1, 2, 1)); assertEquals(2, PostingListSearch.interpolationSearch(values, 1, 2, 2)); @@ -45,7 +45,7 @@ public class PostingListSearchTest { } @Test - public void require_that_search_is_correct_for_large_arrays() { + void require_that_search_is_correct_for_large_arrays() { int length = 10000; int[] values = new int[length]; for (int i = 0; i < length; i++) { diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/utils/PrimitiveArraySorterTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/utils/PrimitiveArraySorterTest.java index eb641b6fa05..692fb9ab696 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/utils/PrimitiveArraySorterTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/utils/PrimitiveArraySorterTest.java @@ -1,33 +1,30 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate.utils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Random; -import static org.junit.Assert.assertArrayEquals; -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 PrimitiveArraySorterTest { @Test - public void sorting_empty_array_should_not_throw_exception() { + void sorting_empty_array_should_not_throw_exception() { short[] array = {}; PrimitiveArraySorter.sort(array, Short::compare); } @Test - public void test_sorting_single_item_array() { + void test_sorting_single_item_array() { short[] array = {42}; PrimitiveArraySorter.sort(array, Short::compare); assertEquals(42, array[0]); } @Test - public void test_sorting_custom_comparator() { + void test_sorting_custom_comparator() { short[] array = {4, 2, 5}; PrimitiveArraySorter.sort(array, (a, b) -> Short.compare(b, a)); // Sort using inverse ordering. short[] expected = {5, 4, 2}; @@ -35,7 +32,7 @@ public class PrimitiveArraySorterTest { } @Test - public void test_complicated_array() { + void test_complicated_array() { short[] array = {20381, -28785, -19398, 17307, -12612, 11459, -30164, -16597, -4267, 30838, 8918, 9014, -26444, -1232, -14620, 12636, -12389, -4931, 32108, 19854, -12681, 14933, 319, 27348, -4907, 19196, 14209, -32694, 2579, 9771, -1157, -13717, 28506, -8016, 21423, 23697, 23755, 29650, 25644, -14660, -18952, @@ -48,7 +45,7 @@ public class PrimitiveArraySorterTest { } @Test - public void sorting_random_arrays_should_produce_identical_result_as_java_sort() { + void sorting_random_arrays_should_produce_identical_result_as_java_sort() { Random r = new Random(4234); for (int i = 0; i < 10000; i++) { short[] original = makeRandomArray(r); @@ -57,12 +54,12 @@ public class PrimitiveArraySorterTest { PrimitiveArraySorter.sort(customSorted, Short::compare); Arrays.sort(javaSorted); String errorMsg = String.format("%s != %s (before sorting: %s)", Arrays.toString(customSorted), Arrays.toString(javaSorted), Arrays.toString(original)); - assertArrayEquals(errorMsg, customSorted, javaSorted); + assertArrayEquals(customSorted, javaSorted, errorMsg); } } @Test - public void test_merging_simple_array() { + void test_merging_simple_array() { short[] array = {-20, -12, 2, -22, -11, 33, 44}; short[] expected = {-22, -20, -12, -11, 2, 33, 44}; short[] result = new short[array.length]; @@ -71,7 +68,7 @@ public class PrimitiveArraySorterTest { } @Test - public void test_merging_of_random_generated_arrays() { + void test_merging_of_random_generated_arrays() { Random r = new Random(4234); for (int i = 0; i < 10000; i++) { short[] array = makeRandomArray(r); @@ -89,7 +86,7 @@ public class PrimitiveArraySorterTest { } @Test - public void test_sortandmerge_returns_false_when_sort_is_in_place() { + void test_sortandmerge_returns_false_when_sort_is_in_place() { short[] array = {3, 2, 1, 0, 4, 5, 6}; short[] mergeArray = new short[array.length]; assertFalse(PrimitiveArraySorter.sortAndMerge(array, mergeArray, 4, 7, Short::compare)); |