Remove unused circular dep, tidy tests.

Remove all tests that depend on TestParser - they're rubbish and
need to be completely rewritten to be proper unit tests.

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

@@ -79,54 +79,52 @@ public class ProcessingManager {
         // Add processors
         //------------------------------------------------
         // NOTICE AUTH
-        addProcessor(new ProcessNoticeAuth(parser, this));
+        addProcessor(new ProcessNoticeAuth(parser));
         // 001
-        addProcessor(new Process001(parser, this));
+        addProcessor(new Process001(parser));
         // 004
         // 005
-        addProcessor(new Process004005(parser, this));
+        addProcessor(new Process004005(parser));
         // 464
-        addProcessor(new Process464(parser, this));
+        addProcessor(new Process464(parser));
         // 301
         // 305
         // 306
-        addProcessor(new ProcessAway(parser, this));
+        addProcessor(new ProcessAway(parser));
         // 352
-        addProcessor(new ProcessWho(parser, this));
+        addProcessor(new ProcessWho(parser));
         // INVITE
-        addProcessor(new ProcessInvite(parser, this));
+        addProcessor(new ProcessInvite(parser));
         // JOIN
-        addProcessor(new ProcessJoin(parser, prefixModeManager, userModeManager, chanModeManager,
-                this));
+        addProcessor(new ProcessJoin(parser, prefixModeManager, userModeManager, chanModeManager));
         // KICK
-        addProcessor(new ProcessKick(parser, this));
+        addProcessor(new ProcessKick(parser));
         // PRIVMSG
         // NOTICE
-        addProcessor(new ProcessMessage(parser, prefixModeManager, this));
+        addProcessor(new ProcessMessage(parser, prefixModeManager));
         // MODE
         // 324
-        addProcessor(new ProcessMode(parser, prefixModeManager, userModeManager, chanModeManager,
-                this));
+        addProcessor(new ProcessMode(parser, prefixModeManager, userModeManager, chanModeManager));
         // 372
         // 375
         // 376
         // 422
-        addProcessor(new ProcessMOTD(parser, this));
+        addProcessor(new ProcessMOTD(parser));
         // 353
         // 366
-        addProcessor(new ProcessNames(parser, prefixModeManager, userModeManager, this));
+        addProcessor(new ProcessNames(parser, prefixModeManager, userModeManager));
         // 433
-        addProcessor(new ProcessNickInUse(parser, this));
+        addProcessor(new ProcessNickInUse(parser));
         // NICK
-        addProcessor(new ProcessNick(parser, this));
+        addProcessor(new ProcessNick(parser));
         // PART
-        addProcessor(new ProcessPart(parser, this));
+        addProcessor(new ProcessPart(parser));
         // QUIT
-        addProcessor(new ProcessQuit(parser, this));
+        addProcessor(new ProcessQuit(parser));
         // TOPIC
         // 332
         // 333
-        addProcessor(new ProcessTopic(parser, this));
+        addProcessor(new ProcessTopic(parser));
         // 344
         // 345
         // 346
@@ -135,17 +133,17 @@ public class ProcessingManager {
         // 349
         // 367
         // 368
-        addProcessor(new ProcessListModes(parser, this));
+        addProcessor(new ProcessListModes(parser));
         // WALLOPS
-        addProcessor(new ProcessWallops(parser, this));
+        addProcessor(new ProcessWallops(parser));
         // 321
         // 322
         // 323
-        addProcessor(new ProcessList(parser, this));
+        addProcessor(new ProcessList(parser));
         // CAP
-        addProcessor(new ProcessCap(parser, this));
+        addProcessor(new ProcessCap(parser));
         // ACCOUNT
-        addProcessor(new ProcessAccount(parser, this));
+        addProcessor(new ProcessAccount(parser));
     }
 
     /**

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

@@ -32,16 +32,15 @@ import java.util.Date;
  * Superclass for all IRCProcessor types that accept timestamps for process.
  */
 public abstract class TimestampedIRCProcessor extends IRCProcessor {
+
     /**
      * Create a new instance of the IRCTimestampedProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
      * @param handledTokens Tokens that this processor handles
      */
-    protected TimestampedIRCProcessor(final IRCParser parser, final ProcessingManager manager,
-            final String... handledTokens) {
-        super(parser, manager, handledTokens);
+    protected TimestampedIRCProcessor(final IRCParser parser, final String... handledTokens) {
+        super(parser, handledTokens);
     }
 
     @Override

irc/src/com/dmdirc/parser/irc/processors/IRCProcessor.java

@@ -28,7 +28,6 @@ import com.dmdirc.parser.common.QueuePriority;
 import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ProcessingManager;
 
 /**
  * IRCProcessor.
@@ -38,8 +37,6 @@ public abstract class IRCProcessor {
 
     /** Reference to the IRCParser that owns this IRCProcessor. */
     protected final IRCParser parser;
-    /** Reference to the Processing in charge of this IRCProcessor. */
-    protected final ProcessingManager manager;
 
     /** The names of the tokens this processor handles. */
     private final String[] handledTokens;
@@ -48,15 +45,11 @@ public abstract class IRCProcessor {
     // is annoying, so we also implement them here (calling them again using parser)
     /**
      * Create a new instance of the IRCProcessor Object.
-     *
-     * @param parser IRCParser That owns this IRCProcessor
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
+     *  @param parser IRCParser That owns this IRCProcessor
      * @param handledTokens Tokens that this processor handles
      */
-    protected IRCProcessor(final IRCParser parser, final ProcessingManager manager,
-            final String ... handledTokens) {
+    protected IRCProcessor(final IRCParser parser, final String... handledTokens) {
         this.parser = parser;
-        this.manager = manager;
         this.handledTokens = handledTokens;
     }
 

irc/src/com/dmdirc/parser/irc/processors/Process001.java

@@ -25,7 +25,6 @@ package com.dmdirc.parser.irc.processors;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.Collection;
 
@@ -38,10 +37,9 @@ public class Process001 extends IRCProcessor {
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    public Process001(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager, "001");
+    public Process001(final IRCParser parser) {
+        super(parser, "001");
     }
 
     /**

irc/src/com/dmdirc/parser/irc/processors/Process004005.java

@@ -28,7 +28,6 @@ import com.dmdirc.parser.events.NetworkDetectedEvent;
 import com.dmdirc.parser.irc.CapabilityState;
 import com.dmdirc.parser.irc.IRCEncoding;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ProcessingManager;
 import com.dmdirc.parser.irc.ProcessorNotFoundException;
 
 import java.util.Date;
@@ -44,10 +43,9 @@ public class Process004005 extends IRCProcessor {
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    public Process004005(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager, "002", "003", "004", "005");
+    public Process004005(final IRCParser parser) {
+        super(parser, "002", "003", "004", "005");
     }
 
     /**

irc/src/com/dmdirc/parser/irc/processors/Process464.java

@@ -24,7 +24,6 @@ package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.events.PasswordRequiredEvent;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.Date;
 
@@ -37,10 +36,9 @@ public class Process464 extends IRCProcessor {
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    public Process464(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager, "464");
+    public Process464(final IRCParser parser) {
+        super(parser, "464");
     }
 
     /**

irc/src/com/dmdirc/parser/irc/processors/ProcessAccount.java

@@ -24,7 +24,6 @@ package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ProcessingManager;
 
 /**
  * Process an Account message.
@@ -35,10 +34,9 @@ public class ProcessAccount extends IRCProcessor {
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    public ProcessAccount(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager, "ACCOUNT");
+    public ProcessAccount(final IRCParser parser) {
+        super(parser, "ACCOUNT");
     }
 
     /**

irc/src/com/dmdirc/parser/irc/processors/ProcessAway.java

@@ -25,7 +25,6 @@ import com.dmdirc.parser.common.AwayState;
 import com.dmdirc.parser.events.AwayStateEvent;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.Date;
 
@@ -38,10 +37,9 @@ public class ProcessAway extends IRCProcessor {
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    public ProcessAway(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager, "301", "305", "306", "AWAY");
+    public ProcessAway(final IRCParser parser) {
+        super(parser, "301", "305", "306", "AWAY");
     }
 
     /**

irc/src/com/dmdirc/parser/irc/processors/ProcessCap.java

@@ -24,7 +24,6 @@ package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.irc.CapabilityState;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ProcessingManager;
 import com.dmdirc.parser.irc.TimestampedIRCProcessor;
 
 import java.util.ArrayList;
@@ -53,10 +52,9 @@ public class ProcessCap extends TimestampedIRCProcessor {
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    public ProcessCap(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager, "CAP");
+    public ProcessCap(final IRCParser parser) {
+        super(parser, "CAP");
 
         // IRCv3.1 Standard
         supportedCapabilities.add("multi-prefix");

irc/src/com/dmdirc/parser/irc/processors/ProcessInvite.java

@@ -24,7 +24,6 @@ package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.events.InviteEvent;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.Date;
 
@@ -37,10 +36,9 @@ public class ProcessInvite extends IRCProcessor {
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    public ProcessInvite(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager, "INVITE");
+    public ProcessInvite(final IRCParser parser) {
+        super(parser, "INVITE");
     }
 
     /**

irc/src/com/dmdirc/parser/irc/processors/ProcessJoin.java

@@ -35,7 +35,6 @@ import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ModeManager;
 import com.dmdirc.parser.irc.PrefixModeManager;
-import com.dmdirc.parser.irc.ProcessingManager;
 import com.dmdirc.parser.irc.ProcessorNotFoundException;
 
 import java.util.Arrays;
@@ -60,12 +59,10 @@ public class ProcessJoin extends IRCProcessor {
      * @param prefixModeManager The manager to use to access prefix modes.
      * @param userModeManager Mode manager to use for user modes.
      * @param chanModeManager Mode manager to use for channel modes.
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
     public ProcessJoin(final IRCParser parser, final PrefixModeManager prefixModeManager,
-            final ModeManager userModeManager, final ModeManager chanModeManager,
-            final ProcessingManager manager) {
-        super(parser, manager, "JOIN", "329");
+            final ModeManager userModeManager, final ModeManager chanModeManager) {
+        super(parser, "JOIN", "329");
         this.prefixModeManager = prefixModeManager;
         this.userModeManager = userModeManager;
         this.chanModeManager = chanModeManager;

irc/src/com/dmdirc/parser/irc/processors/ProcessKick.java

@@ -30,7 +30,6 @@ import com.dmdirc.parser.irc.IRCChannelClientInfo;
 import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -44,10 +43,9 @@ public class ProcessKick extends IRCProcessor {
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    public ProcessKick(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager, "KICK");
+    public ProcessKick(final IRCParser parser) {
+        super(parser, "KICK");
     }
 
     /**

irc/src/com/dmdirc/parser/irc/processors/ProcessList.java

@@ -26,7 +26,6 @@ import com.dmdirc.parser.events.GroupListEndEvent;
 import com.dmdirc.parser.events.GroupListEntryEvent;
 import com.dmdirc.parser.events.GroupListStartEvent;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.Date;
 
@@ -39,10 +38,9 @@ public class ProcessList extends IRCProcessor {
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    public ProcessList(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager, "321", "322", "323");
+    public ProcessList(final IRCParser parser) {
+        super(parser, "321", "322", "323");
     }
 
     /**

irc/src/com/dmdirc/parser/irc/processors/ProcessListModes.java

@@ -27,7 +27,6 @@ import com.dmdirc.parser.events.ChannelListModeEvent;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ProcessingManager;
 import com.dmdirc.parser.irc.ServerType;
 import com.dmdirc.parser.irc.ServerTypeGroup;
 
@@ -45,11 +44,9 @@ public class ProcessListModes extends IRCProcessor {
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    public ProcessListModes(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager,
-                "367", "368", /* Bans */
+    public ProcessListModes(final IRCParser parser) {
+        super(parser, "367", "368", /* Bans */
                 "344", "345", /* Reop list (ircnet) or bad words (euirc) */
                 "346", "347", /* Invite List */
                 "348", "349", /* Except/Exempt List */

irc/src/com/dmdirc/parser/irc/processors/ProcessMOTD.java

@@ -26,7 +26,6 @@ import com.dmdirc.parser.events.MOTDEndEvent;
 import com.dmdirc.parser.events.MOTDLineEvent;
 import com.dmdirc.parser.events.MOTDStartEvent;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.Date;
 
@@ -39,10 +38,9 @@ public class ProcessMOTD extends IRCProcessor {
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    public ProcessMOTD(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager, "372", "375", "376", "422");
+    public ProcessMOTD(final IRCParser parser) {
+        super(parser, "372", "375", "376", "422");
     }
 
     /**

irc/src/com/dmdirc/parser/irc/processors/ProcessMessage.java

@@ -49,7 +49,6 @@ import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.PrefixModeManager;
-import com.dmdirc.parser.irc.ProcessingManager;
 import com.dmdirc.parser.irc.ProcessorNotFoundException;
 import com.dmdirc.parser.irc.TimestampedIRCProcessor;
 
@@ -74,11 +73,9 @@ public class ProcessMessage extends TimestampedIRCProcessor {
      *
      * @param parser IRCParser That owns this IRCProcessor
      * @param prefixModeManager The manager to use to access prefix modes.
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    public ProcessMessage(final IRCParser parser, final PrefixModeManager prefixModeManager,
-            final ProcessingManager manager) {
-        super(parser, manager, "PRIVMSG", "NOTICE");
+    public ProcessMessage(final IRCParser parser, final PrefixModeManager prefixModeManager) {
+        super(parser, "PRIVMSG", "NOTICE");
         this.prefixModeManager = prefixModeManager;
     }
 

irc/src/com/dmdirc/parser/irc/processors/ProcessMode.java

@@ -39,7 +39,6 @@ import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ModeManager;
 import com.dmdirc.parser.irc.PrefixModeManager;
-import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -63,12 +62,10 @@ public class ProcessMode extends IRCProcessor {
      * @param prefixModeManager The manager to use to access prefix modes.
      * @param userModeManager Mode manager to use for user modes.
      * @param chanModeManager Mode manager to use for channel modes.
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
     public ProcessMode(final IRCParser parser, final PrefixModeManager prefixModeManager,
-            final ModeManager userModeManager, final ModeManager chanModeManager,
-            final ProcessingManager manager) {
-        super(parser, manager, "MODE", "324", "221");
+            final ModeManager userModeManager, final ModeManager chanModeManager) {
+        super(parser, "MODE", "324", "221");
         this.prefixModeManager = prefixModeManager;
         this.userModeManager = userModeManager;
         this.chanModeManager = chanModeManager;

irc/src/com/dmdirc/parser/irc/processors/ProcessNames.java

@@ -31,7 +31,6 @@ import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ModeManager;
 import com.dmdirc.parser.irc.PrefixModeManager;
-import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.Date;
 
@@ -51,11 +50,10 @@ public class ProcessNames extends IRCProcessor {
      * @param parser IRCParser That owns this IRCProcessor
      * @param prefixModeManager The manager to use to access prefix modes.
      * @param userModeManager Mode manager to use for user modes.
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
     public ProcessNames(final IRCParser parser, final PrefixModeManager prefixModeManager,
-            final ModeManager userModeManager, final ProcessingManager manager) {
-        super(parser, manager, "353", "366");
+            final ModeManager userModeManager) {
+        super(parser, "353", "366");
         this.prefixModeManager = prefixModeManager;
         this.userModeManager = userModeManager;
     }

irc/src/com/dmdirc/parser/irc/processors/ProcessNick.java

@@ -32,7 +32,6 @@ import com.dmdirc.parser.irc.IRCChannelClientInfo;
 import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.Date;
 
@@ -45,10 +44,9 @@ public class ProcessNick extends IRCProcessor {
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    public ProcessNick(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager, "NICK");
+    public ProcessNick(final IRCParser parser) {
+        super(parser, "NICK");
     }
 
     /**

irc/src/com/dmdirc/parser/irc/processors/ProcessNickInUse.java

@@ -24,7 +24,6 @@ package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.events.NickInUseEvent;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.Date;
 
@@ -43,10 +42,9 @@ public class ProcessNickInUse extends IRCProcessor {
      * Create a new instance of the ProcessNickInUse Object.
      *
      * @param parser IRCParser That owns this object
-     * @param manager ProcessingManager that is in charge of this object
      */
-    public ProcessNickInUse(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager, "433");
+    public ProcessNickInUse(final IRCParser parser) {
+        super(parser, "433");
     }
 
     /**

irc/src/com/dmdirc/parser/irc/processors/ProcessNoticeAuth.java

@@ -24,7 +24,6 @@ package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.events.AuthNoticeEvent;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.Date;
 
@@ -37,10 +36,9 @@ public class ProcessNoticeAuth extends IRCProcessor {
      * Create a new instance of the ProcessNoticeAuth Object.
      *
      * @param parser IRCParser That owns this object
-     * @param manager ProcessingManager that is in charge of this object
      */
-    public ProcessNoticeAuth(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager, "Notice Auth");
+    public ProcessNoticeAuth(final IRCParser parser) {
+        super(parser, "Notice Auth");
     }
 
     /**

irc/src/com/dmdirc/parser/irc/processors/ProcessPart.java

@@ -30,7 +30,6 @@ import com.dmdirc.parser.irc.IRCChannelClientInfo;
 import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.Date;
 
@@ -43,10 +42,9 @@ public class ProcessPart extends IRCProcessor {
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    public ProcessPart(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager, "PART");
+    public ProcessPart(final IRCParser parser) {
+        super(parser, "PART");
     }
 
     /**

irc/src/com/dmdirc/parser/irc/processors/ProcessQuit.java

@@ -31,7 +31,6 @@ import com.dmdirc.parser.irc.IRCChannelClientInfo;
 import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -45,10 +44,9 @@ public class ProcessQuit extends IRCProcessor {
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    public ProcessQuit(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager, "QUIT");
+    public ProcessQuit(final IRCParser parser) {
+        super(parser, "QUIT");
     }
 
     /**

irc/src/com/dmdirc/parser/irc/processors/ProcessTopic.java

@@ -27,7 +27,6 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.Date;
 
@@ -40,10 +39,9 @@ public class ProcessTopic extends IRCProcessor {
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    public ProcessTopic(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager, "TOPIC", "332", "333");
+    public ProcessTopic(final IRCParser parser) {
+        super(parser, "TOPIC", "332", "333");
     }
 
     /**

irc/src/com/dmdirc/parser/irc/processors/ProcessWallops.java

@@ -26,7 +26,6 @@ import com.dmdirc.parser.events.WallDesyncEvent;
 import com.dmdirc.parser.events.WallopEvent;
 import com.dmdirc.parser.events.WalluserEvent;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.Date;
 
@@ -39,10 +38,9 @@ public class ProcessWallops extends IRCProcessor {
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    public ProcessWallops(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager, "WALLOPS");
+    public ProcessWallops(final IRCParser parser) {
+        super(parser, "WALLOPS");
     }
 
     /**

irc/src/com/dmdirc/parser/irc/processors/ProcessWho.java

@@ -31,7 +31,6 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ProcessingManager;
 
 import java.util.Date;
 
@@ -44,10 +43,9 @@ public class ProcessWho extends IRCProcessor {
      * Create a new instance of the IRCProcessor Object.
      *
      * @param parser IRCParser That owns this IRCProcessor
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
      */
-    public ProcessWho(final IRCParser parser, final ProcessingManager manager) {
-        super(parser, manager, "352");
+    public ProcessWho(final IRCParser parser) {
+        super(parser, "352");
     }
 
     /**

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

@@ -1,346 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.parser.irc;
-
-import com.dmdirc.harness.parser.TestParser;
-import com.dmdirc.parser.common.CallbackNotFoundException;
-import com.dmdirc.parser.common.MyInfo;
-import com.dmdirc.parser.interfaces.callbacks.AuthNoticeListener;
-import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
-import com.dmdirc.parser.interfaces.callbacks.ChannelKickListener;
-import com.dmdirc.parser.interfaces.callbacks.ConnectErrorListener;
-import com.dmdirc.parser.interfaces.callbacks.ErrorInfoListener;
-import com.dmdirc.parser.interfaces.callbacks.NumericListener;
-import com.dmdirc.parser.interfaces.callbacks.ServerErrorListener;
-import com.dmdirc.parser.interfaces.callbacks.ServerReadyListener;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Arrays;
-
-import javax.net.ssl.TrustManager;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-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;
-
-@Ignore
-public class IRCParserTest {
-
-    private interface TestCallback extends CallbackInterface { }
-
-    @Test(expected=CallbackNotFoundException.class)
-    public void testIssue42() {
-        // Invalid callback names are silently ignored instead of raising exceptions
-        final IRCParser myParser = new IRCParser();
-    }
-
-    @Test
-    public void testIssue1674() {
-        // parser nick change error with dual 001
-        final ErrorInfoListener error = mock(ErrorInfoListener.class);
-
-        final TestParser myParser = new TestParser();
-        myParser.injectConnectionStrings();
-        myParser.nick = "nick2";
-        myParser.injectConnectionStrings();
-        myParser.injectLine(":nick2!ident@host NICK :nick");
-
-        verify(error, never()).onErrorInfo(same(myParser), anyObject(), anyObject());
-    }
-
-    @Test
-    public void testTokeniser() {
-        final String line1 = "a b c d e";
-        final String line2 = "a b c :d e";
-        final String line3 = ":a b:c :d e";
-        final String line4 = null;
-
-        final String[] res1 = IRCParser.tokeniseLine(line1);
-        final String[] res2 = IRCParser.tokeniseLine(line2);
-        final String[] res3 = IRCParser.tokeniseLine(line3);
-        final String[] res4 = IRCParser.tokeniseLine(line4);
-
-        assertTrue(Arrays.equals(res1, new String[]{"a", "b", "c", "d", "e"}));
-        assertTrue(Arrays.equals(res2, new String[]{"a", "b", "c", "d e"}));
-        assertTrue(Arrays.equals(res3, new String[]{":a", "b:c", "d e"}));
-        assertTrue(Arrays.equals(res4, new String[]{""}));
-    }
-
-    @Test
-    public void testSendConnectionStrings1() throws URISyntaxException {
-        final MyInfo myInfo = new MyInfo();
-        myInfo.setNickname("Nickname");
-        myInfo.setRealname("Real name");
-        myInfo.setUsername("Username");
-
-        final TestParser parser = new TestParser(myInfo, new URI("irc://irc.testing.dmdirc:6667/"));
-        parser.sendConnectionStrings();
-
-        assertEquals(3, parser.sentLines.size());
-
-        assertTrue("Should send CAP LS line",
-                Arrays.equals(parser.getLine(0), new String[]{"CAP", "LS"}));
-
-        assertTrue("Should send nickname line",
-                Arrays.equals(parser.getLine(1), new String[]{"NICK", "Nickname"}));
-
-        final String[] userParts = parser.getLine(2);
-        assertEquals("First token should be USER", "USER", userParts[0]);
-        assertEquals("USER should contain username", myInfo.getUsername().toLowerCase(),
-                userParts[1].toLowerCase());
-        assertEquals("USER should contain server name", "irc.testing.dmdirc", userParts[3]);
-        assertEquals("USER should contain real name", "Real name", userParts[4]);
-    }
-
-    @Test
-    public void testSendConnectionStrings2() throws URISyntaxException {
-        final MyInfo myInfo = new MyInfo();
-        myInfo.setNickname("Nickname");
-        myInfo.setRealname("Real name");
-        myInfo.setUsername("Username");
-
-        final TestParser parser = new TestParser(myInfo, new URI("irc://password@irc.testing.dmdirc:6667/"));
-        parser.sendConnectionStrings();
-
-        assertEquals(4, parser.sentLines.size());
-
-        assertTrue("Should send password line",
-                Arrays.equals(parser.getLine(1), new String[]{"PASS", "password"}));
-    }
-
-    @Test
-    public void testPingPong() {
-        final TestParser parser = new TestParser();
-
-        parser.injectLine("PING :flubadee7291");
-
-        assertTrue("Should reply to PINGs with PONGs",
-                Arrays.equals(parser.getLine(0), new String[]{"PONG", "flubadee7291"}));
-    }
-
-    @Test
-    public void testError() throws CallbackNotFoundException {
-        final ServerErrorListener test = mock(ServerErrorListener.class);
-
-        final TestParser parser = new TestParser();
-        parser.injectLine("ERROR :You smell of cheese");
-
-        verify(test).onServerError(same(parser), anyObject(), eq("You smell of cheese"));
-    }
-
-    @Test
-    public void testAuthNotice() throws CallbackNotFoundException {
-        final AuthNoticeListener test = mock(AuthNoticeListener.class);
-        final TestParser parser = new TestParser();
-        parser.sendConnectionStrings();
-
-        parser.injectLine("NOTICE AUTH :Random auth notice?");
-        verify(test).onNoticeAuth(same(parser), anyObject(), eq("Random auth notice?"));
-    }
-
-    @Test
-    public void testAuthNoticeTwenty() throws CallbackNotFoundException {
-        final AuthNoticeListener test = mock(AuthNoticeListener.class);
-        final TestParser parser = new TestParser();
-        parser.sendConnectionStrings();
-
-        parser.injectLine(":us.ircnet.org 020 * :Stupid notice");
-        verify(test).onNoticeAuth(same(parser), anyObject(), eq("Stupid notice"));
-    }
-
-    @Test
-    public void testPre001NickChange() throws CallbackNotFoundException {
-        final AuthNoticeListener test = mock(AuthNoticeListener.class);
-        final TestParser parser = new TestParser();
-        parser.sendConnectionStrings();
-        parser.injectLine(":chris!@ NICK :user2");
-
-        verify(test, never()).onNoticeAuth(anyObject(), anyObject(), anyString());
-    }
-
-    @Test
-    public void testNumeric() throws CallbackNotFoundException {
-        final NumericListener test = mock(NumericListener.class);
-        final TestParser parser = new TestParser();
-
-        parser.injectLine(":server 001 nick :Hi there, nick");
-
-        verify(test).onNumeric(same(parser), anyObject(), eq(1),
-                eq(new String[]{":server", "001", "nick", "Hi there, nick"}));
-    }
-
-    @Test
-    public void testServerReady() throws CallbackNotFoundException {
-        final ServerReadyListener test = mock(ServerReadyListener.class);
-        final TestParser parser = new TestParser();
-
-        final String[] strings = {
-            "NOTICE AUTH :Blah, blah",
-            ":server 020 * :Blah! Blah!",
-            ":server 001 nick :Welcome to the Testing IRC Network, nick",
-            ":server 002 nick :Your host is server.net, running version foo",
-            "NOTICE AUTH :I'm a retarded server",
-            ":server 003 nick :This server was created Sun Jan 6 2008 at 17:34:54 CET",
-            ":server 004 nick server.net foo dioswkgxRXInP biklmnopstvrDcCNuMT bklov",
-            ":server 005 nick WHOX WALLCHOPS WALLVOICES USERIP :are supported by this server",
-            ":server 005 nick MAXNICKLEN=15 TOPICLEN=250 AWAYLEN=160 :are supported " +
-                    "by this server",
-            ":server 375 nick :zomg, motd!",
-        };
-
-        for (String string : strings) {
-            verify(test, never()).onServerReady(anyObject(), anyObject());
-            parser.injectLine(string);
-        }
-
-        verify(test).onServerReady(same(parser), anyObject());
-    }
-
-    @Test
-    public void test005Parsing() {
-        final TestParser parser = new TestParser();
-
-        final String[] strings = {
-            ":server 001 nick :Welcome to the Testing IRC Network, nick",
-            ":server 002 nick :Your host is server.net, running version foo",
-            ":server 003 nick :This server was created Sun Jan 6 2008 at 17:34:54 CET",
-            ":server 004 nick server.net foo dioswkgxRXInP biklmnopstvrDcCNuMT bklov",
-            ":server 005 nick WHOX WALLCHOPS WALLVOICES NETWORK=moo :are supported by" +
-                    " this server",
-            ":server 005 nick MAXNICKLEN=15 MAXLIST=b:10,e:22,I:45 :are supported by" +
-                    " this server",
-            ":server 375 nick :zomg, motd!",
-        };
-
-        for (String string : strings) {
-            parser.injectLine(string);
-        }
-
-        assertEquals(10, parser.getMaxListModes('b'));
-        assertEquals(22, parser.getMaxListModes('e'));
-        assertEquals(45, parser.getMaxListModes('I'));
-        assertEquals("getMaxListModes should return 0 for unknowns;", 0,
-                parser.getMaxListModes('z'));
-        assertEquals("moo", parser.getNetworkName());
-        assertEquals("server", parser.getServerName());
-    }
-
-    @Test
-    public void testBindIP() {
-        final TestParser parser = new TestParser();
-
-        parser.setBindIP("abc.def.ghi.123");
-        assertEquals("abc.def.ghi.123", parser.getBindIP());
-    }
-
-    @Test
-    public void testAutoListMode() {
-        final TestParser parser = new TestParser();
-
-        parser.setAutoListMode(false);
-        assertFalse(parser.getAutoListMode());
-        parser.setAutoListMode(true);
-        assertTrue(parser.getAutoListMode());
-    }
-
-    @Test
-    public void testRemoveAfterCallback() {
-        final TestParser parser = new TestParser();
-
-        parser.setRemoveAfterCallback(false);
-        assertFalse(parser.getRemoveAfterCallback());
-        parser.setRemoveAfterCallback(true);
-        assertTrue(parser.getRemoveAfterCallback());
-    }
-
-    @Test
-    public void testAddLastLine() {
-        final TestParser parser = new TestParser();
-
-        parser.setAddLastLine(false);
-        assertFalse(parser.getAddLastLine());
-        parser.setAddLastLine(true);
-        assertTrue(parser.getAddLastLine());
-    }
-
-    @Test
-    public void testDisconnectOnFatal() {
-        final TestParser parser = new TestParser();
-
-        parser.setDisconnectOnFatal(false);
-        assertFalse(parser.getDisconnectOnFatal());
-        parser.setDisconnectOnFatal(true);
-        assertTrue(parser.getDisconnectOnFatal());
-    }
-
-    @Test
-    public void testTrustManager() {
-        final TestParser parser = new TestParser();
-
-        assertTrue(Arrays.equals(parser.getDefaultTrustManager(), parser.getTrustManager()));
-
-        parser.setTrustManagers(new TrustManager[0]);
-
-        assertTrue(Arrays.equals(new TrustManager[0], parser.getTrustManager()));
-    }
-
-    @Test
-    public void testGetParam() {
-        assertEquals("abc def", TestParser.getParam("foo :abc def"));
-        assertEquals("bar :abc def", TestParser.getParam("foo :bar :abc def"));
-        assertEquals("abc def", TestParser.getParam("abc def"));
-    }
-
-    @Test
-    public void testKick() throws CallbackNotFoundException {
-        final TestParser parser = new TestParser();
-        final ChannelKickListener ick = mock(ChannelKickListener.class);
-        parser.injectConnectionStrings();
-
-        parser.injectLine(":nick JOIN #D");
-        parser.injectLine(":bar!me@moo KICK #D nick :Bye!");
-
-        verify(ick).onChannelKick(same(parser), anyObject(), anyObject(), anyObject(), anyObject(),
-                anyString(), anyString());
-    }
-
-    @Test
-    public void testIllegalPort2() throws URISyntaxException {
-        final TestParser tp = new TestParser(new MyInfo(), new URI("irc://127.0.0.1:65570/"));
-        final ConnectErrorListener tiei = mock(ConnectErrorListener.class);
-        tp.runSuper();
-        verify(tiei).onConnectError(same(tp), anyObject(), anyObject());
-    }
-
-}

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

@@ -60,7 +60,7 @@ public class Process001Test {
     @Before
     public void setup() {
         when(parser.getLocalClient()).thenReturn(localClient);
-        processor = new Process001(parser, processingManager);
+        processor = new Process001(parser);
     }
 
     @Test

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

@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.parser.irc.processors;
-
-import com.dmdirc.harness.parser.TestParser;
-import com.dmdirc.parser.common.ParserError;
-import com.dmdirc.parser.interfaces.callbacks.ErrorInfoListener;
-import com.dmdirc.parser.irc.IRCEncoding;
-
-import java.util.Date;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
-@Ignore
-public class Process004005Test {
-
-    private TestParser doCaseMappingTest(final String target, final IRCEncoding expected) {
-        final TestParser parser = new TestParser();
-        parser.injectConnectionStrings();
-        parser.injectLine(":server 005 nick CASEMAPPING=" + target
-                    + " :are supported by this server");
-
-        assertEquals(expected, parser.getStringConverter().getEncoding());
-
-        return parser;
-    }
-
-    @Test
-    public void testCaseMappingASCII() {
-        doCaseMappingTest("ascii", IRCEncoding.ASCII);
-        doCaseMappingTest("ASCII", IRCEncoding.ASCII);
-    }
-
-    @Test
-    public void testCaseMappingRFC() {
-        doCaseMappingTest("rfc1459", IRCEncoding.RFC1459);
-        doCaseMappingTest("RFC1459", IRCEncoding.RFC1459);
-    }
-
-    @Test
-    public void testCaseMappingStrict() {
-        doCaseMappingTest("strict-rfc1459", IRCEncoding.STRICT_RFC1459);
-        doCaseMappingTest("strict-RFC1459", IRCEncoding.STRICT_RFC1459);
-    }
-
-    @Test
-    public void testCaseMappingUnknown() {
-        final TestParser tp = doCaseMappingTest("rfc1459", IRCEncoding.RFC1459);
-        final ErrorInfoListener info = mock(ErrorInfoListener.class);
-
-        tp.injectLine(":server 005 nick CASEMAPPING=unknown :are supported by this server");
-
-        verify(info).onErrorInfo(same(tp), (Date) anyObject(), (ParserError) anyObject());
-    }
-
-}

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

@@ -23,42 +23,42 @@
 package com.dmdirc.parser.irc.processors;
 
 import com.dmdirc.parser.common.CallbackManager;
-import com.dmdirc.parser.interfaces.callbacks.PasswordRequiredListener;
+import com.dmdirc.parser.events.PasswordRequiredEvent;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.ProcessingManager;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.same;
+import static org.junit.Assert.assertSame;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
-@Ignore
 public class Process464Test {
 
     @Mock private IRCParser parser;
     @Mock private ProcessingManager processingManager;
     @Mock private CallbackManager callbackManager;
-    @Mock private PasswordRequiredListener listener;
+    @Captor private ArgumentCaptor<PasswordRequiredEvent> eventCaptor;
     private Process464 processor;
 
     @Before
     public void setup() {
         when(parser.getCallbackManager()).thenReturn(callbackManager);
-        processor = new Process464(parser, processingManager);
+        processor = new Process464(parser);
     }
 
     @Test
     public void testFiresPasswordListenerOn464() {
         processor.process("464", ":server.com", "464", ":Bad password!");
-        verify(listener).onPasswordRequired(same(parser), anyObject());
+        verify(callbackManager).publish(eventCaptor.capture());
+        assertSame(parser, eventCaptor.getValue().getParser());
     }
 
 }

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

@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.parser.irc.processors;
-
-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 java.util.Date;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.mockito.Mockito.*;
-
-@Ignore
-public class ProcessJoinTest {
-    
-    @Test
-    public void testSelfJoinChannel() throws CallbackNotFoundException {
-        final TestParser parser = new TestParser();
-        final ChannelSelfJoinListener test = mock(ChannelSelfJoinListener.class);
-
-        parser.injectConnectionStrings();
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-
-        verify(test).onChannelSelfJoin(same(parser), (Date) anyObject(),
-                same(parser.getChannel("#DMDirc_testing")));
-    }
-    
-    @Test
-    public void testOtherJoinChannel() throws CallbackNotFoundException {
-        final TestParser parser = new TestParser();
-        final ChannelJoinListener test = mock(ChannelJoinListener.class);
-
-        parser.injectConnectionStrings();
-        
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-        parser.injectLine(":foo!bar@baz JOIN #DMDirc_testing");
-
-        verify(test).onChannelJoin(same(parser), (Date) anyObject(),
-                same(parser.getChannel("#DMDirc_testing")),
-                same(parser.getClient("foo!bar@baz").getChannelClients().get(0)));
-    }    
-
-}

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

@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.parser.irc.processors;
-
-import com.dmdirc.harness.parser.TestParser;
-import com.dmdirc.parser.common.CallbackNotFoundException;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.PrivateActionListener;
-import com.dmdirc.parser.interfaces.callbacks.PrivateCtcpListener;
-import com.dmdirc.parser.interfaces.callbacks.PrivateMessageListener;
-import java.util.Date;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.mockito.Mockito.*;
-
-@Ignore
-public class ProcessMessageTest {
-
-    @Test
-    public void testPrivateMessage() 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.injectLine(":a!b@c PRIVMSG nick :Hello!");
-        verify(ipmtest).onPrivateMessage(same(parser), (Date) anyObject(),
-                eq("Hello!"), eq("a!b@c"));
-        verify(ipatest, never()).onPrivateAction((Parser) anyObject(),
-                (Date) anyObject(), anyString(), anyString());
-        verify(ipctest, never()).onPrivateCTCP((Parser) anyObject(),
-                (Date) 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.injectLine(":a!b@c PRIVMSG nick :" + ((char) 1) + "ACTION meep" + ((char) 1));
-        verify(ipmtest, never()).onPrivateMessage((Parser) anyObject(),
-                (Date) anyObject(), anyString(), anyString());
-        verify(ipatest).onPrivateAction(same(parser), (Date) anyObject(),
-                eq("meep"), eq("a!b@c"));
-        verify(ipctest, never()).onPrivateCTCP((Parser) anyObject(),
-                (Date) 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.injectLine(":a!b@c PRIVMSG nick :" + ((char) 1) + "FOO meep" + ((char) 1));
-        verify(ipmtest, never()).onPrivateMessage((Parser) anyObject(),
-                (Date) anyObject(), anyString(), anyString());
-        verify(ipatest, never()).onPrivateAction((Parser) anyObject(),
-                (Date) anyObject(), anyString(), anyString());
-        verify(ipctest).onPrivateCTCP(same(parser),
-                (Date) anyObject(), eq("FOO"), eq("meep"), eq("a!b@c"));
-    }
-
-}

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

@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.parser.irc.processors;
-
-import com.dmdirc.harness.parser.TestParser;
-import com.dmdirc.parser.common.CallbackNotFoundException;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.callbacks.ErrorInfoListener;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-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;
-
-@Ignore
-public class ProcessNamesTest {
-    
-    @Test
-    public void testExternalNames() throws CallbackNotFoundException {
-        final TestParser parser = new TestParser();
-        final ErrorInfoListener test = mock(ErrorInfoListener.class);
-
-        parser.injectLine(":server 366 nick #nonexistant :End of /NAMES list.");
-        
-        verify(test, never()).onErrorInfo(anyObject(), anyObject(), anyObject());
-    }
-    
-    @Test
-    public void testChannelUmodes() {
-        final TestParser parser = new TestParser();
-
-        parser.injectConnectionStrings();
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-        parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser @+nick2 nick3");
-        parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
-
-        assertEquals(1, parser.getChannels().size());
-        assertNotNull(parser.getChannel("#DMDirc_testing"));
-        assertEquals(4, parser.getChannel("#DMDirc_testing").getChannelClients().size());
-        assertNotNull(parser.getClient("luser"));
-        assertEquals(1, parser.getClient("luser").getChannelClients().size());
-
-        ChannelClientInfo cci = parser.getClient("luser").getChannelClients().get(0);
-        assertEquals(parser.getChannel("#DMDirc_testing"), cci.getChannel());
-        assertEquals("+", cci.getAllModesPrefix());
-        
-        cci = parser.getChannel("#DMDirc_testing").getChannelClient("nick2");
-        assertNotNull(cci);
-        assertEquals("@+", cci.getAllModesPrefix());
-
-        cci = parser.getChannel("#DMDirc_testing").getChannelClient("nick3");
-        assertNotNull(cci);
-        assertEquals("", cci.getAllModesPrefix());
-    }
-
-}

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

@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.parser.irc.processors;
-
-import com.dmdirc.harness.parser.TestParser;
-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 org.junit.Ignore;
-import org.junit.Test;
-
-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;
-
-@Ignore
-public class ProcessNickTest {
-    
-    @Test
-    public void testNickSameName() {
-        final TestParser parser = new TestParser();
-        final NickChangeListener tinc = mock(NickChangeListener.class);
-        
-        parser.injectConnectionStrings();
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-        parser.injectLine(":nick JOIN #DMDirc_testing2");
-        parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser @+nick2 nick3");
-        parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
-        parser.injectLine(":luser!lu@ser.com NICK LUSER");
-
-        assertNotNull(parser.getClient("LUSER"));
-        assertEquals(1, parser.getClient("LUSER").getChannelClients().size());
-
-        final ChannelClientInfo cci = parser.getClient("LUSER").getChannelClients().get(0);
-        assertEquals(parser.getChannel("#DMDirc_testing"), cci.getChannel());
-        assertEquals("+", cci.getAllModesPrefix());
-
-        verify(tinc).onNickChanged(same(parser), anyObject(),
-                same(parser.getClient("LUSER")), eq("luser"));
-    }
-    
-    @Test
-    public void testNickDifferent() {
-        final TestParser parser = new TestParser();
-
-        parser.injectConnectionStrings();
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-        parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser @+nick2 nick3");
-        parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
-        parser.injectLine(":luser!lu@ser.com NICK foobar");
-
-        assertNotNull(parser.getClient("foobar"));
-        assertFalse(parser.isKnownClient("luser"));
-        assertEquals(1, parser.getClient("foobar").getChannelClients().size());
-
-        final ChannelClientInfo cci = parser.getClient("foobar").getChannelClients().get(0);
-        assertEquals(parser.getChannel("#DMDirc_testing"), cci.getChannel());
-        assertEquals("+", cci.getAllModesPrefix());
-    }    
-    
-    @Test
-    public void testOverrideNick() throws CallbackNotFoundException {
-        final TestParser parser = new TestParser();
-        final ErrorInfoListener info = mock(ErrorInfoListener.class);
-
-        parser.injectConnectionStrings();
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-        parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser @+nick2 nick3");
-        parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
-        parser.injectLine(":luser!lu@ser.com NICK nick3");
-
-        verify(info).onErrorInfo(same(parser), anyObject(), anyObject());
-    }
-    
-    @Test
-    public void testUnknownNick() {
-        final TestParser parser = new TestParser();
-        final NickChangeListener tinc = mock(NickChangeListener.class);
-
-        parser.injectConnectionStrings();
-        parser.injectLine(":random!lu@ser NICK rand");
-
-        verify(tinc, never()).onNickChanged(anyObject(), anyObject(), anyObject(), anyString());
-    }
-
-}

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

@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.parser.irc.processors;
-
-import com.dmdirc.harness.parser.TestParser;
-import com.dmdirc.parser.common.CallbackNotFoundException;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.callbacks.ChannelPartListener;
-import java.util.Date;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
-@Ignore
-public class ProcessPartTest {
-    
-    @Test
-    public void testNormalPart() throws CallbackNotFoundException {
-        final TestParser parser = new TestParser();
-
-        parser.injectConnectionStrings();
-
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-        parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser");
-        parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list.");
-        
-        final ChannelPartListener test = mock(ChannelPartListener.class);
-        
-        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());
-
-        verify(test).onChannelPart(same(parser), (Date) anyObject(),
-                same(parser.getChannel("#DMDirc_testing")),
-                same(cci), eq("Bye bye, cruel world"));
-    }
-    
-    @Test
-    public void testEmptyPart() throws CallbackNotFoundException {
-        final TestParser parser = new TestParser();
-
-        parser.injectConnectionStrings();
-
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-        parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser");
-        parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list.");
-        
-        final ChannelPartListener test = mock(ChannelPartListener.class);
-        
-        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());
-
-        verify(test).onChannelPart(same(parser), (Date) anyObject(),
-                same(parser.getChannel("#DMDirc_testing")), same(cci), eq(""));
-    }    
-
-}

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

@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.parser.irc.processors;
-
-import com.dmdirc.harness.parser.TestParser;
-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 java.util.Date;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
-@Ignore
-public class ProcessQuitTest {
-    
-    @Test
-    public void testChannelQuit() throws CallbackNotFoundException {
-        final TestParser parser = new TestParser();
-
-        parser.injectConnectionStrings();
-
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-        parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser");
-        parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list.");
-        parser.injectLine(":nick JOIN #DMDirc_testing2");
-        parser.injectLine(":server 353 nick = #DMDirc_testing2 :@nick +luser2");
-        parser.injectLine(":server 366 nick #DMDirc_testing2 :End of /NAMES list.");        
-        
-        final ChannelQuitListener test = mock(ChannelQuitListener.class);
-        
-        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());
-
-        verify(test).onChannelQuit(same(parser), (Date) anyObject(),
-                same(parser.getChannel("#DMDirc_testing")), same(cci),
-                eq("Bye bye, cruel world"));
-    }
-    
-    @Test
-    public void testGlobalQuit() throws CallbackNotFoundException {
-        final TestParser parser = new TestParser();
-
-        parser.injectConnectionStrings();
-
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-        parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser");
-        parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list.");
-        parser.injectLine(":nick JOIN #DMDirc_testing2");
-        parser.injectLine(":server 353 nick = #DMDirc_testing2 :@nick +luser2");
-        parser.injectLine(":server 366 nick #DMDirc_testing2 :End of /NAMES list.");
-        
-        final QuitListener test = mock(QuitListener.class);
-        
-        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());
-
-        verify(test).onQuit(same(parser), (Date) anyObject(),
-                same(client), eq("Bye bye, cruel world"));
-    }
-    
-    @Test
-    public void testEmptyQuit() throws CallbackNotFoundException {
-        final TestParser parser = new TestParser();
-
-        parser.injectConnectionStrings();
-
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-        parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser");
-        parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list.");
-        
-        final QuitListener test = mock(QuitListener.class);
-        
-        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());
-        
-        verify(test).onQuit(same(parser), (Date) anyObject(), same(client), eq(""));
-    }    
-
-}

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

@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.parser.irc.processors;
-
-import com.dmdirc.harness.parser.TestParser;
-import com.dmdirc.parser.common.CallbackNotFoundException;
-import com.dmdirc.parser.interfaces.callbacks.ChannelTopicListener;
-import java.util.Date;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
-@Ignore
-public class ProcessTopicTest {
-    
-    @Test
-    public void testBasicTopic() throws CallbackNotFoundException {
-        final TestParser parser = new TestParser();
-        final ChannelTopicListener test = mock(ChannelTopicListener.class);
-        parser.injectConnectionStrings();
-        
-        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");
-
-        verify(test).onChannelTopic(same(parser), (Date) anyObject(),
-                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 ChannelTopicListener test = mock(ChannelTopicListener.class);
-        parser.injectConnectionStrings();
-        
-        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");
-
-        
-        parser.injectLine(":foobar TOPIC #DMDirc_testing :New topic here");
-
-        verify(test).onChannelTopic(same(parser), (Date) anyObject(),
-                same(parser.getChannel("#DMDirc_testing")), eq(false));
-        
-        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());
-    }    
-
-}

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

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.parser.irc.processors;
-
-import com.dmdirc.parser.common.AwayState;
-import com.dmdirc.harness.parser.TestParser;
-import com.dmdirc.parser.common.CallbackNotFoundException;
-import com.dmdirc.parser.interfaces.callbacks.AwayStateListener;
-import com.dmdirc.parser.irc.IRCParser;
-
-import java.util.Date;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.mockito.Mockito.*;
-
-@Ignore
-public class ProcessWhoTest {
-
-    @Test
-    public void testSelfAway() throws CallbackNotFoundException {
-        final TestParser parser = new TestParser();
-        final AwayStateListener test = mock(AwayStateListener.class);
-        parser.injectConnectionStrings();
-
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-
-        parser.injectLine(":server 352 nick #DMDirc_testing nick2 host2 server nick2 G@ :0 rn");
-
-        verify(test, never()).onAwayState((IRCParser) anyObject(),
-                (Date) anyObject(), (AwayState) anyObject(), (AwayState) anyObject() , anyString());
-
-        parser.injectLine(":server 352 nick #DMDirc_testing nick host server nick G@ :0 rn");
-
-        verify(test).onAwayState(same(parser), (Date) anyObject(),
-                same(AwayState.UNKNOWN), same(AwayState.AWAY), eq(""));
-    }
-
-}