summaryrefslogtreecommitdiff
path: root/same/src/test/java/com/orbekk
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-03-20 15:54:17 +0100
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-03-20 15:54:17 +0100
commit810c7c1587b5c44c150eb4ba893874555802fc6b (patch)
tree8b34c6ca117d489241b66def1a394f26dcea2a14 /same/src/test/java/com/orbekk
parenta16f9ef4b751900a412da4c72c9245f716dc29a6 (diff)
Remove discovery code.
Use centralized discovery instead.
Diffstat (limited to 'same/src/test/java/com/orbekk')
-rw-r--r--same/src/test/java/com/orbekk/same/ClientTest.java9
-rw-r--r--same/src/test/java/com/orbekk/same/MasterTest.java5
2 files changed, 0 insertions, 14 deletions
diff --git a/same/src/test/java/com/orbekk/same/ClientTest.java b/same/src/test/java/com/orbekk/same/ClientTest.java
index a94c039..0e2a278 100644
--- a/same/src/test/java/com/orbekk/same/ClientTest.java
+++ b/same/src/test/java/com/orbekk/same/ClientTest.java
@@ -57,15 +57,6 @@ public class ClientTest {
verify(listener).notifyNetwork("MyNetwork", "MasterUrl");
}
- @Test public void discover() throws Exception {
- clientS.setState(".masterUrl", "master", 1);
- ClientService mockClient = mock(ClientService.class);
- connections.clientMap.put("mockClient/ClientService.json",
- mockClient);
- client.discover("mockClient/ClientService.json");
- verify(mockClient).notifyNetwork("ClientNetwork", "master");
- }
-
@Test public void stateListenerReceivesUpdate() throws Exception {
StateChangedListener listener = mock(StateChangedListener.class);
client.getInterface().addStateListener(listener);
diff --git a/same/src/test/java/com/orbekk/same/MasterTest.java b/same/src/test/java/com/orbekk/same/MasterTest.java
index e2cbadd..f369d06 100644
--- a/same/src/test/java/com/orbekk/same/MasterTest.java
+++ b/same/src/test/java/com/orbekk/same/MasterTest.java
@@ -30,11 +30,6 @@ public class MasterTest {
}
@Override
- public void discoveryRequest(String remoteUrl) throws Exception {
- throw new Exception("Unreachable client");
- }
-
- @Override
public void masterTakeover(String masterUrl, String networkName, int masterId)
throws Exception {
throw new Exception("Unreachable client");