Fix up debug command tests.

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

src/com/dmdirc/addons/debug/Debug.java

@@ -26,11 +26,11 @@ 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;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import java.util.Arrays;
@@ -48,15 +48,20 @@ public class Debug extends Command implements IntelligentCommand {
     /** Parent debug plugin. */
     private final DebugPlugin plugin;
 
+    /** The command controller to use to lookup command information. */
+    private final CommandController controller;
+
     /**
      * Creates a new debug command with the specified parent plugin.
      *
-     * @param plugin Parent debug plugin
+     * @param plugin Parent debug plugin.
+     * @param controller The command controller to use to lookup command information.
      */
-    public Debug(final DebugPlugin plugin) {
-        super();
+    public Debug(final DebugPlugin plugin, final CommandController controller) {
+        super(controller);
 
         this.plugin = plugin;
+        this.controller = controller;
     }
 
     /** {@inheritDoc} */
@@ -74,7 +79,7 @@ public class Debug extends Command implements IntelligentCommand {
                         "Unknown debug action.");
             } else {
                 final CommandArguments newArgs = new CommandArguments(
-                        Arrays.asList((CommandManager.getCommandManager().getCommandChar()
+                        Arrays.asList((controller.getCommandChar()
                         + command.getName() + " "
                         + args.getArgumentsAsString(1)).split(" ")));
                 command.execute(origin, newArgs, context);

src/com/dmdirc/addons/debug/DebugPlugin.java

@@ -77,8 +77,8 @@ public class DebugPlugin extends BaseCommandPlugin {
         super(commandController);
         this.identityManager = identityManager;
         this.pluginManager = pluginManager;
-        commands = new HashMap<String, DebugCommand>();
-        debugCommand = new Debug(this);
+        commands = new HashMap<>();
+        debugCommand = new Debug(this, commandController);
         registerCommand(debugCommand, Debug.INFO);
     }
 
@@ -90,10 +90,7 @@ public class DebugPlugin extends BaseCommandPlugin {
             try {
                 addCommand(type.getConstructor(DebugPlugin.class, Debug.class)
                         .newInstance(this, debugCommand));
-            } catch (LinkageError e) {
-                Logger.appError(ErrorLevel.HIGH,
-                        "Unable to load debug command", e);
-            } catch (Exception e) {
+            } catch (LinkageError | Exception e) {
                 Logger.appError(ErrorLevel.HIGH,
                         "Unable to load debug command", e);
             }
@@ -132,7 +129,7 @@ public class DebugPlugin extends BaseCommandPlugin {
      * @return List of command names
      */
     public List<String> getCommandNames() {
-        final List<String> names = new ArrayList<String>(commands.size());
+        final List<String> names = new ArrayList<>(commands.size());
 
         for (DebugCommand command : commands.values()) {
             names.add(command.getName());

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

@@ -22,38 +22,42 @@
 
 package com.dmdirc.addons.debug;
 
-import com.dmdirc.TestMain;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.config.InvalidIdentityFileException;
+import com.dmdirc.interfaces.CommandController;
 
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import static com.dmdirc.harness.CommandArgsMatcher.*;
 import static org.mockito.Mockito.*;
 
+@RunWith(MockitoJUnitRunner.class)
 public class DebugTest {
 
-    @BeforeClass
-    public static void setUp() throws InvalidIdentityFileException {
-        // Command has a dependency on CommandManager (to get the command char)
-        // And CommandManager has a dependency on IdentityManager for the same
-        TestMain.getTestMain();
+    @Mock private CommandArguments arguments;
+    @Mock private FrameContainer container;
+    @Mock private DebugPlugin plugin;
+    @Mock private CommandController controller;
+    @Mock private DebugCommand debugCommand;
+    @Mock private CommandContext commandContext;
+    private Debug debug;
+
+    @Before
+    public void setup() {
+        when(controller.getCommandChar()).thenReturn('/');
+        debug = new Debug(plugin, controller);
     }
 
     /** Checks the debug command with no arguments shows usage. */
     @Test
     public void testNoArgs() {
-        final CommandArguments arguments = mock(CommandArguments.class);
-        final FrameContainer container = mock(FrameContainer.class);
-
         when(arguments.isCommand()).thenReturn(true);
         when(arguments.getArguments()).thenReturn(new String[0]);
-
-        final Debug debug = new Debug(null);
-
         debug.execute(container, arguments, null);
         verify(container).addLine(eq("commandUsage"), anyObject(),
                 eq("debug"), anyObject());
@@ -62,16 +66,10 @@ public class DebugTest {
     /** Checks the debug command with an invalid subcommand shows an error. */
     @Test
     public void testInvalidArg() {
-        final DebugPlugin plugin = mock(DebugPlugin.class);
-        final CommandArguments arguments = mock(CommandArguments.class);
-        final FrameContainer container = mock(FrameContainer.class);
-
         when(plugin.getCommand("test")).thenReturn(null);
         when(arguments.isCommand()).thenReturn(true);
         when(arguments.getArguments()).thenReturn(new String[]{"test"});
 
-        final Debug debug = new Debug(plugin);
-
         debug.execute(container, arguments, null);
         verify(container).addLine(eq("commandError"), anyObject());
     }
@@ -79,47 +77,31 @@ public class DebugTest {
     /** Checks the debug command executes a subcommand with no args. */
     @Test
     public void testCommandNoArgs() {
-        final DebugPlugin plugin = mock(DebugPlugin.class);
-        final CommandArguments arguments = mock(CommandArguments.class);
-        final FrameContainer container = mock(FrameContainer.class);
-        final DebugCommand command = mock(DebugCommand.class);
-        final CommandContext context = mock(CommandContext.class);
-
-        when(plugin.getCommand("test")).thenReturn(command);
+        when(plugin.getCommand("test")).thenReturn(debugCommand);
         when(arguments.isCommand()).thenReturn(true);
         when(arguments.getArguments()).thenReturn(new String[]{"test"});
         when(arguments.getArgumentsAsString(1)).thenReturn("");
-        when(command.getName()).thenReturn("test");
-
-        final Debug debug = new Debug(plugin);
+        when(debugCommand.getName()).thenReturn("test");
 
-        debug.execute(container, arguments, context);
+        debug.execute(container, arguments, commandContext);
 
         verify(container, never()).addLine(anyString(), anyObject());
-        verify(command).execute(same(container), eqLine("/test"), same(context));
+        verify(debugCommand).execute(same(container), eqLine("/test"), same(commandContext));
     }
 
     /** Checks the debug command executes a subcommand with args. */
     @Test
     public void testCommandWithArgs() {
-        final DebugPlugin plugin = mock(DebugPlugin.class);
-        final CommandArguments arguments = mock(CommandArguments.class);
-        final FrameContainer container = mock(FrameContainer.class);
-        final DebugCommand command = mock(DebugCommand.class);
-        final CommandContext context = mock(CommandContext.class);
-
-        when(plugin.getCommand("test")).thenReturn(command);
+        when(plugin.getCommand("test")).thenReturn(debugCommand);
         when(arguments.isCommand()).thenReturn(true);
         when(arguments.getArguments()).thenReturn(new String[]{"test", "1", "2", "3"});
         when(arguments.getArgumentsAsString(1)).thenReturn("1 2 3");
-        when(command.getName()).thenReturn("test");
-
-        final Debug debug = new Debug(plugin);
+        when(debugCommand.getName()).thenReturn("test");
 
-        debug.execute(container, arguments, context);
+        debug.execute(container, arguments, commandContext);
 
         verify(container, never()).addLine(anyString(), anyObject());
-        verify(command).execute(same(container), eqLine("/test 1 2 3"), same(context));
+        verify(debugCommand).execute(same(container), eqLine("/test 1 2 3"), same(commandContext));
     }
 
 }