1 files changed, 11 insertions, 11 deletions

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"))