Add unit tests, remove unused file

Depends-On: Ib757d21e2619855308019c7bcec543c532851634
Change-Id: I7998deadce5889a16e704e347139af7efc30dbbe
Reviewed-on: http://gerrit.dmdirc.com/1794
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

src/com/dmdirc/addons/calc/DotOutputter.java

@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2006-2011 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.addons.calc;
-
-import java.text.ParseException;
-
-/**
- * Outputs a string which can be read by the unix `dot` utility to show a
- * directed graph showing the tokens parsed by a {@link Parser}.
- *
- * @author chris
- */
-public class DotOutputter {
-
-    /** The parser which will be read. */
-    private final Parser parser;
-
-    /** Counter for assigning node IDs. */
-    private int nodes = 0;
-
-    /**
-     * Creates a new DotOutputter for the specified parser.
-     *
-     * @param parser The parser whose output should be shown
-     */
-    public DotOutputter(final Parser parser) {
-        this.parser = parser;
-    }
-
-    /**
-     * Outputs a string which may be read by the `dot` utility to create a
-     * directed graph of tokens.
-     *
-     * @return A string describing the parse tree from the specified parser
-     * @throws ParseException If the parser encounters an exception
-     */
-    public String output() throws ParseException {
-        return "digraph astoutput { " + output(0, parser.parse()) + " }";
-    }
-
-    /**
-     * Outputs the relevant text for the specified token, assigning it an ID
-     * specified by the node parameter.
-     *
-     * @param node The ID of the node to be used in the output
-     * @param token The token to be outputted
-     * @return A string corresponding to the dot representation of the
-     * specified node and its children
-     */
-    protected String output(final int node, final TreeToken token) {
-        String out = "node" + node + " [label=\"" + token.getToken().getType()
-                + "\\n" + token.getToken().getContent() + "\"];";
-
-        for (TreeToken child : token.getChildren()) {
-            int id = ++nodes;
-
-            out += output(id, child);
-            out += "node" + node + " -> node" + id + ";";
-        }
-
-        return out;
-    }
-
-}

test/com/dmdirc/addons/calc/EvaluatorTest.java

@@ -61,13 +61,11 @@ public class EvaluatorTest {
             {"2+2*3/4-1", "2.5"},
             {"1.0000(17.5+0.5)(1.000)", "18"},
             {"2^3", "8"},
+            {"+3", "3"},
+            {"20%5", "0"},
         };
 
         return Arrays.asList(data);
     }
 
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(EvaluatorTest.class);
-    }
-
 }

test/com/dmdirc/addons/calc/TokenTypeTest.java

@@ -57,4 +57,10 @@ public class TokenTypeTest {
         assertFalse(TokenType.START.getFollowers().isEmpty());
     }
 
+    /** Checks that tokens which can't be evaluated throw an exception. */
+    @Test(expected=AbstractMethodError.class)
+    public void testNonEvaluatable() {
+        TokenType.BRACKET_CLOSE.evaluate(null);
+    }
+
 }

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

@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2006-2011 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.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 org.mockito.Mockito.*;
+
+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
+        IdentityManager.load();
+        CommandManager.initCommands();
+    }
+
+    /** 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());
+    }
+    
+    /** 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());
+    }
+    
+    /** 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(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);
+        
+        debug.execute(container, arguments, context);
+        
+        verify(container, never()).addLine(anyString(), anyObject());
+        verify(command).execute(same(container), eqLine("/test"), same(context));
+    }
+    
+    /** 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(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);
+        
+        debug.execute(container, arguments, context);
+        
+        verify(container, never()).addLine(anyString(), anyObject());
+        verify(command).execute(same(container), eqLine("/test 1 2 3"), same(context));
+    }
+
+}