Remove ConfigManager references.

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

src/com/dmdirc/addons/serverlistdialog/Settings.java

@@ -28,6 +28,7 @@ import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 
 import java.util.HashMap;
@@ -155,7 +156,7 @@ public class Settings extends JPanel implements ServerListListener {
      * @param identity The provider to write settings to.
      */
     private void addSettings(final SettingsPanel settingsPanel,
-            final ConfigManager manager, final ConfigProvider identity) {
+            final AggregateConfigProvider manager, final ConfigProvider identity) {
         settingsPanel.addOption(PreferencesManager.getPreferencesManager()
                 .getServerSettings(manager, identity));
     }

test/com/dmdirc/addons/identd/IdentClientTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.addons.identd;
 
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
 
@@ -32,19 +32,25 @@ import java.util.ArrayList;
 import java.util.List;
 
 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 IdentClientTest {
 
+    @Mock private AggregateConfigProvider acp;
+    @Mock private IdentdPlugin plugin;
+    @Mock private ServerManager sm;
+    @Mock private Server server;
+    @Mock private IRCParser parser;
+    @Mock private IRCClientInfo client;
+
     protected IdentClient getClient() {
-        IdentdPlugin plugin = mock(IdentdPlugin.class);
-        ServerManager sm = mock(ServerManager.class);
-        Server server = mock(Server.class);
-        IRCParser parser = mock(IRCParser.class);
-        IRCClientInfo client = mock(IRCClientInfo.class);
-        final List<Server> servers = new ArrayList<Server>();
+        final List<Server> servers = new ArrayList<>();
         servers.add(server);
 
         when(plugin.getDomain()).thenReturn("plugin-Identd");
@@ -60,8 +66,7 @@ public class IdentClientTest {
 
     @Test
     public void testInvalidIdent() {
-        final ConfigManager cm = mock(ConfigManager.class);
-        final String response = getClient().getIdentResponse("invalid request!", cm);
+        final String response = getClient().getIdentResponse("invalid request!", acp);
 
         assertContains("Illegal requests must result in an ERROR response",
                 response, "ERROR");
@@ -69,8 +74,7 @@ public class IdentClientTest {
 
     @Test
     public void testQuoting() {
-        final ConfigManager cm = mock(ConfigManager.class);
-        final String response = getClient().getIdentResponse("in\\valid:invalid", cm);
+        final String response = getClient().getIdentResponse("in\\valid:invalid", acp);
 
         assertStartsWith("Special chars in illegal requests must be quoted",
                 response, "in\\\\valid\\:invalid");
@@ -78,8 +82,7 @@ public class IdentClientTest {
 
     @Test
     public void testQuoting2() {
-        final ConfigManager cm = mock(ConfigManager.class);
-        final String response = getClient().getIdentResponse("in\\\\valid\\ inv\\:alid", cm);
+        final String response = getClient().getIdentResponse("in\\\\valid\\ inv\\:alid", acp);
 
         assertStartsWith("Escaped characters in illegal requests shouldn't be doubly-escaped",
                 response, "in\\\\valid\\ inv\\:alid");
@@ -87,8 +90,7 @@ public class IdentClientTest {
 
     @Test
     public void testNonNumericPort() {
-        final ConfigManager cm = mock(ConfigManager.class);
-        final String response = getClient().getIdentResponse("abc, def", cm);
+        final String response = getClient().getIdentResponse("abc, def", acp);
 
         assertContains("Non-numeric ports must result in an ERROR response",
                 response, "ERROR");
@@ -97,8 +99,7 @@ public class IdentClientTest {
     }
 
     private void doPortTest(final String ports) {
-        final ConfigManager cm = mock(ConfigManager.class);
-        final String response = getClient().getIdentResponse(ports, cm);
+        final String response = getClient().getIdentResponse(ports, acp);
 
         assertContains("Illegal ports must result in an ERROR response",
                 response, "ERROR");
@@ -118,10 +119,9 @@ public class IdentClientTest {
 
     @Test
     public void testAlwaysOn() {
-        final ConfigManager cm = mock(ConfigManager.class);
-        when(cm.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(false);
+        when(acp.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(false);
 
-        final String response = getClient().getIdentResponse("50, 50", cm);
+        final String response = getClient().getIdentResponse("50, 50", acp);
         assertContains("Unknown port requests must return an ERROR response",
                 response, "ERROR");
         assertContains("Unknown port requests must return a NO-USER response",
@@ -130,11 +130,10 @@ public class IdentClientTest {
 
     @Test
     public void testHidden() {
-        final ConfigManager cm = mock(ConfigManager.class);
-        when(cm.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
-        when(cm.getOptionBool("plugin-Identd", "advanced.isHiddenUser")).thenReturn(true);
+        when(acp.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
+        when(acp.getOptionBool("plugin-Identd", "advanced.isHiddenUser")).thenReturn(true);
 
-        final String response = getClient().getIdentResponse("50, 50", cm);
+        final String response = getClient().getIdentResponse("50, 50", acp);
         assertContains("Hidden requests must return an ERROR response",
                 response, "ERROR");
         assertContains("Hidden requests must return a HIDDEN-USER response",
@@ -143,45 +142,42 @@ public class IdentClientTest {
 
     @Test
     public void testSystemNameQuoting() {
-        final ConfigManager cm = mock(ConfigManager.class);
-        when(cm.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
-        when(cm.getOptionBool("plugin-Identd", "advanced.isHiddenUser")).thenReturn(false);
-        when(cm.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(true);
-        when(cm.getOption("plugin-Identd", "advanced.customSystem")).thenReturn("a:b\\c,d");
-        when(cm.getOptionBool("plugin-Identd", "general.useCustomName")).thenReturn(false);
-        when(cm.getOption("plugin-Identd", "general.customName")).thenReturn("");
-
-        final String response = getClient().getIdentResponse("50, 50", cm);
+        when(acp.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
+        when(acp.getOptionBool("plugin-Identd", "advanced.isHiddenUser")).thenReturn(false);
+        when(acp.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(true);
+        when(acp.getOption("plugin-Identd", "advanced.customSystem")).thenReturn("a:b\\c,d");
+        when(acp.getOptionBool("plugin-Identd", "general.useCustomName")).thenReturn(false);
+        when(acp.getOption("plugin-Identd", "general.customName")).thenReturn("");
+
+        final String response = getClient().getIdentResponse("50, 50", acp);
         assertContains("Special characters must be quoted in system names",
                 response, "a\\:b\\\\c\\,d");
     }
 
     @Test
     public void testCustomNameQuoting() {
-        final ConfigManager cm = mock(ConfigManager.class);
-        when(cm.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
-        when(cm.getOptionBool("plugin-Identd", "advanced.isHiddenUser")).thenReturn(false);
-        when(cm.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(false);
-        when(cm.getOption("plugin-Identd", "advanced.customSystem")).thenReturn("");
-        when(cm.getOptionBool("plugin-Identd", "general.useCustomName")).thenReturn(true);
-        when(cm.getOption("plugin-Identd", "general.customName")).thenReturn("a:b\\c,d");
-
-        final String response = getClient().getIdentResponse("50, 50", cm);
+        when(acp.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
+        when(acp.getOptionBool("plugin-Identd", "advanced.isHiddenUser")).thenReturn(false);
+        when(acp.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(false);
+        when(acp.getOption("plugin-Identd", "advanced.customSystem")).thenReturn("");
+        when(acp.getOptionBool("plugin-Identd", "general.useCustomName")).thenReturn(true);
+        when(acp.getOption("plugin-Identd", "general.customName")).thenReturn("a:b\\c,d");
+
+        final String response = getClient().getIdentResponse("50, 50", acp);
         assertContains("Special characters must be quoted in custom names",
                 response, "a\\:b\\\\c\\,d");
     }
 
     @Test
     public void testCustomNames() {
-        final ConfigManager cm = mock(ConfigManager.class);
-        when(cm.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
-        when(cm.getOptionBool("plugin-Identd", "advanced.isHiddenUser")).thenReturn(false);
-        when(cm.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(true);
-        when(cm.getOption("plugin-Identd", "advanced.customSystem")).thenReturn("system");
-        when(cm.getOptionBool("plugin-Identd", "general.useCustomName")).thenReturn(true);
-        when(cm.getOption("plugin-Identd", "general.customName")).thenReturn("name");
-
-        final String response = getClient().getIdentResponse("50, 60", cm);
+        when(acp.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
+        when(acp.getOptionBool("plugin-Identd", "advanced.isHiddenUser")).thenReturn(false);
+        when(acp.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(true);
+        when(acp.getOption("plugin-Identd", "advanced.customSystem")).thenReturn("system");
+        when(acp.getOptionBool("plugin-Identd", "general.useCustomName")).thenReturn(true);
+        when(acp.getOption("plugin-Identd", "general.customName")).thenReturn("name");
+
+        final String response = getClient().getIdentResponse("50, 60", acp);
         final String[] bits = response.split(":");
 
         assertTrue("Responses must include port pair",
@@ -194,144 +190,132 @@ public class IdentClientTest {
 
     @Test
     public void testOSWindows() {
-        final ConfigManager cm = mock(ConfigManager.class);
-        when(cm.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
-        when(cm.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(false);
+        when(acp.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
+        when(acp.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(false);
         System.setProperty("user.name", "test");
         System.setProperty("os.name", "windows");
 
-        final String response = getClient().getIdentResponse("50, 50", cm);
+        final String response = getClient().getIdentResponse("50, 50", acp);
         assertEquals("50 , 50 : USERID : WIN32 : test", response);
     }
 
     @Test
     public void testOSMac() {
-        final ConfigManager cm = mock(ConfigManager.class);
-        when(cm.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
-        when(cm.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(false);
+        when(acp.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
+        when(acp.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(false);
         System.setProperty("user.name", "test");
         System.setProperty("os.name", "mac");
 
-        final String response = getClient().getIdentResponse("50, 50", cm);
+        final String response = getClient().getIdentResponse("50, 50", acp);
         assertEquals("50 , 50 : USERID : MACOS : test", response);
     }
 
     @Test
     public void testOSLinux() {
-        final ConfigManager cm = mock(ConfigManager.class);
-        when(cm.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
-        when(cm.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(false);
+        when(acp.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
+        when(acp.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(false);
         System.setProperty("user.name", "test");
         System.setProperty("os.name", "linux");
 
-        final String response = getClient().getIdentResponse("50, 50", cm);
+        final String response = getClient().getIdentResponse("50, 50", acp);
         assertEquals("50 , 50 : USERID : UNIX : test", response);
     }
 
     @Test
     public void testOSBSD() {
-        final ConfigManager cm = mock(ConfigManager.class);
-        when(cm.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
-        when(cm.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(false);
+        when(acp.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
+        when(acp.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(false);
         System.setProperty("user.name", "test");
         System.setProperty("os.name", "bsd");
 
-        final String response = getClient().getIdentResponse("50, 50", cm);
+        final String response = getClient().getIdentResponse("50, 50", acp);
         assertEquals("50 , 50 : USERID : UNIX-BSD : test", response);
     }
 
     @Test
     public void testOSOS2() {
-        final ConfigManager cm = mock(ConfigManager.class);
-        when(cm.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
-        when(cm.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(false);
+        when(acp.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
+        when(acp.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(false);
         System.setProperty("user.name", "test");
         System.setProperty("os.name", "os/2");
 
-        final String response = getClient().getIdentResponse("50, 50", cm);
+        final String response = getClient().getIdentResponse("50, 50", acp);
         assertEquals("50 , 50 : USERID : OS/2 : test", response);
     }
 
     @Test
     public void testOSUnix() {
-        final ConfigManager cm = mock(ConfigManager.class);
-        when(cm.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
-        when(cm.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(false);
+        when(acp.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
+        when(acp.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(false);
         System.setProperty("user.name", "test");
         System.setProperty("os.name", "unix");
 
-        final String response = getClient().getIdentResponse("50, 50", cm);
+        final String response = getClient().getIdentResponse("50, 50", acp);
         assertEquals("50 , 50 : USERID : UNIX : test", response);
     }
 
     @Test
     public void testOSIrix() {
-        final ConfigManager cm = mock(ConfigManager.class);
-        when(cm.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
-        when(cm.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(false);
+        when(acp.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
+        when(acp.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(false);
         System.setProperty("user.name", "test");
         System.setProperty("os.name", "irix");
 
-        final String response = getClient().getIdentResponse("50, 50", cm);
+        final String response = getClient().getIdentResponse("50, 50", acp);
         assertEquals("50 , 50 : USERID : IRIX : test", response);
     }
 
     @Test
     public void testOSUnknown() {
-        final ConfigManager cm = mock(ConfigManager.class);
-        when(cm.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
-        when(cm.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(false);
+        when(acp.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
+        when(acp.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(false);
         System.setProperty("user.name", "test");
         System.setProperty("os.name", "test");
 
-        final String response = getClient().getIdentResponse("50, 50", cm);
+        final String response = getClient().getIdentResponse("50, 50", acp);
         assertEquals("50 , 50 : USERID : UNKNOWN : test", response);
     }
 
     @Test
     public void testNameSystem() {
-        final ConfigManager cm = mock(ConfigManager.class);
-        when(cm.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
-        when(cm.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(false);
+        when(acp.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
+        when(acp.getOptionBool("plugin-Identd", "advanced.useCustomSystem")).thenReturn(false);
         System.setProperty("user.name", "test");
         System.setProperty("os.name", "test");
 
-        final String response = getClient().getIdentResponse("50, 50", cm);
+        final String response = getClient().getIdentResponse("50, 50", acp);
         assertEquals("50 , 50 : USERID : UNKNOWN : test", response);
     }
 
     @Test
     public void testNameCustom() {
-        final ConfigManager cm = mock(ConfigManager.class);
-        when(cm.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
-        when(cm.getOptionBool("plugin-Identd", "general.useCustomName")).thenReturn(true);
-        when(cm.getOption("plugin-Identd", "general.customName")).thenReturn("name");
+        when(acp.getOptionBool("plugin-Identd", "advanced.alwaysOn")).thenReturn(true);
+        when(acp.getOptionBool("plugin-Identd", "general.useCustomName")).thenReturn(true);
+        when(acp.getOption("plugin-Identd", "general.customName")).thenReturn("name");
         System.setProperty("user.name", "test");
         System.setProperty("os.name", "test");
 
-        final String response = getClient().getIdentResponse("50, 50", cm);
+        final String response = getClient().getIdentResponse("50, 50", acp);
         assertEquals("50 , 50 : USERID : UNKNOWN : name", response);
     }
 
     @Test
     public void testNameNickname() {
-        final ConfigManager cm = mock(ConfigManager.class);
-        when(cm.getOptionBool("plugin-Identd", "general.useNickname")).thenReturn(true);
+        when(acp.getOptionBool("plugin-Identd", "general.useNickname")).thenReturn(true);
         System.setProperty("user.name", "test");
         System.setProperty("os.name", "test");
 
-        final String response = getClient().getIdentResponse("60, 50", cm);
+        final String response = getClient().getIdentResponse("60, 50", acp);
         assertEquals("60 , 50 : USERID : UNKNOWN : nickname", response);
     }
 
     @Test
     public void testNameUsername() {
-        final ConfigManager cm = mock(ConfigManager.class);
-        when(cm.getOptionBool("plugin-Identd", "general.useUsername")).thenReturn(true);
+        when(acp.getOptionBool("plugin-Identd", "general.useUsername")).thenReturn(true);
         System.setProperty("user.name", "test");
         System.setProperty("os.name", "test");
 
-        final String response = getClient().getIdentResponse("60, 50", cm);
+        final String response = getClient().getIdentResponse("60, 50", acp);
         assertEquals("60 , 50 : USERID : UNKNOWN : username", response);
     }
 

test/com/dmdirc/addons/redirect/RedirectCommandTest.java

@@ -29,8 +29,8 @@ import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.commands.global.Echo;
 import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.InputWindow;
 
 import org.junit.Before;
@@ -50,7 +50,7 @@ public class RedirectCommandTest {
     @Mock private InputWindow inputWindow;
     @Mock private CommandController commandController;
     @Mock private WritableFrameContainer frameContainer;
-    @Mock private ConfigManager configManager;
+    @Mock private AggregateConfigProvider configProvider;
     @Mock private CommandParser commandParser;
 
     @Before
@@ -58,10 +58,10 @@ public class RedirectCommandTest {
         when(commandController.getCommandChar()).thenReturn('/');
         when(commandController.getSilenceChar()).thenReturn('.');
         when(inputWindow.getContainer()).thenReturn(frameContainer);
-        when(target.getConfigManager()).thenReturn(configManager);
+        when(target.getConfigManager()).thenReturn(configProvider);
         when(target.getCommandParser()).thenReturn(commandParser);
-        when(configManager.hasOptionString("formatter", "commandOutput")).thenReturn(true);
-        when(configManager.getOption("formatter", "commandOutput")).thenReturn("%1$s");
+        when(configProvider.hasOptionString("formatter", "commandOutput")).thenReturn(true);
+        when(configProvider.getOption("formatter", "commandOutput")).thenReturn("%1$s");
         doAnswer(new Answer<Void>() {
             @Override
             public Void answer(final InvocationOnMock invocation) throws Throwable {

test/com/dmdirc/addons/urlcatcher/UrlCatcherPluginTest.java

@@ -24,10 +24,10 @@ package com.dmdirc.addons.urlcatcher;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.ui.messages.Styliser;
 
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.*;
 public class UrlCatcherPluginTest {
 
     @Mock private FrameContainer container;
-    @Mock private ConfigManager manager;
+    @Mock private AggregateConfigProvider configProvider;
     @Mock private CommandController controller;
     @Mock private IdentityController identityController;
     @Mock private ActionController actionController;
@@ -51,7 +51,7 @@ public class UrlCatcherPluginTest {
 
     @Before
     public void setupClass() {
-        when(container.getConfigManager()).thenReturn(manager);
+        when(container.getConfigManager()).thenReturn(configProvider);
         final Styliser styliser = new Styliser(container);
         when(container.getStyliser()).thenReturn(styliser);
         plugin = new UrlCatcherPlugin(controller, identityController, actionController);