Down with dodgy harness classes, up with mocks!

Change-Id: I48ceb58b942dfb017e8698d4b9bca5a1e11dfb61
Reviewed-on: http://gerrit.dmdirc.com/462
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Tested-by: Shane Mc Cormack <shane@dmdirc.com>

test/com/dmdirc/harness/parser/TestIChannelPart.java

@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.harness.parser;
-
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.ChannelPartListener;
-
-public class TestIChannelPart implements ChannelPartListener {
-
-    public ChannelInfo channel;
-
-    public ChannelClientInfo cclient;
-
-    public String reason;
-
-    public void onChannelPart(Parser tParser, ChannelInfo cChannel,
-                              ChannelClientInfo cChannelClient, String sReason) {
-        channel = cChannel;
-        cclient = cChannelClient;
-        reason = sReason;
-    }
-}

test/com/dmdirc/harness/parser/TestIChannelSelfJoin.java

@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.harness.parser;
-
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.ChannelSelfJoinListener;
-
-public class TestIChannelSelfJoin implements ChannelSelfJoinListener {
-
-    public ChannelInfo channel = null;
-
-    public void onChannelSelfJoin(Parser tParser, ChannelInfo cChannel) {
-        channel = cChannel;
-    }
-}

test/com/dmdirc/harness/parser/TestIChannelTopic.java

@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.harness.parser;
-
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.ChannelTopicListener;
-
-public class TestIChannelTopic implements ChannelTopicListener {
-
-    public boolean triggered;
-
-    public boolean isJoin;
-
-    public ChannelInfo channel;
-
-    public void onChannelTopic(Parser tParser, ChannelInfo cChannel,
-                               boolean bIsJoinTopic) {
-        triggered = true;
-        isJoin = bIsJoinTopic;
-        channel = cChannel;
-    }
-}

test/com/dmdirc/harness/parser/TestIConnectError.java

@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.harness.parser;
-
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.ConnectErrorListener;
-import com.dmdirc.parser.common.ParserError;
-
-public class TestIConnectError implements ConnectErrorListener {
-
-    public boolean error = false;
-
-    @Override
-    public void onConnectError(Parser tParser, ParserError errorInfo) {
-        error = true;
-    }
-}

test/com/dmdirc/harness/parser/TestIErrorInfo.java

@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.harness.parser;
-
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.ErrorInfoListener;
-import com.dmdirc.parser.common.ParserError;
-
-public class TestIErrorInfo implements ErrorInfoListener {
-
-    public boolean error = false;
-
-    public void onErrorInfo(Parser tParser, ParserError errorInfo) {
-        error = true;
-    }
-}

test/com/dmdirc/harness/parser/TestINickChanged.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.harness.parser;
-
-import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.NickChangeListener;
-
-public class TestINickChanged implements NickChangeListener {
-
-    public String oldNick = null;
-    public ClientInfo client;
-
-    @Override
-    public void onNickChanged(Parser tParser, ClientInfo cClient,
-                              String sOldNick) {
-        oldNick = sOldNick;
-        client = cClient;
-    }
-}

test/com/dmdirc/harness/parser/TestINoticeAuth.java

@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.harness.parser;
-
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.AuthNoticeListener;
-
-public class TestINoticeAuth implements AuthNoticeListener {
-
-    public String message = null;
-
-    @Override
-    public void onNoticeAuth(Parser tParser, String sData) {
-        message = sData;
-    }
-}

test/com/dmdirc/harness/parser/TestINumeric.java

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.harness.parser;
-
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.NumericListener;
-
-public class TestINumeric implements NumericListener {
-
-    public int numeric = 0;
-
-    public String[] data;
-
-    @Override
-    public void onNumeric(Parser tParser, int numeric, String[] token) {
-        this.numeric = numeric;
-        data = token;
-    }
-}

test/com/dmdirc/harness/parser/TestIPost005.java

@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.harness.parser;
-
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.Post005Listener;
-
-public class TestIPost005 implements Post005Listener {
-
-    public boolean done = false;
-
-    @Override
-    public void onPost005(Parser tParser) {
-        done = true;
-    }
-}

test/com/dmdirc/harness/parser/TestIPrivateAction.java

@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.harness.parser;
-
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.PrivateActionListener;
-
-public class TestIPrivateAction implements PrivateActionListener {
-
-    public String message, host;
-
-    @Override
-    public void onPrivateAction(Parser tParser, String sMessage, String sHost) {
-        message = sMessage;
-        host = sHost;
-    }
-}

