diff options
author | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-04-24 13:38:20 +0200 |
---|---|---|
committer | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-04-24 13:38:20 +0200 |
commit | 8c0633f4d9055c6710b170e40bb006ed8fc3a0c0 (patch) | |
tree | 20a3e6673df64a4c42408079dd3c682e2bf4f211 /same/src/test/java/com/orbekk/paxos/PaxosServiceFunctionalTest.java | |
parent | ae8791a096626b0196c63e4d9cb68f7a18ad86b0 (diff) |
Fix master takeover code.
– Use the new services to send a MasterTakeover().
– Remove some old broadcast code.
– Remove MasterProposerTest because this functionality is well enough
covered by the functional test.
– Remove HTTP services from PaxosServiceFunctionalTest.
– Fix master takeover test.
Diffstat (limited to 'same/src/test/java/com/orbekk/paxos/PaxosServiceFunctionalTest.java')
-rw-r--r-- | same/src/test/java/com/orbekk/paxos/PaxosServiceFunctionalTest.java | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/same/src/test/java/com/orbekk/paxos/PaxosServiceFunctionalTest.java b/same/src/test/java/com/orbekk/paxos/PaxosServiceFunctionalTest.java index 6ceb423..98631b0 100644 --- a/same/src/test/java/com/orbekk/paxos/PaxosServiceFunctionalTest.java +++ b/same/src/test/java/com/orbekk/paxos/PaxosServiceFunctionalTest.java @@ -13,13 +13,9 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.googlecode.jsonrpc4j.JsonRpcServer; import com.orbekk.protobuf.SimpleProtobufServer; import com.orbekk.same.ConnectionManagerImpl; import com.orbekk.same.Services.ClientState; -import com.orbekk.same.http.JettyServerBuilder; -import com.orbekk.same.http.JettyServerContainer; -import com.orbekk.same.http.RpcServlet; public class PaxosServiceFunctionalTest { ConnectionManagerImpl connections = new ConnectionManagerImpl(500, 500); @@ -65,18 +61,6 @@ public class PaxosServiceFunctionalTest { paxosUrls.add(location); } - public List<String> setupPaxos(JettyServerBuilder builder, int instances) { - List<String> tempUrls = new ArrayList<String>(); - for (int i = 1; i <= instances; i++) { - JsonRpcServer jsonServer = new JsonRpcServer( - new PaxosServiceImpl("P" + i + ": "), PaxosService.class); - String serviceId = "/PaxosService" + i + ".json"; - builder.withServlet(new RpcServlet(jsonServer), serviceId); - tempUrls.add(serviceId); - } - return tempUrls; - } - public void addUrls(List<String> services) { for (String url : services) { paxosUrls.add(myUrl + url); |