Merge pull request #23555 from vespa-engine/bjorncs/more-junit5v8.26.15

Bjorncs/more junit5

1 files changed, 24 insertions, 24 deletions

diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/PartitionTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/PartitionTest.java
index ec60adf16d3..65acea02d34 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/PartitionTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/PartitionTest.java
@@ -3,47 +3,47 @@ package com.yahoo.vespa.clustercontroller.core.restapiv2;
 
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.response.UnitResponse;
 import org.codehaus.jettison.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class PartitionTest extends StateRestApiTest {
 
     @Test
-    public void testPartition() throws Exception {
+    void testPartition() throws Exception {
         setUp(true);
         UnitResponse response = restAPI.getState(new StateRequest("music/storage/1/0", 0));
         String expected =
                 "{\n" +
-                "  \"state\": {\"generated\": {\n" +
-                "    \"state\": \"up\",\n" +
-                "    \"reason\": \"\"\n" +
-                "  }},\n" +
-                "  \"metrics\": {\n" +
-                "    \"bucket-count\": 1,\n" +
-                "    \"unique-document-count\": 2,\n" +
-                "    \"unique-document-total-size\": 3\n" +
-                "  }\n" +
-                "}";
+                        "  \"state\": {\"generated\": {\n" +
+                        "    \"state\": \"up\",\n" +
+                        "    \"reason\": \"\"\n" +
+                        "  }},\n" +
+                        "  \"metrics\": {\n" +
+                        "    \"bucket-count\": 1,\n" +
+                        "    \"unique-document-count\": 2,\n" +
+                        "    \"unique-document-total-size\": 3\n" +
+                        "  }\n" +
+                        "}";
         assertEquals(expected, jsonWriter.createJson(response).toString(2));
     }
 
     @Test
-    public void testRecursiveCluster() throws Exception {
+    void testRecursiveCluster() throws Exception {
         setUp(true);
         UnitResponse response = restAPI.getState(new StateRequest("music/storage/1/0", 1));
         String expected =
                 "{\n" +
-                "  \"state\": {\"generated\": {\n" +
-                "    \"state\": \"up\",\n" +
-                "    \"reason\": \"\"\n" +
-                "  }},\n" +
-                "  \"metrics\": {\n" +
-                "    \"bucket-count\": 1,\n" +
-                "    \"unique-document-count\": 2,\n" +
-                "    \"unique-document-total-size\": 3\n" +
-                "  }\n" +
-                "}";
+                        "  \"state\": {\"generated\": {\n" +
+                        "    \"state\": \"up\",\n" +
+                        "    \"reason\": \"\"\n" +
+                        "  }},\n" +
+                        "  \"metrics\": {\n" +
+                        "    \"bucket-count\": 1,\n" +
+                        "    \"unique-document-count\": 2,\n" +
+                        "    \"unique-document-total-size\": 3\n" +
+                        "  }\n" +
+                        "}";
         assertEquals(expected, jsonWriter.createJson(response).toString(2));
     }
 }