Fix unit tests.

DMDirc · Jan 19, 2015 · eb1d322 · eb1d322
1 parent 399748c
commit eb1d322
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/channelwho/src/com/dmdirc/addons/channelwho/ConnectionHandler.java b/channelwho/src/com/dmdirc/addons/channelwho/ConnectionHandler.java
@@ -90,7 +90,8 @@ void checkWho() {
         connectionManager.getConnections().forEach(connection ->
                 connection.getGroupChatManager().getChannels().forEach(channel -> {
                     if (channel.getWindowModel().getConfigManager().getOptionBool(domain, "sendwho")) {
-                        channel.requestUsersInfo();}}));
+                        channel.requestUsersInfo();
+                    }}));
     }
 
     @VisibleForTesting

diff --git a/channelwho/test/com/dmdirc/addons/channelwho/ChannelWhoManagerTest.java b/channelwho/test/com/dmdirc/addons/channelwho/ChannelWhoManagerTest.java
@@ -56,7 +56,8 @@ public class ChannelWhoManagerTest {
     public void setUp() throws Exception {
         when(connectionManager.getConnections()).thenReturn(Lists.newArrayList(connection));
         when(connectionHandlerFactory.get(connection)).thenReturn(connectionHandler);
-        instance = new ChannelWhoManager(connectionHandlerFactory, connectionManager, eventBus);
+        instance = new ChannelWhoManager("domain", connectionHandlerFactory, connectionManager,
+                eventBus);
         instance.load();
     }
 

diff --git a/channelwho/test/com/dmdirc/addons/channelwho/ConnectionHandlerTest.java b/channelwho/test/com/dmdirc/addons/channelwho/ConnectionHandlerTest.java
@@ -81,8 +81,8 @@ public class ConnectionHandlerTest {
 
     @Before
     public void setUp() throws Exception {
-        when(scheduledExecutorService.schedule(any(Runnable.class), anyLong(), any()))
-                .thenReturn(scheduledFuture);
+        when(scheduledExecutorService.scheduleAtFixedRate(any(Runnable.class), anyLong(), anyLong(),
+                any())).thenReturn(scheduledFuture);
         when(windowModel.getEventBus()).thenReturn(eventBus);
         when(connection.getWindowModel()).thenReturn(windowModel);
         when(config.getBinder()).thenReturn(configBinder);
@@ -107,7 +107,7 @@ public void testLoad() throws Exception {
         instance.load();
         verify(configBinder).bind(instance, ConnectionHandler.class);
         verify(eventBus).subscribe(instance);
-        verify(scheduledExecutorService).schedule(any(Runnable.class), eq(5l),
+        verify(scheduledExecutorService).scheduleAtFixedRate(any(Runnable.class), eq(5l), eq(5l),
                 eq(TimeUnit.MILLISECONDS));
     }
 
@@ -122,26 +122,26 @@ public void testUnload() throws Exception {
     @Test
     public void testHandleWhoInterval() throws Exception {
         instance.handleWhoInterval(10);
-        verify(scheduledFuture).cancel(true);
-        verify(scheduledExecutorService).schedule(any(Runnable.class), eq(5l),
+        verify(scheduledFuture).cancel(false);
+        verify(scheduledExecutorService).scheduleAtFixedRate(any(Runnable.class), eq(5l), eq(5l),
                 eq(TimeUnit.MILLISECONDS));
-        verify(scheduledExecutorService).schedule(any(Runnable.class), eq(10l),
+        verify(scheduledExecutorService).scheduleAtFixedRate(any(Runnable.class), eq(10l), eq(10l),
                 eq(TimeUnit.MILLISECONDS));
     }
 
     @Test
     public void testCheckWho_True() throws Exception {
-        when(config.getOptionBool("domain", "sendWho")).thenReturn(true);
+        when(config.getOptionBool("domain", "sendwho")).thenReturn(true);
         instance.checkWho();
-        verify(config).getOptionBool("domain", "sendWho");
+        verify(config).getOptionBool("domain", "sendwho");
         verify(groupChat).requestUsersInfo();
     }
 
     @Test
     public void testCheckWho_False() throws Exception {
-        when(config.getOptionBool("domain", "sendWho")).thenReturn(false);
+        when(config.getOptionBool("domain", "sendwho")).thenReturn(false);
         instance.checkWho();
-        verify(config).getOptionBool("domain", "sendWho");
+        verify(config).getOptionBool("domain", "sendwho");
         verify(groupChat, never()).requestUsersInfo();
     }