Improve some actions tests.

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

src/com/dmdirc/actions/ActionComponentChain.java

@@ -23,6 +23,7 @@
 package com.dmdirc.actions;
 
 import com.dmdirc.Precondition;
+import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.actions.ActionComponent;
 import com.dmdirc.logger.Logger;
 
@@ -38,7 +39,7 @@ public class ActionComponentChain implements ActionComponent {
     /**
      * A list of components in this chain.
      */
-    private final List<ActionComponent> components = new ArrayList<ActionComponent>();
+    private final List<ActionComponent> components = new ArrayList<>();
 
     /**
      * Creates a new component chain from the specified text representation.
@@ -46,7 +47,9 @@ public class ActionComponentChain implements ActionComponent {
      *
      * @param source The class that this chain needs to start with
      * @param chain The textual representation of the chain
+     * @deprecated Should specify an action controller.
      */
+    @Deprecated
     public ActionComponentChain(final Class<?> source, final String chain) {
         this(source, chain, ActionManager.getActionManager());
     }
@@ -60,7 +63,7 @@ public class ActionComponentChain implements ActionComponent {
      * @param manager The action manager to use to look up components
      */
     public ActionComponentChain(final Class<?> source, final String chain,
-            final ActionManager manager) {
+            final ActionController manager) {
         Class<?> current = source;
 
         for (String componentName : chain.split("\\.")) {

src/com/dmdirc/actions/ActionSubstitutor.java

@@ -29,6 +29,7 @@ import com.dmdirc.ServerState;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.actions.ActionComponent;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.ui.Window;
@@ -70,18 +71,33 @@ public class ActionSubstitutor {
     /** Pattern to determine if a substitution is a server component type. */
     private static final Pattern SERVER_PATTERN = Pattern.compile("[A-Z_]+(\\.[A-Z_]+)*");
 
+    /** The action controller to use to find components. */
+    private final ActionController actionController;
     /** The action type this substitutor is for. */
     private final ActionType type;
 
     /**
      * Creates a new substitutor for the specified action type.
      *
+     * @param actionController The action controller to use to find components.
      * @param type The action type this substitutor is for
      */
-    public ActionSubstitutor(final ActionType type) {
+    public ActionSubstitutor(final ActionController actionController, final ActionType type) {
+        this.actionController = actionController;
         this.type = type;
     }
 
+    /**
+     * Creates a new substitutor for the specified action type.
+     *
+     * @param type The action type this substitutor is for
+     * @deprecated Should use {@link #ActionSubstitutor(ActionController, ActionType)}.
+     */
+    @Deprecated
+    public ActionSubstitutor(final ActionType type) {
+        this(ActionManager.getActionManager(), type);
+    }
+
     /**
      * Retrieves a list of global config variables that will be substituted.
      * Note: does not include initial $.
@@ -100,12 +116,11 @@ public class ActionSubstitutor {
      * @return A map of component substitution names and their descriptions
      */
     public Map<String, String> getComponentSubstitutions() {
-        final Map<String, String> res = new HashMap<String, String>();
+        final Map<String, String> res = new HashMap<>();
 
         int i = 0;
         for (Class<?> myClass : type.getType().getArgTypes()) {
-            for (ActionComponent comp : ActionManager.getActionManager()
-                    .findCompatibleComponents(myClass)) {
+            for (ActionComponent comp : actionController.findCompatibleComponents(myClass)) {
                 final String key = "{" + i + "." + comp.toString() + "}";
                 final String desc = type.getType().getArgNames()[i] + "'s " + comp.getName();
 
@@ -126,11 +141,10 @@ public class ActionSubstitutor {
      * @return A map of server substitution names and their descriptions.
      */
     public Map<String, String> getServerSubstitutions() {
-        final Map<String, String> res = new HashMap<String, String>();
+        final Map<String, String> res = new HashMap<>();
 
         if (hasFrameContainer()) {
-            for (ActionComponent comp : ActionManager.getActionManager()
-                    .findCompatibleComponents(Server.class)) {
+            for (ActionComponent comp : actionController.findCompatibleComponents(Server.class)) {
                 final String key = "{" + comp.toString() + "}";
                 final String desc = "The connection's " + comp.getName();
 
@@ -248,7 +262,8 @@ public class ActionSubstitutor {
 
             try {
                 final ActionComponentChain chain = new ActionComponentChain(
-                        type.getType().getArgTypes()[argument], compMatcher.group(2));
+                        type.getType().getArgTypes()[argument], compMatcher.group(2),
+                        actionController);
                 return escape(checkConnection(chain, args, args[argument]));
             } catch (IllegalArgumentException ex) {
                 return ERR_ILLEGAL_COMPONENT;
@@ -267,7 +282,7 @@ public class ActionSubstitutor {
             if (server != null) {
                 try {
                     final ActionComponentChain chain = new ActionComponentChain(
-                        Server.class, substitution);
+                        Server.class, substitution, actionController);
                     return escape(checkConnection(chain, args, server));
                 } catch (IllegalArgumentException ex) {
                     return ERR_ILLEGAL_COMPONENT;

test/com/dmdirc/actions/ActionConditionTest.java

@@ -22,9 +22,6 @@
 
 package com.dmdirc.actions;
 
-import com.dmdirc.TestMain;
-
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import static org.junit.Assert.*;

test/com/dmdirc/actions/ActionModelTest.java

@@ -22,8 +22,6 @@
 
 package com.dmdirc.actions;
 
-import org.junit.BeforeClass;
-import com.dmdirc.TestMain;
 import com.dmdirc.interfaces.actions.ActionType;
 
 import java.util.ArrayList;
@@ -36,11 +34,6 @@ import static org.junit.Assert.*;
 
 public class ActionModelTest {
 
-    @BeforeClass
-    public static void setUp() throws Exception {
-        TestMain.getTestMain();
-    }
-
     @Test
     public void testConditions() {
         final ActionModel model = new ActionModel("group", "name");
@@ -48,7 +41,7 @@ public class ActionModelTest {
         assertTrue("ActionModel must start with no conditions",
                 model.getConditions().isEmpty());
 
-        final List<ActionCondition> conds = new ArrayList<ActionCondition>();
+        final List<ActionCondition> conds = new ArrayList<>();
 
         model.setConditions(conds);
 

test/com/dmdirc/actions/ActionSubstitutorTest.java

@@ -22,12 +22,12 @@
 
 package com.dmdirc.actions;
 
-import com.dmdirc.TestMain;
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.InvalidIdentityFileException;
+import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 
 import java.util.Arrays;
@@ -46,7 +46,7 @@ import static org.mockito.Mockito.*;
 @RunWith(Parameterized.class)
 public class ActionSubstitutorTest {
 
-    private static final Map<String, String> SETTINGS = new HashMap<String, String>();
+    private static final Map<String, String> SETTINGS = new HashMap<>();
 
     private final String input, expected;
     private final Channel channel;
@@ -55,8 +55,6 @@ public class ActionSubstitutorTest {
 
     @BeforeClass
     public static void setup() throws InvalidIdentityFileException {
-        TestMain.getTestMain();
-
         SETTINGS.put("alpha", "A");
         SETTINGS.put("bravo", "$alpha");
         SETTINGS.put("charlie", "${bravo}");
@@ -87,7 +85,14 @@ public class ActionSubstitutorTest {
             when(manager.getOption("actions", entry.getKey())).thenReturn(entry.getValue());
         }
 
-        substitutor = new ActionSubstitutor(CoreActionType.CHANNEL_MESSAGE);
+        final ActionController controller = mock(ActionController.class);
+        when(controller.getComponent("STRING_STRING")).thenReturn(CoreActionComponent.STRING_STRING);
+        when(controller.getComponent("STRING_LENGTH")).thenReturn(CoreActionComponent.STRING_LENGTH);
+        when(controller.getComponent("SERVER_NETWORK")).thenReturn(CoreActionComponent.SERVER_NETWORK);
+        when(controller.getComponent("SERVER_PROTOCOL")).thenReturn(CoreActionComponent.SERVER_PROTOCOL);
+        when(controller.getComponent("SERVER_MYAWAYREASON")).thenReturn(CoreActionComponent.SERVER_MYAWAYREASON);
+
+        substitutor = new ActionSubstitutor(controller, CoreActionType.CHANNEL_MESSAGE);
 
         args = new Object[]{
             channel,