diff options
Diffstat (limited to 'same/src/test/java/com/orbekk')
-rw-r--r-- | same/src/test/java/com/orbekk/same/FunctionalTest.java | 9 | ||||
-rw-r--r-- | same/src/test/java/com/orbekk/same/MasterTest.java | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/same/src/test/java/com/orbekk/same/FunctionalTest.java b/same/src/test/java/com/orbekk/same/FunctionalTest.java index 839b107..c5d9a56 100644 --- a/same/src/test/java/com/orbekk/same/FunctionalTest.java +++ b/same/src/test/java/com/orbekk/same/FunctionalTest.java @@ -29,11 +29,10 @@ public class FunctionalTest { VariableFactory vf3; List<Client> clients = new ArrayList<Client>(); TestConnectionManager connections = new TestConnectionManager(); - TestBroadcaster broadcaster = new TestBroadcaster(); @Before public void setUp() { master = Master.create(connections, - broadcaster, masterUrl, "TestMaster", masterLocation); + masterUrl, "TestMaster", masterLocation); connections.masterMap0.put(masterLocation, master.getNewService()); client1 = newClient("TestClient1", "http://client1/ClientService.json", "client1"); @@ -113,7 +112,7 @@ public class FunctionalTest { String newMasterUrl = "http://newMaster/MasterService.json"; String newMasterLocation = "newMaster:1"; final Master newMaster = Master.create(connections, - broadcaster, newMasterUrl, "TestMaster", newMasterLocation); + newMasterUrl, "TestMaster", newMasterLocation); joinClients(); MasterController controller = new MasterController() { @Override @@ -137,7 +136,7 @@ public class FunctionalTest { String newMasterUrl = "http://newMaster/MasterService.json"; String newMasterLocation = "newMaster:1"; final Master newMaster = Master.create(connections, - broadcaster, newMasterUrl, "TestMaster", newMasterLocation); + newMasterUrl, "TestMaster", newMasterLocation); joinClients(); MasterController controller = new MasterController() { boolean firstMaster = true; @@ -165,7 +164,7 @@ public class FunctionalTest { String newMasterUrl = "http://newMaster/MasterService.json"; String newMasterLocation = "newMaster:2"; final Master newMaster = Master.create(connections, - broadcaster, newMasterUrl, "TestMaster", newMasterLocation); + newMasterUrl, "TestMaster", newMasterLocation); joinClients(); MasterController controller = new MasterController() { @Override diff --git a/same/src/test/java/com/orbekk/same/MasterTest.java b/same/src/test/java/com/orbekk/same/MasterTest.java index 4fa0a5f..50b3302 100644 --- a/same/src/test/java/com/orbekk/same/MasterTest.java +++ b/same/src/test/java/com/orbekk/same/MasterTest.java @@ -13,7 +13,6 @@ import org.junit.Test; public class MasterTest { private State state = new State("TestNetwork"); private TestConnectionManager connections = new TestConnectionManager(); - private TestBroadcaster broadcaster = new TestBroadcaster(); private Master master; @Before @@ -21,7 +20,7 @@ public class MasterTest { String masterLocation = "master:1000"; state.update(".masterUrl", "http://master/MasterService.json", 1); state.update(".masterLocation", masterLocation, 1); - master = new Master(state, connections, broadcaster, + master = new Master(state, connections, "http://master/MasterService.json", masterLocation); connections.masterMap0.put("master:1000", master.getNewService()); } |