From 72101219235a9e4858a0d585d8278581b67c11f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Tue, 10 Apr 2012 14:55:56 +0200
Subject: Add protobuf based Client service.

Use the new service internally in Client.
---
 same/src/test/java/com/orbekk/same/ClientTest.java | 10 +---------
 same/src/test/java/com/orbekk/same/MasterTest.java |  6 ------
 2 files changed, 1 insertion(+), 15 deletions(-)

(limited to 'same/src/test/java/com')

diff --git a/same/src/test/java/com/orbekk/same/ClientTest.java b/same/src/test/java/com/orbekk/same/ClientTest.java
index 6c617be..d494fe7 100644
--- a/same/src/test/java/com/orbekk/same/ClientTest.java
+++ b/same/src/test/java/com/orbekk/same/ClientTest.java
@@ -33,7 +33,7 @@ public class ClientTest {
     }
     
     @Test public void connectedUpdateWorks() throws Exception {
-        clientS.masterTakeover("master", null, 1);
+        clientS.masterTakeover("master", "MyNetwork", 1);
         ClientInterface clientI = client.getInterface();
         State.Component component = new State.Component(
                 "TestVariable", 1, "meow");
@@ -49,14 +49,6 @@ public class ClientTest {
         assertEquals("Test data", state.getDataOf("TestState"));
     }
     
-    @Test public void testNetworkListener() throws Exception {
-        NetworkNotificationListener listener =
-                mock(NetworkNotificationListener.class);
-        client.setNetworkListener(listener);
-        clientS.notifyNetwork("MyNetwork", "MasterUrl");
-        verify(listener).notifyNetwork("MyNetwork", "MasterUrl");
-    }
-    
     @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 f369d06..39bee1f 100644
--- a/same/src/test/java/com/orbekk/same/MasterTest.java
+++ b/same/src/test/java/com/orbekk/same/MasterTest.java
@@ -17,12 +17,6 @@ public class MasterTest {
     private MasterService masterS;
 
     public static class UnreachableClient implements ClientService {
-        @Override
-        public void notifyNetwork(String networkName, String masterUrl)
-                throws Exception {
-            throw new Exception("Unreachable client");
-        }
-
         @Override
         public void setState(String component, String data, long revision)
                 throws Exception {
-- 
cgit v1.2.3