From 67e3b2d5a0092d41df629e950a38a80743717d81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Tue, 17 Apr 2012 17:05:32 +0200 Subject: =?UTF-8?q?Master=E2=86=92Client=20communication=20uses=20protobuf?= =?UTF-8?q?=20services.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit – This change causes inconsistency in the .participants list and as a result some Paxos related tests run infinitely. --- same/src/test/java/com/orbekk/same/FunctionalTest.java | 7 ------- 1 file changed, 7 deletions(-) (limited to 'same/src/test/java/com/orbekk/same/FunctionalTest.java') diff --git a/same/src/test/java/com/orbekk/same/FunctionalTest.java b/same/src/test/java/com/orbekk/same/FunctionalTest.java index 0a20fc1..79bd9b8 100644 --- a/same/src/test/java/com/orbekk/same/FunctionalTest.java +++ b/same/src/test/java/com/orbekk/same/FunctionalTest.java @@ -30,13 +30,10 @@ public class FunctionalTest { List clients = new ArrayList(); TestConnectionManager connections = new TestConnectionManager(); TestBroadcaster broadcaster = new TestBroadcaster(); - MasterServiceProxy masterServiceProxy; @Before public void setUp() { master = Master.create(connections, broadcaster, masterUrl, "TestMaster", masterLocation); - masterServiceProxy = new MasterServiceProxy(master.getService()); - connections.masterMap.put(masterUrl, masterServiceProxy); connections.masterMap0.put(masterLocation, master.getNewService()); client1 = newClient("TestClient1", "http://client1/ClientService.json", "client1"); @@ -118,7 +115,6 @@ public class FunctionalTest { String newMasterLocation = "newMaster:1"; final Master newMaster = Master.create(connections, broadcaster, newMasterUrl, "TestMaster", newMasterLocation); - connections.masterMap.put(newMasterUrl, newMaster.getService()); joinClients(); MasterController controller = new MasterController() { @Override @@ -143,7 +139,6 @@ public class FunctionalTest { String newMasterLocation = "newMaster:1"; final Master newMaster = Master.create(connections, broadcaster, newMasterUrl, "TestMaster", newMasterLocation); - connections.masterMap.put(newMasterUrl, newMaster.getService()); joinClients(); MasterController controller = new MasterController() { boolean firstMaster = true; @@ -172,7 +167,6 @@ public class FunctionalTest { String newMasterLocation = "newMaster:2"; final Master newMaster = Master.create(connections, broadcaster, newMasterUrl, "TestMaster", newMasterLocation); - connections.masterMap.put(newMasterUrl, newMaster.getService()); joinClients(); MasterController controller = new MasterController() { @Override @@ -188,7 +182,6 @@ public class FunctionalTest { client2.setMasterController(controller); client3.setMasterController(controller); Variable x1 = vf1.createString("TestMasterFailure"); - masterServiceProxy.setService(null); connections.masterMap0.put(masterLocation, null); assertThat(x1.set("Woop, woop").getStatus().getStatusCode(), is(DelayedOperation.Status.ERROR)); -- cgit v1.2.3