Die, TestMain, die.

It's been horrible knowing you.

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

src/com/dmdirc/ui/messages/Styliser.java

@@ -143,6 +143,8 @@ public class Styliser implements ConfigChangeListener {
     private final Server server;
     /** Config manager to retrieve settings from. */
     private final AggregateConfigProvider configManager;
+    /** Colour manager to use to parse colours. */
+    private final ColourManager colourManager;
 
     /**
      * Creates a new instance of Styliser.
@@ -164,6 +166,9 @@ public class Styliser implements ConfigChangeListener {
         this.server = server;
         this.configManager = configManager;
 
+        // TODO: This should probably be passed in, not created here.
+        this.colourManager = new ColourManager(configManager);
+
         configManager.addChangeListener("ui", "linkcolour", this);
         configManager.addChangeListener("ui", "channelcolour", this);
         configManager.addChangeListener("ui", "stylelinks", this);
@@ -824,12 +829,13 @@ public class Styliser implements ConfigChangeListener {
      * @param attribs The attribute set to modify
      * @param foreground The colour code/hex of the new foreground colour
      */
-    private static void setForeground(final SimpleAttributeSet attribs,
+    private void setForeground(final SimpleAttributeSet attribs,
             final String foreground) {
         if (attribs.isDefined(StyleConstants.Foreground)) {
             attribs.removeAttribute(StyleConstants.Foreground);
         }
-        attribs.addAttribute(StyleConstants.Foreground, convertColour(ColourManager.parseColour(foreground)));
+        attribs.addAttribute(StyleConstants.Foreground,
+                convertColour(colourManager.getColourFromString(foreground, Colour.WHITE)));
     }
 
     /**
@@ -838,12 +844,13 @@ public class Styliser implements ConfigChangeListener {
      * @param attribs The attribute set to modify
      * @param background The colour code/hex of the new background colour
      */
-    private static void setBackground(final SimpleAttributeSet attribs,
+    private void setBackground(final SimpleAttributeSet attribs,
             final String background) {
         if (attribs.isDefined(StyleConstants.Background)) {
             attribs.removeAttribute(StyleConstants.Background);
         }
-        attribs.addAttribute(StyleConstants.Background, convertColour(ColourManager.parseColour(background)));
+        attribs.addAttribute(StyleConstants.Background,
+                convertColour(colourManager.getColourFromString(background, Colour.WHITE)));
     }
 
     /**
@@ -851,9 +858,9 @@ public class Styliser implements ConfigChangeListener {
      * @param attribs The attribute set to apply this default on
      * @param foreground The default foreground colour
      */
-    private static void setDefaultForeground(final SimpleAttributeSet attribs,
-            final String foreground) {
-        attribs.addAttribute("DefaultForeground", convertColour(ColourManager.parseColour(foreground)));
+    private void setDefaultForeground(final SimpleAttributeSet attribs, final String foreground) {
+        attribs.addAttribute("DefaultForeground",
+                convertColour(colourManager.getColourFromString(foreground, Colour.WHITE)));
     }
 
     /**
@@ -861,9 +868,9 @@ public class Styliser implements ConfigChangeListener {
      * @param attribs The attribute set to apply this default on
      * @param background The default background colour
      */
-    private static void setDefaultBackground(final SimpleAttributeSet attribs,
-            final String background) {
-        attribs.addAttribute("DefaultBackground", convertColour(ColourManager.parseColour(background)));
+    private void setDefaultBackground(final SimpleAttributeSet attribs, final String background) {
+        attribs.addAttribute("DefaultBackground",
+                convertColour(colourManager.getColourFromString(background, Colour.WHITE)));
     }
 
     /** {@inheritDoc} */

test/com/dmdirc/TestMain.java

@@ -1,144 +0,0 @@
-package com.dmdirc;
-
-import com.dmdirc.actions.ActionFactory;
-import com.dmdirc.actions.ActionGroup;
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.commandline.CommandLineParser;
-import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.config.IdentityManager;
-import com.dmdirc.config.InvalidIdentityFileException;
-import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.CommandController.CommandDetails;
-import com.dmdirc.interfaces.config.IdentityController;
-import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.updater.manager.UpdateManager;
-import com.dmdirc.util.URLBuilder;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-
-import javax.inject.Provider;
-import static org.mockito.Mockito.*;
-
-/**
- * Main subclass to init things needed for testing.
- *
- * @deprecated Tests shouldn't need the entire universe created.
- */
-@Deprecated
-public class TestMain extends Main {
-
-    private static Main instance;
-
-    private final IdentityManager identityManager;
-    private final PluginManager pluginManager;
-    private final CommandManager commandManager;
-
-    public TestMain(final IdentityManager identityManager,
-            final ServerManager serverManager,
-            final ActionManager actionManager,
-            final CommandLineParser commandLineParser,
-            final PluginManager pluginManager,
-            final CommandManager commandManager,
-            final CorePluginExtractor corePluginExtractor) {
-        super(identityManager, serverManager, actionManager, commandLineParser,
-                pluginManager, commandManager, null, null, corePluginExtractor,
-                mock(URLBuilder.class), Collections.<CommandDetails>emptySet());
-        this.identityManager = identityManager;
-        this.pluginManager = pluginManager;
-        this.commandManager = commandManager;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void init() {
-        try {
-            identityManager.initialise();
-        } catch (InvalidIdentityFileException ex) {
-            // If a bad config dir exists, try to continue anyway, maybe the
-            // test doesn't need it.
-            // DON'T do anything to the user's configuration... (so no calls
-            // to handleInvalidConfigFile(); here)
-        }
-
-        pluginManager.refreshPlugins();
-        commandManager.initialise(identityManager.getGlobalConfiguration());
-        CommandManager.setCommandManager(commandManager);
-
-        ActionManager.getActionManager().initialise();
-    }
-
-    /**
-     * Singleton method for convenience so that we don't need to init a billion
-     * TestMain instances to run tests.
-     *
-     * Separate instances of TestMain are available, but probably pointless as
-     * long as IdentityManager, PluginManager and ConfigManater are still
-     * singletons.
-     *
-     * @return A Singleton instance of TestMain
-     */
-    public static Main getTestMain() {
-        if (instance == null) {
-            try {
-                File tempFile = File.createTempFile("dmdirc", "test");
-                tempFile.delete();
-                tempFile.mkdir();
-                tempFile.deleteOnExit();
-
-                final String configDirectory = tempFile.getAbsolutePath() + File.separator;
-                final String pluginDirectory = configDirectory + "plugins" + File.separator;
-                final String actionsDirectory = configDirectory + "actions" + File.separator;
-
-                // TODO: Tests probably shouldn't rely on a config dir... Who knows
-                //       what the user has done with their config.
-                final IdentityManager identityManager = new IdentityManager(configDirectory);
-                IdentityManager.setIdentityManager(identityManager);
-                IdentityManager.getIdentityManager().loadVersionIdentity();
-
-                final ServerManager serverManager = mock(ServerManager.class);
-                final CommandManager commandManager = new CommandManager(serverManager);
-
-                final ActionFactory actionFactory = new ActionFactory(
-                        new DummyProvider<>(mock(ActionController.class)),
-                        new DummyProvider<IdentityController>(identityManager),
-                        actionsDirectory);
-                final ActionManager actionManager = new ActionManager(
-                        serverManager, identityManager, actionFactory,
-                        new DummyProvider<>(Collections.<ActionGroup>emptySet()));
-                ActionManager.setActionManager(actionManager);
-
-                final PluginManager pluginManager = new PluginManager(
-                        identityManager, actionManager,
-                        mock(UpdateManager.class),
-                        mock(Provider.class),
-                        pluginDirectory);
-                final CorePluginExtractor corePluginExtractor =
-                        new CorePluginExtractor(pluginManager, pluginDirectory);
-
-                instance = new TestMain(identityManager, serverManager,
-                        actionManager, null, pluginManager, commandManager,
-                        corePluginExtractor);
-                instance.init();
-            } catch (IOException ex) {
-                // Blargh.
-            }
-        }
-        return instance;
-    }
-
-    private static class DummyProvider<T> implements Provider<T> {
-
-        private final T value;
-
-        public DummyProvider(T value) {
-            this.value = value;
-        }
-
-        @Override
-        public T get() {
-            return value;
-        }
-    }
-}

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

@@ -21,7 +21,6 @@
  */
 package com.dmdirc.commandparser.commands.channel;
 
-import com.dmdirc.TestMain;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;

test/com/dmdirc/ui/messages/IntelligentLinkingTest.java

@@ -23,14 +23,11 @@ package com.dmdirc.ui.messages;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
-import com.dmdirc.TestMain;
-import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -58,11 +55,6 @@ public class IntelligentLinkingTest {
         styliser = new Styliser(container);
     }
 
-    @BeforeClass
-    public static void setUp() throws InvalidIdentityFileException {
-        TestMain.getTestMain();
-    }
-
     @Test
     public void testLink() throws InterruptedException {
         assertEquals(expected, styliser.doLinks(input)

test/com/dmdirc/ui/messages/StyliserStylesTest.java

@@ -23,8 +23,6 @@
 package com.dmdirc.ui.messages;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.TestMain;
-import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.core.util.Utils;
 
@@ -37,7 +35,6 @@ import java.util.Map;
 
 import javax.swing.text.DefaultStyledDocument;
 
-import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -57,11 +54,6 @@ public class StyliserStylesTest {
         this.output = output;
     }
 
-    @BeforeClass
-    public static void setUp() throws InvalidIdentityFileException {
-        TestMain.getTestMain();
-    }
-
     @Test
     public void testStyle() {
         assertEquals(output, style(input));

test/com/dmdirc/ui/messages/StyliserTest.java

@@ -23,13 +23,10 @@
 package com.dmdirc.ui.messages;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.TestMain;
-import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import java.util.Enumeration;
 
-import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -38,11 +35,6 @@ import static org.mockito.Mockito.*;
 
 public class StyliserTest {
 
-    @Before
-    public void setUp() throws InvalidIdentityFileException {
-        TestMain.getTestMain();
-    }
-
     @Test
     public void testStripControlCodes1() {
         String input = "This"+((char) 2)+" is "+((char) 17)+"a test";