1 files changed, 25 insertions, 28 deletions
diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/ConjunctionTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/ConjunctionTest.java
index cbcab2917e5..fa4872715f6 100644
--- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/ConjunctionTest.java
+++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/ConjunctionTest.java
@@ -1,14 +1,11 @@
 // 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 java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author Simon Thoresen Hult
@@ -16,12 +13,12 @@ import static org.junit.Assert.assertTrue;
 public class ConjunctionTest {
 
     @Test
-    public void requireThatConjunctionIsAnOperator() {
+    void requireThatConjunctionIsAnOperator() {
         assertTrue(PredicateOperator.class.isAssignableFrom(Conjunction.class));
     }
 
     @Test
-    public void requireThatAccessorsWork() {
+    void requireThatAccessorsWork() {
         Conjunction node = new Conjunction();
         Predicate a = SimplePredicates.newString("a");
         node.addOperand(a);
@@ -40,7 +37,7 @@ public class ConjunctionTest {
     }
 
     @Test
-    public void requireThatConstructorsWork() {
+    void requireThatConstructorsWork() {
         Predicate foo = SimplePredicates.newString("foo");
         Predicate bar = SimplePredicates.newString("bar");
         Conjunction node = new Conjunction(foo, bar);
@@ -51,7 +48,7 @@ public class ConjunctionTest {
     }
 
     @Test
-    public void requireThatCloneIsImplemented() throws CloneNotSupportedException {
+    void requireThatCloneIsImplemented() throws CloneNotSupportedException {
         Conjunction node1 = new Conjunction(SimplePredicates.newString("a"), SimplePredicates.newString("b"));
         Conjunction node2 = node1.clone();
         assertEquals(node1, node2);
@@ -60,27 +57,27 @@ public class ConjunctionTest {
     }
 
     @Test
-    public void requireThatHashCodeIsImplemented() {
+    void requireThatHashCodeIsImplemented() {
         assertEquals(new Conjunction().hashCode(), new Conjunction().hashCode());
     }
 
     @Test
-    public void requireThatEqualsIsImplemented() {
+    void requireThatEqualsIsImplemented() {
         Conjunction lhs = new Conjunction(SimplePredicates.newString("foo"),
-                                          SimplePredicates.newString("bar"));
-        assertTrue(lhs.equals(lhs));
-        assertFalse(lhs.equals(new Object()));
+                SimplePredicates.newString("bar"));
+        assertEquals(lhs, lhs);
+        assertNotEquals(lhs, new Object());
 
         Conjunction rhs = new Conjunction();
-        assertFalse(lhs.equals(rhs));
+        assertNotEquals(lhs, rhs);
         rhs.addOperand(SimplePredicates.newString("foo"));
-        assertFalse(lhs.equals(rhs));
+        assertNotEquals(lhs, rhs);
         rhs.addOperand(SimplePredicates.newString("bar"));
-        assertTrue(lhs.equals(rhs));
+        assertEquals(lhs, rhs);
     }
 
     @Test
-    public void requireThatNodeDelimiterIsAND() {
+    void requireThatNodeDelimiterIsAND() {
         assertEquals("", newConjunction().toString());
         assertEquals("foo", newConjunction("foo").toString());
         assertEquals("foo and bar", newConjunction("foo", "bar").toString());
@@ -88,22 +85,22 @@ public class ConjunctionTest {
     }
 
     @Test
-    public void requireThatSimpleConjunctionsArePrettyPrinted() {
+    void requireThatSimpleConjunctionsArePrettyPrinted() {
         assertEquals("foo and bar",
-                     new Conjunction(SimplePredicates.newString("foo"),
-                                     SimplePredicates.newString("bar")).toString());
+                new Conjunction(SimplePredicates.newString("foo"),
+                        SimplePredicates.newString("bar")).toString());
     }
 
     @Test
-    public void requireThatComplexConjunctionsArePrintedAsGroup() {
+    void requireThatComplexConjunctionsArePrintedAsGroup() {
         assertEquals("foo and bar and baz",
-                     new Conjunction(SimplePredicates.newString("foo"),
-                                     new Conjunction(SimplePredicates.newString("bar"),
-                                                     SimplePredicates.newString("baz"))).toString());
+                new Conjunction(SimplePredicates.newString("foo"),
+                        new Conjunction(SimplePredicates.newString("bar"),
+                                SimplePredicates.newString("baz"))).toString());
         assertEquals("foo and (bar or baz)",
-                     new Conjunction(SimplePredicates.newString("foo"),
-                                     new Disjunction(SimplePredicates.newString("bar"),
-                                                     SimplePredicates.newString("baz"))).toString());
+                new Conjunction(SimplePredicates.newString("foo"),
+                        new Disjunction(SimplePredicates.newString("bar"),
+                                SimplePredicates.newString("baz"))).toString());
     }
 
     private static Conjunction newConjunction(String... operands) {