Fix some unit tests after Command Parser changes

Change-Id: I2838ac60f809408480d985123fde9427e1e5f0e4
Depends-On: Id8a9fde29d189e1c3cd025a3b9f30f2b575a7280
Reviewed-on: http://gerrit.dmdirc.com/2306
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

test/com/dmdirc/addons/debug/DebugTest.java

@@ -24,14 +24,15 @@ package com.dmdirc.addons.debug;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
-import static com.dmdirc.harness.CommandArgsMatcher.eqLine;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
+
+import static com.dmdirc.harness.CommandArgsMatcher.*;
+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 public class DebugTest {
@@ -41,7 +42,6 @@ public class DebugTest {
         // Command has a dependency on CommandManager (to get the command char)
         // And CommandManager has a dependency on IdentityManager for the same
         IdentityManager.getIdentityManager().initialise();
-        CommandManager.getCommandManager().initCommands();
     }
 
     /** Checks the debug command with no arguments shows usage. */

test/com/dmdirc/addons/redirect/RedirectCommandTest.java

@@ -26,6 +26,7 @@ import com.dmdirc.MessageTarget;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
+import com.dmdirc.commandparser.commands.global.Echo;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.interfaces.ui.InputWindow;
@@ -41,7 +42,7 @@ public class RedirectCommandTest {
     @BeforeClass
     public static void setupClass() throws InvalidIdentityFileException {
         IdentityManager.getIdentityManager().initialise();
-        CommandManager.getCommandManager().initCommands();
+        CommandManager.getCommandManager().registerCommand(new Echo(), Echo.INFO);
     }
 
     @Ignore
@@ -55,7 +56,7 @@ public class RedirectCommandTest {
                 IdentityManager.getIdentityManager().getGlobalConfiguration());
 
         command.execute(target, new CommandArguments("/redirect /echo test"),
-                new ChatCommandContext(window.getContainer(), command.INFO, target));
+                new ChatCommandContext(window.getContainer(), RedirectCommand.INFO, target));
 
         verify(target).sendLine("test");
     }