Make ConfigManager package private.

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

src/com/dmdirc/config/ConfigManager.java

@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
 /**
  * The config manager manages the various config sources for each entity.
  */
-public class ConfigManager extends BaseConfigProvider implements ConfigChangeListener,
+class ConfigManager extends BaseConfigProvider implements ConfigChangeListener,
         ConfigProviderListener, AggregateConfigProvider {
 
     private static final org.slf4j.Logger log = LoggerFactory.getLogger(ConfigManager.class);
@@ -83,7 +83,7 @@ public class ConfigManager extends BaseConfigProvider implements ConfigChangeLis
      * @param server The name of the server for this manager
      * @since 0.6.3
      */
-    public ConfigManager(final String protocol, final String ircd,
+    ConfigManager(final String protocol, final String ircd,
             final String network, final String server) {
         this(protocol, ircd, network, server, "<Unknown>");
     }
@@ -98,7 +98,7 @@ public class ConfigManager extends BaseConfigProvider implements ConfigChangeLis
      * @param channel The name of the channel for this manager
      * @since 0.6.3
      */
-    public ConfigManager(final String protocol, final String ircd,
+    ConfigManager(final String protocol, final String ircd,
             final String network, final String server, final String channel) {
         final String chanName = channel + "@" + network;
 
@@ -121,6 +121,7 @@ public class ConfigManager extends BaseConfigProvider implements ConfigChangeLis
         IdentityManager.getIdentityManager().registerIdentityListener(this);
     }
 
+    @Override
     public ConfigBinder getBinder() {
         return binder;
     }

test/com/dmdirc/harness/TestConfigManagerMap.java

@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.harness;
-
-import com.dmdirc.config.ConfigManager;
-import com.dmdirc.util.validators.Validator;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class TestConfigManagerMap extends ConfigManager {
-    private static final long serialVersionUID = 3604727894041756961L;
-
-    public final Map<String, String> settings = new HashMap<>();
-
-    public TestConfigManagerMap() {
-        super("", "", "", "");
-    }
-
-    @Override
-    public String getOption(String domain, String option) {
-        if (settings.containsKey(domain + "." + option)) {
-            return settings.get(domain + "." + option);
-        } else {
-            return super.getOption(domain, option);
-        }
-    }
-
-    @Override
-    public boolean hasOption(String domain, String option, Validator<String> validator) {
-        if (settings.containsKey(domain + "." + option)) {
-            return true;
-        } else {
-            return super.hasOption(domain, option, validator);
-        }
-    }
-}

test/com/dmdirc/harness/TestConfigManagerOptionToggle.java

@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.harness;
-
-import com.dmdirc.config.ConfigManager;
-import com.dmdirc.util.validators.Validator;
-
-public class TestConfigManagerOptionToggle extends ConfigManager {
-    private static final long serialVersionUID = 8078917248288638755L;
-
-    public TestConfigManagerOptionToggle() {
-        super(null, null, null, null);
-    }
-
-    @Override
-    public String getOption(String domain, String option, Validator<String> validator) {
-        return option.substring(1);
-    }
-
-    @Override
-    public boolean hasOption(String domain, String option, Validator<String> validator) {
-        return option.charAt(0) == '1';
-    }
-}

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

@@ -21,68 +21,66 @@
  */
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.config.ConfigManager;
-import com.dmdirc.config.IdentityManager;
-import com.dmdirc.harness.TestConfigManagerOptionToggle;
-import com.dmdirc.interfaces.config.ConfigProvider;
-
-import java.util.Collections;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.invocation.InvocationOnMock;
 import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.stubbing.Answer;
 
 import static org.junit.Assert.*;
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.startsWith;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class FormatterTest {
 
-    private TestConfigManagerOptionToggle mcm;
-
-    @Mock private IdentityManager identityManager;
+    @Mock private AggregateConfigProvider configProvider;
 
     @Before
     public void setup() {
-        IdentityManager.setIdentityManager(identityManager);
-        when(identityManager.getIdentitiesForManager(any(ConfigManager.class)))
-                .thenReturn(Collections.<ConfigProvider>emptyList());
-
-        mcm = new TestConfigManagerOptionToggle();
+        when(configProvider.hasOptionString(any(String.class), startsWith("1"))).thenReturn(true);
+        when(configProvider.getOption(any(String.class), startsWith("1"))).thenAnswer(new Answer<String> () {
+            @Override
+            public String answer(final InvocationOnMock invocation) throws Throwable {
+                return invocation.getArguments()[1].toString().substring(1);
+            }
+        });
     }
 
     @Test
     public void testBasicFormats() {
-        assertEquals("Hello!", Formatter.formatMessage(mcm, "1%1$s", "Hello!"));
-        assertEquals("Hello!", Formatter.formatMessage(mcm, "1%1$s", "Hello!", "Moo!", "Bar!"));
-        assertTrue(Formatter.formatMessage(mcm, "0%1$s", "Hello!")
+        assertEquals("Hello!", Formatter.formatMessage(configProvider, "1%1$s", "Hello!"));
+        assertEquals("Hello!", Formatter.formatMessage(configProvider, "1%1$s", "Hello!", "Moo!", "Bar!"));
+        assertTrue(Formatter.formatMessage(configProvider, "0%1$s", "Hello!")
                 .toLowerCase().indexOf("no format string") > -1);
-        assertTrue(Formatter.formatMessage(mcm, "1%5$s", "Hello!")
+        assertTrue(Formatter.formatMessage(configProvider, "1%5$s", "Hello!")
                 .toLowerCase().indexOf("invalid format string") > -1);
-        assertTrue(Formatter.formatMessage(mcm, "1%1$Z", "Hello!")
+        assertTrue(Formatter.formatMessage(configProvider, "1%1$Z", "Hello!")
                 .toLowerCase().indexOf("invalid format string") > -1);
     }
 
     @Test
     public void testCasting() {
-        assertEquals("H", Formatter.formatMessage(mcm, "1%1$c", "Hello!"));
-        assertEquals("10", Formatter.formatMessage(mcm, "1%1$d", "10"));
-        assertEquals("111999", Formatter.formatMessage(mcm, "1%1$s", "111999"));
+        assertEquals("H", Formatter.formatMessage(configProvider, "1%1$c", "Hello!"));
+        assertEquals("10", Formatter.formatMessage(configProvider, "1%1$d", "10"));
+        assertEquals("111999", Formatter.formatMessage(configProvider, "1%1$s", "111999"));
     }
 
     @Test
     public void testCaching() {
-        assertEquals("H", Formatter.formatMessage(mcm, "1%1$C", "Hello!"));
-        assertEquals("H", Formatter.formatMessage(mcm, "1%1$C", "Hello!", 123, null));
-        assertEquals("HELLO!", Formatter.formatMessage(mcm, "1%1$S", "Hello!", 123, null));
-        assertEquals("HELLO!", Formatter.formatMessage(mcm, "1%1$S", "Hello!"));
+        assertEquals("H", Formatter.formatMessage(configProvider, "1%1$C", "Hello!"));
+        assertEquals("H", Formatter.formatMessage(configProvider, "1%1$C", "Hello!", 123, null));
+        assertEquals("HELLO!", Formatter.formatMessage(configProvider, "1%1$S", "Hello!", 123, null));
+        assertEquals("HELLO!", Formatter.formatMessage(configProvider, "1%1$S", "Hello!"));
     }
 
     @Test
     public void testFormatDuration() {
-        assertEquals("1 minute, 1 second", Formatter.formatMessage(mcm, "1%1$u", "61"));
+        assertEquals("1 minute, 1 second", Formatter.formatMessage(configProvider, "1%1$u", "61"));
     }
 }