From 6299172d3b9ba0b98b77583c0c3c5fc90d1b7db5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Tue, 20 Mar 2012 12:28:50 +0100 Subject: Master has to advertise its ID when taking over. --- same/src/test/java/com/orbekk/same/FunctionalTest.java | 4 ++-- same/src/test/java/com/orbekk/same/MasterTest.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'same/src/test') diff --git a/same/src/test/java/com/orbekk/same/FunctionalTest.java b/same/src/test/java/com/orbekk/same/FunctionalTest.java index fb8bd10..0da38a6 100644 --- a/same/src/test/java/com/orbekk/same/FunctionalTest.java +++ b/same/src/test/java/com/orbekk/same/FunctionalTest.java @@ -112,8 +112,8 @@ public class FunctionalTest { joinClients(); MasterController controller = new MasterController() { @Override - public void enableMaster(State lastKnownState) { - newMaster.resumeFrom(lastKnownState); + public void enableMaster(State lastKnownState, int masterId) { + newMaster.resumeFrom(lastKnownState, masterId); } @Override public void disableMaster() { diff --git a/same/src/test/java/com/orbekk/same/MasterTest.java b/same/src/test/java/com/orbekk/same/MasterTest.java index 927b504..e2cbadd 100644 --- a/same/src/test/java/com/orbekk/same/MasterTest.java +++ b/same/src/test/java/com/orbekk/same/MasterTest.java @@ -37,10 +37,12 @@ public class MasterTest { @Override public void masterTakeover(String masterUrl, String networkName, int masterId) throws Exception { + throw new Exception("Unreachable client"); } @Override - public void masterDown() throws Exception { + public void masterDown(int masterId) throws Exception { + throw new Exception("Unreachable client"); } } -- cgit v1.2.3