diff options
Diffstat (limited to 'clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/ClusterTest.java')
-rw-r--r-- | clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/ClusterTest.java | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/ClusterTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/ClusterTest.java index 2efb731c88c..ab9c92a6d9e 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/ClusterTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/ClusterTest.java @@ -2,74 +2,74 @@ package com.yahoo.vespa.clustercontroller.core.restapiv2; import com.yahoo.vespa.clustercontroller.utils.staterestapi.response.UnitResponse; -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 ClusterTest extends StateRestApiTest { @Test - public void testCluster() throws Exception { + void testCluster() throws Exception { setUp(true); UnitResponse response = restAPI.getState(new StateRequest("books", 0)); String expected = "{\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" + - "}"; + " \"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" + + "}"; 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", 1)); String expected = "{\n" + - " \"state\": {\"generated\": {\n" + - " \"state\": \"up\",\n" + - " \"reason\": \"\"\n" + - " }},\n" + - " \"service\": {\n" + - " \"storage\": {\"node\": {\n" + - " \"1\": {\"link\": \"\\/cluster\\/v2\\/music\\/storage\\/1\"},\n" + - " \"2\": {\"link\": \"\\/cluster\\/v2\\/music\\/storage\\/2\"},\n" + - " \"3\": {\"link\": \"\\/cluster\\/v2\\/music\\/storage\\/3\"},\n" + - " \"5\": {\"link\": \"\\/cluster\\/v2\\/music\\/storage\\/5\"},\n" + - " \"7\": {\"link\": \"\\/cluster\\/v2\\/music\\/storage\\/7\"}\n" + - " }},\n" + - " \"distributor\": {\"node\": {\n" + - " \"1\": {\"link\": \"\\/cluster\\/v2\\/music\\/distributor\\/1\"},\n" + - " \"2\": {\"link\": \"\\/cluster\\/v2\\/music\\/distributor\\/2\"},\n" + - " \"3\": {\"link\": \"\\/cluster\\/v2\\/music\\/distributor\\/3\"},\n" + - " \"5\": {\"link\": \"\\/cluster\\/v2\\/music\\/distributor\\/5\"},\n" + - " \"7\": {\"link\": \"\\/cluster\\/v2\\/music\\/distributor\\/7\"}\n" + - " }}\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" + - "}"; + " \"state\": {\"generated\": {\n" + + " \"state\": \"up\",\n" + + " \"reason\": \"\"\n" + + " }},\n" + + " \"service\": {\n" + + " \"storage\": {\"node\": {\n" + + " \"1\": {\"link\": \"\\/cluster\\/v2\\/music\\/storage\\/1\"},\n" + + " \"2\": {\"link\": \"\\/cluster\\/v2\\/music\\/storage\\/2\"},\n" + + " \"3\": {\"link\": \"\\/cluster\\/v2\\/music\\/storage\\/3\"},\n" + + " \"5\": {\"link\": \"\\/cluster\\/v2\\/music\\/storage\\/5\"},\n" + + " \"7\": {\"link\": \"\\/cluster\\/v2\\/music\\/storage\\/7\"}\n" + + " }},\n" + + " \"distributor\": {\"node\": {\n" + + " \"1\": {\"link\": \"\\/cluster\\/v2\\/music\\/distributor\\/1\"},\n" + + " \"2\": {\"link\": \"\\/cluster\\/v2\\/music\\/distributor\\/2\"},\n" + + " \"3\": {\"link\": \"\\/cluster\\/v2\\/music\\/distributor\\/3\"},\n" + + " \"5\": {\"link\": \"\\/cluster\\/v2\\/music\\/distributor\\/5\"},\n" + + " \"7\": {\"link\": \"\\/cluster\\/v2\\/music\\/distributor\\/7\"}\n" + + " }}\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" + + "}"; assertEquals(expected, jsonWriter.createJson(response).toString(2)); } } |