diff options
author | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-04-24 16:27:33 +0200 |
---|---|---|
committer | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-04-24 16:28:54 +0200 |
commit | b9469eb43b5647605ad7b9662f584c2efbef5153 (patch) | |
tree | 5a14e1213b8aa8956c639f4687c8d662aaad9773 /same/src/test/java/com/orbekk/same/ClientTest.java | |
parent | b78972404f4b0a5dbccb6849021c2ca2d5e8bb46 (diff) |
Remove unused code.
– Remove old HTTP code.
– Remove Jetty, Jsonrpc and servlet dependencies.
– Remove state viewer servlet.
– Remove unmaintained tests (rely on functional tests instead).
Diffstat (limited to 'same/src/test/java/com/orbekk/same/ClientTest.java')
-rw-r--r-- | same/src/test/java/com/orbekk/same/ClientTest.java | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/same/src/test/java/com/orbekk/same/ClientTest.java b/same/src/test/java/com/orbekk/same/ClientTest.java deleted file mode 100644 index 4dbc408..0000000 --- a/same/src/test/java/com/orbekk/same/ClientTest.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.orbekk.same; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -import com.orbekk.util.DelayedOperation; - -public class ClientTest { - private State state = new State("ClientNetwork"); - private TestConnectionManager connections = new TestConnectionManager(); - private Client client = new Client(state, connections, - "http://client/ClientService.json", "clientLocation"); - private ClientService clientS = client.getService(); - private MasterService mockMaster = mock(MasterService.class); - - @Before public void setUp() { - connections.masterMap.put("master", mockMaster); - } - - @Test public void disconnectedFailsUpdate() throws Exception { - ClientInterface clientI = client.getInterface(); - DelayedOperation op = clientI.set(null); - assertTrue(op.isDone()); - assertFalse(op.getStatus().isOk()); - } - - // TODO: Fix this test with protobuf rpc. - @Ignore - @Test public void connectedUpdateWorks() throws Exception { - clientS.masterTakeover("master", "MyNetwork", 1, "master"); - ClientInterface clientI = client.getInterface(); - State.Component component = new State.Component( - "TestVariable", 1, "meow"); - when(mockMaster.updateStateRequest("TestVariable", "meow", 1)) - .thenReturn(true); - DelayedOperation op = clientI.set(component); - assertTrue(op.getStatus().isOk()); - } - - @Test public void testSetState() throws Exception { - clientS.setState("TestState", "Test data", 100); - assertEquals(100, state.getRevision("TestState")); - assertEquals("Test data", state.getDataOf("TestState")); - } - - @Test public void stateListenerReceivesUpdate() throws Exception { - StateChangedListener listener = mock(StateChangedListener.class); - client.getInterface().addStateListener(listener); - clientS.setState("StateListenerVariable", "100", 1); - State.Component component = state.getComponent("StateListenerVariable"); - assertEquals("100", component.getData()); - verify(listener).stateChanged(eq(component)); - } -} |