summaryrefslogtreecommitdiff
path: root/same/src/test/java/com
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-03-12 21:01:43 +0100
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-03-12 21:01:43 +0100
commit882d749ca5a9934c8ae773d76778c1e8381e5595 (patch)
tree6f50c84290e1f613d299bbe12211b335f2f8927f /same/src/test/java/com
parent68145bc0805364fe3e01e4388de5bb70baa56fe0 (diff)
Fix failing functional test.
Diffstat (limited to 'same/src/test/java/com')
-rw-r--r--same/src/test/java/com/orbekk/same/FunctionalTest.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/same/src/test/java/com/orbekk/same/FunctionalTest.java b/same/src/test/java/com/orbekk/same/FunctionalTest.java
index dfb7d3b..63afafb 100644
--- a/same/src/test/java/com/orbekk/same/FunctionalTest.java
+++ b/same/src/test/java/com/orbekk/same/FunctionalTest.java
@@ -28,8 +28,8 @@ public class FunctionalTest {
TestBroadcaster broadcaster = new TestBroadcaster();
@Before public void setUp() {
- master = new Master(new State("TestMaster"), connections,
- broadcaster);
+ master = Master.create(connections,
+ broadcaster, masterUrl, "TestMaster");
connections.masterMap.put(masterUrl,
master.getService());
client1 = newClient("TestClient1", "http://client1/ClientService.json");
@@ -83,6 +83,7 @@ public class FunctionalTest {
}
for (Client c : clients) {
assertThat(c.getConnectionState(), is(ConnectionState.STABLE));
+ assertThat(c.masterUrl, is(masterUrl));
}
}
@@ -92,6 +93,7 @@ public class FunctionalTest {
Variable<String> x2 = vf2.createString("x");
x1.set("TestValue1");
performWork();
+ x1.update();
x2.update();
assertThat(x1.get(), is("TestValue1"));
assertThat(x2.get(), is("TestValue1"));