1 files changed, 46 insertions, 45 deletions

diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/ClusterListTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/ClusterListTest.java
index 84116674afa..8e49703c94b 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/ClusterListTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/ClusterListTest.java
@@ -2,67 +2,68 @@
 package com.yahoo.vespa.clustercontroller.core.restapiv2;
 
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.response.UnitResponse;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ClusterListTest extends StateRestApiTest {
 
     @Test
-    public void testClusterList() throws Exception {
+    void testClusterList() throws Exception {
         setUp(true);
         UnitResponse response = restAPI.getState(new StateRequest("", 0));
         String expected =
                 "{\"cluster\": {\n" +
-                "  \"books\": {\"link\": \"\\/cluster\\/v2\\/books\"},\n" +
-                "  \"music\": {\"link\": \"\\/cluster\\/v2\\/music\"}\n" +
-                "}}";
+                        "  \"books\": {\"link\": \"\\/cluster\\/v2\\/books\"},\n" +
+                        "  \"music\": {\"link\": \"\\/cluster\\/v2\\/music\"}\n" +
+                        "}}";
         assertEquals(expected, jsonWriter.createJson(response).toString(2));
     }
 
     @Test
-    public void testRecursiveClusterList() throws Exception {
+    void testRecursiveClusterList() throws Exception {
         setUp(true);
         UnitResponse response = restAPI.getState(new StateRequest("", 1));
         String expected =
                 "{\"cluster\": {\n" +
-                "  \"books\": {\n" +
-                "    \"state\": {\"generated\": {\n" +
-                "      \"state\": \"up\",\n" +
-                "      \"reason\": \"\"\n" +
-                "    }},\n" +
-                "    \"service\": {\n" +
-                "      \"storage\": {\"link\": \"\\/cluster\\/v2\\/books\\/storage\"},\n" +
-                "      \"distributor\": {\"link\": \"\\/cluster\\/v2\\/books\\/distributor\"}\n" +
-                "    },\n" +
-                "    \"distribution-states\": {\"published\": {\n" +
-                "      \"baseline\": \"distributor:4 storage:4\",\n" +
-                "      \"bucket-spaces\": [\n" +
-                "        {\n" +
-                "          \"name\": \"default\",\n" +
-                "          \"state\": \"distributor:4 storage:4 .3.s:m\"\n" +
-                "        },\n" +
-                "        {\n" +
-                "          \"name\": \"global\",\n" +
-                "          \"state\": \"distributor:4 storage:4\"\n" +
-                "        }\n" +
-                "      ]\n" +
-                "    }}\n" +
-                "  },\n" +
-                "  \"music\": {\n" +
-                "    \"state\": {\"generated\": {\n" +
-                "      \"state\": \"up\",\n" +
-                "      \"reason\": \"\"\n" +
-                "    }},\n" +
-                "    \"service\": {\n" +
-                "      \"storage\": {\"link\": \"\\/cluster\\/v2\\/music\\/storage\"},\n" +
-                "      \"distributor\": {\"link\": \"\\/cluster\\/v2\\/music\\/distributor\"}\n" +
-                "    },\n" +
-                "    \"distribution-states\": {\"published\": {\n" +
-                "      \"baseline\": \"distributor:8 .0.s:d .2.s:d .4.s:d .6.s:d storage:8 .0.s:d .2.s:d .4.s:d .6.s:d\",\n" +
-                "      \"bucket-spaces\": []\n" +
-                "    }}\n" +
-                "  }\n" +
-                "}}";
+                        "  \"books\": {\n" +
+                        "    \"state\": {\"generated\": {\n" +
+                        "      \"state\": \"up\",\n" +
+                        "      \"reason\": \"\"\n" +
+                        "    }},\n" +
+                        "    \"service\": {\n" +
+                        "      \"storage\": {\"link\": \"\\/cluster\\/v2\\/books\\/storage\"},\n" +
+                        "      \"distributor\": {\"link\": \"\\/cluster\\/v2\\/books\\/distributor\"}\n" +
+                        "    },\n" +
+                        "    \"distribution-states\": {\"published\": {\n" +
+                        "      \"baseline\": \"distributor:4 storage:4\",\n" +
+                        "      \"bucket-spaces\": [\n" +
+                        "        {\n" +
+                        "          \"name\": \"default\",\n" +
+                        "          \"state\": \"distributor:4 storage:4 .3.s:m\"\n" +
+                        "        },\n" +
+                        "        {\n" +
+                        "          \"name\": \"global\",\n" +
+                        "          \"state\": \"distributor:4 storage:4\"\n" +
+                        "        }\n" +
+                        "      ]\n" +
+                        "    }}\n" +
+                        "  },\n" +
+                        "  \"music\": {\n" +
+                        "    \"state\": {\"generated\": {\n" +
+                        "      \"state\": \"up\",\n" +
+                        "      \"reason\": \"\"\n" +
+                        "    }},\n" +
+                        "    \"service\": {\n" +
+                        "      \"storage\": {\"link\": \"\\/cluster\\/v2\\/music\\/storage\"},\n" +
+                        "      \"distributor\": {\"link\": \"\\/cluster\\/v2\\/music\\/distributor\"}\n" +
+                        "    },\n" +
+                        "    \"distribution-states\": {\"published\": {\n" +
+                        "      \"baseline\": \"distributor:8 .0.s:d .2.s:d .4.s:d .6.s:d storage:8 .0.s:d .2.s:d .4.s:d .6.s:d\",\n" +
+                        "      \"bucket-spaces\": []\n" +
+                        "    }}\n" +
+                        "  }\n" +
+                        "}}";
         assertEquals(expected, jsonWriter.createJson(response).toString(2));
     }
 }