1 files changed, 22 insertions, 24 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
index 9b1ff54482b..5394b807861 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
@@ -8,7 +8,7 @@ import ai.vespa.metricsproxy.rpc.RpcConnectorConfig;
 import ai.vespa.metricsproxy.service.VespaServicesConfig;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.test.VespaModelTester;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.yahoo.config.model.api.container.ContainerServiceType.METRICS_PROXY_CONTAINER;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.CONTAINER_CONFIG_ID;
@@ -20,9 +20,7 @@ import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.g
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getNodeDimensionsConfig;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getRpcConnectorConfig;
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.getVespaServicesConfig;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author gjoranv
@@ -30,7 +28,7 @@ import static org.junit.Assert.assertTrue;
 public class MetricsProxyContainerTest {
 
     @Test
-    public void one_metrics_proxy_container_is_added_to_every_node() {
+    void one_metrics_proxy_container_is_added_to_every_node() {
         var numberOfHosts = 7;
         var tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
@@ -42,14 +40,14 @@ public class MetricsProxyContainerTest {
             assertNotNull(host.getService(METRICS_PROXY_CONTAINER.serviceName));
 
             long metricsProxies = host.getServices().stream()
-                                      .filter(s -> s.getClass().equals(MetricsProxyContainer.class))
-                                      .count();
+                    .filter(s -> s.getClass().equals(MetricsProxyContainer.class))
+                    .count();
             assertEquals(1, metricsProxies);
         }
     }
 
     @Test
-    public void one_metrics_proxy_container_is_added_to_every_node_also_when_dedicated_CCC() {
+    void one_metrics_proxy_container_is_added_to_every_node_also_when_dedicated_CCC() {
         var numberOfHosts = 7;
         var tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
@@ -61,16 +59,16 @@ public class MetricsProxyContainerTest {
             assertNotNull(host.getService(METRICS_PROXY_CONTAINER.serviceName));
 
             long metricsProxies = host.getServices().stream()
-                                      .filter(s -> s.getClass().equals(MetricsProxyContainer.class))
-                                      .count();
+                    .filter(s -> s.getClass().equals(MetricsProxyContainer.class))
+                    .count();
             assertEquals(1, metricsProxies);
         }
     }
 
     @Test
-    public void http_server_is_running_on_expected_port() {
+    void http_server_is_running_on_expected_port() {
         VespaModel model = getModel(hostedServicesWithContent(), self_hosted);
-        MetricsProxyContainer container = (MetricsProxyContainer)model.id2producer().get(CONTAINER_CONFIG_ID);
+        MetricsProxyContainer container = (MetricsProxyContainer) model.id2producer().get(CONTAINER_CONFIG_ID);
         assertEquals(19092, container.getSearchPort());
         assertEquals(19092, container.getHealthPort());
 
@@ -79,9 +77,9 @@ public class MetricsProxyContainerTest {
     }
 
     @Test
-    public void metrics_rpc_server_is_running_on_expected_port() {
+    void metrics_rpc_server_is_running_on_expected_port() {
         VespaModel model = getModel(hostedServicesWithContent(), self_hosted);
-        MetricsProxyContainer container = (MetricsProxyContainer)model.id2producer().get(CONTAINER_CONFIG_ID);
+        MetricsProxyContainer container = (MetricsProxyContainer) model.id2producer().get(CONTAINER_CONFIG_ID);
 
         int offset = 3;
         assertEquals(2, container.getPortsMeta().getTagsAt(offset).size());
@@ -93,9 +91,9 @@ public class MetricsProxyContainerTest {
     }
 
     @Test
-    public void admin_rpc_server_is_running() {
+    void admin_rpc_server_is_running() {
         VespaModel model = getModel(hostedServicesWithContent(), self_hosted);
-        MetricsProxyContainer container = (MetricsProxyContainer)model.id2producer().get(CONTAINER_CONFIG_ID);
+        MetricsProxyContainer container = (MetricsProxyContainer) model.id2producer().get(CONTAINER_CONFIG_ID);
 
         int offset = 2;
         assertEquals(2, container.getPortsMeta().getTagsAt(offset).size());
@@ -104,15 +102,15 @@ public class MetricsProxyContainerTest {
     }
 
     @Test
-    public void preload_is_empty() {
+    void preload_is_empty() {
         VespaModel model = getModel(hostedServicesWithContent(), self_hosted);
-        MetricsProxyContainer container = (MetricsProxyContainer)model.id2producer().get(CONTAINER_CONFIG_ID);
+        MetricsProxyContainer container = (MetricsProxyContainer) model.id2producer().get(CONTAINER_CONFIG_ID);
 
         assertEquals("", container.getPreLoad());
     }
 
     @Test
-    public void hosted_application_propagates_node_dimensions() {
+    void hosted_application_propagates_node_dimensions() {
         String services = hostedServicesWithContent();
         VespaModel hostedModel = getModel(services, hosted);
         assertEquals(4, hostedModel.getHosts().size());
@@ -124,11 +122,11 @@ public class MetricsProxyContainerTest {
     }
 
     @Test
-    public void metrics_v2_handler_is_set_up_with_node_info_config() {
+    void metrics_v2_handler_is_set_up_with_node_info_config() {
         String services = hostedServicesWithContent();
         VespaModel hostedModel = getModel(services, hosted);
 
-        var container = (MetricsProxyContainer)hostedModel.id2producer().get(containerConfigId(hostedModel, hosted));
+        var container = (MetricsProxyContainer) hostedModel.id2producer().get(containerConfigId(hostedModel, hosted));
         var handlers = container.getHandlers().getComponents();
 
         assertEquals(1, handlers.size());
@@ -140,13 +138,13 @@ public class MetricsProxyContainerTest {
     }
 
     @Test
-    public void vespa_services_config_has_all_services() {
+    void vespa_services_config_has_all_services() {
         VespaServicesConfig vespaServicesConfig = getVespaServicesConfig(hostedServicesWithContent());
         assertEquals(9, vespaServicesConfig.service().size());
 
         for (var service : vespaServicesConfig.service()) {
             if (service.configId().equals("admin/cluster-controllers/0")) {
-                assertEquals("Wrong service name", "container-clustercontroller", service.name());
+                assertEquals("container-clustercontroller", service.name(), "Wrong service name");
                 assertEquals(1, service.dimension().size());
                 assertEquals("clustername", service.dimension(0).key());
                 assertEquals("cluster-controllers", service.dimension(0).value());
@@ -155,7 +153,7 @@ public class MetricsProxyContainerTest {
     }
 
     @Test
-    public void vespa_services_config_has_service_dimensions() {
+    void vespa_services_config_has_service_dimensions() {
         VespaServicesConfig vespaServicesConfig = getVespaServicesConfig(hostedServicesWithContent());
         for (var service : vespaServicesConfig.service()) {
             if (service.configId().equals("admin/cluster-controllers/0")) {