1 files changed, 16 insertions, 16 deletions
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) {