1 files changed, 14 insertions, 14 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilterTest.java
index be3a50c38b0..64dce08e735 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilterTest.java
@@ -11,7 +11,7 @@ import com.yahoo.vespa.hosted.controller.ControllerTester;
 import com.yahoo.vespa.hosted.controller.api.role.Role;
 import com.yahoo.vespa.hosted.controller.api.role.SecurityContext;
 import com.yahoo.vespa.hosted.controller.restapi.ApplicationRequestToDiscFilterRequestWrapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -20,9 +20,9 @@ import java.util.Set;
 
 import static com.yahoo.container.jdisc.RequestHandlerTestDriver.MockResponseHandler;
 import static com.yahoo.jdisc.http.HttpResponse.Status.FORBIDDEN;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author bjorncs
@@ -33,7 +33,7 @@ public class ControllerAuthorizationFilterTest {
     private static final ObjectMapper mapper = new ObjectMapper();
 
     @Test
-    public void operator() {
+    void operator() {
         ControllerTester tester = new ControllerTester();
         SecurityContext securityContext = new SecurityContext(() -> "operator", Set.of(Role.hostedOperator()));
         ControllerAuthorizationFilter filter = createFilter(tester);
@@ -44,7 +44,7 @@ public class ControllerAuthorizationFilterTest {
     }
 
     @Test
-    public void supporter() {
+    void supporter() {
         ControllerTester tester = new ControllerTester();
         SecurityContext securityContext = new SecurityContext(() -> "operator", Set.of(Role.hostedSupporter()));
         ControllerAuthorizationFilter filter = createFilter(tester);
@@ -54,7 +54,7 @@ public class ControllerAuthorizationFilterTest {
     }
 
     @Test
-    public void unprivileged() {
+    void unprivileged() {
         ControllerTester tester = new ControllerTester();
         SecurityContext securityContext = new SecurityContext(() -> "user", Set.of(Role.everyone()));
         ControllerAuthorizationFilter filter = createFilter(tester);
@@ -65,7 +65,7 @@ public class ControllerAuthorizationFilterTest {
     }
 
     @Test
-    public void unprivilegedInPublic() {
+    void unprivilegedInPublic() {
         ControllerTester tester = new ControllerTester(SystemName.Public);
         SecurityContext securityContext = new SecurityContext(() -> "user", Set.of(Role.everyone()));
 
@@ -76,7 +76,7 @@ public class ControllerAuthorizationFilterTest {
     }
 
     @Test
-    public void hostedDeveloper() {
+    void hostedDeveloper() {
         ControllerTester tester = new ControllerTester();
         TenantName tenantName = TenantName.defaultName();
         SecurityContext securityContext = new SecurityContext(() -> "user", Set.of(Role.hostedDeveloper(tenantName)));
@@ -88,14 +88,14 @@ public class ControllerAuthorizationFilterTest {
     }
 
     private static void assertIsAllowed(Optional<AuthorizationResponse> response) {
-        assertFalse("Expected no response from filter, but got \"" +
-                    response.map(r -> r.message + "\" (" + r.statusCode + ")").orElse(""),
-                    response.isPresent());
+        assertFalse(response.isPresent(),
+                    "Expected no response from filter, but got \"" +
+                    response.map(r -> r.message + "\" (" + r.statusCode + ")").orElse(""));
     }
 
     private static void assertIsForbidden(Optional<AuthorizationResponse> response) {
-        assertTrue("Expected a response from filter", response.isPresent());
-        assertEquals("Invalid status code", FORBIDDEN, response.get().statusCode);
+        assertTrue(response.isPresent(), "Expected a response from filter");
+        assertEquals(FORBIDDEN, response.get().statusCode, "Invalid status code");
     }
 
     private static ControllerAuthorizationFilter createFilter(ControllerTester tester) {