1 files changed, 17 insertions, 18 deletions
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChainTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChainTest.java
index 46d6be2e73b..645e523c155 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChainTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChainTest.java
@@ -9,8 +9,7 @@ import com.yahoo.jdisc.handler.ResponseDispatch;
 import com.yahoo.jdisc.handler.ResponseHandler;
 import com.yahoo.jdisc.http.HttpRequest;
 import com.yahoo.jdisc.test.TestDriver;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.InetSocketAddress;
 import java.net.URI;
@@ -18,7 +17,7 @@ import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author bjorncs
@@ -32,40 +31,40 @@ public class SecurityRequestFilterChainTest {
         driver.activateContainer(driver.newContainerBuilder());
         HttpRequest request = HttpRequest.newServerRequest(driver, uri, method, version, address);
         request.release();
-        Assert.assertTrue(driver.close());
+        assertTrue(driver.close());
         return request;
     }
 
     @Test
-    public void testFilterChainConstruction() {
-        SecurityRequestFilterChain chain = (SecurityRequestFilterChain)SecurityRequestFilterChain.newInstance();
-        assertEquals(chain.getFilters().size(),0);
+    void testFilterChainConstruction() {
+        SecurityRequestFilterChain chain = (SecurityRequestFilterChain) SecurityRequestFilterChain.newInstance();
+        assertEquals(chain.getFilters().size(), 0);
 
         List<SecurityRequestFilter> requestFilters = new ArrayList<SecurityRequestFilter>();
-        chain = (SecurityRequestFilterChain)SecurityRequestFilterChain.newInstance();
+        chain = (SecurityRequestFilterChain) SecurityRequestFilterChain.newInstance();
 
-        chain = (SecurityRequestFilterChain)SecurityRequestFilterChain.newInstance(new RequestHeaderFilter("abc", "xyz"),
-                                                                                   new RequestHeaderFilter("pqr", "def"));
+        chain = (SecurityRequestFilterChain) SecurityRequestFilterChain.newInstance(new RequestHeaderFilter("abc", "xyz"),
+                new RequestHeaderFilter("pqr", "def"));
 
         assertEquals(chain instanceof SecurityRequestFilterChain, true);
     }
 
 
     @Test
-    public void testFilterChainRun() {
+    void testFilterChainRun() {
         RequestFilter chain = SecurityRequestFilterChain.newInstance(new RequestHeaderFilter("abc", "xyz"),
-                                                                     new RequestHeaderFilter("pqr", "def"));
+                new RequestHeaderFilter("pqr", "def"));
 
         assertEquals(chain instanceof SecurityRequestFilterChain, true);
         ResponseHandler handler = newResponseHandler();
         HttpRequest request =  newRequest(URI.create("http://test/test"), HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
         chain.filter(request, handler);
-        Assert.assertTrue(request.headers().contains("abc", "xyz"));
-        Assert.assertTrue(request.headers().contains("pqr", "def"));
+        assertTrue(request.headers().contains("abc", "xyz"));
+        assertTrue(request.headers().contains("pqr", "def"));
     }
 
     @Test
-    public void testFilterChainResponds() {
+    void testFilterChainResponds() {
         RequestFilter chain = SecurityRequestFilterChain.newInstance(
                 new MyFilter(),
                 new RequestHeaderFilter("abc", "xyz"),
@@ -76,9 +75,9 @@ public class SecurityRequestFilterChainTest {
         HttpRequest request =  newRequest(URI.create("http://test/test"), HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
         chain.filter(request, handler);
         Response response = getResponse(handler);
-        Assert.assertNotNull(response);
-        Assert.assertTrue(!request.headers().contains("abc", "xyz"));
-        Assert.assertTrue(!request.headers().contains("pqr", "def"));
+        assertNotNull(response);
+        assertFalse(request.headers().contains("abc", "xyz"));
+        assertFalse(request.headers().contains("pqr", "def"));
     }
 
     private class RequestHeaderFilter extends AbstractResource implements SecurityRequestFilter {