Use new RPC in Client.joinNetwork().

2 files changed, 4 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 12898ad..91322fa 100644
--- a/same/src/test/java/com/orbekk/same/FunctionalTest.java
+++ b/same/src/test/java/com/orbekk/same/FunctionalTest.java
@@ -36,8 +36,8 @@ public class FunctionalTest {
         master = Master.create(connections,
                 broadcaster, masterUrl, "TestMaster", masterLocation);
         masterServiceProxy = new MasterServiceProxy(master.getService());
-        connections.masterMap.put(masterUrl,
-                masterServiceProxy);
+        connections.masterMap.put(masterUrl, masterServiceProxy);
+        connections.masterMap0.put(masterLocation, master.getNewService());
         client1 = newClient("TestClient1", "http://client1/ClientService.json");
         vf1 = new VariableFactory(client1.getInterface());
         client2 = newClient("TestClient2", "http://client2/ClientService.json");
diff --git a/same/src/test/java/com/orbekk/same/MasterTest.java b/same/src/test/java/com/orbekk/same/MasterTest.java
index b0bd666..914daaa 100644
--- a/same/src/test/java/com/orbekk/same/MasterTest.java
+++ b/same/src/test/java/com/orbekk/same/MasterTest.java
@@ -44,6 +44,7 @@ public class MasterTest {
         masterS = master.getService();
         connections.masterMap.put("http://master/MasterService.json",
                 masterS);
+        connections.masterMap0.put("master:1000", master.getNewService());
     }
 
     @Test
@@ -54,7 +55,7 @@ public class MasterTest {
     }
 
     @Test
-    public void clientJoin() {
+    public void clientJoin() throws Exception {
         Client client = new Client(
                 new State("ClientNetwork"), connections,
                 "http://client/ClientService.json", null);