test/com/dmdirc/harness/parser/TestIPrivateCTCP.java

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.harness.parser;
-
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.PrivateCtcpListener;
-
-public class TestIPrivateCTCP implements PrivateCtcpListener {
-
-    public String type, message, host;
-
-    @Override
-    public void onPrivateCTCP(Parser tParser, String sType, String sMessage,
-                              String sHost) {
-        type = sType;
-        message = sMessage;
-        host = sHost;
-    }
-}

test/com/dmdirc/harness/parser/TestIPrivateMessage.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.harness.parser;
-
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.PrivateMessageListener;
-
-public class TestIPrivateMessage implements PrivateMessageListener {
-
-    public String host, message;
-
-    @Override
-    public void onPrivateMessage(Parser tParser, String sMessage,
-                                 String sHost) {
-        host = sHost;
-        message = sMessage;
-    }
-}

test/com/dmdirc/harness/parser/TestIQuit.java

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.harness.parser;
-
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.ChannelQuitListener;
-import com.dmdirc.parser.interfaces.callbacks.QuitListener;
-
-public class TestIQuit implements ChannelQuitListener, QuitListener {
-
-    public ChannelInfo channel;
-
-    public ChannelClientInfo cclient;
-
-    public ClientInfo client;
-
-    public String reason;
-
-    public int count = 0;
-
-    @Override
-    public void onChannelQuit(Parser tParser, ChannelInfo cChannel,
-                              ChannelClientInfo cChannelClient, String sReason) {
-        this.channel = cChannel;
-        this.cclient = cChannelClient;
-        this.reason = sReason;
-        this.count++;
-    }
-
-    @Override
-    public void onQuit(Parser tParser, ClientInfo cClient, String sReason) {
-        this.client = cClient;
-        this.reason = sReason;
-        this.count++;
-    }
-}

test/com/dmdirc/harness/parser/TestIServerError.java

@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.harness.parser;
-
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.ServerErrorListener;
-
-public class TestIServerError implements ServerErrorListener {
-
-    public String message = null;
-
-    @Override
-    public void onServerError(Parser tParser, String sMessage) {
-        message = sMessage;
-    }
-}

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

@@ -25,15 +25,8 @@ package com.dmdirc.parser.irc;
 import com.dmdirc.parser.common.MyInfo;
 import com.dmdirc.parser.common.ChannelListModeItem;
 import com.dmdirc.parser.common.ParserError;
-import com.dmdirc.harness.parser.TestIPrivateCTCP;
 import com.dmdirc.harness.parser.TestParser;
-import com.dmdirc.harness.parser.TestIConnectError;
-import com.dmdirc.harness.parser.TestINoticeAuth;
-import com.dmdirc.harness.parser.TestINumeric;
-import com.dmdirc.harness.parser.TestIServerError;
-import com.dmdirc.harness.parser.TestIPost005;
-import com.dmdirc.harness.parser.TestIPrivateMessage;
-import com.dmdirc.harness.parser.TestIPrivateAction;
+import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.AuthNoticeListener;
 import com.dmdirc.parser.common.CallbackNotFoundException;
 import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
