diff options
Diffstat (limited to 'clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/NotMasterTest.java')
-rw-r--r-- | clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/NotMasterTest.java | 72 |
1 files changed, 35 insertions, 37 deletions
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/NotMasterTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/NotMasterTest.java index d85cf95defc..15aeded2d37 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/NotMasterTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/NotMasterTest.java @@ -5,19 +5,17 @@ import com.yahoo.vespa.clustercontroller.utils.staterestapi.errors.OtherMasterEx import com.yahoo.vespa.clustercontroller.utils.staterestapi.errors.UnknownMasterException; import com.yahoo.vespa.clustercontroller.utils.staterestapi.response.UnitResponse; import static com.yahoo.vespa.defaults.Defaults.getDefaults; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.*; public class NotMasterTest extends StateRestApiTest { @Test - public void testUnknownMaster() throws Exception { + void testUnknownMaster() throws Exception { setUp(true); music.fleetControllerMaster = null; - // Non-recursive cluster list works, as it doesn't touches into fleetcontrollers + // Non-recursive cluster list works, as it doesn't touches into fleetcontrollers { UnitResponse response = restAPI.getState(new StateRequest("", 0)); String expected = @@ -27,49 +25,49 @@ public class NotMasterTest extends StateRestApiTest { "}}"; assertEquals(expected, jsonWriter.createJson(response).toString(2)); } - // Recursive cluster list does not work - try{ + // Recursive cluster list does not work + try { restAPI.getState(new StateRequest("", 1)); fail(); } catch (UnknownMasterException e) { - assertTrue(e.getMessage(), e.getMessage().contains("No known master cluster controller")); + assertTrue(e.getMessage().contains("No known master cluster controller"), e.getMessage()); } - // Other requests does not work either - try{ + // Other requests does not work either + try { restAPI.getState(new StateRequest("music", 0)); fail(); } catch (UnknownMasterException e) { - assertTrue(e.getMessage(), e.getMessage().contains("No known master cluster controller")); + assertTrue(e.getMessage().contains("No known master cluster controller"), e.getMessage()); } - try{ + try { restAPI.getState(new StateRequest("music/storage", 0)); fail(); } catch (UnknownMasterException e) { - assertTrue(e.getMessage(), e.getMessage().contains("No known master cluster controller")); + assertTrue(e.getMessage().contains("No known master cluster controller"), e.getMessage()); } - try{ + try { restAPI.getState(new StateRequest("music/storage/1", 0)); fail(); } catch (UnknownMasterException e) { - assertTrue(e.getMessage(), e.getMessage().contains("No known master cluster controller")); + assertTrue(e.getMessage().contains("No known master cluster controller"), e.getMessage()); } - try{ + try { restAPI.getState(new StateRequest("music/storage/1/0", 0)); fail(); } catch (UnknownMasterException e) { - assertTrue(e.getMessage(), e.getMessage().contains("No known master cluster controller")); + assertTrue(e.getMessage().contains("No known master cluster controller"), e.getMessage()); } - try{ + try { restAPI.setUnitState(new SetNodeStateTest.SetUnitStateRequestImpl("music/storage/1") - .setNewState("user", "down", "test")); + .setNewState("user", "down", "test")); fail(); } catch (UnknownMasterException e) { - assertTrue(e.getMessage(), e.getMessage().contains("No known master cluster controller")); + assertTrue(e.getMessage().contains("No known master cluster controller"), e.getMessage()); } } @Test - public void testKnownOtherMaster() throws Exception { + void testKnownOtherMaster() throws Exception { setUp(true); ccSockets.put(1, new ClusterControllerStateRestAPI.Socket("otherhost", getDefaults().vespaWebServicePort())); music.fleetControllerMaster = 1; @@ -78,59 +76,59 @@ public class NotMasterTest extends StateRestApiTest { 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)); } // Recursive cluster list does not work - try{ + try { restAPI.getState(new StateRequest("", 1)); fail(); } catch (OtherMasterException e) { - assertTrue(e.getMessage(), e.getMessage().contains("Cluster controller not master. Use master at otherhost:" + getDefaults().vespaWebServicePort() + ".")); + assertTrue(e.getMessage().contains("Cluster controller not master. Use master at otherhost:" + getDefaults().vespaWebServicePort() + "."), e.getMessage()); assertEquals("otherhost", e.getHost()); assertEquals(e.getPort(), getDefaults().vespaWebServicePort()); } // Other requests does not work either - try{ + try { restAPI.getState(new StateRequest("music", 0)); fail(); } catch (OtherMasterException e) { - assertTrue(e.getMessage(), e.getMessage().contains("Cluster controller not master. Use master at otherhost:" + getDefaults().vespaWebServicePort() + ".")); + assertTrue(e.getMessage().contains("Cluster controller not master. Use master at otherhost:" + getDefaults().vespaWebServicePort() + "."), e.getMessage()); assertEquals("otherhost", e.getHost()); assertEquals(e.getPort(), getDefaults().vespaWebServicePort()); } - try{ + try { restAPI.getState(new StateRequest("music/storage", 0)); fail(); } catch (OtherMasterException e) { - assertTrue(e.getMessage(), e.getMessage().contains("Cluster controller not master. Use master at otherhost:" + getDefaults().vespaWebServicePort() + ".")); + assertTrue(e.getMessage().contains("Cluster controller not master. Use master at otherhost:" + getDefaults().vespaWebServicePort() + "."), e.getMessage()); assertEquals("otherhost", e.getHost()); assertEquals(e.getPort(), getDefaults().vespaWebServicePort()); } - try{ + try { restAPI.getState(new StateRequest("music/storage/1", 0)); fail(); } catch (OtherMasterException e) { - assertTrue(e.getMessage(), e.getMessage().contains("Cluster controller not master. Use master at otherhost:" + getDefaults().vespaWebServicePort() + ".")); + assertTrue(e.getMessage().contains("Cluster controller not master. Use master at otherhost:" + getDefaults().vespaWebServicePort() + "."), e.getMessage()); assertEquals("otherhost", e.getHost()); assertEquals(e.getPort(), getDefaults().vespaWebServicePort()); } - try{ + try { restAPI.getState(new StateRequest("music/storage/1/0", 0)); fail(); } catch (OtherMasterException e) { - assertTrue(e.getMessage(), e.getMessage().contains("Cluster controller not master. Use master at otherhost:" + getDefaults().vespaWebServicePort() + ".")); + assertTrue(e.getMessage().contains("Cluster controller not master. Use master at otherhost:" + getDefaults().vespaWebServicePort() + "."), e.getMessage()); assertEquals("otherhost", e.getHost()); assertEquals(e.getPort(), getDefaults().vespaWebServicePort()); } - try{ + try { restAPI.setUnitState(new SetNodeStateTest.SetUnitStateRequestImpl("music/storage/1") .setNewState("user", "down", "test")); fail(); } catch (OtherMasterException e) { - assertTrue(e.getMessage(), e.getMessage().contains("Cluster controller not master. Use master at otherhost:" + getDefaults().vespaWebServicePort() + ".")); + assertTrue(e.getMessage().contains("Cluster controller not master. Use master at otherhost:" + getDefaults().vespaWebServicePort() + "."), e.getMessage()); assertEquals("otherhost", e.getHost()); assertEquals(e.getPort(), getDefaults().vespaWebServicePort()); } |