Fix unit tests.

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

 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 {
         
         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());
         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

 
 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 {
     
         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

 
 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 {
     
         
         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
         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

 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 {
     
         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"));
     }
     
         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());
     }    
         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
         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());
     }
 
 }