summaryrefslogtreecommitdiff
path: root/same/src/test/java/com/orbekk/same/FunctionalTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'same/src/test/java/com/orbekk/same/FunctionalTest.java')
-rw-r--r--same/src/test/java/com/orbekk/same/FunctionalTest.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/same/src/test/java/com/orbekk/same/FunctionalTest.java b/same/src/test/java/com/orbekk/same/FunctionalTest.java
index c5d9a56..275eaac 100644
--- a/same/src/test/java/com/orbekk/same/FunctionalTest.java
+++ b/same/src/test/java/com/orbekk/same/FunctionalTest.java
@@ -29,10 +29,11 @@ public class FunctionalTest {
VariableFactory vf3;
List<Client> clients = new ArrayList<Client>();
TestConnectionManager connections = new TestConnectionManager();
+ RpcFactory rpcf = new RpcFactory(5000);
@Before public void setUp() {
master = Master.create(connections,
- masterUrl, "TestMaster", masterLocation);
+ masterUrl, "TestMaster", masterLocation, rpcf);
connections.masterMap0.put(masterLocation, master.getNewService());
client1 = newClient("TestClient1", "http://client1/ClientService.json",
"client1");
@@ -47,7 +48,7 @@ public class FunctionalTest {
Client newClient(String clientName, String clientUrl, String location) {
Client client = new Client(new State(clientName), connections,
- clientUrl, location);
+ clientUrl, location, rpcf);
connections.clientMap0.put(location, client.getNewService());
clients.add(client);
String paxosUrl = clientUrl.replace("ClientService", "PaxosService");
@@ -112,7 +113,7 @@ public class FunctionalTest {
String newMasterUrl = "http://newMaster/MasterService.json";
String newMasterLocation = "newMaster:1";
final Master newMaster = Master.create(connections,
- newMasterUrl, "TestMaster", newMasterLocation);
+ newMasterUrl, "TestMaster", newMasterLocation, rpcf);
joinClients();
MasterController controller = new MasterController() {
@Override
@@ -136,7 +137,7 @@ public class FunctionalTest {
String newMasterUrl = "http://newMaster/MasterService.json";
String newMasterLocation = "newMaster:1";
final Master newMaster = Master.create(connections,
- newMasterUrl, "TestMaster", newMasterLocation);
+ newMasterUrl, "TestMaster", newMasterLocation, rpcf);
joinClients();
MasterController controller = new MasterController() {
boolean firstMaster = true;
@@ -164,7 +165,7 @@ public class FunctionalTest {
String newMasterUrl = "http://newMaster/MasterService.json";
String newMasterLocation = "newMaster:2";
final Master newMaster = Master.create(connections,
- newMasterUrl, "TestMaster", newMasterLocation);
+ newMasterUrl, "TestMaster", newMasterLocation, rpcf);
joinClients();
MasterController controller = new MasterController() {
@Override