1 files changed, 15 insertions, 17 deletions

diff --git a/container-core/src/test/java/com/yahoo/processing/request/test/PropertyMapTestCase.java b/container-core/src/test/java/com/yahoo/processing/request/test/PropertyMapTestCase.java
index 5d7d1e63b21..de5437ab658 100644
--- a/container-core/src/test/java/com/yahoo/processing/request/test/PropertyMapTestCase.java
+++ b/container-core/src/test/java/com/yahoo/processing/request/test/PropertyMapTestCase.java
@@ -3,15 +3,13 @@ package com.yahoo.processing.request.test;
 
 import com.yahoo.processing.request.properties.PropertyMap;
 import com.yahoo.processing.request.properties.PublicCloneable;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author  bratseth
@@ -19,40 +17,40 @@ import static org.junit.Assert.assertTrue;
 public class PropertyMapTestCase {
 
     @Test
-    public void testObjectCloning() {
+    void testObjectCloning() {
         PropertyMap map = new PropertyMap();
         map.set("clonable", new ClonableObject());
         map.set("publicClonable", new PublicClonableObject());
         map.set("nonclonable", new NonClonableObject());
-        map.set("clonableArray", new ClonableObject[] {new ClonableObject()});
-        map.set("publicClonableArray", new ClonableObject[] {new ClonableObject()});
-        map.set("nonclonableArray", new NonClonableObject[] {new NonClonableObject()});
+        map.set("clonableArray", new ClonableObject[]{new ClonableObject()});
+        map.set("publicClonableArray", new ClonableObject[]{new ClonableObject()});
+        map.set("nonclonableArray", new NonClonableObject[]{new NonClonableObject()});
         map.set("clonableList", Collections.singletonList(new ClonableObject()));
         map.set("nonclonableList", Collections.singletonList(new NonClonableObject()));
         assertNotNull(map.get("clonable"));
         assertNotNull(map.get("nonclonable"));
 
-        PropertyMap mapClone=map.clone();
+        PropertyMap mapClone = map.clone();
         assertTrue(map.get("clonable")      != mapClone.get("clonable"));
-        assertTrue(map.get("publicClonable")!= mapClone.get("publicClonable"));
-        assertTrue(map.get("nonclonable")   == mapClone.get("nonclonable"));
+        assertTrue(map.get("publicClonable") != mapClone.get("publicClonable"));
+        assertEquals(map.get("nonclonable"), mapClone.get("nonclonable"));
 
         assertTrue(map.get("clonableArray") != mapClone.get("clonableArray"));
         assertTrue(first(map.get("clonableArray")) != first(mapClone.get("clonableArray")));
         assertTrue(map.get("publicClonableArray") != mapClone.get("publicClonableArray"));
         assertTrue(first(map.get("publicClonableArray")) != first(mapClone.get("publicClonableArray")));
-        assertTrue(first(map.get("nonclonableArray")) == first(mapClone.get("nonclonableArray")));
+        assertEquals(first(map.get("nonclonableArray")), first(mapClone.get("nonclonableArray")));
     }
-    
+
     @Test
-    public void testArrayCloning() {
+    void testArrayCloning() {
         PropertyMap map = new PropertyMap();
-        byte[] byteArray = new byte[] {2, 4, 7};
+        byte[] byteArray = new byte[]{2, 4, 7};
         map.set("byteArray", byteArray);
 
         PropertyMap mapClone = map.clone();
-        assertArrayEquals(byteArray, (byte[])mapClone.get("byteArray"));
-        assertTrue("Array was cloned", mapClone.get("byteArray") != byteArray);
+        assertArrayEquals(byteArray, (byte[]) mapClone.get("byteArray"));
+        assertTrue(mapClone.get("byteArray") != byteArray, "Array was cloned");
     }
 
     private Object first(Object object) {