Remove some more TestMain references.

Rework how Logger/ErrorManager interact so they can be half
mocked out (or, at least, used in a thread-safe-ish manner).

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

src/com/dmdirc/commandparser/CommandLoader.java

@@ -68,6 +68,7 @@ import com.dmdirc.commandparser.commands.server.RawServerCommand;
 import com.dmdirc.commandparser.commands.server.Reconnect;
 import com.dmdirc.commandparser.commands.server.Umode;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.PluginManager;
 
@@ -90,6 +91,9 @@ public class CommandLoader {
     /** The identity manager to pass to config-related commands. */
     private final IdentityManager identityManager;
 
+    /** The action controller to pass to action-aware commands. */
+    private final ActionController actionController;
+
     /**
      * Creates a new instance of {@link CommandLoader}.
      *
@@ -103,11 +107,13 @@ public class CommandLoader {
             final LifecycleController lifecycleController,
             final ServerManager serverManager,
             final PluginManager pluginManager,
-            final IdentityManager identityManager) {
+            final IdentityManager identityManager,
+            final ActionController actionController) {
         this.lifecycleController = lifecycleController;
         this.serverManager = serverManager;
         this.pluginManager = pluginManager;
         this.identityManager = identityManager;
+        this.actionController = actionController;
     }
 
     /**
@@ -138,7 +144,7 @@ public class CommandLoader {
         manager.registerCommand(new Ctcp(), Ctcp.INFO);
         manager.registerCommand(new Disconnect(), Disconnect.INFO);
         manager.registerCommand(new Ignore(), Ignore.INFO);
-        manager.registerCommand(new JoinChannelCommand(), JoinChannelCommand.INFO);
+        manager.registerCommand(new JoinChannelCommand(actionController), JoinChannelCommand.INFO);
         manager.registerCommand(new Message(), Message.INFO);
         manager.registerCommand(new Nick(), Nick.INFO);
         manager.registerCommand(new Notice(), Notice.INFO);

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

@@ -32,13 +32,17 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
+import lombok.NoArgsConstructor;
+
 /**
  * The kick command bans a specified user or host from the channel.
  */
+@NoArgsConstructor
 public class Ban extends Command implements IntelligentCommand {
 
     /** A command info object for this command. */
@@ -46,6 +50,15 @@ public class Ban extends Command implements IntelligentCommand {
             "ban <user|host> - bans the specified user or host from the channel",
             CommandType.TYPE_CHANNEL);
 
+    /**
+     * Creates a new instance of {@link Ban} using the given command controller.
+     *
+     * @param controller The controller to use for command information.
+     */
+    public Ban(final CommandController controller) {
+        super(controller);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -33,14 +33,18 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
+import lombok.NoArgsConstructor;
+
 /**
  * The kick command kicks a specified user from the channel.
  * This version allows the user to specify a reason.
  */
+@NoArgsConstructor
 @CommandOptions(allowOffline = false)
 public class KickReason extends Command implements IntelligentCommand {
 
@@ -49,6 +53,15 @@ public class KickReason extends Command implements IntelligentCommand {
             "kick <user> [reason] - kicks the specified user from the channel",
             CommandType.TYPE_CHANNEL);
 
+    /**
+     * Creates a new instance of {@link KickReason} using the given command controller.
+     *
+     * @param controller The controller to use for command information.
+     */
+    public KickReason(final CommandController controller) {
+        super(controller);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/server/JoinChannelCommand.java

@@ -24,7 +24,6 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
-import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
@@ -34,6 +33,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
+import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.parser.common.ChannelJoinRequest;
@@ -58,17 +58,17 @@ public class JoinChannelCommand extends Command implements
             CommandType.TYPE_SERVER);
 
     /** A map of channel name mentions. */
-    private final MapList<FrameContainer, String> mentions
-            = new MapList<FrameContainer, String>();
+    private final MapList<FrameContainer, String> mentions = new MapList<>();
 
     /**
      * Creates a new instance of the join channel command.
+     *
+     * @param controller The action controller to register listeners with.
      */
-    public JoinChannelCommand() {
+    public JoinChannelCommand(final ActionController controller) {
         super();
 
-        ActionManager.getActionManager().registerListener(this,
-                CoreActionType.CLIENT_LINE_ADDED);
+        controller.registerListener(this, CoreActionType.CLIENT_LINE_ADDED);
     }
 
     /** {@inheritDoc} */
@@ -81,7 +81,7 @@ public class JoinChannelCommand extends Command implements
             return;
         }
 
-        final List<ChannelJoinRequest> channels = new ArrayList<ChannelJoinRequest>();
+        final List<ChannelJoinRequest> channels = new ArrayList<>();
 
         for (String pair : args.getArgumentsAsString().split(",")) {
             final int index = pair.trim().indexOf(' ');
@@ -107,8 +107,7 @@ public class JoinChannelCommand extends Command implements
         final String[] parts = source.getStyliser().doLinks(message)
                 .split(Character.toString(Styliser.CODE_CHANNEL));
 
-        int i = 1;
-        for (i = 1; i < parts.length; i += 2) {
+        for (int i = 1; i < parts.length; i += 2) {
             // All of the odd parts of the array are channel names
             mentions.add(source, parts[i]);
         }
@@ -166,7 +165,7 @@ public class JoinChannelCommand extends Command implements
      */
     protected List<String> checkSource(final FrameContainer source,
             final boolean checkParents, final boolean checkChildren) {
-        final List<String> results = new ArrayList<String>();
+        final List<String> results = new ArrayList<>();
 
         // Check the window itself
         if (mentions.containsKey(source)) {

src/com/dmdirc/config/validators/URLProtocolValidator.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.config.validators;
 
+import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.util.validators.ValidationResponse;
 import com.dmdirc.util.validators.Validator;
@@ -31,13 +32,35 @@ import com.dmdirc.util.validators.Validator;
  */
 public class URLProtocolValidator implements Validator<String> {
 
+    /** The global configuration to read settings from. */
+    private final ConfigManager globalConfig;
+
+    /**
+     * Creates a {@link URLProtocolValidator} that will read from the given
+     * config.
+     *
+     * @param globalConfig The config manager to read protocol info from.
+     */
+    public URLProtocolValidator(final ConfigManager globalConfig) {
+        this.globalConfig = globalConfig;
+    }
+
+    /**
+     * Creates a {@link URLProtocolValidator} with the default global config.
+     *
+     * @deprecated Specify a global config
+     */
+    @Deprecated
+    public URLProtocolValidator() {
+        this(IdentityManager.getIdentityManager().getGlobalConfiguration());
+    }
+
     /** {@inheritDoc} */
     @Override
     public ValidationResponse validate(final String object) {
         if (object == null || object.isEmpty()) {
             return new ValidationResponse("Cannot be empty");
-        } else if (IdentityManager.getIdentityManager().getGlobalConfiguration()
-                .hasOptionString("protocol", object)) {
+        } else if (globalConfig.hasOptionString("protocol", object)) {
             return new ValidationResponse("Cannot already exist");
         } else {
             return new ValidationResponse();

src/com/dmdirc/logger/ErrorManager.java

@@ -25,6 +25,7 @@ package com.dmdirc.logger;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.ui.FatalErrorDialog;
 import com.dmdirc.util.collections.ListenerList;
 
@@ -39,10 +40,10 @@ import java.util.concurrent.atomic.AtomicLong;
 /**
  * Error manager.
  */
-public final class ErrorManager implements ConfigChangeListener {
+public class ErrorManager implements ConfigChangeListener {
 
     /** Previously instantiated instance of ErrorManager. */
-    private static final ErrorManager ME = new ErrorManager();
+    private static ErrorManager me;
 
     /** A list of exceptions which we don't consider bugs and thus don't report. */
     private static final Class<?>[] BANNED_EXCEPTIONS = new Class<?>[]{
@@ -59,7 +60,7 @@ public final class ErrorManager implements ConfigChangeListener {
     private boolean logReports;
 
     /** Queue of errors to be reported. */
-    private final BlockingQueue<ProgramError> reportQueue = new LinkedBlockingQueue<ProgramError>();
+    private final BlockingQueue<ProgramError> reportQueue = new LinkedBlockingQueue<>();
 
     /** Thread used for sending errors. */
     private volatile Thread reportThread;
@@ -74,11 +75,18 @@ public final class ErrorManager implements ConfigChangeListener {
     private final AtomicLong nextErrorID;
 
     /** Creates a new instance of ErrorListDialog. */
-    private ErrorManager() {
-        errors = new LinkedList<ProgramError>();
+    public ErrorManager() {
+        errors = new LinkedList<>();
         nextErrorID = new AtomicLong();
+    }
 
-        final ConfigManager config = IdentityManager.getIdentityManager().getGlobalConfiguration();
+    /**
+     * Initialiases the error manager.
+     *
+     * @param controller The controller to use to read/write settings.
+     */
+    public void initialise(final IdentityController controller) {
+        final ConfigManager config = controller.getGlobalConfiguration();
 
         config.addChangeListener("general", "logerrors", this);
         config.addChangeListener("general", "submitErrors", this);
@@ -92,8 +100,21 @@ public final class ErrorManager implements ConfigChangeListener {
      *
      * @return Instance of ErrorManager
      */
-    public static ErrorManager getErrorManager() {
-        return ME;
+    public static synchronized ErrorManager getErrorManager() {
+        if (me == null) {
+            me = new ErrorManager();
+            me.initialise(IdentityManager.getIdentityManager());
+        }
+        return me;
+    }
+
+    /**
+     * Sets the singleton instance of the error manager.
+     *
+     * @param errorManager The error manager to use.
+     */
+    public static void setErrorManager(final ErrorManager errorManager) {
+        me = errorManager;
     }
 
     /**
@@ -348,7 +369,7 @@ public final class ErrorManager implements ConfigChangeListener {
      */
     public List<ProgramError> getErrors() {
         synchronized (errors) {
-            return new LinkedList<ProgramError>(errors);
+            return new LinkedList<>(errors);
         }
     }
 

src/com/dmdirc/logger/Logger.java

@@ -27,6 +27,9 @@ package com.dmdirc.logger;
  */
 public final class Logger {
 
+    /** The error manager to report errors to. */
+    private static ErrorManager errorManager;
+
     /** Prevent instantiation of a new instance of Logger. */
     private Logger() {
         //Ignore
@@ -96,8 +99,21 @@ public final class Logger {
      *
      * @return The error manager to be used.
      */
-    private static ErrorManager getErrorManager() {
-        return ErrorManager.getErrorManager();
+    private static synchronized ErrorManager getErrorManager() {
+        if (errorManager == null) {
+            errorManager = ErrorManager.getErrorManager();
+        }
+
+        return errorManager;
+    }
+
+    /**
+     * Sets the error manager that this logger will use.
+     *
+     * @param errorManager The error manager to use.
+     */
+    public static void setErrorManager(final ErrorManager errorManager) {
+        Logger.errorManager = errorManager;
     }
 
 }

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.actions.wrappers;
 
-import com.dmdirc.TestMain;
+import com.dmdirc.ServerManager;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.CoreActionComparison;
@@ -30,33 +30,45 @@ import com.dmdirc.actions.CoreActionComponent;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.logger.ErrorManager;
+import com.dmdirc.logger.Logger;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
+@RunWith(MockitoJUnitRunner.class)
 public class AliasWrapperTest {
 
-    private Action action;
-    private ActionCondition condition;
+    @Mock private Action action;
+    @Mock private ActionCondition condition;
+    @Mock private ServerManager serverManager;
+    @Mock private CommandController commandController;
     private List<ActionCondition> conditions;
 
     private AliasWrapper aliasWrapper;
 
+    @BeforeClass
+    public static void overrideLogger() {
+        // We expect errors to be generated, so mock out the error manager.
+        Logger.setErrorManager(mock(ErrorManager.class));
+    }
+
     @Before
     public void setup() {
-        final CommandController controller = mock(CommandController.class);
-        when(controller.getCommandChar()).thenReturn('!');
+        when(commandController.getCommandChar()).thenReturn('!');
 
-        action = mock(Action.class);
-        condition = mock(ActionCondition.class);
         conditions = new ArrayList<>();
-        aliasWrapper = new AliasWrapper(controller, TestMain.getTestMain().getServerManager());
+        aliasWrapper = new AliasWrapper(commandController, serverManager);
 
         when(condition.getArg()).thenReturn(1);
         when(condition.getComparison()).thenReturn(CoreActionComparison.STRING_EQUALS);

test/com/dmdirc/commandparser/commands/HelpTest.java

@@ -23,13 +23,13 @@ package com.dmdirc.commandparser.commands;
 
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.ServerManager;
-import com.dmdirc.TestMain;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandLoader;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
+import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.plugins.PluginManager;
 
 import java.util.LinkedList;
@@ -61,15 +61,17 @@ public class HelpTest {
     public static List<Object[]> data() throws InvalidIdentityFileException {
         final List<Object[]> res = new LinkedList<>();
 
-        TestMain.getTestMain();
+        final ServerManager serverManager = mock(ServerManager.class);
+        final CommandManager commandManager = new CommandManager(serverManager);
         new CommandLoader(
                 mock(LifecycleController.class),
-                mock(ServerManager.class),
+                serverManager,
                 mock(PluginManager.class),
-                mock(IdentityManager.class)).loadCommands(CommandManager.getCommandManager());
+                mock(IdentityManager.class),
+                mock(ActionController.class)).loadCommands(commandManager);
 
         for (CommandType type : CommandType.values()) {
-            for (CommandInfo command : CommandManager.getCommandManager().getCommands(type).keySet()) {
+            for (CommandInfo command : commandManager.getCommands(type).keySet()) {
                 res.add(new Object[]{command});
             }
         }

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

@@ -24,32 +24,39 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.TestMain;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.mockito.Mockito.*;
 
+@RunWith(MockitoJUnitRunner.class)
 public class BanTest {
 
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        TestMain.getTestMain();
-    }
+    @Mock private CommandController controller;
+    private Ban command;
 
-    private final Ban command = new Ban();
+    @Before
+    public void setup() {
+        when(controller.getCommandChar()).thenReturn('/');
+        when(controller.getSilenceChar()).thenReturn('.');
+        command = new Ban(controller);
+    }
 
     @Test
     public void testUsage() {
         final FrameContainer tiw = mock(FrameContainer.class);
         final Channel channel = mock(Channel.class);
-        command.execute(tiw, new CommandArguments("/ban"),
+        command.execute(tiw, new CommandArguments(controller, "/ban"),
                 new ChannelCommandContext(null, Ban.INFO, channel));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -69,7 +76,7 @@ public class BanTest {
         when(ccInfo.getClient()).thenReturn(clientInfo);
         when(clientInfo.getHostname()).thenReturn("my.host.name");
 
-        command.execute(container, new CommandArguments("/ban user"),
+        command.execute(container, new CommandArguments(controller, "/ban user"),
                 new ChannelCommandContext(null, Ban.INFO, channel));
 
         verify(channelInfo).alterMode(true, 'b', "*!*@my.host.name");
@@ -85,7 +92,7 @@ public class BanTest {
 
         when(channel.getChannelInfo()).thenReturn(channelInfo);
 
-        command.execute(container, new CommandArguments("/ban *!*@my.host.name"),
+        command.execute(container, new CommandArguments(controller, "/ban *!*@my.host.name"),
                 new ChannelCommandContext(null, Ban.INFO, channel));
 
         verify(channelInfo).alterMode(true, 'b', "*!*@my.host.name");

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

@@ -22,34 +22,41 @@
 
 package com.dmdirc.commandparser.commands.channel;
 
-import com.dmdirc.TestMain;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.irc.IRCChannelClientInfo;
 import com.dmdirc.parser.irc.IRCChannelInfo;
 
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.mockito.Mockito.*;
 
+@RunWith(MockitoJUnitRunner.class)
 public class KickReasonTest {
 
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        TestMain.getTestMain();
-    }
+    private KickReason command;
+    @Mock private CommandController controller;
 
-    private final KickReason command = new KickReason();
+    @Before
+    public void setup() {
+        when(controller.getCommandChar()).thenReturn('/');
+        when(controller.getSilenceChar()).thenReturn('.');
+        command = new KickReason(controller);
+    }
 
     @Test
     public void testUsage() {
         final FrameContainer tiw = mock(FrameContainer.class);
         final Channel channel = mock(Channel.class);
-        command.execute(tiw, new CommandArguments("/kick"),
+        command.execute(tiw, new CommandArguments(controller, "/kick"),
                 new ChannelCommandContext(null, KickReason.INFO, channel));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -64,7 +71,7 @@ public class KickReasonTest {
         when(channel.getChannelInfo()).thenReturn(channelInfo);
         when(channelInfo.getChannelClient(anyString())).thenReturn(null);
 
-        command.execute(tiw, new CommandArguments("/kick user1"),
+        command.execute(tiw, new CommandArguments(controller, "/kick user1"),
                 new ChannelCommandContext(null, KickReason.INFO, channel));
 
         verify(tiw).addLine(eq("commandError"), matches(".*user1"));
@@ -80,7 +87,7 @@ public class KickReasonTest {
         when(channel.getChannelInfo()).thenReturn(channelInfo);
         when(channelInfo.getChannelClient("user1")).thenReturn(cci);
 
-        command.execute(tiw, new CommandArguments("/kick user1 reason here"),
+        command.execute(tiw, new CommandArguments(controller, "/kick user1 reason here"),
                 new ChannelCommandContext(null, KickReason.INFO, channel));
 
         verify(cci).kick("reason here");
@@ -99,7 +106,7 @@ public class KickReasonTest {
         when(channelInfo.getChannelClient("user1")).thenReturn(cci);
         when(manager.getOption("general", "kickmessage")).thenReturn("reason here");
 
-        command.execute(tiw, new CommandArguments("/kick user1"),
+        command.execute(tiw, new CommandArguments(controller, "/kick user1"),
                 new ChannelCommandContext(null, KickReason.INFO, channel));
 
         verify(cci).kick("reason here");

test/com/dmdirc/commandparser/commands/flags/CommandFlagHandlerTest.java

@@ -21,16 +21,14 @@
  */
 package com.dmdirc.commandparser.commands.flags;
 
-import com.dmdirc.TestMain;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.config.InvalidIdentityFileException;
+import com.dmdirc.interfaces.CommandController;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -55,11 +53,6 @@ public class CommandFlagHandlerTest {
     private final CommandFlag[] flags;
     private final int[] offsets;
 
-    @BeforeClass
-    public static void setupClass() throws InvalidIdentityFileException {
-        TestMain.getTestMain();
-    }
-
     public CommandFlagHandlerTest(String input, CommandFlag[] flags, int[] offsets) {
         noArgsFlag3.addEnabled(noArgsFlag4);
         noArgsFlag3.addDisabled(noArgsFlag1);
@@ -75,9 +68,12 @@ public class CommandFlagHandlerTest {
     @Test
     public void testParse() {
         final FrameContainer container = mock(FrameContainer.class);
+        final CommandController controller = mock(CommandController.class);
+        when(controller.getCommandChar()).thenReturn('/');
+        when(controller.getSilenceChar()).thenReturn('.');
 
-        final Map<CommandFlag, Integer> results
-                = handler.parse(container, new CommandArguments(input));
+        final Map<CommandFlag, Integer> results = handler.parse(container,
+                new CommandArguments(controller, input));
 
         if (flags == null) {
             assertNull("Command should fail: " + input, results);

test/com/dmdirc/config/validators/URLProtocolValidatorTest.java

@@ -22,30 +22,31 @@
 
 package com.dmdirc.config.validators;
 
-import com.dmdirc.TestMain;
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
+import static org.mockito.Mockito.*;
 import static org.junit.Assert.*;
 
+@RunWith(MockitoJUnitRunner.class)
 public class URLProtocolValidatorTest {
 
+    @Mock private ConfigManager configManager;
+
     @Test
     public void testValidate() throws InvalidIdentityFileException {
-        TestMain.getTestMain();
-        IdentityManager.getIdentityManager().getGlobalConfigIdentity()
-                .setOption("protocol", "unit-test-1", "BROWSER");
+        when(configManager.hasOptionString("protocol", "unit-test-1")).thenReturn(true);
 
-        final URLProtocolValidator validator = new URLProtocolValidator();
+        final URLProtocolValidator validator = new URLProtocolValidator(configManager);
         assertTrue(validator.validate(null).isFailure());
         assertTrue(validator.validate("").isFailure());
         assertTrue(validator.validate("unit-test-1").isFailure());
         assertFalse(validator.validate("unit-test-2").isFailure());
-
-        IdentityManager.getIdentityManager().getGlobalConfigIdentity()
-                .unsetOption("protocol", "unit-test-1");
     }
 
 }

test/com/dmdirc/logger/DMDircExceptionHandlerTest.java

@@ -22,29 +22,38 @@
 package com.dmdirc.logger;
 
 
-import com.dmdirc.TestMain;
-
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
+@RunWith(MockitoJUnitRunner.class)
 public class DMDircExceptionHandlerTest {
 
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        TestMain.getTestMain();
+    @Mock private ErrorManager errorManager;
+    private DMDircExceptionHandler eh;
+
+    @Before
+    public void setup() {
+        Logger.setErrorManager(errorManager);
+        eh = new DMDircExceptionHandler();
     }
 
     @Test
     public void testUncaughtException() {
-        final DMDircExceptionHandler eh = new DMDircExceptionHandler();
-
-        final int initial = ErrorManager.getErrorManager().getErrorCount();
-
-        eh.uncaughtException(null, new Exception());
+        final Exception exception = new Exception();
+        eh.uncaughtException(null, exception);
+        verify(errorManager).addError(eq(ErrorLevel.HIGH), anyString(), same(exception), eq(true));
+    }
 
-        assertEquals(initial + 1, ErrorManager.getErrorManager().getErrorCount());
+    @Test
+    public void testUncaughtError() {
+        final Error error = new Error();
+        eh.uncaughtException(null, error);
+        verify(errorManager).addError(eq(ErrorLevel.FATAL), anyString(), same(error), eq(true));
     }
 
 }

test/com/dmdirc/logger/ProgramErrorTest.java

@@ -21,113 +21,61 @@
  */
 package com.dmdirc.logger;
 
-import com.dmdirc.TestMain;
-import com.dmdirc.config.InvalidIdentityFileException;
 
 import java.util.Arrays;
 import java.util.Date;
 
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.junit.Assert.*;
 
+@RunWith(MockitoJUnitRunner.class)
 public class ProgramErrorTest {
 
-    @BeforeClass
-    public static void setup() throws InvalidIdentityFileException {
-        TestMain.getTestMain();
+    @Mock private ErrorManager errorManager;
+
+    @Before
+    public void setup() {
+        ErrorManager.setErrorManager(errorManager);
     }
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void testConstructorNegativeID() {
-        boolean exception = false;
-
-        try {
-            new ProgramError(-1, ErrorLevel.HIGH, "moo", new String[0], new Date());
-        } catch (Exception ex) {
-            exception = true;
-        }
-
-        assertTrue(exception);
+        new ProgramError(-1, ErrorLevel.HIGH, "moo", new String[0], new Date());
     }
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void testConstructorNullErrorLevel() {
-        boolean exception = false;
-
-        try {
-            new ProgramError(1, null, "moo", new String[0], new Date());
-        } catch (Exception ex) {
-            exception = true;
-        }
-
-        assertTrue(exception);
+        new ProgramError(1, null, "moo", new String[0], new Date());
     }
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void testConstructorNullMessage() {
-        boolean exception = false;
-
-        try {
-            new ProgramError(1, ErrorLevel.HIGH, null, new String[0], new Date());
-        } catch (Exception ex) {
-            exception = true;
-        }
-
-        assertTrue(exception);
+        new ProgramError(1, ErrorLevel.HIGH, null, new String[0], new Date());
     }
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void testConstructorEmptyMessage() {
-        boolean exception = false;
-
-        try {
-            new ProgramError(1, ErrorLevel.HIGH, "", new String[0], new Date());
-        } catch (Exception ex) {
-            exception = true;
-        }
-
-        assertTrue(exception);
+        new ProgramError(1, ErrorLevel.HIGH, "", new String[0], new Date());
     }
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void testConstructorNullTrace() {
-        boolean exception = false;
-
-        try {
-            new ProgramError(1, ErrorLevel.HIGH, "moo", null, new Date());
-        } catch (Exception ex) {
-            exception = true;
-        }
-
-        assertTrue(exception);
+        new ProgramError(1, ErrorLevel.HIGH, "moo", null, new Date());
     }
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void testConstructorNullDate() {
-        boolean exception = false;
-
-        try {
-            new ProgramError(1, ErrorLevel.HIGH, "moo", new String[0], null);
-        } catch (Exception ex) {
-            exception = true;
-        }
-
-        assertTrue(exception);
+        new ProgramError(1, ErrorLevel.HIGH, "moo", new String[0], null);
     }
 
     @Test
     public void testConstructorGood() {
-        boolean exception = false;
-
-        try {
-            new ProgramError(1, ErrorLevel.HIGH, "moo", new String[0], new Date());
-        } catch (IllegalArgumentException ex) {
-            exception = true;
-        }
-
-        assertFalse(exception);
+        new ProgramError(1, ErrorLevel.HIGH, "moo", new String[0], new Date());
     }
 
     @Test