Merge pull request #61 from greboid/dev

Expose getChannelClients in ClientInfo.

common/src/com/dmdirc/parser/interfaces/ClientInfo.java

@@ -24,6 +24,7 @@ package com.dmdirc.parser.interfaces;
 
 import com.dmdirc.parser.common.AwayState;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -76,6 +77,13 @@ public interface ClientInfo {
      */
     int getChannelCount();
 
+    /**
+     * Get a list of channelClients that point to this object.
+     *
+     * @return int with the count of known channels
+     */
+    public List<ChannelClientInfo> getChannelClients();
+
     /**
      * Get the away state of a user.
      *

irc/src/com/dmdirc/parser/irc/IRCClientInfo.java

@@ -23,6 +23,7 @@
 package com.dmdirc.parser.irc;
 
 import com.dmdirc.parser.common.AwayState;
+import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.LocalClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 
@@ -372,12 +373,8 @@ public class IRCClientInfo implements LocalClientInfo {
         return clients.size();
     }
 
-    /**
-     * Get a list of channelClients that point to this object.
-     *
-     * @return int with the count of known channels
-     */
-    public List<IRCChannelClientInfo> getChannelClients() {
+    @Override
+    public List<ChannelClientInfo> getChannelClients() {
         return new ArrayList<>(clients.values());
     }
 

irc/test/com/dmdirc/parser/irc/ChannelClientInfoTest.java

@@ -23,11 +23,15 @@
 package com.dmdirc.parser.irc;
 
 import com.dmdirc.harness.parser.TestParser;
+import com.dmdirc.parser.interfaces.ChannelClientInfo;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import org.junit.Test;
-import static org.junit.Assert.*;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
 
 public class ChannelClientInfoTest {
         
@@ -40,7 +44,8 @@ public class ChannelClientInfoTest {
         parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser");
         parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
 
-        final IRCChannelClientInfo cci = parser.getClient("luser").getChannelClients().get(0);
+        final IRCChannelClientInfo cci = (IRCChannelClientInfo) parser.getClient("luser")
+                .getChannelClients().get(0);
 
         assertEquals("v", cci.getImportantMode());
         assertEquals("+", cci.getImportantModePrefix());
@@ -69,7 +74,8 @@ public class ChannelClientInfoTest {
         final Map<Object, Object> map1 = new HashMap<>();
         final Map<Object, Object> map2 = new HashMap<>();
         
-        final IRCChannelClientInfo cci = parser.getClient("nick").getChannelClients().get(0);
+        final IRCChannelClientInfo cci = (IRCChannelClientInfo) parser.getClient("nick")
+                .getChannelClients().get(0);
         
         cci.setMap(map1);
         assertSame(map1, cci.getMap());

irc/test/com/dmdirc/parser/irc/processors/ProcessModeTest.java

@@ -24,10 +24,13 @@ package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.harness.parser.TestParser;
 import com.dmdirc.parser.common.CallbackNotFoundException;
-import com.dmdirc.parser.irc.IRCChannelClientInfo;
+import com.dmdirc.parser.interfaces.ChannelClientInfo;
 
 import org.junit.Test;
-import static org.junit.Assert.*;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 public class ProcessModeTest {
     
@@ -67,7 +70,7 @@ public class ProcessModeTest {
         parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser");
         parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
 
-        final IRCChannelClientInfo cci = parser.getClient("luser").getChannelClients().get(0);
+        final ChannelClientInfo cci = parser.getClient("luser").getChannelClients().get(0);
 
         parser.injectLine(":server MODE #DMDirc_testing +v luser");
         assertEquals("v", cci.getAllModes());

irc/test/com/dmdirc/parser/irc/processors/ProcessNamesTest.java

@@ -24,15 +24,17 @@ package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.harness.parser.TestParser;
 import com.dmdirc.parser.common.CallbackNotFoundException;
-import com.dmdirc.parser.common.ParserError;
-import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.callbacks.ErrorInfoListener;
-import com.dmdirc.parser.irc.IRCChannelClientInfo;
 
-import java.util.Date;
 import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.anyObject;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 
 public class ProcessNamesTest {
     
@@ -45,8 +47,7 @@ public class ProcessNamesTest {
         
         parser.injectLine(":server 366 nick #nonexistant :End of /NAMES list.");
         
-        verify(test, never()).onErrorInfo((Parser) anyObject(),
-                (Date) anyObject(), (ParserError) anyObject());
+        verify(test, never()).onErrorInfo(anyObject(), anyObject(), anyObject());
     }
     
     @Test
@@ -64,7 +65,7 @@ public class ProcessNamesTest {
         assertNotNull(parser.getClient("luser"));
         assertEquals(1, parser.getClient("luser").getChannelClients().size());
 
-        IRCChannelClientInfo cci = parser.getClient("luser").getChannelClients().get(0);
+        ChannelClientInfo cci = parser.getClient("luser").getChannelClients().get(0);
         assertEquals(parser.getChannel("#DMDirc_testing"), cci.getChannel());
         assertEquals("+", cci.getAllModesPrefix());
         

irc/test/com/dmdirc/parser/irc/processors/ProcessNickTest.java

@@ -23,18 +23,23 @@
 package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.harness.parser.TestParser;
-import com.dmdirc.parser.common.ParserError;
-import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.common.CallbackNotFoundException;
+import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.callbacks.ErrorInfoListener;
 import com.dmdirc.parser.interfaces.callbacks.NickChangeListener;
-import com.dmdirc.parser.common.CallbackNotFoundException;
-import com.dmdirc.parser.irc.IRCChannelClientInfo;
 
-import java.util.Date;
 import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.anyObject;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.same;
+import static org.mockito.Mockito.verify;
 
 public class ProcessNickTest {
     
@@ -55,11 +60,11 @@ public class ProcessNickTest {
         assertNotNull(parser.getClient("LUSER"));
         assertEquals(1, parser.getClient("LUSER").getChannelClients().size());
 
-        final IRCChannelClientInfo cci = parser.getClient("LUSER").getChannelClients().get(0);
+        final ChannelClientInfo cci = parser.getClient("LUSER").getChannelClients().get(0);
         assertEquals(parser.getChannel("#DMDirc_testing"), cci.getChannel());
         assertEquals("+", cci.getAllModesPrefix());
 
-        verify(tinc).onNickChanged(same(parser), (Date) anyObject(),
+        verify(tinc).onNickChanged(same(parser), anyObject(),
                 same(parser.getClient("LUSER")), eq("luser"));
     }
     
@@ -77,7 +82,7 @@ public class ProcessNickTest {
         assertFalse(parser.isKnownClient("luser"));
         assertEquals(1, parser.getClient("foobar").getChannelClients().size());
 
-        final IRCChannelClientInfo cci = parser.getClient("foobar").getChannelClients().get(0);
+        final ChannelClientInfo cci = parser.getClient("foobar").getChannelClients().get(0);
         assertEquals(parser.getChannel("#DMDirc_testing"), cci.getChannel());
         assertEquals("+", cci.getAllModesPrefix());
     }    
@@ -94,7 +99,7 @@ public class ProcessNickTest {
         parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
         parser.injectLine(":luser!lu@ser.com NICK nick3");
 
-        verify(info).onErrorInfo(same(parser), (Date) anyObject(), (ParserError) anyObject());
+        verify(info).onErrorInfo(same(parser), anyObject(), anyObject());
     }
     
     @Test
@@ -107,8 +112,7 @@ public class ProcessNickTest {
         parser.injectConnectionStrings();
         parser.injectLine(":random!lu@ser NICK rand");
 
-        verify(tinc, never()).onNickChanged((Parser) anyObject(),
-                (Date) anyObject(), (ClientInfo) anyObject(), anyString());
+        verify(tinc, never()).onNickChanged(anyObject(), anyObject(), anyObject(), anyString());
     }
 
 }