Start getting rid of stub parser classes

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

@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2006-2009 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.irc.IRCParser;
-import com.dmdirc.parser.irc.callbacks.interfaces.IAwayState;
-
-public class TestIAwayState implements IAwayState {
-
-    public boolean called = false;
-    public boolean state = false;
-    public String reason = null;
-
-    public void onAwayState(IRCParser tParser, boolean currentState,
-            String reason) {
-        this.state = currentState;
-        this.reason = reason;
-        this.called = true;
-    }
-
-}

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

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2006-2009 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.irc.*;
-import com.dmdirc.parser.irc.callbacks.interfaces.IChannelJoin;
-
-public class TestIChannelJoin implements IChannelJoin {
-
-    public ChannelInfo channel = null;
-    
-    public ChannelClientInfo client = null;
-
-    public void onChannelJoin(IRCParser tParser, ChannelInfo cChannel,
-            ChannelClientInfo cChannelClient) {
-        channel = cChannel;
-        client = cChannelClient;
-    }
-}

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

@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2006-2009 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.irc.*;
-import com.dmdirc.parser.irc.callbacks.interfaces.IChannelKick;
-
-public class TestIChannelKick implements IChannelKick {
-
-    public ChannelClientInfo cKickedClient = null;
-
-    public boolean called = false;
-
-    public void onChannelKick(IRCParser tParser, ChannelInfo cChannel,
-                              ChannelClientInfo cKickedClient,
-                              ChannelClientInfo cKickedByClient, String sReason,
-                              String sKickedByHost) {
-        this.cKickedClient = cKickedClient;
-        called = true;
-    }
-}

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

@@ -24,7 +24,6 @@ package com.dmdirc.parser.irc;
 
 import com.dmdirc.harness.parser.TestIPrivateCTCP;
 import com.dmdirc.harness.parser.TestParser;
-import com.dmdirc.harness.parser.TestIChannelKick;
 import com.dmdirc.harness.parser.TestIConnectError;
 import com.dmdirc.harness.parser.TestINoticeAuth;
 import com.dmdirc.harness.parser.TestINumeric;
@@ -34,14 +33,16 @@ import com.dmdirc.harness.parser.TestIPrivateMessage;
 import com.dmdirc.harness.parser.TestIPrivateAction;
 import com.dmdirc.parser.irc.callbacks.CallbackNotFoundException;
 import com.dmdirc.parser.irc.callbacks.interfaces.IAwayState;
+import com.dmdirc.parser.irc.callbacks.interfaces.IChannelKick;
 
 import java.util.Arrays;
-
 import java.util.List;
+
 import javax.net.ssl.TrustManager;
 
 import org.junit.Test;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class IRCParserTest {
 
@@ -430,15 +431,16 @@ public class IRCParserTest {
     @Test
     public void testKick() throws CallbackNotFoundException {
         final TestParser parser = new TestParser();
-        final TestIChannelKick ick = new TestIChannelKick();
+        final IChannelKick ick = mock(IChannelKick.class);
         parser.injectConnectionStrings();
 
         parser.injectLine(":nick JOIN #D");
         parser.getCallbackManager().addCallback("onChannelKick", ick, "#D");
         parser.injectLine(":bar!me@moo KICK #D nick :Bye!");
-     
-        assertTrue("onChannelKick must be called", ick.called);
-        assertNotNull("cKickedClient must not be null", ick.cKickedClient);
+
+        verify(ick).onChannelKick(same(parser), (ChannelInfo) anyObject(),
+                (ChannelClientInfo) anyObject(), (ChannelClientInfo) anyObject(),
+                anyString(), anyString());
     }
 
     @Test

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

@@ -22,13 +22,14 @@
 
 package com.dmdirc.parser.irc;
 
-import com.dmdirc.harness.parser.TestIChannelJoin;
 import com.dmdirc.harness.parser.TestIChannelSelfJoin;
 import com.dmdirc.harness.parser.TestParser;
 import com.dmdirc.parser.irc.callbacks.CallbackNotFoundException;
+import com.dmdirc.parser.irc.callbacks.interfaces.IChannelJoin;
 
 import org.junit.Test;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class ProcessJoinTest {
     
@@ -53,7 +54,7 @@ public class ProcessJoinTest {
     @Test
     public void testOtherJoinChannel() throws CallbackNotFoundException {
         final TestParser parser = new TestParser();
-        final TestIChannelJoin test = new TestIChannelJoin();
+        final IChannelJoin test = mock(IChannelJoin.class);
 
         parser.injectConnectionStrings();
         parser.getCallbackManager().addCallback("onChannelJoin", test);
@@ -61,13 +62,8 @@ public class ProcessJoinTest {
         parser.injectLine(":nick JOIN #DMDirc_testing");
         parser.injectLine(":foo!bar@baz JOIN #DMDirc_testing");
 
-        assertNotNull(test.channel);
-        assertEquals("#DMDirc_testing", test.channel.getName());
-        assertEquals("#DMDirc_testing", test.channel.toString());
-        assertSame(parser, test.channel.getParser());
-        assertNotNull(parser.getClientInfo("foo"));
-        assertSame(test.client.getClient(), parser.getClientInfo("foo"));
-        assertTrue(parser.getClientInfo("foo").getChannelClients().contains(test.client));
+        verify(test).onChannelJoin(parser, parser.getChannelInfo("#DMDirc_testing"),
+                parser.getClientInfo("foo!bar@baz").getChannelClients().get(0));
     }    
 
 }

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

@@ -22,18 +22,18 @@
 
 package com.dmdirc.parser.irc;
 
-import com.dmdirc.harness.parser.TestIAwayState;
 import com.dmdirc.harness.parser.TestParser;
 import com.dmdirc.parser.irc.callbacks.CallbackNotFoundException;
+import com.dmdirc.parser.irc.callbacks.interfaces.IAwayState;
 import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class ProcessWhoTest {
 
     @Test
     public void testSelfAway() throws CallbackNotFoundException {
         final TestParser parser = new TestParser();
-        final TestIAwayState test = new TestIAwayState();
+        final IAwayState test = mock(IAwayState.class);
         parser.injectConnectionStrings();
         parser.getCallbackManager().addCallback("OnAwayState", test);
 
@@ -41,12 +41,11 @@ public class ProcessWhoTest {
 
         parser.injectLine(":server 352 nick #DMDirc_testing nick2 host2 server nick2 G@ :0 rn");
 
-        assertFalse(test.called);
+        verify(test, never()).onAwayState((IRCParser) anyObject(),anyBoolean(), anyString());
 
         parser.injectLine(":server 352 nick #DMDirc_testing nick host server nick G@ :0 rn");
 
-        assertTrue(test.called);
-        assertTrue(test.state);
+        verify(test).onAwayState(parser, true, "");
     }
 
 }