1 files changed, 11 insertions, 14 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/HandlerBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/HandlerBuilderTest.java
index 42cda0d8034..291a5f21305 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/HandlerBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/HandlerBuilderTest.java
@@ -7,7 +7,7 @@ import com.yahoo.container.usability.BindingsOverviewHandler;
 import com.yahoo.vespa.model.container.ApplicationContainerCluster;
 import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.container.component.Handler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Element;
 
 import static com.yahoo.vespa.model.container.ContainerCluster.ROOT_HANDLER_BINDING;
@@ -16,10 +16,7 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.hasItem;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Tests for container model building with custom handlers.
@@ -29,13 +26,13 @@ import static org.junit.Assert.fail;
 public class HandlerBuilderTest extends ContainerModelBuilderTestBase {
 
     @Test
-    public void handlers_are_included_in_components_config() {
+    void handlers_are_included_in_components_config() {
         createClusterWithJDiscHandler();
         assertThat(componentsConfig().toString(), containsString(".id \"discHandler\""));
     }
 
     @Test
-    public void handler_bindings_are_included_in_discBindings_config() {
+    void handler_bindings_are_included_in_discBindings_config() {
         createClusterWithJDiscHandler();
         String discBindingsConfig = root.getConfig(JdiscBindingsConfig.class, "default").toString();
         assertThat(discBindingsConfig, containsString(".serverBindings[0] \"http://*/binding0\""));
@@ -43,7 +40,7 @@ public class HandlerBuilderTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void nested_components_are_injected_to_handlers() {
+    void nested_components_are_injected_to_handlers() {
         Element clusterElem = DomBuilderTest.parse(
                 "<container id='default' version='1.0'>",
                 "  <handler id='myHandler'>",
@@ -52,12 +49,12 @@ public class HandlerBuilderTest extends ContainerModelBuilderTestBase {
                 "</container>");
 
         createModel(root, clusterElem);
-        Component<?,?> handler = getComponent("default", "myHandler");
+        Component<?, ?> handler = getComponent("default", "myHandler");
         assertThat(handler.getInjectedComponentIds(), hasItem("injected@myHandler"));
     }
 
     @Test
-    public void default_root_handler_binding_can_be_stolen_by_user_configured_handler() {
+    void default_root_handler_binding_can_be_stolen_by_user_configured_handler() {
         Element clusterElem = DomBuilderTest.parse(
                 "<container id='default' version='1.0'>" +
                         "  <handler id='userRootHandler'>" +
@@ -76,7 +73,7 @@ public class HandlerBuilderTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void reserved_binding_cannot_be_stolen_by_user_configured_handler() {
+    void reserved_binding_cannot_be_stolen_by_user_configured_handler() {
         Element clusterElem = DomBuilderTest.parse(
                 "<container id='default' version='1.0'>" +
                         "  <handler id='userHandler'>" +
@@ -88,14 +85,14 @@ public class HandlerBuilderTest extends ContainerModelBuilderTestBase {
             fail("Expected exception when stealing a reserved binding.");
         } catch (IllegalArgumentException e) {
             assertThat(e.getMessage(), is("Binding 'http://*/state/v1' is a reserved Vespa binding " +
-                                                  "and cannot be used by handler: userHandler"));
+                    "and cannot be used by handler: userHandler"));
         }
     }
 
     @Test
-    public void custom_handler_gets_default_threadpool() {
+    void custom_handler_gets_default_threadpool() {
         createClusterWithJDiscHandler();
-        ApplicationContainerCluster cluster = (ApplicationContainerCluster)root.getChildren().get("default");
+        ApplicationContainerCluster cluster = (ApplicationContainerCluster) root.getChildren().get("default");
         Handler handler = cluster.getHandlers().stream()
                 .filter(h -> h.getComponentId().toString().equals("discHandler"))
                 .findAny().orElseThrow();