Merge pull request #79 from csmith/master

Add defensive checks to all events.

common/src/com/dmdirc/parser/common/CallbackManager.java

@@ -57,19 +57,6 @@ public class CallbackManager extends MBassador<ParserEvent> {
         this.parser = parser;
     }
 
-    @Override
-    public void publish(final ParserEvent message) {
-        // TODO: HACKY REMOVE
-        if (message.getParser() == null) {
-            message.setParser(parser);
-        }
-        if (message.getDate() == null) {
-            message.setDate(new Date());
-        }
-        // TODO: HACKY REMOVE
-        super.publish(message);
-    }
-
     @SuppressWarnings({
             "ThrowableResultOfMethodCallIgnored",
             "CallToPrintStackTrace",

common/src/com/dmdirc/parser/events/AuthNoticeEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Used on every incomming line before 001.
  */
@@ -35,7 +37,7 @@ public class AuthNoticeEvent extends ParserEvent {
 
     public AuthNoticeEvent(final Parser parser, final Date date, final String message) {
         super(parser, date);
-        this.message = message;
+        this.message = checkNotNull(message);
     }
 
     public String getMessage() {

common/src/com/dmdirc/parser/events/AwayStateEvent.java

@@ -27,6 +27,10 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import javax.annotation.Nullable;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when we go away, or come back.
  */
@@ -37,10 +41,10 @@ public class AwayStateEvent extends ParserEvent {
     private final String reason;
 
     public AwayStateEvent(final Parser parser, final Date date, final AwayState oldState,
-            final AwayState newState, final String reason) {
+            final AwayState newState, @Nullable final String reason) {
         super(parser, date);
-        this.oldState = oldState;
-        this.newState = newState;
+        this.oldState = checkNotNull(oldState);
+        this.newState = checkNotNull(newState);
         this.reason = reason;
     }
 
@@ -52,6 +56,7 @@ public class AwayStateEvent extends ParserEvent {
         return newState;
     }
 
+    @Nullable
     public String getReason() {
         return reason;
     }

common/src/com/dmdirc/parser/events/ChannelActionEvent.java

@@ -28,6 +28,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a person does an action in a channel.
  */
@@ -41,10 +43,10 @@ public class ChannelActionEvent extends ParserEvent {
     public ChannelActionEvent(final Parser parser, final Date date, final ChannelInfo channel,
             final ChannelClientInfo client, final String message, final String host) {
         super(parser, date);
-        this.channel = channel;
-        this.client = client;
-        this.message = message;
-        this.host = host;
+        this.channel = checkNotNull(channel);
+        this.client = checkNotNull(client);
+        this.message = checkNotNull(message);
+        this.host = checkNotNull(host);
     }
 
     public ChannelInfo getChannel() {

common/src/com/dmdirc/parser/events/ChannelCTCPEvent.java

@@ -28,6 +28,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a person sends a CTCP to a channel.
  */
@@ -43,11 +45,11 @@ public class ChannelCTCPEvent extends ParserEvent {
             final ChannelClientInfo client, final String type, final String message,
             final String host) {
         super(parser, date);
-        this.channel = channel;
-        this.client = client;
-        this.type = type;
-        this.message = message;
-        this.host = host;
+        this.channel = checkNotNull(channel);
+        this.client = checkNotNull(client);
+        this.type = checkNotNull(type);
+        this.message = checkNotNull(message);
+        this.host = checkNotNull(host);
     }
 
     public ChannelInfo getChannel() {

common/src/com/dmdirc/parser/events/ChannelCTCPReplyEvent.java

@@ -28,6 +28,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a person sends a CTCPRReply to a channel.
  */
@@ -43,11 +45,11 @@ public class ChannelCTCPReplyEvent extends ParserEvent {
             final ChannelClientInfo client, final String type, final String message,
             final String host) {
         super(parser, date);
-        this.channel = channel;
-        this.client = client;
-        this.type = type;
-        this.message = message;
-        this.host = host;
+        this.channel = checkNotNull(channel);
+        this.client = checkNotNull(client);
+        this.type = checkNotNull(type);
+        this.message = checkNotNull(message);
+        this.host = checkNotNull(host);
     }
 
     public ChannelInfo getChannel() {

common/src/com/dmdirc/parser/events/ChannelJoinEvent.java

@@ -28,6 +28,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called When we, or another client joins a channel.
  */
@@ -39,8 +41,8 @@ public class ChannelJoinEvent extends ParserEvent {
     public ChannelJoinEvent(final Parser parser, final Date date, final ChannelInfo channel,
             final ChannelClientInfo client) {
         super(parser, date);
-        this.channel = channel;
-        this.client = client;
+        this.channel = checkNotNull(channel);
+        this.client = checkNotNull(client);
     }
 
     public ChannelInfo getChannel() {

common/src/com/dmdirc/parser/events/ChannelKickEvent.java

@@ -28,26 +28,28 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a person is kicked.
  */
 public class ChannelKickEvent extends ParserEvent {
 
-    final ChannelInfo channel;
-    final ChannelClientInfo kickedClient;
-    final ChannelClientInfo client;
-    final String reason;
-    final String host;
+    private final ChannelInfo channel;
+    private final ChannelClientInfo kickedClient;
+    private final ChannelClientInfo client;
+    private final String reason;
+    private final String host;
 
     public ChannelKickEvent(final Parser parser, final Date date, final ChannelInfo channel,
             final ChannelClientInfo kickedClient, final ChannelClientInfo client,
             final String reason, final String host) {
         super(parser, date);
-        this.channel = channel;
-        this.kickedClient = kickedClient;
-        this.client = client;
-        this.reason = reason;
-        this.host = host;
+        this.channel = checkNotNull(channel);
+        this.kickedClient = checkNotNull(kickedClient);
+        this.client = checkNotNull(client);
+        this.reason = checkNotNull(reason);
+        this.host = checkNotNull(host);
     }
 
     public ChannelInfo getChannel() {

common/src/com/dmdirc/parser/events/ChannelListModeEvent.java

@@ -27,6 +27,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when all requested ListModes have been sent.
  */
@@ -38,7 +40,7 @@ public class ChannelListModeEvent extends ParserEvent {
     public ChannelListModeEvent(final Parser parser, final Date date, final ChannelInfo channel,
             final char mode) {
         super(parser, date);
-        this.channel = channel;
+        this.channel = checkNotNull(channel);
         this.mode = mode;
     }
 

common/src/com/dmdirc/parser/events/ChannelMessageEvent.java

@@ -28,6 +28,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a person sends a message to a channel.
  */
@@ -41,10 +43,10 @@ public class ChannelMessageEvent extends ParserEvent {
     public ChannelMessageEvent(final Parser parser, final Date date, final ChannelInfo channel,
             final ChannelClientInfo client, final String message, final String host) {
         super(parser, date);
-        this.channel = channel;
-        this.client = client;
-        this.message = message;
-        this.host = host;
+        this.channel = checkNotNull(channel);
+        this.client = checkNotNull(client);
+        this.message = checkNotNull(message);
+        this.host = checkNotNull(host);
     }
 
     public ChannelInfo getChannel() {

common/src/com/dmdirc/parser/events/ChannelModeChangeEvent.java

@@ -28,6 +28,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when the channel modes are changed or discovered.
  */
@@ -41,10 +43,10 @@ public class ChannelModeChangeEvent extends ParserEvent {
     public ChannelModeChangeEvent(final Parser parser, final Date date, final ChannelInfo channel,
             final ChannelClientInfo client, final String host, final String modes) {
         super(parser, date);
-        this.channel = channel;
-        this.client = client;
-        this.host = host;
-        this.modes = modes;
+        this.channel = checkNotNull(channel);
+        this.client = checkNotNull(client);
+        this.host = checkNotNull(host);
+        this.modes = checkNotNull(modes);
     }
 
     public ChannelInfo getChannel() {

common/src/com/dmdirc/parser/events/ChannelModeMessageEvent.java

@@ -28,6 +28,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a person sends a Message to a channel with a mode prefix.
  */
@@ -43,11 +45,11 @@ public class ChannelModeMessageEvent extends ParserEvent {
             final char prefix, final ChannelClientInfo client, final String message,
             final String host) {
         super(parser, date);
-        this.channel = channel;
-        this.prefix = prefix;
-        this.client = client;
-        this.message = message;
-        this.host = host;
+        this.channel = checkNotNull(channel);
+        this.prefix = checkNotNull(prefix);
+        this.client = checkNotNull(client);
+        this.message = checkNotNull(message);
+        this.host = checkNotNull(host);
     }
 
     public ChannelInfo getChannel() {

common/src/com/dmdirc/parser/events/ChannelModeNoticeEvent.java

@@ -28,6 +28,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a person sends a notice to a channel with a mode prefix.
  */
@@ -43,11 +45,11 @@ public class ChannelModeNoticeEvent extends ParserEvent {
             final char prefix, final ChannelClientInfo client, final String message,
             final String host) {
         super(parser, date);
-        this.channel = channel;
-        this.prefix = prefix;
-        this.client = client;
-        this.message = message;
-        this.host = host;
+        this.channel = checkNotNull(channel);
+        this.prefix = checkNotNull(prefix);
+        this.client = checkNotNull(client);
+        this.message = checkNotNull(message);
+        this.host = checkNotNull(host);
     }
 
     public ChannelInfo getChannel() {

common/src/com/dmdirc/parser/events/ChannelNamesEvent.java

@@ -27,6 +27,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a names reply is parsed.
  */
@@ -36,7 +38,7 @@ public class ChannelNamesEvent extends ParserEvent {
 
     public ChannelNamesEvent(final Parser parser, final Date date, final ChannelInfo channel) {
         super(parser, date);
-        this.channel = channel;
+        this.channel = checkNotNull(channel);
     }
 
     public ChannelInfo getChannel() {

common/src/com/dmdirc/parser/events/ChannelNickChangeEvent.java

@@ -28,6 +28,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when we or another user change nickname (Called once per channel the user is on).
  */
@@ -40,9 +42,9 @@ public class ChannelNickChangeEvent extends ParserEvent {
     public ChannelNickChangeEvent(final Parser parser, final Date date, final ChannelInfo channel,
             final ChannelClientInfo client, final String oldNick) {
         super(parser, date);
-        this.channel = channel;
-        this.client = client;
-        this.oldNick = oldNick;
+        this.channel = checkNotNull(channel);
+        this.client = checkNotNull(client);
+        this.oldNick = checkNotNull(oldNick);
     }
 
     public ChannelInfo getChannel() {

common/src/com/dmdirc/parser/events/ChannelNonUserModeChangeEvent.java

@@ -28,6 +28,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when the channel modes are changed or discovered.
  */
@@ -42,10 +44,10 @@ public class ChannelNonUserModeChangeEvent extends ParserEvent {
             final ChannelInfo channel, final ChannelClientInfo client, final String host,
             final String modes) {
         super(parser, date);
-        this.channel = channel;
-        this.client = client;
-        this.host = host;
-        this.modes = modes;
+        this.channel = checkNotNull(channel);
+        this.client = checkNotNull(client);
+        this.host = checkNotNull(host);
+        this.modes = checkNotNull(modes);
     }
 
     public ChannelInfo getChannel() {

common/src/com/dmdirc/parser/events/ChannelNoticeEvent.java

@@ -28,6 +28,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a person sends a notice to a channel.
  */
@@ -41,10 +43,10 @@ public class ChannelNoticeEvent extends ParserEvent {
     public ChannelNoticeEvent(final Parser parser, final Date date, final ChannelInfo channel,
             final ChannelClientInfo client, final String message, final String host) {
         super(parser, date);
-        this.channel = channel;
-        this.client = client;
-        this.message = message;
-        this.host = host;
+        this.channel = checkNotNull(channel);
+        this.client = checkNotNull(client);
+        this.message = checkNotNull(message);
+        this.host = checkNotNull(host);
     }
 
     public ChannelInfo getChannel() {

common/src/com/dmdirc/parser/events/ChannelOtherAwayStateEvent.java

@@ -29,6 +29,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when we go away, or come back.
  */
@@ -43,10 +45,10 @@ public class ChannelOtherAwayStateEvent extends ParserEvent {
             final ChannelInfo channel, final ChannelClientInfo client, final AwayState oldState,
             final AwayState newState) {
         super(parser, date);
-        this.channel = channel;
-        this.client = client;
-        this.oldState = oldState;
-        this.newState = newState;
+        this.channel = checkNotNull(channel);
+        this.client = checkNotNull(client);
+        this.oldState = checkNotNull(oldState);
+        this.newState = checkNotNull(newState);
     }
 
     public ChannelInfo getChannel() {

common/src/com/dmdirc/parser/events/ChannelPartEvent.java

@@ -28,6 +28,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called When we, or another client parts a channel.
  */
@@ -40,9 +42,9 @@ public class ChannelPartEvent extends ParserEvent {
     public ChannelPartEvent(final Parser parser, final Date date, final ChannelInfo channel,
             final ChannelClientInfo client, final String reason) {
         super(parser, date);
-        this.channel = channel;
-        this.client = client;
-        this.reason = reason;
+        this.channel = checkNotNull(channel);
+        this.client = checkNotNull(client);
+        this.reason = checkNotNull(reason);
     }
 
     public ChannelInfo getChannel() {

common/src/com/dmdirc/parser/events/ChannelQuitEvent.java

@@ -28,6 +28,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called When we, or another client quits IRC (Called once per channel the user was on).
  */
@@ -40,9 +42,9 @@ public class ChannelQuitEvent extends ParserEvent {
     public ChannelQuitEvent(final Parser parser, final Date date, final ChannelInfo channel,
             final ChannelClientInfo client, final String reason) {
         super(parser, date);
-        this.channel = channel;
-        this.client = client;
-        this.reason = reason;
+        this.channel = checkNotNull(channel);
+        this.client = checkNotNull(client);
+        this.reason = checkNotNull(reason);
     }
 
     public ChannelInfo getChannel() {

common/src/com/dmdirc/parser/events/ChannelSelfJoinEvent.java

@@ -27,6 +27,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when we join a channel.
  */
@@ -36,7 +38,7 @@ public class ChannelSelfJoinEvent extends ParserEvent {
 
     public ChannelSelfJoinEvent(final Parser parser, final Date date, final ChannelInfo channel) {
         super(parser, date);
-        this.channel = channel;
+        this.channel = checkNotNull(channel);
     }
 
     public ChannelInfo getChannel() {

common/src/com/dmdirc/parser/events/ChannelSingleModeChangeEvent.java

@@ -28,6 +28,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when the channel modes are changed or discovered.
  */
@@ -42,10 +44,10 @@ public class ChannelSingleModeChangeEvent extends ParserEvent {
             final ChannelInfo channel, final ChannelClientInfo client, final String host,
             final String modes) {
         super(parser, date);
-        this.channel = channel;
-        this.client = client;
-        this.host = host;
-        this.modes = modes;
+        this.channel = checkNotNull(channel);
+        this.client = checkNotNull(client);
+        this.host = checkNotNull(host);
+        this.modes = checkNotNull(modes);
     }
 
     public ChannelInfo getChannel() {

common/src/com/dmdirc/parser/events/ChannelTopicEvent.java

@@ -27,6 +27,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when the topic is changed or discovered for the first time.
  */
@@ -38,7 +40,7 @@ public class ChannelTopicEvent extends ParserEvent {
     public ChannelTopicEvent(final Parser parser, final Date date, final ChannelInfo channel,
             final boolean isJoinTopic) {
         super(parser, date);
-        this.channel = channel;
+        this.channel = checkNotNull(channel);
         this.isJoinTopic = isJoinTopic;
     }
 

common/src/com/dmdirc/parser/events/ChannelUserModeChangeEvent.java

@@ -28,6 +28,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  *  Called when a users channel mode is changed.
  */
@@ -43,11 +45,11 @@ public class ChannelUserModeChangeEvent extends ParserEvent {
             final ChannelInfo channel, final ChannelClientInfo targetClient,
             final ChannelClientInfo client, final String host, final String mode) {
         super(parser, date);
-        this.channel = channel;
-        this.targetClient = targetClient;
-        this.client = client;
-        this.host = host;
-        this.mode = mode;
+        this.channel = checkNotNull(channel);
+        this.targetClient = checkNotNull(targetClient);
+        this.client = checkNotNull(client);
+        this.host = checkNotNull(host);
+        this.mode = checkNotNull(mode);
     }
 
     public ChannelInfo getChannel() {

common/src/com/dmdirc/parser/events/CompositionStateChangeEvent.java

@@ -27,6 +27,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a person's composition state changes.
  */
@@ -38,8 +40,8 @@ public class CompositionStateChangeEvent extends ParserEvent {
     public CompositionStateChangeEvent(final Parser parser, final Date date,
             final CompositionState state, final String host) {
         super(parser, date);
-        this.state = state;
-        this.host = host;
+        this.state = checkNotNull(state);
+        this.host = checkNotNull(host);
     }
 
     public CompositionState getState() {

common/src/com/dmdirc/parser/events/ConnectErrorEvent.java

@@ -27,6 +27,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called to give Error Information related to a connection attempt.
  */
@@ -36,7 +38,7 @@ public class ConnectErrorEvent extends ParserEvent {
 
     public ConnectErrorEvent(final Parser parser, final Date date, final ParserError errorInfo) {
         super(parser, date);
-        this.errorInfo = errorInfo;
+        this.errorInfo = checkNotNull(errorInfo);
     }
 
     public ParserError getErrorInfo() {

common/src/com/dmdirc/parser/events/DataInEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Interface Used on every incoming line BEFORE parsing.
  */
@@ -35,7 +37,7 @@ public class DataInEvent extends ParserEvent {
 
     public DataInEvent(final Parser parser, final Date date, final String data) {
         super(parser, date);
-        this.data = data;
+        this.data = checkNotNull(data);
     }
 
     public String getData() {

common/src/com/dmdirc/parser/events/DataOutEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called on every incoming line BEFORE being sent.
  */
@@ -35,7 +37,7 @@ public class DataOutEvent extends ParserEvent {
 
     public DataOutEvent(final Parser parser, final Date date, final String data) {
         super(parser, date);
-        this.data = data;
+        this.data = checkNotNull(data);
     }
 
     public String getData() {

common/src/com/dmdirc/parser/events/DebugInfoEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Interface Used to give Debug Information.
  */
@@ -38,7 +40,7 @@ public class DebugInfoEvent extends ParserEvent {
             final String data) {
         super(parser, date);
         this.level = level;
-        this.data = data;
+        this.data = checkNotNull(data);
     }
 
     public int getLevel() {

common/src/com/dmdirc/parser/events/ErrorInfoEvent.java

@@ -27,6 +27,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called to give Error Information.
  */
@@ -36,7 +38,7 @@ public class ErrorInfoEvent extends ParserEvent {
 
     public ErrorInfoEvent(final Parser parser, final Date date, final ParserError errorInfo) {
         super(parser, date);
-        this.errorInfo = errorInfo;
+        this.errorInfo = checkNotNull(errorInfo);
     }
 
     public ParserError getErrorInfo() {

common/src/com/dmdirc/parser/events/GroupListEntryEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Callback interface for when the parser receives an entry during a group list response.
  */
@@ -38,9 +40,9 @@ public class GroupListEntryEvent extends ParserEvent {
     public GroupListEntryEvent(final Parser parser, final Date date, final String name,
             final int users, final String topic) {
         super(parser, date);
-        this.name = name;
-        this.users = users;
-        this.topic = topic;
+        this.name = checkNotNull(name);
+        this.users = checkNotNull(users);
+        this.topic = checkNotNull(topic);
     }
 
     public String getName() {

common/src/com/dmdirc/parser/events/InviteEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when we are invited to a channel.
  */
@@ -37,8 +39,8 @@ public class InviteEvent extends ParserEvent {
     public InviteEvent(final Parser parser, final Date date, final String userHost,
             final String channel) {
         super(parser, date);
-        this.userHost = userHost;
-        this.channel = channel;
+        this.userHost = checkNotNull(userHost);
+        this.channel = checkNotNull(channel);
     }
 
     public String getUserHost() {

common/src/com/dmdirc/parser/events/MOTDEndEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when "End of MOTD" or "No MOTD" is received.
  */
@@ -38,7 +40,7 @@ public class MOTDEndEvent extends ParserEvent {
             final String data) {
         super(parser, date);
         this.noMOTD = noMOTD;
-        this.data = data;
+        this.data = checkNotNull(data);
     }
 
     public boolean isNoMOTD() {

common/src/com/dmdirc/parser/events/MOTDLineEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Interface Used to give MOTD Information.
  */
@@ -35,7 +37,7 @@ public class MOTDLineEvent extends ParserEvent {
 
     public MOTDLineEvent(final Parser parser, final Date date, final String data) {
         super(parser, date);
-        this.data = data;
+        this.data = checkNotNull(data);
     }
 
     public String getData() {

common/src/com/dmdirc/parser/events/MOTDStartEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Interface Used when the MOTD Starts.
  */
@@ -35,7 +37,7 @@ public class MOTDStartEvent extends ParserEvent {
 
     public MOTDStartEvent(final Parser parser, final Date date, final String data) {
         super(parser, date);
-        this.data = data;
+        this.data = checkNotNull(data);
     }
 
     public String getData() {

common/src/com/dmdirc/parser/events/NetworkDetectedEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Interface Used when the Network=blah 005 token is recieved.
  */
@@ -38,9 +40,9 @@ public class NetworkDetectedEvent extends ParserEvent {
     public NetworkDetectedEvent(final Parser parser, final Date date, final String networkName,
             final String ircdVersion, final String ircdType) {
         super(parser, date);
-        this.networkName = networkName;
-        this.ircdVersion = ircdVersion;
-        this.ircdType = ircdType;
+        this.networkName = checkNotNull(networkName);
+        this.ircdVersion = checkNotNull(ircdVersion);
+        this.ircdType = checkNotNull(ircdType);
     }
 
     public String getNetworkName() {

common/src/com/dmdirc/parser/events/NickChangeEvent.java

@@ -27,6 +27,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when we or another user change nickname.
  */
@@ -38,8 +40,8 @@ public class NickChangeEvent extends ParserEvent {
     public NickChangeEvent(final Parser parser, final Date date, final ClientInfo client,
             final String oldNick) {
         super(parser, date);
-        this.client = client;
-        this.oldNick = oldNick;
+        this.client = checkNotNull(client);
+        this.oldNick = checkNotNull(oldNick);
     }
 
     public ClientInfo getClient() {

common/src/com/dmdirc/parser/events/NickInUseEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when requested nickname is in use.
  */
@@ -35,7 +37,7 @@ public class NickInUseEvent extends ParserEvent {
 
     public NickInUseEvent(final Parser parser, final Date date, final String nickname) {
         super(parser, date);
-        this.nickname = nickname;
+        this.nickname = checkNotNull(nickname);
     }
 
     public String getNickname() {

common/src/com/dmdirc/parser/events/NumericEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Interface Used to give numeric Information.
  */
@@ -37,8 +39,8 @@ public class NumericEvent extends ParserEvent {
     public NumericEvent(final Parser parser, final Date date, final int numeric,
             final String[] token) {
         super(parser, date);
-        this.numeric = numeric;
-        this.token = token;
+        this.numeric = checkNotNull(numeric);
+        this.token = checkNotNull(token);
     }
 
     public int getNumeric() {

common/src/com/dmdirc/parser/events/OtherAwayStateEvent.java

@@ -28,6 +28,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when we go away, or come back.
  */
@@ -40,9 +42,9 @@ public class OtherAwayStateEvent extends ParserEvent {
     public OtherAwayStateEvent(final Parser parser, final Date date, final ClientInfo client,
             final AwayState oldState, final AwayState newState) {
         super(parser, date);
-        this.client = client;
-        this.oldState = oldState;
-        this.newState = newState;
+        this.client = checkNotNull(client);
+        this.oldState = checkNotNull(oldState);
+        this.newState = checkNotNull(newState);
     }
 
     public ClientInfo getClient() {

common/src/com/dmdirc/parser/events/ParserErrorEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Parser error event.
  */
@@ -35,7 +37,7 @@ public class ParserErrorEvent extends ParserEvent {
 
     public ParserErrorEvent(final Parser parser, final Date date, final Throwable throwable) {
         super(parser, date);
-        this.throwable = throwable;
+        this.throwable = checkNotNull(throwable);
     }
 
     public Throwable getThrowable() {

common/src/com/dmdirc/parser/events/ParserEvent.java

@@ -26,17 +26,19 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
- *
+ * Base class for events emitted by a {@link Parser}.
  */
-public class ParserEvent {
+public abstract class ParserEvent {
 
-    private Parser parser;
-    private Date date;
+    private final Parser parser;
+    private final Date date;
 
     public ParserEvent(final Parser parser, final Date date) {
-        this.parser = parser;
-        this.date = date;
+        this.parser = checkNotNull(parser);
+        this.date = checkNotNull(date);
     }
 
     public Parser getParser() {
@@ -47,13 +49,4 @@ public class ParserEvent {
         return date;
     }
 
-    // TODO: HACKY REMOVE
-    public void setParser(final Parser parser) {
-        this.parser = parser;
-    }
-
-    // TODO: HACKY REMOVE
-    public void setDate(final Date date) {
-        this.date = date;
-    }
 }

common/src/com/dmdirc/parser/events/PrivateActionEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a person does an action to you (PM).
  */
@@ -37,8 +39,8 @@ public class PrivateActionEvent extends ParserEvent {
     public PrivateActionEvent(final Parser parser, final Date date, final String message,
             final String host) {
         super(parser, date);
-        this.message = message;
-        this.host = host;
+        this.message = checkNotNull(message);
+        this.host = checkNotNull(host);
     }
 
     public String getMessage() {

common/src/com/dmdirc/parser/events/PrivateCTCPEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a person sends a CTCP to you directly.
  */
@@ -38,9 +40,9 @@ public class PrivateCTCPEvent extends ParserEvent {
     public PrivateCTCPEvent(final Parser parser, final Date date, final String type,
             final String message, final String host) {
         super(parser, date);
-        this.type = type;
-        this.message = message;
-        this.host = host;
+        this.type = checkNotNull(type);
+        this.message = checkNotNull(message);
+        this.host = checkNotNull(host);
     }
 
     public String getType() {

common/src/com/dmdirc/parser/events/PrivateCTCPReplyEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a person sends a CTCPRReply to you directly.
  */
@@ -38,9 +40,9 @@ public class PrivateCTCPReplyEvent extends ParserEvent {
     public PrivateCTCPReplyEvent(final Parser parser, final Date date, final String type,
             final String message, final String host) {
         super(parser, date);
-        this.type = type;
-        this.message = message;
-        this.host = host;
+        this.type = checkNotNull(type);
+        this.message = checkNotNull(message);
+        this.host = checkNotNull(host);
     }
 
     public String getType() {

common/src/com/dmdirc/parser/events/PrivateMessageEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a person sends a message to you directly (PM).
  */
@@ -37,8 +39,8 @@ public class PrivateMessageEvent extends ParserEvent {
     public PrivateMessageEvent(final Parser parser, final Date date, final String message,
             final String host) {
         super(parser, date);
-        this.message = message;
-        this.host = host;
+        this.message = checkNotNull(message);
+        this.host = checkNotNull(host);
     }
 
     public String getMessage() {

common/src/com/dmdirc/parser/events/PrivateNoticeEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a person sends a notice to you.
  */
@@ -37,8 +39,8 @@ public class PrivateNoticeEvent extends ParserEvent {
     public PrivateNoticeEvent(final Parser parser, final Date date, final String message,
             final String host) {
         super(parser, date);
-        this.message = message;
-        this.host = host;
+        this.message = checkNotNull(message);
+        this.host = checkNotNull(host);
     }
 
     public String getMessage() {

common/src/com/dmdirc/parser/events/QuitEvent.java

@@ -27,6 +27,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called When we, or another client quits IRC (Called once in total).
  */
@@ -38,8 +40,8 @@ public class QuitEvent extends ParserEvent {
     public QuitEvent(final Parser parser, final Date date, final ClientInfo client,
             final String reason) {
         super(parser, date);
-        this.client = client;
-        this.reason = reason;
+        this.client = checkNotNull(client);
+        this.reason = checkNotNull(reason);
     }
 
     public ClientInfo getClient() {

common/src/com/dmdirc/parser/events/ServerErrorEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Interface Used to give ServerError.
  */
@@ -35,7 +37,7 @@ public class ServerErrorEvent extends ParserEvent {
 
     public ServerErrorEvent(final Parser parser, final Date date, final String message) {
         super(parser, date);
-        this.message = message;
+        this.message = checkNotNull(message);
     }
 
     public String getMessage() {

common/src/com/dmdirc/parser/events/ServerNoticeEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a server sends a notice to you.
  */
@@ -37,8 +39,8 @@ public class ServerNoticeEvent extends ParserEvent {
     public ServerNoticeEvent(final Parser parser, final Date date, final String message,
             final String host) {
         super(parser, date);
-        this.message = message;
-        this.host = host;
+        this.message = checkNotNull(message);
+        this.host = checkNotNull(host);
     }
 
     public String getMessage() {

common/src/com/dmdirc/parser/events/UnknownActionEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a person sends an action not aimed specifically at you or a channel (ie $*).
  */
@@ -38,9 +40,9 @@ public class UnknownActionEvent extends ParserEvent {
     public UnknownActionEvent(final Parser parser, final Date date, final String message,
             final String target, final String host) {
         super(parser, date);
-        this.message = message;
-        this.target = target;
-        this.host = host;
+        this.message = checkNotNull(message);
+        this.target = checkNotNull(target);
+        this.host = checkNotNull(host);
     }
 
     public String getMessage() {

common/src/com/dmdirc/parser/events/UnknownCTCPEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a person sends a CTCP not aimed at you or a channel (ie $*).
  */
@@ -39,10 +41,10 @@ public class UnknownCTCPEvent extends ParserEvent {
     public UnknownCTCPEvent(final Parser parser, final Date date, final String type,
             final String message, final String target, final String host) {
         super(parser, date);
-        this.type = type;
-        this.message = message;
-        this.target = target;
-        this.host = host;
+        this.type = checkNotNull(type);
+        this.message = checkNotNull(message);
+        this.target = checkNotNull(target);
+        this.host = checkNotNull(host);
     }
 
     public String getType() {

common/src/com/dmdirc/parser/events/UnknownCTCPReplyEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a person sends a CTCP not aimed at you or a channel (ie $*).
  */
@@ -39,10 +41,10 @@ public class UnknownCTCPReplyEvent extends ParserEvent {
     public UnknownCTCPReplyEvent(final Parser parser, final Date date, final String type,
             final String message, final String target, final String host) {
         super(parser, date);
-        this.type = type;
-        this.message = message;
-        this.target = target;
-        this.host = host;
+        this.type = checkNotNull(type);
+        this.message = checkNotNull(message);
+        this.target = checkNotNull(target);
+        this.host = checkNotNull(host);
     }
 
     public String getType() {

common/src/com/dmdirc/parser/events/UnknownMessageEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a person sends a message not aimed specifically at you or a channel (ie $*).
  */
@@ -38,9 +40,9 @@ public class UnknownMessageEvent extends ParserEvent {
     public UnknownMessageEvent(final Parser parser, final Date date,
             final String message, final String target, final String host) {
         super(parser, date);
-        this.message = message;
-        this.target = target;
-        this.host = host;
+        this.message = checkNotNull(message);
+        this.target = checkNotNull(target);
+        this.host = checkNotNull(host);
     }
 
     public String getMessage() {

common/src/com/dmdirc/parser/events/UnknownNoticeEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a person sends a notice not aimed specifically at you or a channel (ie $*).
  */
@@ -38,9 +40,9 @@ public class UnknownNoticeEvent extends ParserEvent {
     public UnknownNoticeEvent(final Parser parser, final Date date,
             final String message, final String target, final String host) {
         super(parser, date);
-        this.message = message;
-        this.target = target;
-        this.host = host;
+        this.message = checkNotNull(message);
+        this.target = checkNotNull(target);
+        this.host = checkNotNull(host);
     }
 
     public String getMessage() {

common/src/com/dmdirc/parser/events/UnknownServerNoticeEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a server sends a notice not aimed specifically at you or a channel (ie $*).
  */
@@ -38,9 +40,9 @@ public class UnknownServerNoticeEvent extends ParserEvent {
     public UnknownServerNoticeEvent(final Parser parser, final Date date, final String message,
             final String target, final String host) {
         super(parser, date);
-        this.message = message;
-        this.target = target;
-        this.host = host;
+        this.message = checkNotNull(message);
+        this.target = checkNotNull(target);
+        this.host = checkNotNull(host);
     }
 
     public String getMessage() {

common/src/com/dmdirc/parser/events/UserModeChangeEvent.java

@@ -27,6 +27,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when user modes are changed.
  */
@@ -39,9 +41,9 @@ public class UserModeChangeEvent extends ParserEvent {
     public UserModeChangeEvent(final Parser parser, final Date date, final ClientInfo client,
             final String host, final String modes) {
         super(parser, date);
-        this.client = client;
-        this.host = host;
-        this.modes = modes;
+        this.client = checkNotNull(client);
+        this.host = checkNotNull(host);
+        this.modes = checkNotNull(modes);
     }
 
     public ClientInfo getClient() {

common/src/com/dmdirc/parser/events/UserModeDiscoveryEvent.java

@@ -27,6 +27,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when user modes are Discovered.
  */
@@ -38,8 +40,8 @@ public class UserModeDiscoveryEvent extends ParserEvent {
     public UserModeDiscoveryEvent(final Parser parser, final Date date, final ClientInfo client,
             final String modes) {
         super(parser, date);
-        this.client = client;
-        this.modes = modes;
+        this.client = checkNotNull(client);
+        this.modes = checkNotNull(modes);
     }
 
     public ClientInfo getClient() {

common/src/com/dmdirc/parser/events/WallDesyncEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when a Desync message is recieved over wallops.
  */
@@ -37,8 +39,8 @@ public class WallDesyncEvent extends ParserEvent {
     public WallDesyncEvent(final Parser parser, final Date date, final String message,
             final String host) {
         super(parser, date);
-        this.message = message;
-        this.host = host;
+        this.message = checkNotNull(message);
+        this.host = checkNotNull(host);
     }
 
     public String getMessage() {

common/src/com/dmdirc/parser/events/WallopEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when an oper-only message is recieved over wallops.
  */
@@ -37,8 +39,8 @@ public class WallopEvent extends ParserEvent {
     public WallopEvent(final Parser parser, final Date date, final String message,
             final String host) {
         super(parser, date);
-        this.message = message;
-        this.host = host;
+        this.message = checkNotNull(message);
+        this.host = checkNotNull(host);
     }
 
     public String getMessage() {

common/src/com/dmdirc/parser/events/WalluserEvent.java

@@ -26,6 +26,8 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Date;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Called when an all-users message is recieved over wallops.
  */
@@ -37,8 +39,8 @@ public class WalluserEvent extends ParserEvent {
     public WalluserEvent(final Parser parser, final Date date, final String message,
             final String host) {
         super(parser, date);
-        this.message = message;
-        this.host = host;
+        this.message = checkNotNull(message);
+        this.host = checkNotNull(host);
     }
 
     public String getMessage() {

irc/test/com/dmdirc/harness/parser/TestParser.java

@@ -1,127 +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.harness.parser;
-
-import com.dmdirc.parser.common.ChildImplementations;
-import com.dmdirc.parser.common.MyInfo;
-import com.dmdirc.parser.common.QueuePriority;
-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.IRCReader;
-import com.dmdirc.parser.irc.SocketState;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Timer;
-
-@ChildImplementations({
-    IRCChannelClientInfo.class,
-    IRCChannelInfo.class,
-    IRCClientInfo.class
-})
-public class TestParser extends IRCParser {
-
-    public final List<String> sentLines = new ArrayList<>();
-
-    public String nick = "nick";
-
-    public String network = null;
-
-    public TestParser() {
-        super(buildURI());
-        currentSocketState = SocketState.OPEN;
-        setPingTimerFraction(10);
-        setPingTimerInterval(60000);
-    }
-
-    public TestParser(final MyInfo myDetails, final URI address) {
-        super(myDetails, address);
-        currentSocketState = SocketState.OPEN;
-        setPingTimerFraction(10);
-        setPingTimerInterval(60000);
-    }
-
-    private static URI buildURI() {
-        try {
-            return new URI("irc://host:1234/");
-        } catch (URISyntaxException ex) {
-            return null;
-        }
-    }
-
-    @Override
-    protected boolean doSendString(final String line, final QueuePriority priority, final boolean fromParser) {
-        sentLines.add(line);
-        return true;
-    }
-
-    public String[] getLine(final int index) {
-        return tokeniseLine(sentLines.get(index));
-    }
-
-    public void injectLine(final String line) {
-        processLine(new IRCReader.ReadLine(line, IRCParser.tokeniseLine(line)));
-    }
-
-    public void injectConnectionStrings() {
-        final String[] lines = {
-            "NOTICE AUTH :Blah, blah",
-            ":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 bRIeiklmnopstvrDcCNuMT bklov",
-            ":server 005 " + nick + " WHOX WALLCHOPS WALLVOICES USERIP PREFIX=(ov)@+ " +
-                    (network == null ? "" : "NETWORK=" + network + ' ') +
-                    ":are supported by this server",
-            ":server 005 " + nick + " MAXNICKLEN=15 TOPICLEN=250 AWAYLEN=160 MODES=6 " +
-                    "CHANMODES=bIeR,k,l,imnpstrDducCNMT :are supported by this server",
-        };
-
-        sendConnectionStrings();
-
-        for (String line : lines) {
-            injectLine(line);
-        }
-
-        sentLines.clear();
-    }
-
-    @Override
-    protected void pingTimerTask(final Timer timer) {
-        // Do nothing
-    }
-
-    @Override
-    public void run() {
-        injectConnectionStrings();
-    }
-
-    public void runSuper() {
-        super.run();
-    }
-
-}

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

@@ -1,105 +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.interfaces.ChannelClientInfo;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-
-public class ChannelClientInfoTest {
-        
-    @Test
-    public void testImportantMode() {
-        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 IRCChannelClientInfo cci = (IRCChannelClientInfo) parser.getClient("luser")
-                .getChannelClients().get(0);
-
-        assertEquals("v", cci.getImportantMode());
-        assertEquals("+", cci.getImportantModePrefix());
-        assertEquals("+luser", cci.toString());
-        assertEquals("+luser", cci.toFullString());
-
-        parser.injectLine(":server MODE #DMDirc_testing +o luser");
-        assertEquals("o", cci.getImportantMode());
-        assertEquals("@", cci.getImportantModePrefix());
-        assertEquals("@luser", cci.toString());
-        assertEquals("@+luser", cci.toFullString());
-
-        parser.injectLine(":server MODE #DMDirc_testing -ov luser luser");
-        assertEquals("", cci.getImportantMode());
-        assertEquals("", cci.getImportantModePrefix());
-        assertEquals("luser", cci.toString());
-        assertEquals("luser", cci.toFullString());
-    }
-    
-    @Test
-    public void testMap() {
-        final TestParser parser = new TestParser();
-
-        parser.injectConnectionStrings();
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-        final Map<Object, Object> map1 = new HashMap<>();
-        final Map<Object, Object> map2 = new HashMap<>();
-        
-        final IRCChannelClientInfo cci = (IRCChannelClientInfo) parser.getClient("nick")
-                .getChannelClients().get(0);
-        
-        cci.setMap(map1);
-        assertSame(map1, cci.getMap());
-        
-        cci.setMap(map2);
-        assertSame(map2, cci.getMap());
-    }
-    
-    @Test
-    public void testKick() {
-        final TestParser parser = new TestParser();
-
-        parser.injectConnectionStrings();
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-        parser.sentLines.clear();
-        
-        parser.getClient("nick").getChannelClients().get(0).kick("");
-        assertEquals(1, parser.sentLines.size());
-        assertEquals("KICK #DMDirc_testing nick", parser.sentLines.get(0));
-        parser.sentLines.clear();
-        
-        parser.getClient("nick").getChannelClients().get(0).kick("booya");
-        assertEquals(1, parser.sentLines.size());
-        assertEquals("KICK #DMDirc_testing nick :booya", parser.sentLines.get(0));
-    }
-
-}

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

@@ -1,347 +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.interfaces.ChannelInfo;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class ChannelInfoTest {
-
-    final IRCChannelInfo ci = new IRCChannelInfo(null, null, null, null, "name");
-
-    @Test
-    public void testGetName() {
-        assertEquals("name", ci.getName());
-    }
-
-    @Test
-    public void testAddingNames() {
-        assertTrue(ci.isAddingNames());
-
-        ci.setAddingNames(false);
-
-        assertFalse(ci.isAddingNames());
-    }
-
-    @Test
-    public void testCreateTime() {
-        ci.setCreateTime(12345L);
-
-        assertEquals(12345L, ci.getCreateTime());
-    }
-
-    @Test
-    public void testTopicTime() {
-        ci.setTopicTime(12345L);
-
-        assertEquals(12345L, ci.getTopicTime());
-    }
-
-    @Test
-    public void testTopic() {
-        ci.setInternalTopic("abcdef");
-
-        assertEquals("abcdef", ci.getTopic());
-    }
-
-    @Test
-    public void testSendMessage() {
-        final TestParser parser = new TestParser();
-        getChannel(parser).sendMessage("hello");
-
-        assertEquals("PRIVMSG #DMDirc_testing :hello", parser.sentLines.get(0));
-    }
-
-    @Test
-    public void testSendNotice() {
-        final TestParser parser = new TestParser();
-        getChannel(parser).sendNotice("hello");
-
-        assertEquals("NOTICE #DMDirc_testing :hello", parser.sentLines.get(0));
-    }
-
-    @Test
-    public void testSendCTCP() {
-        final TestParser parser = new TestParser();
-        getChannel(parser).sendCTCP("type", "hello");
-
-        assertEquals("PRIVMSG #DMDirc_testing :" + ((char) 1) + "TYPE hello" + ((char) 1),
-                parser.sentLines.get(0));
-    }
-
-    @Test
-    public void testSendCTCPEmpty() {
-        final TestParser parser = new TestParser();
-        getChannel(parser).sendCTCP("type", "");
-
-        assertEquals("PRIVMSG #DMDirc_testing :" + ((char) 1) + "TYPE" + ((char) 1),
-                parser.sentLines.get(0));
-    }
-
-    @Test
-    public void testSendAction() {
-        final TestParser parser = new TestParser();
-        getChannel(parser).sendAction("moo");
-
-        assertEquals("PRIVMSG #DMDirc_testing :" + ((char) 1) + "ACTION moo" + ((char) 1),
-                parser.sentLines.get(0));
-    }
-
-    @Test
-    public void testSendCTCPReply() {
-        final TestParser parser = new TestParser();
-        getChannel(parser).sendCTCPReply("type", "moo");
-
-        assertEquals("NOTICE #DMDirc_testing :" + ((char) 1) + "TYPE moo" + ((char) 1),
-                parser.sentLines.get(0));
-    }
-
-    @Test
-    public void testSendCTCPReplyEmpty() {
-        final TestParser parser = new TestParser();
-        getChannel(parser).sendCTCPReply("type", "");
-
-        assertEquals("NOTICE #DMDirc_testing :" + ((char) 1) + "TYPE" + ((char) 1),
-                parser.sentLines.get(0));
-    }
-
-    @Test
-    public void testSendEmptyMessages() {
-        final TestParser parser = new TestParser();
-        final IRCChannelInfo info = getChannel(parser);
-
-        info.sendAction("");
-        info.sendCTCP("", "");
-        info.sendCTCPReply("", "");
-        info.sendMessage("");
-        info.sendNotice("");
-
-        assertEquals(0, parser.sentLines.size());
-    }
-
-    @Test
-    public void testGetSetParamMode() {
-        final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannel(parser);
-        parser.injectLine(":server 324 nick #DMDirc_testing +k lalala");
-        parser.sentLines.clear();
-
-        assertEquals("lalala", info.getMode('k'));
-        assertEquals("", info.getMode('z'));
-
-        parser.injectLine(":server MODE #DMDirc_testing -k *");
-
-        assertEquals("", info.getMode('k'));
-    }
-
-    @Test
-    public void testModeSendFull() {
-        final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannel(parser);
-
-        parser.sentLines.clear();
-        info.alterMode(true, 'i', null);
-        info.alterMode(true, 'm', null);
-        info.alterMode(true, 'n', null);
-        info.alterMode(true, 'p', null);
-        info.alterMode(true, 't', null);
-        info.alterMode(true, 'r', null);
-
-        assertEquals("Parser must send modes as soon as the max number is reached",
-                1, parser.sentLines.size());
-        final String modes = getModes(parser.sentLines.get(0));
-
-        assertTrue(modes.indexOf('i') > -1);
-        assertTrue(modes.indexOf('m') > -1);
-        assertTrue(modes.indexOf('n') > -1);
-        assertTrue(modes.indexOf('p') > -1);
-        assertTrue(modes.indexOf('t') > -1);
-        assertTrue(modes.indexOf('r') > -1);
-    }
-
-    @Test
-    public void testModeSendExtra() {
-        final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannel(parser);
-
-        parser.sentLines.clear();
-        info.alterMode(true, 'i', null);
-        info.alterMode(true, 'm', null);
-        info.alterMode(true, 'n', null);
-        info.alterMode(true, 'p', null);
-        info.alterMode(true, 't', null);
-        info.alterMode(true, 'r', null);
-        info.alterMode(true, 'N', null);
-        info.flushModes();
-
-        assertEquals("sendModes must send modes",
-                2, parser.sentLines.size());
-
-        final String modes = getModes(parser.sentLines.get(0))
-                + getModes(parser.sentLines.get(1));
-
-        assertTrue(modes.indexOf('i') > -1);
-        assertTrue(modes.indexOf('m') > -1);
-        assertTrue(modes.indexOf('n') > -1);
-        assertTrue(modes.indexOf('p') > -1);
-        assertTrue(modes.indexOf('t') > -1);
-        assertTrue(modes.indexOf('r') > -1);
-        assertTrue(modes.indexOf('N') > -1);
-    }
-
-    @Test
-    public void testModeSendOptimisation1() {
-        final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannel(parser);
-
-        parser.sentLines.clear();
-        info.alterMode(true, 'i', null);
-        info.alterMode(true, 'm', null);
-        info.alterMode(true, 'n', null);
-        info.alterMode(true, 'n', null);
-        info.alterMode(false, 'i', null);
-        info.flushModes();
-
-        assertEquals("sendModes must send modes in one go",
-                1, parser.sentLines.size());
-
-        final String modes = getModes(parser.sentLines.get(0));
-
-        assertEquals("Setting a negative mode should cancel a positive one",
-                -1, modes.indexOf('i'));
-
-        assertTrue(modes.indexOf('m') > -1);
-    }
-
-    @Test
-    public void testModeSendOptimisation2() {
-        final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannel(parser);
-
-        parser.sentLines.clear();
-        info.alterMode(true, 'm', null);
-        info.alterMode(true, 'n', null);
-        info.alterMode(true, 'n', null);
-        info.flushModes();
-
-        assertEquals("sendModes must send modes in one go",
-                1, parser.sentLines.size());
-
-        final String modes = getModes(parser.sentLines.get(0));
-
-        assertEquals("Setting a mode twice should have no effect",
-                modes.indexOf('n'), modes.lastIndexOf('n'));
-
-        assertTrue(modes.indexOf('m') > -1);
-    }
-
-    @Test
-    public void testModeUnsetKey() {
-        final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannel(parser);
-        parser.injectLine(":server 324 nick #DMDirc_testing +k lalala");
-        parser.sentLines.clear();
-
-        info.alterMode(true, 'k', "foobar");
-        info.flushModes();
-
-        assertEquals("sendModes must send modes in one go",
-                1, parser.sentLines.size());
-        assertEquals("Setting +k must set -k first",
-                "-k+k lalala foobar", getModes(parser.sentLines.get(0)));
-    }
-
-    @Test
-    public void testIssue1410() {
-        final TestParser parser = new TestParser();
-
-        parser.injectConnectionStrings();
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-        parser.injectLine(":foo!bar@baz JOIN #DMDirc_testing");
-        parser.injectLine(":flub!floo@fleeee JOIN #DMDirc_testing");
-
-        assertNotSame(parser.getChannel("#DMDirc_testing").getChannelClients(),
-                parser.getChannel("#DMDirc_testing").getChannelClients());
-        assertEquals(parser.getChannel("#DMDirc_testing").getChannelClients(),
-                parser.getChannel("#DMDirc_testing").getChannelClients());
-    }
-
-    @Test @Ignore
-    public void testModeUnsetKeyMultiple() {
-        final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannel(parser);
-        parser.injectLine(":server 324 nick #DMDirc_testing +k lalala");
-        parser.sentLines.clear();
-
-        info.alterMode(true, 'k', "foobar");
-        info.alterMode(true, 'k', "blahblah");
-        info.alterMode(true, 'k', "unittest");
-        info.flushModes();
-
-        assertEquals("sendModes must send modes in one go",
-                1, parser.sentLines.size());
-        assertEquals("Setting a mode multiple times should have no effect",
-                "-k+k lalala unittest", getModes(parser.sentLines.get(0)));
-    }
-
-    @Test @Ignore
-    public void testModeUnsetLimitMultiple() {
-        final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannel(parser);
-        parser.injectLine(":server 324 nick #DMDirc_testing +l 73");
-        parser.sentLines.clear();
-
-        info.alterMode(true, 'l', "74");
-        info.alterMode(true, 'l', "75");
-        info.alterMode(true, 'l', "76");
-        info.flushModes();
-
-        assertEquals("sendModes must send modes in one go",
-                1, parser.sentLines.size());
-        assertEquals("Setting a mode multiple times should have no effect",
-                "+l 76", getModes(parser.sentLines.get(0)));
-    }
-
-    private String getModes(final String line) {
-        final String res = line.substring("MODE #DMDirc_testing ".length());
-
-        if (res.charAt(0) == '+') {
-            return res.substring(1);
-        }
-
-        return res;
-    }
-
-    private IRCChannelInfo getChannel(final TestParser parser) {
-        parser.injectConnectionStrings();
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-
-        parser.sentLines.clear();
-        return parser.getChannels().iterator().next();
-    }
-
-}

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

@@ -1,76 +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 java.util.Arrays;
-import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import static org.junit.Assert.*;
-
-@RunWith(Parameterized.class)
-public class IRCParserIrcdTest {
-
-    private final String ircd, expected;
-
-    public IRCParserIrcdTest(final String ircd, final String expected) {
-        this.ircd = ircd;
-        this.expected = expected;
-    }
-
-    @Test
-    public void testIrcdDetection() {
-        final TestParser parser = new TestParser();
-
-        String[] strings = {
-            ":server 001 nick :Welcome to the Testing IRC Network, nick",
-            ":server 002 nick :Your host is server.net, running version %s",
-            ":server 003 nick :This server was created Sun Jan 6 2008 at 17:34:54 CET",
-            ":server 004 nick server.net %s dioswkgxRXInP biklmnopstvrDcCNuMT bklov"
-        };
-
-        for (String line : strings) {
-            parser.injectLine(String.format(line, ircd));
-        }
-
-        assertEquals(ircd, parser.getServerSoftware());
-        assertEquals(expected.toLowerCase(), parser.getServerSoftwareType().toLowerCase());
-    }
-
-    @Parameterized.Parameters
-    public static List<String[]> data() {
-        final String[][] tests = {
-            {"u2.10.12.10+snircd(1.3.4)", "snircd"},
-            {"u2.10.12.12", "ircu"},
-            {"hyperion-1.0.2b", "hyperion"},
-            {"hybrid-7.2.3", "hybrid"},
-            {"Unreal3.2.6", "unreal"},
-            {"bahamut-1.8(04)", "bahamut"},
-        };
-
-        return Arrays.asList(tests);
-    }
-
-}

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

@@ -1,93 +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.ChannelListModeItem;
-import java.util.Collection;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class ProcessListModeTest {
-
-    private void testListModes(final String numeric1, final String numeric2, final char mode) {
-        final TestParser parser = new TestParser();
-        parser.injectConnectionStrings();
-
-        parser.injectLine(":nick JOIN #D");
-        parser.injectLine(":server " + numeric1 + " nick #D ban1!ident@.host bansetter1 1001");
-        parser.injectLine(":server " + numeric1 + " nick #D ban2!*@.host bansetter2 1002");
-        parser.injectLine(":server " + numeric1 + " nick #D ban3!ident@* bansetter3 1003");
-        parser.injectLine(":server " + numeric2 + " nick #D :End of Channel Something List");
-
-        final Collection<ChannelListModeItem> items
-                = parser.getChannel("#D").getListMode(mode);
-
-        assertEquals(3, items.size());
-        boolean gotOne = false, gotTwo = false, gotThree = false;
-
-        for (ChannelListModeItem item : items) {
-            if (item.getItem().equals("ban1!ident@.host")) {
-                assertEquals("bansetter1", item.getOwner());
-                assertEquals(1001L, item.getTime());
-                assertFalse(gotOne);
-                gotOne = true;
-            } else if (item.getItem().equals("ban2!*@.host")) {
-                assertEquals("bansetter2", item.getOwner());
-                assertEquals(1002L, item.getTime());
-                assertFalse(gotTwo);
-                gotTwo = true;
-            } else if (item.toString().equals("ban3!ident@*")) {
-                assertEquals("bansetter3", item.getOwner());
-                assertEquals(1003L, item.getTime());
-                assertFalse(gotThree);
-                gotThree = true;
-            }
-        }
-
-        assertTrue(gotOne);
-        assertTrue(gotTwo);
-        assertTrue(gotThree);
-    }
-
-    @Test
-    public void testNormalBans() {
-        testListModes("367", "368", 'b');
-    }
-
-    @Test
-    public void testInvexList() {
-        testListModes("346", "347", 'I');
-    }
-
-    @Test
-    public void testExemptList() {
-        testListModes("348", "349", 'e');
-    }
-
-    @Test
-    public void testReopList() {
-        testListModes("344", "345", 'R');
-    }
-
-}

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

@@ -1,145 +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 org.junit.Ignore;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-@Ignore
-public class ProcessModeTest {
-    
-    @Test
-    public void testBasicUmodes() throws CallbackNotFoundException {
-        final TestParser parser = new TestParser();
-
-        parser.injectConnectionStrings();
-
-        parser.injectLine(":server 221 nick iw");
-
-        assertTrue(parser.getLocalClient().getModes().indexOf('i') > -1);
-        assertTrue(parser.getLocalClient().getModes().indexOf('w') > -1);
-    }
-    
-    @Test
-    public void testAlteringUmodes() throws CallbackNotFoundException {
-        final TestParser parser = new TestParser();
-
-        parser.injectConnectionStrings();
-
-        parser.injectLine(":server 221 nick iw");
-        parser.injectLine(":server MODE nick :-iw+ox");
-
-        assertTrue(parser.getLocalClient().getModes().indexOf('o') > -1);
-        assertTrue(parser.getLocalClient().getModes().indexOf('x') > -1);
-        assertEquals(-1, parser.getLocalClient().getModes().indexOf('i'));
-        assertEquals(-1, parser.getLocalClient().getModes().indexOf('w'));
-    }
-    
-    @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");
-        parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
-
-        final ChannelClientInfo cci = parser.getClient("luser").getChannelClients().get(0);
-
-        parser.injectLine(":server MODE #DMDirc_testing +v luser");
-        assertEquals("v", cci.getAllModes());
-        assertEquals("+", cci.getAllModesPrefix());
-
-        parser.injectLine(":server MODE #DMDirc_testing +o luser");
-        assertEquals("ov", cci.getAllModes());
-        assertEquals("@+", cci.getAllModesPrefix());
-
-        parser.injectLine(":server MODE #DMDirc_testing +bov moo luser luser");
-        assertEquals("ov", cci.getAllModes());
-
-        parser.injectLine(":server MODE #DMDirc_testing -bov moo luser luser");
-        assertEquals("", cci.getAllModes());
-        assertEquals("", cci.getAllModesPrefix());
-    }
-    
-    @Test
-    public void testUnknownUser1() {
-        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(":luser!me@my MODE #DMDirc_testing +v :moo");
-        
-        assertNotNull(parser.getClient("moo"));
-        assertEquals(0, parser.getClient("moo").getChannelCount());
-        
-        assertEquals("Parser should update ident when it sees a MODE line",
-                "me", parser.getClient("luser").getUsername());
-        assertEquals("Parser should update host when it sees a MODE line",
-                "my", parser.getClient("luser").getHostname());
-    }
-    
-    @Test
-    public void testChannelModes() {
-        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(":server 324 nick #DMDirc_testing +Zstnl 1234");
-
-        assertEquals("1234", parser.getChannel("#DMDirc_testing").getMode('l'));
-        
-        String modes = parser.getChannel("#DMDirc_testing").getModes().split(" ")[0];
-        assertEquals(6, modes.length());
-        assertEquals('+', modes.charAt(0));
-        assertTrue(modes.indexOf('Z') > -1);
-        assertTrue(modes.indexOf('s') > -1);
-        assertTrue(modes.indexOf('t') > -1);
-        assertTrue(modes.indexOf('n') > -1);
-        assertTrue(modes.indexOf('l') > -1);
-        
-        parser.injectLine(":server MODE #DMDirc_testing :-Z");
-        
-        modes = parser.getChannel("#DMDirc_testing").getModes().split(" ")[0];
-        assertEquals(5, modes.length());
-        assertEquals('+', modes.charAt(0));
-        assertTrue(modes.indexOf('s') > -1);
-        assertTrue(modes.indexOf('t') > -1);
-        assertTrue(modes.indexOf('n') > -1);
-        assertTrue(modes.indexOf('l') > -1);        
-    }
-
-}