1 files changed, 31 insertions, 31 deletions
diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateTest.java
index 10de465f342..544403f6c9f 100644
--- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateTest.java
+++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/PredicateTest.java
@@ -1,14 +1,14 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.predicate;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 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.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Simon Thoresen Hult
@@ -16,12 +16,12 @@ import static org.junit.Assert.assertTrue;
 public class PredicateTest {
 
     @Test
-    public void requireThatPredicateIsCloneable() {
+    void requireThatPredicateIsCloneable() {
         assertTrue(Cloneable.class.isAssignableFrom(Predicate.class));
     }
 
     @Test
-    public void requireThatANDConstructsAConjunction() {
+    void requireThatANDConstructsAConjunction() {
         Predicate foo = SimplePredicates.newString("foo");
         Predicate bar = SimplePredicates.newString("bar");
         Predicate predicate = and(foo, bar);
@@ -30,7 +30,7 @@ public class PredicateTest {
     }
 
     @Test
-    public void requireThatORConstructsADisjunction() {
+    void requireThatORConstructsADisjunction() {
         Predicate foo = SimplePredicates.newString("foo");
         Predicate bar = SimplePredicates.newString("bar");
         Predicate predicate = or(foo, bar);
@@ -39,7 +39,7 @@ public class PredicateTest {
     }
 
     @Test
-    public void requireThatNOTConstructsANegation() {
+    void requireThatNOTConstructsANegation() {
         Predicate foo = SimplePredicates.newString("foo");
         Predicate predicate = not(foo);
         assertEquals(Negation.class, predicate.getClass());
@@ -47,52 +47,52 @@ public class PredicateTest {
     }
 
     @Test
-    public void requireThatFeatureBuilderCanConstructFeatureRange() {
+    void requireThatFeatureBuilderCanConstructFeatureRange() {
         assertEquals(new FeatureRange("key", 6L, 9L),
-                     feature("key").inRange(6, 9));
+                feature("key").inRange(6, 9));
         assertEquals(new Negation(new FeatureRange("key", 6L, 9L)),
-                     feature("key").notInRange(6, 9));
+                feature("key").notInRange(6, 9));
         assertEquals(new FeatureRange("key", 7L, null),
-                     feature("key").greaterThan(6));
+                feature("key").greaterThan(6));
         assertEquals(new FeatureRange("key", 6L, null),
-                     feature("key").greaterThanOrEqualTo(6));
+                feature("key").greaterThanOrEqualTo(6));
         assertEquals(new FeatureRange("key", null, 5L),
-                     feature("key").lessThan(6));
+                feature("key").lessThan(6));
         assertEquals(new FeatureRange("key", null, 9L),
-                     feature("key").lessThanOrEqualTo(9));
+                feature("key").lessThanOrEqualTo(9));
     }
 
     @Test
-    public void requireThatFeatureBuilderCanConstructFeatureSet() {
+    void requireThatFeatureBuilderCanConstructFeatureSet() {
         assertEquals(new FeatureSet("key", "valueA", "valueB"),
-                     feature("key").inSet("valueA", "valueB"));
+                feature("key").inSet("valueA", "valueB"));
         assertEquals(new Negation(new FeatureSet("key", "valueA", "valueB")),
-                     feature("key").notInSet("valueA", "valueB"));
+                feature("key").notInSet("valueA", "valueB"));
     }
 
     @Test
-    public void requireThatPredicatesCanBeConstructedUsingConstructors() {
+    void requireThatPredicatesCanBeConstructedUsingConstructors() {
         assertEquals("country in [no, se] and age in [20..30]",
-                     new Conjunction(new FeatureSet("country", "no", "se"),
-                                     new FeatureRange("age", 20L, 30L)).toString());
+                new Conjunction(new FeatureSet("country", "no", "se"),
+                        new FeatureRange("age", 20L, 30L)).toString());
         assertEquals("country not in [no, se] or age in [20..] or height in [..160]",
-                     new Disjunction(new Negation(new FeatureSet("country", "no", "se")),
-                                     new FeatureRange("age", 20L, null),
-                                     new FeatureRange("height", null, 160L)).toString());
+                new Disjunction(new Negation(new FeatureSet("country", "no", "se")),
+                        new FeatureRange("age", 20L, null),
+                        new FeatureRange("height", null, 160L)).toString());
     }
 
     @Test
-    public void requireThatPredicatesCanBeBuiltUsingChainedMethodCalls() {
+    void requireThatPredicatesCanBeBuiltUsingChainedMethodCalls() {
         assertEquals("country not in [no, se] or age in [20..] or height in [..160]",
-                     new Disjunction()
-                             .addOperand(new Negation(new FeatureSet("country").addValue("no").addValue("se")))
-                             .addOperand(new FeatureRange("age").setFromInclusive(20L))
-                             .addOperand(new FeatureRange("height").setToInclusive(160L))
-                             .toString());
+                new Disjunction()
+                        .addOperand(new Negation(new FeatureSet("country").addValue("no").addValue("se")))
+                        .addOperand(new FeatureRange("age").setFromInclusive(20L))
+                        .addOperand(new FeatureRange("height").setToInclusive(160L))
+                        .toString());
     }
 
     @Test
-    public void requireThatPredicatesCanBeBuiltUsingSeparateMethodCalls() {
+    void requireThatPredicatesCanBeBuiltUsingSeparateMethodCalls() {
         Conjunction conjunction = new Conjunction();
         FeatureSet countrySet = new FeatureSet("country");
         countrySet.addValue("no");
@@ -105,6 +105,6 @@ public class PredicateTest {
         heightRange.setToInclusive(160L);
         conjunction.addOperand(heightRange);
         assertEquals("country in [no, se] and age in [20..] and height in [..160]",
-                     conjunction.toString());
+                conjunction.toString());
     }
 }