summaryrefslogtreecommitdiff
path: root/same/src/test/java/com/orbekk
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-04-24 13:38:20 +0200
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-04-24 13:38:20 +0200
commit8c0633f4d9055c6710b170e40bb006ed8fc3a0c0 (patch)
tree20a3e6673df64a4c42408079dd3c682e2bf4f211 /same/src/test/java/com/orbekk
parentae8791a096626b0196c63e4d9cb68f7a18ad86b0 (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')
-rw-r--r--same/src/test/java/com/orbekk/paxos/MasterProposerTest.java58
-rw-r--r--same/src/test/java/com/orbekk/paxos/PaxosServiceFunctionalTest.java16
-rw-r--r--same/src/test/java/com/orbekk/same/FunctionalTest.java4
3 files changed, 2 insertions, 76 deletions
diff --git a/same/src/test/java/com/orbekk/paxos/MasterProposerTest.java b/same/src/test/java/com/orbekk/paxos/MasterProposerTest.java
deleted file mode 100644
index e753d6e..0000000
--- a/same/src/test/java/com/orbekk/paxos/MasterProposerTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.orbekk.paxos;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.orbekk.same.Services.ClientState;
-import com.orbekk.same.TestConnectionManager;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
-public class MasterProposerTest {
- TestConnectionManager connections = new TestConnectionManager();
- ClientState client = ClientState.newBuilder()
- .setLocation("client1Location")
- .build();
- PaxosService p1 = mock(PaxosService.class);
- PaxosService p2 = mock(PaxosService.class);
- PaxosService p3 = mock(PaxosService.class);
- PaxosService p4 = mock(PaxosService.class);
- PaxosService p5 = mock(PaxosService.class);
-
- @Before public void setUp() {
- }
-
- List<String> paxosUrls() {
- List<String> urls = new ArrayList<String>();
- urls.addAll(connections.paxosMap.keySet());
- return urls;
- }
-
- @Test public void successfulProposal() throws Exception {
- connections.paxosMap.put("p1", p1);
- when(p1.propose("client1", 1)).thenReturn(1);
- when(p1.acceptRequest("client1", 1)).thenReturn(1);
-
- MasterProposer c1 = new MasterProposer(
- client,
- paxosUrls(),
- connections);
- assertTrue(c1.propose(1));
- }
-
- @Test public void unsucessfulProposal() throws Exception {
- connections.paxosMap.put("p1", p1);
- when(p1.propose("client1", 1)).thenReturn(-1);
- when(p1.acceptRequest("client1", 1)).thenReturn(-1);
-
- MasterProposer c1 = new MasterProposer(
- client,
- paxosUrls(),
- connections);
- assertFalse(c1.propose(1));
- }
-}
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);
diff --git a/same/src/test/java/com/orbekk/same/FunctionalTest.java b/same/src/test/java/com/orbekk/same/FunctionalTest.java
index c0b710e..b0df4dc 100644
--- a/same/src/test/java/com/orbekk/same/FunctionalTest.java
+++ b/same/src/test/java/com/orbekk/same/FunctionalTest.java
@@ -131,8 +131,8 @@ public class FunctionalTest {
client3.setMasterController(controller);
client1.startMasterElection();
newMaster.performWork();
- assertThat(client1.getMaster().getMasterUrl(), is(newMasterUrl));
- assertThat(client2.getMaster().getMasterUrl(), is(newMasterUrl));
+ assertThat(client1.getMaster().getMasterLocation(), is(newMasterLocation));
+ assertThat(client2.getMaster().getMasterLocation(), is(newMasterLocation));
}
@Test public void onlyOneNewMaster() {