Add unit test for /mode and fix bug with external invocations not

working (oops!)

src/com/dmdirc/Channel.java

@@ -54,8 +54,8 @@ import java.util.Map;
  *
  * @author chris
  */
-public final class Channel extends MessageTarget
-        implements ConfigChangeListener, Serializable {
+public class Channel extends MessageTarget implements ConfigChangeListener,
+        Serializable {
 
     /**
      * A version number for this class. It should be changed whenever the class

src/com/dmdirc/commandparser/commands/channel/Mode.java

@@ -67,10 +67,10 @@ public final class Mode extends ChannelCommand implements IntelligentCommand,
     @Override
     public void execute(final InputWindow origin, final Server server,
             final String channel, final boolean isSilent, final CommandArguments args) {
-        if (args.getArguments().length == 0) {
+        if (args.getArguments().length == 1) {
             server.getParser().sendLine("MODE " + channel);
         } else {
-            server.getParser().sendLine("MODE " + channel + " " + args.getArgumentsAsString());
+            server.getParser().sendLine("MODE " + channel + " " + args.getArgumentsAsString(1));
         }
     }
 

src/com/dmdirc/parser/irc/ChannelInfo.java

@@ -37,7 +37,7 @@ import java.util.Queue;
  * @author Chris Smith
  * @see IRCParser
  */
-public final class ChannelInfo {
+public class ChannelInfo {
 	/**
 	 * Boolean repreenting the status of names requests.
 	 * When this is false, any new names reply will cause current known channelclients to be removed.

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

@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * 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.commandparser.commands.channel;
+
+import com.dmdirc.Channel;
+import com.dmdirc.Server;
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.ui.interfaces.InputWindow;
+
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.mockito.Mockito.*;
+
+public class ModeTest {
+
+    private final Mode command = new Mode();
+    private ChannelInfo channelinfo;
+    private Channel channel;
+    private Server server;
+    private IRCParser parser;
+
+    @BeforeClass
+    public static void setUpClass() {
+        IdentityManager.load();
+    }
+
+    @Before
+    public void setUp() {
+        IdentityManager.load();
+        
+        parser = mock(IRCParser.class);
+        server = mock(Server.class);
+        channel = mock(Channel.class);
+        channelinfo = mock(ChannelInfo.class);
+
+        when(server.getParser()).thenReturn(parser);
+        when(channel.getChannelInfo()).thenReturn(channelinfo);
+        when(channelinfo.getModeStr()).thenReturn("my mode string!");
+        when(channelinfo.toString()).thenReturn("#chan");
+    }
+
+    @Test
+    public void testWithoutArgs() {
+        final InputWindow origin = mock(InputWindow.class);
+        
+        command.execute(origin, server, channel, false, new CommandArguments("/mode"));
+
+        verify(origin).addLine("channelModeDiscovered", "my mode string!", channelinfo);
+    }
+
+    @Test
+    public void testWithArgs() {
+        final InputWindow origin = mock(InputWindow.class);
+
+        command.execute(origin, server, channel, false, new CommandArguments("/mode +hello -bye"));
+
+        verify(parser).sendLine("MODE #chan +hello -bye");
+    }
+
+    @Test
+    public void testExternalWithArgs() {
+        final InputWindow origin = mock(InputWindow.class);
+
+        command.execute(origin, server, "#chan", false,
+                new CommandArguments("/mode #chan +hello -bye"));
+
+        verify(parser).sendLine("MODE #chan +hello -bye");
+    }
+
+    @Test
+    public void testExternalWithoutArgs() {
+        final InputWindow origin = mock(InputWindow.class);
+
+        command.execute(origin, server, "#chan", false,
+                new CommandArguments("/mode #chan"));
+
+        verify(parser).sendLine("MODE #chan");
+    }
+
+}