From a6a1c550731caaa2e46aab2112b81f318da229aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Tue, 17 Apr 2012 14:23:25 +0200 Subject: Client registers with protobuf service location. --- same/src/test/java/com/orbekk/same/ClientTest.java | 2 +- same/src/test/java/com/orbekk/same/FunctionalTest.java | 2 +- same/src/test/java/com/orbekk/same/MasterTest.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'same/src/test/java/com') diff --git a/same/src/test/java/com/orbekk/same/ClientTest.java b/same/src/test/java/com/orbekk/same/ClientTest.java index 97ccae0..1781ef3 100644 --- a/same/src/test/java/com/orbekk/same/ClientTest.java +++ b/same/src/test/java/com/orbekk/same/ClientTest.java @@ -18,7 +18,7 @@ public class ClientTest { private State state = new State("ClientNetwork"); private TestConnectionManager connections = new TestConnectionManager(); private Client client = new Client(state, connections, - "http://client/ClientService.json", null); + "http://client/ClientService.json", "clientLocation", null); private ClientService clientS = client.getService(); private MasterService mockMaster = mock(MasterService.class); diff --git a/same/src/test/java/com/orbekk/same/FunctionalTest.java b/same/src/test/java/com/orbekk/same/FunctionalTest.java index 3d2b3d8..73f0a37 100644 --- a/same/src/test/java/com/orbekk/same/FunctionalTest.java +++ b/same/src/test/java/com/orbekk/same/FunctionalTest.java @@ -48,7 +48,7 @@ public class FunctionalTest { Client newClient(String clientName, String clientUrl) { Client client = new Client(new State(clientName), connections, - clientUrl, broadcaster); + clientUrl, "clientLocation", broadcaster); connections.clientMap.put(clientUrl, client.getService()); clients.add(client); String paxosUrl = clientUrl.replace("ClientService", "PaxosService"); diff --git a/same/src/test/java/com/orbekk/same/MasterTest.java b/same/src/test/java/com/orbekk/same/MasterTest.java index 99a05d3..8830c10 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 { public void clientJoin() throws Exception { Client client = new Client( new State("ClientNetwork"), connections, - "http://client/ClientService.json", null); + "http://client/ClientService.json", "clientLocation", null); ClientService clientS = client.getService(); connections.clientMap.put("http://client/ClientService.json", clientS); client.joinNetwork(master.getMasterInfo()); @@ -73,12 +73,12 @@ public class MasterTest { public void updateStateRequest() throws Exception { Client client1 = new Client( new State("ClientNetwork"), connections, - "http://client/ClientService.json", null); + "http://client/ClientService.json", "clientLocation", null); ClientService client1S = client1.getService(); connections.clientMap.put("http://client/ClientService.json", client1S); Client client2 = new Client( new State("ClientNetwork"), connections, - "http://client2/ClientService.json", null); + "http://client2/ClientService.json", "clientLocation", null); ClientService client2S = client2.getService(); connections.clientMap.put("http://client2/ClientService.json", client2S); @@ -108,7 +108,7 @@ public class MasterTest { public void masterRemovesParticipant() throws Exception { Client client = new Client( new State("ClientNetwork"), connections, - "http://client/ClientService.json", null); + "http://client/ClientService.json", "clientLocation", null); ClientService clientS = client.getService(); connections.clientMap.put("http://client/ClientService.json", clientS); client.joinNetwork(master.getMasterInfo()); -- cgit v1.2.3