summaryrefslogtreecommitdiff
path: root/same/src/test/java/com/orbekk/same/FunctionalTest.java
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-04-11 16:50:51 +0200
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-04-11 16:50:51 +0200
commit3f007673deb7b4c4a59f9d5ba501aa379db1dfc1 (patch)
treeb73a1791e2a574bc086441812358e8acb24d5fc1 /same/src/test/java/com/orbekk/same/FunctionalTest.java
parent8cef018aab54ac3f31643a26a75f974c454893ba (diff)
Client → Master communication now only protobuf-rpc.
Diffstat (limited to 'same/src/test/java/com/orbekk/same/FunctionalTest.java')
-rw-r--r--same/src/test/java/com/orbekk/same/FunctionalTest.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/same/src/test/java/com/orbekk/same/FunctionalTest.java b/same/src/test/java/com/orbekk/same/FunctionalTest.java
index 91322fa..3d2b3d8 100644
--- a/same/src/test/java/com/orbekk/same/FunctionalTest.java
+++ b/same/src/test/java/com/orbekk/same/FunctionalTest.java
@@ -93,6 +93,7 @@ public class FunctionalTest {
for (Client c : clients) {
assertThat(c.getConnectionState(), is(ConnectionState.STABLE));
assertThat(c.masterUrl, is(masterUrl));
+ assertThat(c.masterLocation, is(masterLocation));
}
}
@@ -184,6 +185,7 @@ public class FunctionalTest {
client3.setMasterController(controller);
Variable<String> x1 = vf1.createString("TestMasterFailure");
masterServiceProxy.setService(null);
+ connections.masterMap0.put(masterLocation, null);
assertThat(x1.set("Woop, woop").getStatus().getStatusCode(),
is(DelayedOperation.Status.ERROR));
performWork();