Merge remote-tracking branch 'upstream/master'

1 files changed, 10 insertions, 13 deletions

diff --git a/predicate-search-core/src/test/java/com/yahoo/document/predicate/BooleanPredicateTest.java b/predicate-search-core/src/test/java/com/yahoo/document/predicate/BooleanPredicateTest.java
index 92c45520504..0dbfdb2559d 100644
--- a/predicate-search-core/src/test/java/com/yahoo/document/predicate/BooleanPredicateTest.java
+++ b/predicate-search-core/src/test/java/com/yahoo/document/predicate/BooleanPredicateTest.java
@@ -1,12 +1,9 @@
 // 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 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
@@ -14,12 +11,12 @@ import static org.junit.Assert.assertTrue;
 public class BooleanPredicateTest {
 
     @Test
-    public void requireThatFalseIsAValue() {
+    void requireThatFalseIsAValue() {
         assertTrue(PredicateValue.class.isAssignableFrom(BooleanPredicate.class));
     }
 
     @Test
-    public void requireThatCloneIsImplemented() throws CloneNotSupportedException {
+    void requireThatCloneIsImplemented() throws CloneNotSupportedException {
         BooleanPredicate node1 = new BooleanPredicate(true);
         BooleanPredicate node2 = node1.clone();
         assertEquals(node1, node2);
@@ -27,21 +24,21 @@ public class BooleanPredicateTest {
     }
 
     @Test
-    public void requireThatHashCodeIsImplemented() {
+    void requireThatHashCodeIsImplemented() {
         assertEquals(new BooleanPredicate(true).hashCode(), new BooleanPredicate(true).hashCode());
         assertEquals(new BooleanPredicate(false).hashCode(), new BooleanPredicate(false).hashCode());
     }
 
     @Test
-    public void requireThatEqualsIsImplemented() {
+    void requireThatEqualsIsImplemented() {
         BooleanPredicate lhs = new BooleanPredicate(true);
-        assertTrue(lhs.equals(lhs));
-        assertFalse(lhs.equals(new Object()));
+        assertEquals(lhs, lhs);
+        assertNotEquals(lhs, new Object());
 
         BooleanPredicate rhs = new BooleanPredicate(false);
-        assertFalse(lhs.equals(rhs));
+        assertNotEquals(lhs, rhs);
         rhs.setValue(true);
-        assertTrue(lhs.equals(rhs));
+        assertEquals(lhs, rhs);
     }
 
 }