diff options
| author | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-04-11 15:46:27 +0200 |
|---|---|---|
| committer | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-04-11 15:46:27 +0200 |
| commit | 04d448aade12127b1d8c9d4f26963833102698f8 (patch) | |
| tree | b4120784e328197aa5d724f6e6ca0d4d3b676c7d /same/src/test/java | |
| parent | a21280cc77c163ec7bd7bc1fc4b451a1fc01a1d8 (diff) | |
Change Client.joinNetwork.
Take MasterState instead of a simple URL.
Diffstat (limited to 'same/src/test/java')
| -rw-r--r-- | same/src/test/java/com/orbekk/same/FunctionalTest.java | 2 | ||||
| -rw-r--r-- | same/src/test/java/com/orbekk/same/MasterTest.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/same/src/test/java/com/orbekk/same/FunctionalTest.java b/same/src/test/java/com/orbekk/same/FunctionalTest.java index fc71803..12898ad 100644 --- a/same/src/test/java/com/orbekk/same/FunctionalTest.java +++ b/same/src/test/java/com/orbekk/same/FunctionalTest.java @@ -68,7 +68,7 @@ public class FunctionalTest { void joinClients() { for (Client c : clients) { - c.joinNetwork(masterUrl); + c.joinNetwork(master.getMasterInfo()); } performWork(); } diff --git a/same/src/test/java/com/orbekk/same/MasterTest.java b/same/src/test/java/com/orbekk/same/MasterTest.java index 423f292..b0bd666 100644 --- a/same/src/test/java/com/orbekk/same/MasterTest.java +++ b/same/src/test/java/com/orbekk/same/MasterTest.java @@ -60,7 +60,7 @@ public class MasterTest { "http://client/ClientService.json", null); ClientService clientS = client.getService(); connections.clientMap.put("http://client/ClientService.json", clientS); - client.joinNetwork("http://master/MasterService.json"); + client.joinNetwork(master.getMasterInfo()); master.performWork(); assertTrue(state.getList(".participants").contains("http://client/ClientService.json")); assertEquals(state, client.testGetState()); @@ -79,8 +79,8 @@ public class MasterTest { ClientService client2S = client2.getService(); connections.clientMap.put("http://client2/ClientService.json", client2S); - client1.joinNetwork("http://master/MasterService.json"); - client2.joinNetwork("http://master/MasterService.json"); + client1.joinNetwork(master.getMasterInfo()); + client2.joinNetwork(master.getMasterInfo()); master.performWork(); assertTrue(state.getList(".participants").contains("http://client/ClientService.json")); @@ -108,7 +108,7 @@ public class MasterTest { "http://client/ClientService.json", null); ClientService clientS = client.getService(); connections.clientMap.put("http://client/ClientService.json", clientS); - client.joinNetwork("http://master/MasterService.json"); + client.joinNetwork(master.getMasterInfo()); master.performWork(); assertTrue(state.getList(".participants").contains("http://client/ClientService.json")); |