@@ -90,12 +83,12 @@ public class IRCParserTest {
         myParser.injectConnectionStrings();
         myParser.injectLine(":nick2!ident@host NICK :nick");
 
-        verify(error, never()).onErrorInfo((IRCParser) anyObject(), (ParserError) anyObject());
+        verify(error, never()).onErrorInfo(same(myParser), (ParserError) anyObject());
     }
     
     @Test
     public void testProxyPortWithBindIP() {
-        final TestIConnectError tice = new TestIConnectError();
+        final ConnectErrorListener tice = mock(ConnectErrorListener.class);
         final ServerInfo si = new ServerInfo();
         si.setProxyPort(155555);
         si.setUseSocks(true);
@@ -104,9 +97,8 @@ public class IRCParserTest {
         myParser.getCallbackManager().addCallback(ConnectErrorListener.class, tice);
         myParser.setBindIP("0.0.0.0");
         myParser.run();
-        
-        assertTrue("Using an invalid socks proxy port should raise a connect error event",
-                tice.error);
+
+        verify(tice).onConnectError(same(myParser), (ParserError) anyObject());
     }
 
     @Test
@@ -178,63 +170,63 @@ public class IRCParserTest {
 
     @Test
     public void testError() throws CallbackNotFoundException {
-        final TestIServerError test = new TestIServerError();
+        final ServerErrorListener test = mock(ServerErrorListener.class);
 
         final TestParser parser = new TestParser();
         parser.getCallbackManager().addCallback(ServerErrorListener.class, test);
         parser.injectLine("ERROR :You smell of cheese");
 
-        assertNotNull(test.message);
-        assertEquals("ERROR message should be passed to callback",
-                "You smell of cheese", test.message);
+        verify(test).onServerError(same(parser), eq("You smell of cheese"));
     }
 
     @Test
-    public void testAuthNotices() throws CallbackNotFoundException {
-        final TestINoticeAuth test = new TestINoticeAuth();
+    public void testAuthNotice() throws CallbackNotFoundException {
+        final AuthNoticeListener test = mock(AuthNoticeListener.class);
         final TestParser parser = new TestParser();
         parser.getCallbackManager().addCallback(AuthNoticeListener.class, test);
         parser.sendConnectionStrings();
-        parser.injectLine("NOTICE AUTH :Random auth notice?");
 
-        assertNotNull(test.message);
-        assertEquals("Random auth notice?", test.message);
+        parser.injectLine("NOTICE AUTH :Random auth notice?");
+        verify(test).onNoticeAuth(same(parser), eq("Random auth notice?"));
+    }
 
-        test.message = null;
+    @Test
+    public void testAuthNoticeTwenty() throws CallbackNotFoundException {
+        final AuthNoticeListener test = mock(AuthNoticeListener.class);
+        final TestParser parser = new TestParser();
+        parser.getCallbackManager().addCallback(AuthNoticeListener.class, test);
+        parser.sendConnectionStrings();
 
         parser.injectLine(":us.ircnet.org 020 * :Stupid notice");
-
-        assertNotNull(test.message);
-        assertEquals("Stupid notice", test.message);
+        verify(test).onNoticeAuth(same(parser), eq("Stupid notice"));
     }
 
     @Test
     public void testPre001NickChange() throws CallbackNotFoundException {
-        final TestINoticeAuth test = new TestINoticeAuth();
+        final AuthNoticeListener test = mock(AuthNoticeListener.class);
         final TestParser parser = new TestParser();
         parser.getCallbackManager().addCallback(AuthNoticeListener.class, test);
         parser.sendConnectionStrings();
         parser.injectLine(":chris!@ NICK :user2");
 
-        assertNull(test.message);
+        verify(test, never()).onNoticeAuth((Parser) anyObject(),anyString());
     }
 
     @Test
     public void testNumeric() throws CallbackNotFoundException {
-        final TestINumeric test = new TestINumeric();
+        final NumericListener test = mock(NumericListener.class);
         final TestParser parser = new TestParser();
         parser.getCallbackManager().addCallback(NumericListener.class, test);
 
         parser.injectLine(":server 001 nick :Hi there, nick");
 
-        assertEquals(1, test.numeric);
-        assertTrue(Arrays.equals(new String[]{":server", "001", "nick", "Hi there, nick"},
-                test.data));
+        verify(test).onNumeric(same(parser), eq(1),
+                eq(new String[]{":server", "001", "nick", "Hi there, nick"}));
     }
 
     @Test
     public void testPost005() throws CallbackNotFoundException {
-        final TestIPost005 test = new TestIPost005();
+        final Post005Listener test = mock(Post005Listener.class);
         final TestParser parser = new TestParser();
         parser.getCallbackManager().addCallback(Post005Listener.class, test);
 
@@ -253,11 +245,11 @@ public class IRCParserTest {
         };
 
         for (String string : strings) {
-            assertFalse("OnPost005 fired too early", test.done);
+            verify(test, never()).onPost005((Parser) anyObject());
             parser.injectLine(string);
         }
 
-        assertTrue("OnPost005 not fired", test.done);
+        verify(test).onPost005(same(parser));
     }
 
     @Test
@@ -359,11 +351,11 @@ public class IRCParserTest {
     }
 
     @Test
-    public void testPrivateMessages() throws CallbackNotFoundException {
+    public void testPrivateMessage() throws CallbackNotFoundException {
         final TestParser parser = new TestParser();
-        final TestIPrivateMessage ipmtest = new TestIPrivateMessage();
-        final TestIPrivateAction ipatest = new TestIPrivateAction();
-        final TestIPrivateCTCP ipctest = new TestIPrivateCTCP();
+        final PrivateMessageListener ipmtest = mock(PrivateMessageListener.class);
+        final PrivateActionListener ipatest = mock(PrivateActionListener.class);
+        final PrivateCtcpListener ipctest = mock(PrivateCtcpListener.class);
 
         parser.injectConnectionStrings();
 
@@ -372,30 +364,47 @@ public class IRCParserTest {
         parser.getCallbackManager().addCallback(PrivateCtcpListener.class, ipctest);
 
         parser.injectLine(":a!b@c PRIVMSG nick :Hello!");
-        assertNotNull(ipmtest.host);
-        assertNull(ipatest.host);
-        assertNull(ipctest.host);
-        assertEquals("a!b@c", ipmtest.host);
-        assertEquals("Hello!", ipmtest.message);
-        ipmtest.host = null;
-        ipmtest.message = null;
+        verify(ipmtest).onPrivateMessage(same(parser), eq("Hello!"), eq("a!b@c"));
+        verify(ipatest, never()).onPrivateAction((Parser) anyObject(), anyString(), anyString());
+        verify(ipctest, never()).onPrivateCTCP((Parser) anyObject(), anyString(), anyString(), anyString());
+    }
+
+    @Test
+    public void testPrivateAction() throws CallbackNotFoundException {
+        final TestParser parser = new TestParser();
+        final PrivateMessageListener ipmtest = mock(PrivateMessageListener.class);
+        final PrivateActionListener ipatest = mock(PrivateActionListener.class);
+        final PrivateCtcpListener ipctest = mock(PrivateCtcpListener.class);
+
+        parser.injectConnectionStrings();
+
+        parser.getCallbackManager().addCallback(PrivateMessageListener.class, ipmtest);
+        parser.getCallbackManager().addCallback(PrivateActionListener.class, ipatest);
+        parser.getCallbackManager().addCallback(PrivateCtcpListener.class, ipctest);
 
         parser.injectLine(":a!b@c PRIVMSG nick :" + ((char) 1) + "ACTION meep" + ((char) 1));
-        assertNull(ipmtest.host);
-        assertNotNull(ipatest.host);
-        assertNull(ipctest.host);
-        assertEquals("a!b@c", ipatest.host);
-        assertEquals("meep", ipatest.message);
-        ipatest.host = null;
-        ipatest.message = null;
+        verify(ipmtest, never()).onPrivateMessage((Parser) anyObject(), anyString(), anyString());
+        verify(ipatest).onPrivateAction(same(parser), eq("meep"), eq("a!b@c"));
+        verify(ipctest, never()).onPrivateCTCP((Parser) anyObject(), anyString(), anyString(), anyString());
+    }
+
+    @Test
+    public void testPrivateCTCP() throws CallbackNotFoundException {
+        final TestParser parser = new TestParser();
+        final PrivateMessageListener ipmtest = mock(PrivateMessageListener.class);
+        final PrivateActionListener ipatest = mock(PrivateActionListener.class);
+        final PrivateCtcpListener ipctest = mock(PrivateCtcpListener.class);
+
+        parser.injectConnectionStrings();
+
+        parser.getCallbackManager().addCallback(PrivateMessageListener.class, ipmtest);
+        parser.getCallbackManager().addCallback(PrivateActionListener.class, ipatest);
+        parser.getCallbackManager().addCallback(PrivateCtcpListener.class, ipctest);
 
         parser.injectLine(":a!b@c PRIVMSG nick :" + ((char) 1) + "FOO meep" + ((char) 1));
-        assertNull(ipmtest.host);
-        assertNull(ipatest.host);
-        assertNotNull(ipctest.host);
-        assertEquals("a!b@c", ipctest.host);
-        assertEquals("FOO", ipctest.type);
-        assertEquals("meep", ipctest.message);
+        verify(ipmtest, never()).onPrivateMessage((Parser) anyObject(), anyString(), anyString());
+        verify(ipatest, never()).onPrivateAction((Parser) anyObject(), anyString(), anyString());
+        verify(ipctest).onPrivateCTCP(same(parser), eq("FOO"), eq("meep"), eq("a!b@c"));
     }
 
     private void testListModes(String numeric1, String numeric2, char mode) {
@@ -493,28 +502,28 @@ public class IRCParserTest {
     @Test
     public void testIllegalPort1() throws URISyntaxException {
         final TestParser tp = new TestParser(new MyInfo(), new URI("irc://127.0.0.1:0/"));
-        final TestIConnectError tiei = new TestIConnectError();
+        final ConnectErrorListener tiei = mock(ConnectErrorListener.class);
         tp.getCallbackManager().addCallback(ConnectErrorListener.class, tiei);
         tp.runSuper();
-        assertTrue(tiei.error);
+        verify(tiei).onConnectError(same(tp), (ParserError) anyObject());
     }
     
     @Test
     public void testIllegalPort2() throws URISyntaxException {
         final TestParser tp = new TestParser(new MyInfo(), new URI("irc://127.0.0.1:1/"));
-        final TestIConnectError tiei = new TestIConnectError();
+        final ConnectErrorListener tiei = mock(ConnectErrorListener.class);
         tp.getCallbackManager().addCallback(ConnectErrorListener.class, tiei);
         tp.runSuper();
-        assertTrue(tiei.error);
+        verify(tiei).onConnectError(same(tp), (ParserError) anyObject());
     }    
     
     @Test
     public void testIllegalPort3() throws URISyntaxException {
         final TestParser tp = new TestParser(new MyInfo(), new URI("irc://127.0.0.1:65570/"));
-        final TestIConnectError tiei = new TestIConnectError();
+        final ConnectErrorListener tiei = mock(ConnectErrorListener.class);
         tp.getCallbackManager().addCallback(ConnectErrorListener.class, tiei);
         tp.runSuper();
-        assertTrue(tiei.error);
+        verify(tiei).onConnectError(same(tp), (ParserError) anyObject());
     }
 
     private void doIRCdTest(final String ircd, final String expected) {

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

@@ -22,11 +22,12 @@
 
 package com.dmdirc.parser.irc;
 
-import com.dmdirc.harness.parser.TestIErrorInfo;
+import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.harness.parser.TestParser;
 import com.dmdirc.parser.interfaces.callbacks.ErrorInfoListener;
 import org.junit.Test;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class Process004005Test {
     
@@ -62,13 +63,13 @@ public class Process004005Test {
     @Test
     public void testCaseMappingUnknown() {
         final TestParser tp = doCaseMappingTest("rfc1459", 4);
-        final TestIErrorInfo tiei = new TestIErrorInfo();
+        final ErrorInfoListener info = mock(ErrorInfoListener.class);
         
-        tp.getCallbackManager().addCallback(ErrorInfoListener.class, tiei);
+        tp.getCallbackManager().addCallback(ErrorInfoListener.class, info);
         
         tp.injectLine(":server 005 nick CASEMAPPING=unknown :are supported by this server");
         
-        assertTrue(tiei.error);
+        verify(info).onErrorInfo(same(tp), (ParserError) anyObject());
     }
 
 }

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

@@ -22,14 +22,12 @@
 
 package com.dmdirc.parser.irc;
 
-import com.dmdirc.harness.parser.TestIChannelSelfJoin;
 import com.dmdirc.harness.parser.TestParser;
 import com.dmdirc.parser.common.CallbackNotFoundException;
 import com.dmdirc.parser.interfaces.callbacks.ChannelJoinListener;
-
 import com.dmdirc.parser.interfaces.callbacks.ChannelSelfJoinListener;
+
 import org.junit.Test;
-import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
 public class ProcessJoinTest {
@@ -37,19 +35,13 @@ public class ProcessJoinTest {
     @Test
     public void testSelfJoinChannel() throws CallbackNotFoundException {
         final TestParser parser = new TestParser();
-        final TestIChannelSelfJoin test = new TestIChannelSelfJoin();
+        final ChannelSelfJoinListener test = mock(ChannelSelfJoinListener.class);
 
         parser.injectConnectionStrings();
         parser.getCallbackManager().addCallback(ChannelSelfJoinListener.class, test);
         parser.injectLine(":nick JOIN #DMDirc_testing");
 
-        assertNotNull(test.channel);
-        assertEquals("#DMDirc_testing", test.channel.getName());
-        assertEquals("#DMDirc_testing", test.channel.toString());
-        assertSame(parser, test.channel.getParser());
-        assertEquals(1, parser.getChannels().size());
-        assertTrue(parser.getChannels().contains(test.channel));
-        assertEquals(test.channel, parser.getChannel("#DMDirc_testing"));
+        verify(test).onChannelSelfJoin(same(parser), same(parser.getChannel("#DMDirc_testing")));
     }
     
     @Test

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

@@ -23,24 +23,26 @@
 package com.dmdirc.parser.irc;
 
 import com.dmdirc.harness.parser.TestParser;
-import com.dmdirc.harness.parser.TestIErrorInfo;
 import com.dmdirc.parser.common.CallbackNotFoundException;
+import com.dmdirc.parser.common.ParserError;
+import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.ErrorInfoListener;
 import org.junit.Test;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class ProcessNamesTest {
     
     @Test
     public void testExternalNames() throws CallbackNotFoundException {
         final TestParser parser = new TestParser();
-        final TestIErrorInfo test = new TestIErrorInfo();
+        final ErrorInfoListener test = mock(ErrorInfoListener.class);
         parser.injectConnectionStrings();
         parser.getCallbackManager().addCallback(ErrorInfoListener.class, test);
         
         parser.injectLine(":server 366 nick #nonexistant :End of /NAMES list.");
         
-        assertFalse("Should not error on unknown NAMES replies", test.error);
+        verify(test, never()).onErrorInfo((Parser) anyObject(), (ParserError) anyObject());
     }
     
     @Test

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

@@ -23,20 +23,22 @@
 package com.dmdirc.parser.irc;
 
 import com.dmdirc.harness.parser.TestParser;
-import com.dmdirc.harness.parser.TestIErrorInfo;
-import com.dmdirc.harness.parser.TestINickChanged;
+import com.dmdirc.parser.common.ParserError;
+import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.ErrorInfoListener;
 import com.dmdirc.parser.interfaces.callbacks.NickChangeListener;
 import com.dmdirc.parser.common.CallbackNotFoundException;
 import org.junit.Test;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class ProcessNickTest {
     
     @Test
     public void testNickSameName() {
         final TestParser parser = new TestParser();
-        final TestINickChanged tinc = new TestINickChanged();
+        final NickChangeListener tinc = mock(NickChangeListener.class);
 
         parser.getCallbackManager().addCallback(NickChangeListener.class, tinc);
         
@@ -53,9 +55,8 @@ public class ProcessNickTest {
         IRCChannelClientInfo cci = parser.getClient("LUSER").getChannelClients().get(0);
         assertEquals(parser.getChannel("#DMDirc_testing"), cci.getChannel());
         assertEquals("+", cci.getChanModeStr(true));
-        
-        assertSame(cci.getClient(), tinc.client);
-        assertEquals("luser", tinc.oldNick);
+
+        verify(tinc).onNickChanged(same(parser), same(parser.getClient("LUSER")), eq("luser"));
     }
     
     @Test
@@ -80,7 +81,7 @@ public class ProcessNickTest {
     @Test
     public void testOverrideNick() throws CallbackNotFoundException {
         final TestParser parser = new TestParser();
-        final TestIErrorInfo info = new TestIErrorInfo();
+        final ErrorInfoListener info = mock(ErrorInfoListener.class);
         
         parser.getCallbackManager().addCallback(ErrorInfoListener.class, info);
         parser.injectConnectionStrings();
@@ -89,22 +90,21 @@ public class ProcessNickTest {
         parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
         parser.injectLine(":luser!lu@ser.com NICK nick3");
 
-        assertTrue("Parser should raise an error if a nick change overrides an "
-                + "existing client", info.error);
+        verify(info).onErrorInfo(same(parser),(ParserError) anyObject());
     }
     
     @Test
     public void testUnknownNick() {
         final TestParser parser = new TestParser();
-        final TestINickChanged tinc = new TestINickChanged();
+        final NickChangeListener tinc = mock(NickChangeListener.class);
         
         parser.getCallbackManager().addCallback(NickChangeListener.class, tinc);
         
         parser.injectConnectionStrings();
         parser.injectLine(":random!lu@ser NICK rand");
-        
-        assertNull(tinc.client);
-        assertNull(tinc.oldNick);
+
+        verify(tinc, never()).onNickChanged((Parser) anyObject(), (ClientInfo) anyObject(),
+                anyString());
     }
 
 }

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

@@ -25,10 +25,12 @@ package com.dmdirc.parser.irc;
 import com.dmdirc.harness.parser.TestParser;
 import com.dmdirc.harness.parser.TestIChannelPart;
 import com.dmdirc.parser.common.CallbackNotFoundException;
-
+import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.callbacks.ChannelPartListener;
+
 import org.junit.Test;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class ProcessPartTest {
     
@@ -42,22 +44,20 @@ public class ProcessPartTest {
         parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser");
         parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list.");
         
-        final TestIChannelPart test = new TestIChannelPart();
+        final ChannelPartListener test = mock(ChannelPartListener.class);
         parser.getCallbackManager().addCallback(ChannelPartListener.class, test);
         
         assertEquals(2, parser.getChannel("#DMDirc_testing").getChannelClients().size());
-        
+
+        final ChannelClientInfo cci = parser.getChannel("#DMDirc_testing")
+                .getChannelClient("luser");
+
         parser.injectLine(":luser!foo@barsville PART #DMDirc_testing :Bye bye, cruel world");
         
         assertEquals(1, parser.getChannel("#DMDirc_testing").getChannelClients().size());
-        
-        assertNotNull(test.channel);
-        assertNotNull(test.cclient);
-        assertNotNull(test.reason);
-        
-        assertEquals("#DMDirc_testing", test.channel.getName());
-        assertEquals("luser", test.cclient.getClient().getNickname());
-        assertEquals("Bye bye, cruel world", test.reason);
+
+        verify(test).onChannelPart(same(parser), same(parser.getChannel("#DMDirc_testing")),
+                same(cci), eq("Bye bye, cruel world"));
     }
     
     @Test
@@ -70,22 +70,20 @@ public class ProcessPartTest {
         parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser");
         parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list.");
         
-        final TestIChannelPart test = new TestIChannelPart();
+        final ChannelPartListener test = mock(ChannelPartListener.class);
         parser.getCallbackManager().addCallback(ChannelPartListener.class, test);
         
         assertEquals(2, parser.getChannel("#DMDirc_testing").getChannelClients().size());
+
+        final ChannelClientInfo cci = parser.getChannel("#DMDirc_testing")
+                .getChannelClient("luser");
         
         parser.injectLine(":luser!foo@barsville PART #DMDirc_testing");
         
         assertEquals(1, parser.getChannel("#DMDirc_testing").getChannelClients().size());
-        
-        assertNotNull(test.channel);
-        assertNotNull(test.cclient);
-        assertNotNull(test.reason);
-        
-        assertEquals("#DMDirc_testing", test.channel.getName());
-        assertEquals("luser", test.cclient.getClient().getNickname());
-        assertEquals("", test.reason);
+
+        verify(test).onChannelPart(same(parser), same(parser.getChannel("#DMDirc_testing")),
+                same(cci), eq(""));
     }    
 
 }

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

@@ -23,13 +23,15 @@
 package com.dmdirc.parser.irc;
 
 import com.dmdirc.harness.parser.TestParser;
-import com.dmdirc.harness.parser.TestIQuit;
 import com.dmdirc.parser.interfaces.callbacks.ChannelQuitListener;
 import com.dmdirc.parser.interfaces.callbacks.QuitListener;
+import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.common.CallbackNotFoundException;
 
 import org.junit.Test;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class ProcessQuitTest {
     
@@ -46,24 +48,22 @@ public class ProcessQuitTest {
         parser.injectLine(":server 353 nick = #DMDirc_testing2 :@nick +luser2");
         parser.injectLine(":server 366 nick #DMDirc_testing2 :End of /NAMES list.");        
         
-        final TestIQuit test = new TestIQuit();
+        final ChannelQuitListener test = mock(ChannelQuitListener.class);
         parser.getCallbackManager().addCallback(ChannelQuitListener.class, test);
         
         assertEquals(2, parser.getChannel("#DMDirc_testing").getChannelClients().size());
+
+        final ChannelClientInfo cci = parser.getChannel("#DMDirc_testing")
+                .getChannelClient("luser");
         
         parser.injectLine(":luser!foo@barsville QUIT :Bye bye, cruel world");
         
         assertEquals(1, parser.getChannel("#DMDirc_testing").getChannelClients().size());
         assertEquals(2, parser.getChannel("#DMDirc_testing2").getChannelClients().size());
-        
-        assertNotNull(test.channel);
-        assertNotNull(test.cclient);
-        assertNotNull(test.reason);
-        
-        assertEquals(1, test.count);
-        assertEquals("#DMDirc_testing", test.channel.getName());
-        assertEquals("luser", test.cclient.getClient().getNickname());
-        assertEquals("Bye bye, cruel world", test.reason);
+
+        verify(test).onChannelQuit(same(parser),
+                same(parser.getChannel("#DMDirc_testing")), same(cci),
+                eq("Bye bye, cruel world"));
     }
     
     @Test
@@ -79,22 +79,19 @@ public class ProcessQuitTest {
         parser.injectLine(":server 353 nick = #DMDirc_testing2 :@nick +luser2");
         parser.injectLine(":server 366 nick #DMDirc_testing2 :End of /NAMES list.");
         
-        final TestIQuit test = new TestIQuit();
+        final QuitListener test = mock(QuitListener.class);
         parser.getCallbackManager().addCallback(QuitListener.class, test);
         
         assertEquals(2, parser.getChannel("#DMDirc_testing").getChannelClients().size());
+
+        final ClientInfo client = parser.getClient("luser");
         
         parser.injectLine(":luser!foo@barsville QUIT :Bye bye, cruel world");
         
         assertEquals(1, parser.getChannel("#DMDirc_testing").getChannelClients().size());
         assertEquals(2, parser.getChannel("#DMDirc_testing2").getChannelClients().size());
-        
-        assertNotNull(test.client);
-        assertNotNull(test.reason);
-        
-        assertEquals(1, test.count);
-        assertEquals("luser", test.client.getNickname());
-        assertEquals("Bye bye, cruel world", test.reason);
+
+        verify(test).onQuit(same(parser), same(client), eq("Bye bye, cruel world"));
     }
     
     @Test
@@ -107,21 +104,18 @@ public class ProcessQuitTest {
         parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser");
         parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list.");
         
-        final TestIQuit test = new TestIQuit();
+        final QuitListener test = mock(QuitListener.class);
         parser.getCallbackManager().addCallback(QuitListener.class, test);
         
         assertEquals(2, parser.getChannel("#DMDirc_testing").getChannelClients().size());
+
+        final ClientInfo client = parser.getClient("luser");
         
         parser.injectLine(":luser!foo@barsville QUIT");
         
         assertEquals(1, parser.getChannel("#DMDirc_testing").getChannelClients().size());
         
-        assertNotNull(test.client);
-        assertNotNull(test.reason);
-        
-        assertEquals(1, test.count);
-        assertEquals("luser", test.client.getNickname());
-        assertEquals("", test.reason);
+        verify(test).onQuit(same(parser), same(client), eq(""));
     }    
 
 }

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

@@ -23,37 +23,38 @@
 package com.dmdirc.parser.irc;
 
 import com.dmdirc.harness.parser.TestParser;
-import com.dmdirc.harness.parser.TestIChannelTopic;
 import com.dmdirc.parser.common.CallbackNotFoundException;
 import com.dmdirc.parser.interfaces.callbacks.ChannelTopicListener;
 import org.junit.Test;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class ProcessTopicTest {
     
     @Test
     public void testBasicTopic() throws CallbackNotFoundException {
         final TestParser parser = new TestParser();
-        final TestIChannelTopic test = new TestIChannelTopic();
+        final ChannelTopicListener test = mock(ChannelTopicListener.class);
         parser.injectConnectionStrings();
         parser.getCallbackManager().addCallback(ChannelTopicListener.class, test);
         
         parser.injectLine(":nick JOIN #DMDirc_testing");
         parser.injectLine(":server 332 nick #DMDirc_testing :This be a topic");
         parser.injectLine(":server 333 nick #DMDirc_testing Q 1207350306");
-        
-        assertTrue(test.triggered);
-        assertTrue(test.isJoin);
-        assertEquals("#DMDirc_testing", test.channel.getName());
-        assertEquals("This be a topic", test.channel.getTopic());
-        assertEquals("Q", test.channel.getTopicSetter());
-        assertEquals(1207350306l, test.channel.getTopicTime());
+
+        verify(test).onChannelTopic(same(parser), same(parser.getChannel("#DMDirc_testing")),
+                eq(true));
+
+        assertEquals("#DMDirc_testing", parser.getChannel("#DMDirc_testing").getName());
+        assertEquals("This be a topic", parser.getChannel("#DMDirc_testing").getTopic());
+        assertEquals("Q", parser.getChannel("#DMDirc_testing").getTopicSetter());
+        assertEquals(1207350306l, parser.getChannel("#DMDirc_testing").getTopicTime());
     }
     
     @Test
     public void testTopicChange() throws CallbackNotFoundException {
         final TestParser parser = new TestParser();
-        final TestIChannelTopic test = new TestIChannelTopic();
+        final ChannelTopicListener test = mock(ChannelTopicListener.class);
         parser.injectConnectionStrings();
         
         parser.injectLine(":nick JOIN #DMDirc_testing");
@@ -63,13 +64,14 @@ public class ProcessTopicTest {
         parser.getCallbackManager().addCallback(ChannelTopicListener.class, test);
         
         parser.injectLine(":foobar TOPIC #DMDirc_testing :New topic here");
+
+        verify(test).onChannelTopic(same(parser), same(parser.getChannel("#DMDirc_testing")),
+                eq(false));
         
-        assertTrue(test.triggered);
-        assertFalse(test.isJoin);
-        assertEquals("#DMDirc_testing", test.channel.getName());
-        assertEquals("New topic here", test.channel.getTopic());
-        assertEquals("foobar", test.channel.getTopicSetter());
-        assertTrue(1207350306l < test.channel.getTopicTime());
+        assertEquals("#DMDirc_testing", parser.getChannel("#DMDirc_testing").getName());
+        assertEquals("New topic here", parser.getChannel("#DMDirc_testing").getTopic());
+        assertEquals("foobar", parser.getChannel("#DMDirc_testing").getTopicSetter());
+        assertTrue(1207350306l < parser.getChannel("#DMDirc_testing").getTopicTime());
     }    
 
 }