Commands clean up

Reduce dependency on CommandManager singleton
Use Lombok and delete loads of boilerplate code

Change-Id: Id178d20df1838eef99abdc0c3ca12b6dbd2a062f
Reviewed-on: http://gerrit.dmdirc.com/2310
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/commandparser/BaseCommandInfo.java

@@ -22,51 +22,25 @@
 
 package com.dmdirc.commandparser;
 
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
 /**
  * A basic {@link CommandInfo} implementation whose parameters can be
  * configured via the constructor.
  */
+@Getter
+@RequiredArgsConstructor
+@SuppressWarnings("PMD.UnusedPrivateField")
 public class BaseCommandInfo implements CommandInfo {
 
     /** The name of the command. */
     private final String name;
 
     /** The help text for this command. */
-    private final String helpText;
+    private final String help;
 
     /** The type of the command. */
     private final CommandType type;
 
-    /**
-     * Creates a new BaseCommandInfo with the specified information.
-     *
-     * @param name The name of the command
-     * @param helpText The help text for this command
-     * @param type The type of the command
-     */
-    public BaseCommandInfo(final String name, final String helpText,
-            final CommandType type) {
-        this.name = name;
-        this.helpText = helpText;
-        this.type = type;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getHelp() {
-        return helpText;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public CommandType getType() {
-        return type;
-    }
-
 }

src/com/dmdirc/commandparser/CommandArguments.java

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser;
 
 import com.dmdirc.Precondition;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.logger.Logger;
 
 import java.util.Arrays;
@@ -46,22 +47,51 @@ public class CommandArguments {
     /** The line split into whitespace-delimited words. */
     private String[] words;
 
+    /** Command controller to consult for command chars, etc. */
+    private final CommandController controller;
+
     /**
      * Creates a new command arguments parser for the specified line.
      *
      * @param line The line to be parsed
      */
     public CommandArguments(final String line) {
-        this.line = line;
+        this(CommandManager.getCommandManager(), line);
     }
 
     /**
+     * Creates a new command arguments parser for the specified line.
+     *
+     * @param controller The command controller to consult for information
+     * about command characters, etc.
+     * @param line The line to be parsed
+     * @since 0.6.7
+     */
+    public CommandArguments(final CommandController controller, final String line) {
+        this.controller = controller;
+        this.line = line;
+    }
+
+   /**
      * Creates a new command arguments parser for the specified words.
      *
      * @param words The words which form the line ot be parsed
      * @since 0.6.3
      */
     public CommandArguments(final Collection<String> words) {
+        this(CommandManager.getCommandManager(), words);
+    }
+
+    /**
+     * Creates a new command arguments parser for the specified words.
+     *
+     * @param controller The command controller to consult for information
+     * about command characters, etc.
+     * @param words The words which form the line ot be parsed
+     * @since 0.6.7
+     */
+    public CommandArguments(final CommandController controller, final Collection<String> words) {
+        this.controller = controller;
         this.words = words.toArray(new String[words.size()]);
 
         final StringBuilder builder = new StringBuilder();
@@ -208,7 +238,7 @@ public class CommandArguments {
      * @return True if the input was a command, false otherwise
      */
     public boolean isCommand() {
-        return !line.isEmpty() && line.charAt(0) == CommandManager.getCommandManager().getCommandChar();
+        return !line.isEmpty() && line.charAt(0) == controller.getCommandChar();
     }
 
     /**
@@ -218,7 +248,7 @@ public class CommandArguments {
      */
     public boolean isSilent() {
         return isCommand() && line.length() >= 2
-                && line.charAt(1) == CommandManager.getCommandManager().getSilenceChar();
+                && line.charAt(1) == controller.getSilenceChar();
     }
 
     /**

src/com/dmdirc/commandparser/CommandInfoPair.java

@@ -24,46 +24,24 @@ package com.dmdirc.commandparser;
 
 import com.dmdirc.commandparser.commands.Command;
 
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
 /**
  * A combination of a {@link Command} and the {@link CommandInfo} which
  * triggered it.
  *
  * @since 0.6.4
  */
+@RequiredArgsConstructor
+@Getter
+@SuppressWarnings("PMD.UnusedPrivateField")
 public class CommandInfoPair {
 
     /** The command info which caused the command to be triggered. */
     private final CommandInfo commandInfo;
+
     /** The command in question. */
     private final Command command;
 
-    /**
-     * Creates a new CommandInfoPair.
-     *
-     * @param commandInfo The command info associated with the command
-     * @param command The command
-     */
-    public CommandInfoPair(final CommandInfo commandInfo, final Command command) {
-        this.commandInfo = commandInfo;
-        this.command = command;
-    }
-
-    /**
-     * Retrieves the command part of this pair.
-     *
-     * @return This pair's command
-     */
-    public Command getCommand() {
-        return command;
-    }
-
-    /**
-     * Retrieves the commandinfo part of this pair.
-     *
-     * @return This pair's commandinfo
-     */
-    public CommandInfo getCommandInfo() {
-        return commandInfo;
-    }
-
 }

src/com/dmdirc/commandparser/commands/Command.java

@@ -26,11 +26,17 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.messages.Styliser;
 
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
 /**
  * Represents a generic command.
  */
+@RequiredArgsConstructor
 public abstract class Command {
 
     /** The format name used for command output. */
@@ -39,6 +45,18 @@ public abstract class Command {
     /** The format name used for command errors. */
     protected static final String FORMAT_ERROR = "commandError";
 
+    /** The controller this command is associated with. */
+    @Getter(AccessLevel.PROTECTED)
+    private final CommandController controller;
+
+    /**
+     * Creates a new instance of Command using the default CommandManager
+     * provided by {@link CommandManager#getCommandManager()}.
+     */
+    public Command() {
+        this(CommandManager.getCommandManager());
+    }
+
     /**
      * Sends a line, if appropriate, to the specified target.
      * @param target The command window to send the line to
@@ -64,7 +82,7 @@ public abstract class Command {
     protected final void showUsage(final FrameContainer target,
             final boolean isSilent, final String name, final String args) {
         sendLine(target, isSilent, "commandUsage",
-                CommandManager.getCommandManager().getCommandChar(),
+                controller.getCommandChar(),
                 name, args);
     }
 

src/com/dmdirc/commandparser/commands/IntelligentCommand.java

@@ -27,6 +27,9 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import java.util.List;
 
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
 /**
  * Intelligent commands implement a method that provides a list of possible
  * options for them, for use (for example) by table completers.
@@ -49,6 +52,9 @@ public interface IntelligentCommand {
      *
      * @since 0.6.4
      */
+    @RequiredArgsConstructor
+    @Getter
+    @SuppressWarnings("PMD.UnusedPrivateField")
     class IntelligentCommandContext {
 
         /** The window the command is being entered in. */
@@ -60,45 +66,5 @@ public interface IntelligentCommand {
         /** The partially typed word, if any. */
         private final String partial;
 
-        /**
-         * Creates a new context with the specified arguments.
-         *
-         * @param window The window the command is being entered in
-         * @param previousArgs The previously supplied arguments, if any
-         * @param partial The partially-typed word being completed
-         */
-        public IntelligentCommandContext(final WritableFrameContainer window,
-                final List<String> previousArgs, final String partial) {
-            this.window = window;
-            this.previousArgs = previousArgs;
-            this.partial = partial;
-        }
-
-        /**
-         * Retrieves the window that the command was entered in.
-         *
-         * @return The command's input window
-         */
-        public WritableFrameContainer getWindow() {
-            return window;
-        }
-
-        /**
-         * Retrieves the previously supplied arguments.
-         *
-         * @return Any arguments supplied prior to the current one
-         */
-        public List<String> getPreviousArgs() {
-            return previousArgs;
-        }
-
-        /**
-         * Retrieves the partially typed word which is being completed.
-         *
-         * @return The partial word being completed
-         */
-        public String getPartial() {
-            return partial;
-        }
     }
 }

src/com/dmdirc/commandparser/commands/PreviousCommand.java

@@ -24,71 +24,23 @@ package com.dmdirc.commandparser.commands;
 
 import java.util.Date;
 
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
 /**
  * Stores information about a previously executed command.
  */
+@RequiredArgsConstructor
+@EqualsAndHashCode
+@Getter
+@SuppressWarnings("PMD.UnusedPrivateField")
 public final class PreviousCommand {
 
     /** The full command that was executed. */
     private final String line;
 
     /** The timestamp of its execution. */
-    private final long time;
-
-    /**
-     * Creates a new record of the specified command.
-     *
-     * @param line The full command that was executed
-     */
-    public PreviousCommand(final String line) {
-        this.line = line;
-        this.time = new Date().getTime();
-    }
-
-    /**
-     * Retrieves the time that the command was executed at.
-     *
-     * @return The timestamp that the command was executed at
-     */
-    public long getTime() {
-        return time;
-    }
-
-    /**
-     * Retrieves the command that was executed.
-     *
-     * @return The command that was executed.
-     */
-    public String getLine() {
-        return line;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean equals(final Object obj) {
-        if (obj == null) {
-            return false;
-        }
-
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-
-        final PreviousCommand other = (PreviousCommand) obj;
-        if (this.line != other.line
-                && (this.line == null || !this.line.equals(other.line))) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public int hashCode() {
-        int hash = 5;
-        hash = 97 * hash + (this.line == null ? 0 : this.line.hashCode());
-        return hash;
-    }
+    private final long time = new Date().getTime();
 
 }

src/com/dmdirc/commandparser/commands/global/AliasCommand.java

@@ -30,7 +30,6 @@ import com.dmdirc.actions.wrappers.AliasWrapper;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -60,7 +59,7 @@ public class AliasCommand extends Command implements IntelligentCommand {
         if (args.getArguments()[0].equalsIgnoreCase("--remove")) {
             final String name
                     = args.getArguments()[1].charAt(0)
-                    == CommandManager.getCommandManager().getCommandChar()
+                    == getController().getCommandChar()
                     ? args.getArguments()[1].substring(1) : args.getArguments()[1];
 
             if (doRemove(name)) {
@@ -75,7 +74,7 @@ public class AliasCommand extends Command implements IntelligentCommand {
         }
 
         final String name = args.getArguments()[0].charAt(0)
-                == CommandManager.getCommandManager().getCommandChar()
+                == getController().getCommandChar()
                 ? args.getArguments()[0].substring(1) : args.getArguments()[0];
 
         for (Action alias : AliasWrapper.getAliasWrapper()) {

src/com/dmdirc/commandparser/commands/global/Help.java

@@ -27,7 +27,6 @@ import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -111,11 +110,10 @@ public class Help extends Command implements IntelligentCommand {
             final String name) {
         Map.Entry<CommandInfo, Command> command = null;
 
-        if (name.length() > 0 && name.charAt(0)
-                == CommandManager.getCommandManager().getCommandChar()) {
-            command = CommandManager.getCommandManager().getCommand(name.substring(1));
+        if (name.length() > 0 && name.charAt(0) == getController().getCommandChar()) {
+            command = getController().getCommand(name.substring(1));
         } else {
-            command = CommandManager.getCommandManager().getCommand(name);
+            command = getController().getCommand(name);
         }
 
         if (command == null) {

src/com/dmdirc/commandparser/commands/global/Set.java

@@ -27,7 +27,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -163,7 +162,7 @@ public class Set extends Command implements IntelligentCommand {
         final StringBuffer output = new StringBuffer(67);
 
         output.append("Valid domains (use ");
-        output.append(CommandManager.getCommandManager().getCommandChar());
+        output.append(getController().getCommandChar());
         output.append("set <domain> to see options within a domain): ");
 
         for (String domain : manager.getDomains()) {

src/com/dmdirc/commandparser/commands/server/OpenQuery.java

@@ -29,7 +29,6 @@ import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
@@ -65,7 +64,7 @@ public class OpenQuery extends Command implements IntelligentCommand,
             sendLine(origin, args.isSilent(), FORMAT_ERROR, "You can't open a query "
                     + "with a channel; maybe you meant " + Styliser.CODE_FIXED
                     + Styliser.CODE_BOLD
-                    + CommandManager.getCommandManager().getCommandChar()
+                    + getController().getCommandChar()
                     + (args.getArguments().length > 1 ? "msg" : "join") + " "
                     + args.getArgumentsAsString()
                     + Styliser.CODE_BOLD + Styliser.CODE_FIXED + "?");

src/com/dmdirc/commandparser/validators/CommandNameValidator.java

@@ -36,14 +36,25 @@ import java.util.regex.Pattern;
 public class CommandNameValidator extends ValidatorChain<String> {
 
     /**
-     * Instantiates a new command name validator.
+     * Instantiates a new command name validator, using the command char
+     * provided by the default Command Manager.
      */
-    @SuppressWarnings("unchecked")
     public CommandNameValidator() {
+        this(CommandManager.getCommandManager().getCommandChar());
+    }
+
+    /**
+     * Instantiates a new command name validator using the given command char.
+     *
+     * @param commandChar the character commands start with (which is therefore
+     * disallowed at the start of a command name).
+     */
+    @SuppressWarnings("unchecked")
+    public CommandNameValidator(final char commandChar) {
         super(new RegexStringValidator("^[^\\s]*$", "Cannot contain spaces"),
                 new RegexStringValidator("^[^"
-                + Pattern.quote(String.valueOf(CommandManager.getCommandManager().getCommandChar()))
-                + "].*$", "Cannot start with a " + CommandManager.getCommandManager().getCommandChar()));
+                + Pattern.quote(String.valueOf(commandChar))
+                + "].*$", "Cannot start with a " + commandChar));
     }
 
 }

test/com/dmdirc/commandparser/CommandArgumentsTest.java

@@ -22,43 +22,47 @@
 
 package com.dmdirc.commandparser;
 
-import com.dmdirc.config.IdentityManager;
-import com.dmdirc.config.InvalidIdentityFileException;
+import com.dmdirc.interfaces.CommandController;
 
 import java.util.Arrays;
 
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class CommandArgumentsTest {
 
-    @BeforeClass
-    public static void beforeClass() throws InvalidIdentityFileException {
-        IdentityManager.getIdentityManager().initialise();
+    private CommandController controller;
+
+    @Before
+    public void setUp() {
+        this.controller = mock(CommandController.class);
+        when(this.controller.getCommandChar()).thenReturn('/');
+        when(this.controller.getSilenceChar()).thenReturn('.');
     }
 
     /** Ensures the ctor which takes a collection builds the 'line' property. */
     @Test
     public void testCollectionCtorCreatesLine() {
-        final CommandArguments args = new CommandArguments(Arrays.asList(
-                "/command", "arg1", "arg2"));
+        final CommandArguments args = new CommandArguments(controller,
+                Arrays.asList("/command", "arg1", "arg2"));
         assertEquals("/command arg1 arg2", args.getLine());
     }
 
     /** Ensures the ctor works with an empty collection. */
     @Test
     public void testCollectionCtorWithEmpty() {
-        final CommandArguments args = new CommandArguments(Arrays.asList(
-                new String[0]));
+        final CommandArguments args = new CommandArguments(
+                controller, Arrays.asList(new String[0]));
         assertEquals("", args.getLine());
     }
 
     /** Ensures that getStrippedLine returns non-command lines as-is. */
     @Test
     public void testGetStrippedLineNormal() {
-        final CommandArguments args = new CommandArguments("blah blah");
+        final CommandArguments args = new CommandArguments(controller, "blah blah");
         assertEquals("blah blah", args.getStrippedLine());
     }
 
@@ -68,7 +72,7 @@ public class CommandArgumentsTest {
      */
     @Test
     public void testGetStrippedLineCommand() {
-        final CommandArguments args = new CommandArguments("/blah blah");
+        final CommandArguments args = new CommandArguments(controller, "/blah blah");
         assertEquals("blah blah", args.getStrippedLine());
     }
 
@@ -78,41 +82,41 @@ public class CommandArgumentsTest {
      */
     @Test
     public void testGetStrippedLineSilenced() {
-        final CommandArguments args = new CommandArguments("/.blah blah");
+        final CommandArguments args = new CommandArguments(controller, "/.blah blah");
         assertEquals("blah blah", args.getStrippedLine());
     }
 
     @Test
     public void testIsCommand() {
-        assertTrue(new CommandArguments(CommandManager.getCommandManager().getCommandChar() + "").isCommand());
-        assertTrue(new CommandArguments(CommandManager.getCommandManager().getCommandChar() + "foo bar").isCommand());
-        assertFalse(new CommandArguments(" " + CommandManager.getCommandManager().getCommandChar()).isCommand());
-        assertFalse(new CommandArguments("").isCommand());
-        assertFalse(new CommandArguments("foo").isCommand());
+        assertTrue(new CommandArguments(controller, "/").isCommand());
+        assertTrue(new CommandArguments(controller, "/foo bar").isCommand());
+        assertFalse(new CommandArguments(controller, " /").isCommand());
+        assertFalse(new CommandArguments(controller, "").isCommand());
+        assertFalse(new CommandArguments(controller, "foo").isCommand());
     }
 
     @Test
     public void testIsSilent() {
-        final char c = CommandManager.getCommandManager().getCommandChar();
-        final char s = CommandManager.getCommandManager().getSilenceChar();
-
-        assertTrue(new CommandArguments(c + "" + s).isSilent());
-        assertFalse(new CommandArguments("f" + s).isSilent());
-        assertTrue(new CommandArguments(c + "" + s + "foo").isSilent());
-        assertFalse(new CommandArguments("").isSilent());
-        assertFalse(new CommandArguments("foo").isSilent());
+        final char c = '/';
+        final char s = '.';
+
+        assertTrue(new CommandArguments(controller, c + "" + s).isSilent());
+        assertFalse(new CommandArguments(controller, "f" + s).isSilent());
+        assertTrue(new CommandArguments(controller, c + "" + s + "foo").isSilent());
+        assertFalse(new CommandArguments(controller, "").isSilent());
+        assertFalse(new CommandArguments(controller, "foo").isSilent());
     }
 
     @Test
     public void testGetLine() {
-        assertEquals("foo", new CommandArguments("foo").getLine());
-        assertEquals("foo  bar", new CommandArguments("foo  bar").getLine());
-        assertEquals("", new CommandArguments("").getLine());
+        assertEquals("foo", new CommandArguments(controller, "foo").getLine());
+        assertEquals("foo  bar", new CommandArguments(controller, "foo  bar").getLine());
+        assertEquals("", new CommandArguments(controller, "").getLine());
     }
 
     @Test
     public void testGetWords() {
-        final CommandArguments args = new CommandArguments("a\tb    c d e");
+        final CommandArguments args = new CommandArguments(controller, "a\tb    c d e");
 
         assertEquals(5, args.getWords().length);
         assertEquals("a", args.getWords()[0]);
@@ -124,7 +128,7 @@ public class CommandArgumentsTest {
 
     @Test
     public void testGetArguments() {
-        final CommandArguments args = new CommandArguments("a\tb    c d e");
+        final CommandArguments args = new CommandArguments(controller, "a\tb    c d e");
 
         assertEquals(4, args.getArguments().length);
         assertEquals("b", args.getArguments()[0]);
@@ -135,10 +139,10 @@ public class CommandArgumentsTest {
 
     @Test
     public void testGetArgumentsAsString() {
-        assertEquals("b\tc  d", new CommandArguments("a b\tc  d").getArgumentsAsString());
-        assertEquals("", new CommandArguments("a").getArgumentsAsString());
-        assertEquals("", new CommandArguments("a\t  \t   \t").getArgumentsAsString());
-        assertEquals("b", new CommandArguments("a\t  \t   \tb").getArgumentsAsString());
+        assertEquals("b\tc  d", new CommandArguments(controller, "a b\tc  d").getArgumentsAsString());
+        assertEquals("", new CommandArguments(controller, "a").getArgumentsAsString());
+        assertEquals("", new CommandArguments(controller, "a\t  \t   \t").getArgumentsAsString());
+        assertEquals("b", new CommandArguments(controller, "a\t  \t   \tb").getArgumentsAsString());
     }
 
 }

test/com/dmdirc/commandparser/commands/channel/ModeTest.java

@@ -39,7 +39,7 @@ import static org.mockito.Mockito.*;
 
 public class ModeTest {
 
-    private final Mode command = new Mode();
+    private Mode command;
     private IRCChannelInfo channelinfo;
     private Channel channel;
     private Server server;
@@ -59,6 +59,8 @@ public class ModeTest {
         when(channel.getChannelInfo()).thenReturn(channelinfo);
         when(channelinfo.getModes()).thenReturn("my mode string!");
         when(channelinfo.toString()).thenReturn("#chan");
+
+        command = new Mode();
     }
 
     @Test

test/com/dmdirc/commandparser/commands/channel/NamesTest.java

@@ -38,7 +38,7 @@ import static org.mockito.Mockito.*;
 
 public class NamesTest {
 
-    private final Names command = new Names();
+    private Names command;
     private IRCChannelInfo channelinfo;
     private Channel channel;
     private Server server;
@@ -57,6 +57,8 @@ public class NamesTest {
         when(server.getParser()).thenReturn(parser);
         when(channel.getChannelInfo()).thenReturn(channelinfo);
         when(channelinfo.getName()).thenReturn("#chan");
+
+        command = new Names();
     }
 
     @Test

test/com/dmdirc/commandparser/commands/channel/PartTest.java

@@ -37,7 +37,7 @@ import static org.mockito.Mockito.*;
 
 public class PartTest {
 
-    private final Part command = new Part();
+    private Part command;
     private Channel channel;
     private FrameContainer origin;
     private ConfigManager manager;
@@ -52,6 +52,8 @@ public class PartTest {
 
         when(origin.getConfigManager()).thenReturn(manager);
         when(manager.getOption("general", "partmessage")).thenReturn("config part message");
+
+        command = new Part();
     }
 
     @Test