Remove/tidy some iffy tests

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

src/com/dmdirc/actions/wrappers/AliasWrapper.java

@@ -30,6 +30,7 @@ import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.ActionGroup;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -48,11 +49,18 @@ public final class AliasWrapper extends ActionGroup {
     /** A list of registered alias names. */
     private final List<String> aliases = new ArrayList<String>();
 
+    /** Command controller to get command info from. */
+    private final CommandController commandController;
+
     /**
      * Creates a new instance of AliasWrapper.
+     *
+     * @param commandController Command controller to get command info from.
      */
-    private AliasWrapper() {
+    public AliasWrapper(final CommandController commandController) {
         super("aliases");
+
+        this.commandController = commandController;
     }
 
     /**
@@ -62,7 +70,7 @@ public final class AliasWrapper extends ActionGroup {
      */
     public static synchronized AliasWrapper getAliasWrapper() {
         if (me == null) {
-            me = new AliasWrapper();
+            me = new AliasWrapper(CommandManager.getCommandManager());
         }
 
         return me;
@@ -129,10 +137,10 @@ public final class AliasWrapper extends ActionGroup {
      * @return The command name for the specified alias, or null if it has
      *         no appropriate conditions.
      */
-    public static String getCommandName(final Action action) {
+    public String getCommandName(final Action action) {
         for (ActionCondition condition : action.getConditions()) {
             if (condition.getArg() == 1) {
-                return CommandManager.getCommandManager().getCommandChar()
+                return commandController.getCommandChar()
                         + condition.getTarget();
             }
         }

src/com/dmdirc/commandparser/commands/global/AliasCommand.java

@@ -78,8 +78,8 @@ public class AliasCommand extends Command implements IntelligentCommand {
                 ? args.getArguments()[0].substring(1) : args.getArguments()[0];
 
         for (Action alias : AliasWrapper.getAliasWrapper()) {
-            if (AliasWrapper.getCommandName(alias).substring(1).equalsIgnoreCase(
-                    name)) {
+            if (AliasWrapper.getAliasWrapper().getCommandName(alias)
+                    .substring(1).equalsIgnoreCase(name)) {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR, "Alias '" + name
                         + "' already exists.");
                 return;
@@ -102,8 +102,8 @@ public class AliasCommand extends Command implements IntelligentCommand {
      */
     private static boolean doRemove(final String name) {
         for (Action alias : AliasWrapper.getAliasWrapper()) {
-            if (AliasWrapper.getCommandName(alias).substring(1).equalsIgnoreCase(
-                    name)) {
+            if (AliasWrapper.getAliasWrapper().getCommandName(alias)
+                    .substring(1).equalsIgnoreCase(name)) {
                 alias.delete();
                 ActionManager.getActionManager().removeAction(alias);
 
@@ -124,7 +124,7 @@ public class AliasCommand extends Command implements IntelligentCommand {
             res.add("--remove");
         } else if (arg == 1 && context.getPreviousArgs().get(0).equals("--remove")) {
             for (Action alias : AliasWrapper.getAliasWrapper()) {
-                res.add(AliasWrapper.getCommandName(alias));
+                res.add(AliasWrapper.getAliasWrapper().getCommandName(alias));
             }
         } else if (arg >= 1 && !context.getPreviousArgs().get(0).equals("--remove")) {
             return TabCompleter.getIntelligentResults(arg, context, 1);

test/com/dmdirc/InviteTest.java

@@ -24,7 +24,7 @@ package com.dmdirc;
 
 import java.util.Date;
 
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
@@ -32,55 +32,55 @@ import static org.mockito.Mockito.*;
 
 public class InviteTest {
 
-    private static Server server;
-    private static Invite test;
-    private static long ts;
+    private Server server;
+    private Invite invite;
+    private long ts;
 
-    @BeforeClass
-    public static void setUp() throws Exception {
+    @Before
+    public void setUp() {
         server = mock(Server.class);
 
         when(server.parseHostmask("nick!ident@host"))
                 .thenReturn(new String[] {"nick", "ident", "host"});
 
-        test = new Invite(server, "#channel", "nick!ident@host");
+        invite = new Invite(server, "#channel", "nick!ident@host");
         ts = new Date().getTime();
     }
 
     @Test
     public void testGetServer() {
-        assertSame(server, test.getServer());
+        assertSame(server, invite.getServer());
     }
 
     @Test
     public void testGetChannel() {
-        assertEquals("#channel", test.getChannel());
+        assertEquals("#channel", invite.getChannel());
     }
 
     @Test
     public void testGetTimestamp() {
-        assertTrue(test.getTimestamp() - ts < 10000);
-        assertTrue(test.getTimestamp() - ts > -10000);
+        assertTrue(invite.getTimestamp() - ts < 10000);
+        assertTrue(invite.getTimestamp() - ts > -10000);
     }
 
     @Test
     public void testGetSource() {
-        assertEquals(3, test.getSource().length);
-        assertEquals("nick", test.getSource()[0]);
-        assertEquals("ident", test.getSource()[1]);
-        assertEquals("host", test.getSource()[2]);
+        assertEquals(3, invite.getSource().length);
+        assertEquals("nick", invite.getSource()[0]);
+        assertEquals("ident", invite.getSource()[1]);
+        assertEquals("host", invite.getSource()[2]);
     }
 
     @Test
     public void testAccept() {
-        test.accept();
-        verify(server).acceptInvites(test);
+        invite.accept();
+        verify(server).acceptInvites(invite);
     }
 
     @Test
     public void testDecline() {
-        test.decline();
-        verify(server).removeInvite(test);
+        invite.decline();
+        verify(server).removeInvite(invite);
     }
 
 }

test/com/dmdirc/actions/ActionManagerTest.java

@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2006-2012 DMDirc Developers
- *
- * 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.actions;
-
-import com.dmdirc.config.IdentityManager;
-import com.dmdirc.interfaces.actions.ActionType;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class ActionManagerTest {
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        IdentityManager.getIdentityManager().initialise();
-        ActionManager.getActionManager().initialise();
-        ActionManager.getActionManager().loadUserActions();
-
-        tearDownClass();
-    }
-
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-        if (ActionManager.getActionManager().getGroupsMap().containsKey("unit-test")) {
-            ActionManager.getActionManager().deleteGroup("unit-test");
-        }
-
-        if (ActionManager.getActionManager().getGroupsMap().containsKey("unit-test-two")) {
-            ActionManager.getActionManager().deleteGroup("unit-test-two");
-        }
-    }
-
-    @Test
-    public void testMakeGroup() {
-        ActionManager.getActionManager().createGroup("unit-test");
-
-        assertTrue("makeGroup must create the group directory",
-                new File(ActionManager.getDirectory() + "unit-test").isDirectory());
-    }
-
-    @Test
-    public void testGetGroup() {
-        final ActionGroup group = ActionManager.getActionManager().getOrCreateGroup("unit-test");
-
-        assertEquals("getGroup must return an ActionGroup with the right name",
-                "unit-test", group.getName());
-    }
-
-    @Test
-    public void testRenameGroup() {
-        ActionManager.getActionManager().changeGroupName("unit-test", "unit-test-two");
-        assertFalse("renameGroup must unlink the old directory",
-                new File(ActionManager.getDirectory() + "unit-test").isDirectory());
-        assertTrue("renameGroup must create the target directory",
-                new File(ActionManager.getDirectory() + "unit-test-two").isDirectory());
-    }
-
-    @Test
-    public void testRenameGroupWithAction() {
-        final Action action = new Action("unit-test-two", "test1", new ActionType[0],
-                new String[0], new ArrayList<ActionCondition>(), null);
-        assertSame("Creating a new action must add it to the correct group",
-                action, ActionManager.getActionManager().getOrCreateGroup("unit-test-two").get(0));
-
-        ActionManager.getActionManager().changeGroupName("unit-test-two", "unit-test");
-        assertFalse("renameGroup must unlink the old directory",
-                new File(ActionManager.getDirectory() + "unit-test-two").isDirectory());
-        assertTrue("renameGroup must create the target directory",
-                new File(ActionManager.getDirectory() + "unit-test").isDirectory());
-        assertSame("renameGroup must move actions to new group",
-                action, ActionManager.getActionManager().getOrCreateGroup("unit-test").get(0));
-        assertEquals("renameGroup must remove actions from old group",
-                0, ActionManager.getActionManager().getOrCreateGroup("unit-test-two").size());
-    }
-
-    @Test
-    public void testRemoveGroup() {
-        ActionManager.getActionManager().deleteGroup("unit-test");
-        assertFalse("removeGroup must unlink directory",
-                new File(ActionManager.getDirectory() + "unit-test").isDirectory());
-
-        ActionManager.getActionManager().saveAllActions();
-        assertFalse("saveActions must not restore removed groups",
-                new File(ActionManager.getDirectory() + "unit-test").isDirectory());
-    }
-
-}

test/com/dmdirc/actions/ActionModelTest.java

@@ -22,26 +22,18 @@
 
 package com.dmdirc.actions;
 
-import com.dmdirc.config.IdentityManager;
-import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.interfaces.actions.ActionType;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
 
 public class ActionModelTest {
 
-    @BeforeClass
-    public static void setUpClass() throws InvalidIdentityFileException {
-        IdentityManager.getIdentityManager().initialise();
-    }
-
     @Test
     public void testConditions() {
         final ActionModel model = new ActionModel("group", "name");

test/com/dmdirc/actions/wrappers/AliasWrapperTest.java

@@ -27,50 +27,86 @@ import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.CoreActionComparison;
 import com.dmdirc.actions.CoreActionComponent;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.config.IdentityManager;
-import com.dmdirc.config.InvalidIdentityFileException;
+import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.actions.ActionComparison;
 import com.dmdirc.interfaces.actions.ActionType;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class AliasWrapperTest {
 
-    @BeforeClass
-    public static void setupClass() throws InvalidIdentityFileException {
-        IdentityManager.getIdentityManager().initialise();
+    private Action action;
+    private ActionCondition condition;
+    private List<ActionCondition> conditions;
+
+    private AliasWrapper aliasWrapper;
+
+    @Before
+    public void setup() {
+        final CommandController controller = mock(CommandController.class);
+        when(controller.getCommandChar()).thenReturn('!');
+
+        action = mock(Action.class);
+        condition = mock(ActionCondition.class);
+        conditions = new ArrayList<ActionCondition>();
+        aliasWrapper = new AliasWrapper(controller);
+
+        when(condition.getArg()).thenReturn(1);
+        when(condition.getComparison()).thenReturn(CoreActionComparison.STRING_EQUALS);
+        when(condition.getComponent()).thenReturn(CoreActionComponent.STRING_STRING);
+        when(condition.getTarget()).thenReturn("name");
+        when(action.getConditions()).thenReturn(conditions);
+        when(action.getTriggers()).thenReturn(new ActionType[] { CoreActionType.UNKNOWN_COMMAND });
+    }
+
+    @Test
+    public void testAddsAlias() {
+        conditions.add(condition);
+
+        aliasWrapper.add(action);
+        assertFalse(aliasWrapper.getAliases().isEmpty());
     }
 
     @Test
-    public void testNormal() {
-        final List<ActionCondition> conditions = new ArrayList<ActionCondition>();
-        conditions.add(new ActionCondition(1, CoreActionComponent.STRING_STRING,
-                CoreActionComparison.STRING_EQUALS, "testing123"));
-        final Action action = new Action("unit-test", "foo",
-                new ActionType[]{CoreActionType.UNKNOWN_COMMAND}, new String[0],
-                conditions, null);
-
-        assertTrue(AliasWrapper.getAliasWrapper().getAliases().isEmpty());
-        AliasWrapper.getAliasWrapper().add(action);
-        assertFalse(AliasWrapper.getAliasWrapper().getAliases().isEmpty());
-        assertEquals("/testing123", AliasWrapper.getAliasWrapper().getAliases().get(0));
+    public void testDoesNotAddActionWithNoConditions() {
+        aliasWrapper.add(action);
+        assertTrue(aliasWrapper.getAliases().isEmpty());
+    }
+
+    @Test
+    public void testDoesNotAddActionWithWrongTrigger() {
+        when(action.getTriggers()).thenReturn(new ActionType[] { CoreActionType.ACTION_CREATED });
+
+        aliasWrapper.add(action);
+        assertTrue(aliasWrapper.getAliases().isEmpty());
+    }
+
+    @Test
+    public void testGetsCommandName() {
+        conditions.add(condition);
+        assertEquals("!name", aliasWrapper.getCommandName(action));
+    }
+
+    @Test
+    public void testGetsCommandNameWithMultipleConditions() {
+        final ActionCondition otherCondition = mock(ActionCondition.class);
+        when(otherCondition.getArg()).thenReturn(7);
+
+        conditions.add(otherCondition);
+        conditions.add(condition);
+        assertEquals("!name", aliasWrapper.getCommandName(action));
     }
 
     @Test
-    public void testNoConditions() {
-        final List<ActionCondition> conditions = new ArrayList<ActionCondition>();
-        final Action action = new Action("unit-test", "foo",
-                new ActionType[]{CoreActionType.UNKNOWN_COMMAND}, new String[0],
-                conditions, null);
-
-        final int size = AliasWrapper.getAliasWrapper().getAliases().size();
-        AliasWrapper.getAliasWrapper().add(action);
-        assertEquals(size, AliasWrapper.getAliasWrapper().getAliases().size());
+    public void testGetCommandNameReturnsNullIfUnknown() {
+        assertNull(aliasWrapper.getCommandName(action));
     }
 
 }