diff options
Diffstat (limited to 'clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/NodeTest.java')
-rw-r--r-- | clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/NodeTest.java | 160 |
1 files changed, 80 insertions, 80 deletions
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/NodeTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/NodeTest.java index 38fab2f5c54..52c46215e50 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/NodeTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/NodeTest.java @@ -8,99 +8,99 @@ import com.yahoo.vdslib.state.State; import com.yahoo.vespa.clustercontroller.core.ContentCluster; 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 NodeTest extends StateRestApiTest { @Test - public void testDistributor() throws Exception { + void testDistributor() throws Exception { setUp(true); UnitResponse response = restAPI.getState(new StateRequest("music/distributor/1", 0)); String expected = "{\n" + - " \"attributes\": {\"hierarchical-group\": \"east.g2\"},\n" + - " \"state\": {\n" + - " \"generated\": {\n" + - " \"state\": \"up\",\n" + - " \"reason\": \"\"\n" + - " },\n" + - " \"unit\": {\n" + - " \"state\": \"up\",\n" + - " \"reason\": \"\"\n" + - " },\n" + - " \"user\": {\n" + - " \"state\": \"up\",\n" + - " \"reason\": \"\"\n" + - " }\n" + - " }\n" + - "}"; + " \"attributes\": {\"hierarchical-group\": \"east.g2\"},\n" + + " \"state\": {\n" + + " \"generated\": {\n" + + " \"state\": \"up\",\n" + + " \"reason\": \"\"\n" + + " },\n" + + " \"unit\": {\n" + + " \"state\": \"up\",\n" + + " \"reason\": \"\"\n" + + " },\n" + + " \"user\": {\n" + + " \"state\": \"up\",\n" + + " \"reason\": \"\"\n" + + " }\n" + + " }\n" + + "}"; assertEquals(expected, jsonWriter.createJson(response).toString(2)); } @Test - public void testStorage() throws Exception { + void testStorage() throws Exception { setUp(true); UnitResponse response = restAPI.getState(new StateRequest("music/storage/1", 0)); String expected = "{\n" + - " \"attributes\": {\"hierarchical-group\": \"east.g2\"},\n" + - " \"state\": {\n" + - " \"generated\": {\n" + - " \"state\": \"up\",\n" + - " \"reason\": \"\"\n" + - " },\n" + - " \"unit\": {\n" + - " \"state\": \"up\",\n" + - " \"reason\": \"\"\n" + - " },\n" + - " \"user\": {\n" + - " \"state\": \"up\",\n" + - " \"reason\": \"\"\n" + - " }\n" + - " },\n" + - " \"metrics\": {\n" + - " \"bucket-count\": 1,\n" + - " \"unique-document-count\": 2,\n" + - " \"unique-document-total-size\": 3\n" + - " }\n" + - "}"; + " \"attributes\": {\"hierarchical-group\": \"east.g2\"},\n" + + " \"state\": {\n" + + " \"generated\": {\n" + + " \"state\": \"up\",\n" + + " \"reason\": \"\"\n" + + " },\n" + + " \"unit\": {\n" + + " \"state\": \"up\",\n" + + " \"reason\": \"\"\n" + + " },\n" + + " \"user\": {\n" + + " \"state\": \"up\",\n" + + " \"reason\": \"\"\n" + + " }\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 testRecursiveNode() throws Exception { + void testRecursiveNode() throws Exception { setUp(true); UnitResponse response = restAPI.getState(new StateRequest("music/storage/1", 1)); String expected = "{\n" + - " \"attributes\": {\"hierarchical-group\": \"east.g2\"},\n" + - " \"state\": {\n" + - " \"generated\": {\n" + - " \"state\": \"up\",\n" + - " \"reason\": \"\"\n" + - " },\n" + - " \"unit\": {\n" + - " \"state\": \"up\",\n" + - " \"reason\": \"\"\n" + - " },\n" + - " \"user\": {\n" + - " \"state\": \"up\",\n" + - " \"reason\": \"\"\n" + - " }\n" + - " },\n" + - " \"metrics\": {\n" + - " \"bucket-count\": 1,\n" + - " \"unique-document-count\": 2,\n" + - " \"unique-document-total-size\": 3\n" + - " }\n" + - "}"; + " \"attributes\": {\"hierarchical-group\": \"east.g2\"},\n" + + " \"state\": {\n" + + " \"generated\": {\n" + + " \"state\": \"up\",\n" + + " \"reason\": \"\"\n" + + " },\n" + + " \"unit\": {\n" + + " \"state\": \"up\",\n" + + " \"reason\": \"\"\n" + + " },\n" + + " \"user\": {\n" + + " \"state\": \"up\",\n" + + " \"reason\": \"\"\n" + + " }\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 testNodeNotSeenInSlobrok() throws Exception { + void testNodeNotSeenInSlobrok() throws Exception { setUp(true); ContentCluster old = music.context.cluster; music.context.cluster = new ContentCluster(old.getName(), old.getConfiguredNodes().values(), old.getDistribution()); @@ -110,22 +110,22 @@ public class NodeTest extends StateRestApiTest { UnitResponse response = restAPI.getState(new StateRequest("music/storage/1", 0)); String expected = "{\n" + - " \"attributes\": {\"hierarchical-group\": \"east.g2\"},\n" + - " \"state\": {\n" + - " \"generated\": {\n" + - " \"state\": \"down\",\n" + - " \"reason\": \"Not seen\"\n" + - " },\n" + - " \"unit\": {\n" + - " \"state\": \"down\",\n" + - " \"reason\": \"Node not seen in slobrok.\"\n" + - " },\n" + - " \"user\": {\n" + - " \"state\": \"up\",\n" + - " \"reason\": \"\"\n" + - " }\n" + - " }\n" + - "}"; + " \"attributes\": {\"hierarchical-group\": \"east.g2\"},\n" + + " \"state\": {\n" + + " \"generated\": {\n" + + " \"state\": \"down\",\n" + + " \"reason\": \"Not seen\"\n" + + " },\n" + + " \"unit\": {\n" + + " \"state\": \"down\",\n" + + " \"reason\": \"Node not seen in slobrok.\"\n" + + " },\n" + + " \"user\": {\n" + + " \"state\": \"up\",\n" + + " \"reason\": \"\"\n" + + " }\n" + + " }\n" + + "}"; assertEquals(expected, jsonWriter.createJson(response).toString(2)); } } |