Couple of test additions/improvements

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

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

@@ -38,7 +38,8 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ModeTest {
@@ -80,8 +81,8 @@ public class ModeTest {
 
     @Test
     public void testExternalWithArgs() {
-        command.execute(origin, new CommandArguments(controller, "/mode +hello -bye"),
-                new ChannelCommandContext(null, Mode.INFO, channel));
+        command.execute(origin, server, "#chan", false,
+                new CommandArguments(controller, "/mode +hello -bye"));
 
         verify(parser).sendRawMessage("MODE #chan +hello -bye");
     }
@@ -89,7 +90,7 @@ public class ModeTest {
     @Test
     public void testExternalWithoutArgs() {
         command.execute(origin, server, "#chan", false,
-                new CommandArguments(controller,"/mode"));
+                new CommandArguments(controller, "/mode"));
 
         verify(parser).sendRawMessage("MODE #chan");
     }

test/com/dmdirc/commandparser/parsers/CommandParserTest.java

@@ -233,4 +233,27 @@ public class CommandParserTest {
         assertEquals("", channelCommandParser.commandArgs.getArgumentsAsString());
     }
 
+    @Test
+    public void testParseUnregisterCommand() {
+        commandParser.unregisterCommand(commandInfo);
+        commandParser.parseCommand(null, "/command test 123");
+
+        assertNull(commandParser.nonCommandLine);
+        assertEquals("command", commandParser.invalidCommand);
+        assertNull(commandParser.executedCommand);
+        assertFalse(commandParser.wasSilent);
+    }
+
+    @Test
+    public void testGetCommands() {
+        assertEquals(2, commandParser.getCommands().size());
+        assertTrue(commandParser.getCommands().containsKey("command"));
+        assertTrue(commandParser.getCommands().containsKey("channel"));
+
+        commandParser.unregisterCommand(commandInfo);
+        assertEquals(1, commandParser.getCommands().size());
+        assertFalse(commandParser.getCommands().containsKey("command"));
+        assertTrue(commandParser.getCommands().containsKey("channel"));
+    }
+
 }