summaryrefslogtreecommitdiff
path: root/same/src/test/java/com
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-03-20 12:28:50 +0100
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-03-20 12:28:55 +0100
commit6299172d3b9ba0b98b77583c0c3c5fc90d1b7db5 (patch)
tree9cb382dd5b2cdcd4e3508a9caf9d0fbb21a17e75 /same/src/test/java/com
parent9b4a756388aef165b892ae478cf1b0cbf1d7130b (diff)
Master has to advertise its ID when taking over.
Diffstat (limited to 'same/src/test/java/com')
-rw-r--r--same/src/test/java/com/orbekk/same/FunctionalTest.java4
-rw-r--r--same/src/test/java/com/orbekk/same/MasterTest.java4
2 files changed, 5 insertions, 3 deletions
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");
}
}