Add an injectable wrapper around System.

Not 100% sure this is a good idea though.

src/com/dmdirc/LauncherUtils.java

@@ -25,6 +25,7 @@ package com.dmdirc;
 import com.dmdirc.commandline.BaseDirectoryLocator;
 import com.dmdirc.commandline.CommandLineParser;
 import com.dmdirc.updater.Version;
+import com.dmdirc.util.SystemInfo;
 
 /**
  * Utility class to help launcher interface with client.
@@ -39,8 +40,9 @@ public class LauncherUtils {
      * @return Returns the config directory to use
      */
     public static String getDirectory(final String... args) {
-        final CommandLineParser cliParser = new CommandLineParser(null, null, null);
-        final BaseDirectoryLocator locator = new BaseDirectoryLocator();
+        final SystemInfo systemInfo = new SystemInfo();
+        final CommandLineParser cliParser = new CommandLineParser(null, null, null, systemInfo);
+        final BaseDirectoryLocator locator = new BaseDirectoryLocator(systemInfo);
         cliParser.parse(args);
         final String configDirectory = cliParser.getConfigDirectory();
         return configDirectory == null ? locator.getDefaultBaseDirectory() : configDirectory;

src/com/dmdirc/commandline/BaseDirectoryLocator.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.commandline;
 
+import com.dmdirc.util.SystemInfo;
+
 import java.io.File;
 
 import javax.inject.Inject;
@@ -31,8 +33,12 @@ import javax.inject.Inject;
  */
 public class BaseDirectoryLocator {
 
+    private final SystemInfo systemInfo;
+
     @Inject
-    public BaseDirectoryLocator(){}
+    public BaseDirectoryLocator(final SystemInfo systemInfo) {
+        this.systemInfo = systemInfo;
+    }
 
     /**
      * Initialises the location of the configuration directory.
@@ -40,28 +46,28 @@ public class BaseDirectoryLocator {
      * @return Directory
      */
     public String getDefaultBaseDirectory() {
-        final String fs = System.getProperty("file.separator");
-        final String osName = System.getProperty("os.name");
+        final String fs = systemInfo.getProperty("file.separator");
+        final String osName = systemInfo.getProperty("os.name");
         String configdir;
 
-        if (System.getenv("DMDIRC_HOME") != null) {
-            configdir = System.getenv("DMDIRC_HOME");
+        if (systemInfo.getenv("DMDIRC_HOME") != null) {
+            configdir = systemInfo.getenv("DMDIRC_HOME");
         } else if (osName.startsWith("Mac OS")) {
-            configdir = System.getProperty("user.home") + fs + "Library"
+            configdir = systemInfo.getProperty("user.home") + fs + "Library"
                     + fs + "Preferences" + fs + "DMDirc" + fs;
         } else if (osName.startsWith("Windows")) {
-            if (System.getenv("APPDATA") == null) {
-                configdir = System.getProperty("user.home") + fs + "DMDirc" + fs;
+            if (systemInfo.getenv("APPDATA") == null) {
+                configdir = systemInfo.getProperty("user.home") + fs + "DMDirc" + fs;
             } else {
-                configdir = System.getenv("APPDATA") + fs + "DMDirc" + fs;
+                configdir = systemInfo.getenv("APPDATA") + fs + "DMDirc" + fs;
             }
         } else {
-            configdir = System.getProperty("user.home") + fs + ".DMDirc" + fs;
+            configdir = systemInfo.getProperty("user.home") + fs + ".DMDirc" + fs;
             final File testFile = new File(configdir);
             if (!testFile.exists()) {
-                final String configHome = System.getenv("XDG_CONFIG_HOME");
+                final String configHome = systemInfo.getenv("XDG_CONFIG_HOME");
                 configdir = (configHome == null || configHome.isEmpty())
-                        ? System.getProperty("user.home") + fs + ".config" + fs
+                        ? systemInfo.getProperty("user.home") + fs + ".config" + fs
                         : configHome;
                 configdir += fs + "DMDirc" + fs;
             }

src/com/dmdirc/commandline/CommandLineParser.java

@@ -26,6 +26,7 @@ import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.InvalidURIException;
+import com.dmdirc.util.SystemInfo;
 import com.dmdirc.util.URIParser;
 
 import java.io.File;
@@ -72,6 +73,8 @@ public class CommandLineParser {
     @Nullable private final Provider<AggregateConfigProvider> globalConfigProvider;
     /** The parser to use for URIs. */
     @Nullable private final URIParser uriParser;
+    /** Used to retrieve informationa about the running system. */
+    private final SystemInfo systemInfo;
     /** Whether to disable error reporting or not. */
     private boolean disablereporting;
     /** The version string passed for the launcher. */
@@ -92,10 +95,12 @@ public class CommandLineParser {
     public CommandLineParser(
             @Nullable final Provider<ConnectionManager> serverManagerProvider,
             @Nullable @GlobalConfig final Provider<AggregateConfigProvider> globalConfigProvider,
-            @Nullable final URIParser uriParser) {
+            @Nullable final URIParser uriParser,
+            final SystemInfo systemInfo) {
         this.serverManagerProvider = serverManagerProvider;
         this.globalConfigProvider = globalConfigProvider;
         this.uriParser = uriParser;
+        this.systemInfo = systemInfo;
     }
 
     /**
@@ -237,7 +242,7 @@ public class CommandLineParser {
                 launcherVersion = param;
                 break;
             case 'p':
-                doDirectory(Paths.get(System.getProperty("user.dir")));
+                doDirectory(Paths.get(systemInfo.getProperty("user.dir")));
                 break;
             case 'r':
                 disablereporting = true;

src/com/dmdirc/config/profiles/ProfileManager.java

@@ -25,6 +25,7 @@ package com.dmdirc.config.profiles;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ProfileAddedEvent;
 import com.dmdirc.events.ProfileDeletedEvent;
+import com.dmdirc.util.SystemInfo;
 
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
@@ -49,10 +50,10 @@ public class ProfileManager {
     private final Profile defaultProfile;
 
     @Inject
-    public ProfileManager(final DMDircMBassador eventBus) {
+    public ProfileManager(final DMDircMBassador eventBus, final SystemInfo systemInfo) {
         this.eventBus = eventBus;
         profiles = new ArrayList<>();
-        final String nick = System.getProperty("user.name").replace(' ', '_');
+        final String nick = systemInfo.getProperty("user.name").replace(' ', '_');
         defaultProfile = new Profile(nick, nick, Optional.empty(), Lists.newArrayList(nick));
     }
 

src/com/dmdirc/util/SystemInfo.java

@@ -0,0 +1,43 @@
+/*
+ * 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.util;
+
+import javax.inject.Inject;
+
+/**
+ * Injectable wrapper around {@link System}
+ */
+public class SystemInfo {
+
+    @Inject
+    public SystemInfo() {
+    }
+
+    public String getProperty(final String key) {
+        return System.getProperty(key);
+    }
+
+    public String getenv(final String name) {
+        return System.getenv(name);
+    }
+}

test/com/dmdirc/config/profiles/ProfileManagerTest.java

@@ -25,6 +25,7 @@ package com.dmdirc.config.profiles;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ProfileAddedEvent;
 import com.dmdirc.events.ProfileDeletedEvent;
+import com.dmdirc.util.SystemInfo;
 
 import com.google.common.collect.Lists;
 
@@ -42,6 +43,7 @@ import static junit.framework.TestCase.assertTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ProfileManagerTest {
@@ -49,12 +51,14 @@ public class ProfileManagerTest {
     @Mock private DMDircMBassador eventBus;
     @Mock private Profile profile1;
     @Mock private Profile profile2;
+    @Mock private SystemInfo systemInfo;
 
     private ProfileManager instance;
 
     @Before
     public void setUp() throws Exception {
-        instance = new ProfileManager(eventBus);
+        when(systemInfo.getProperty("user.name")).thenReturn("UserName");
+        instance = new ProfileManager(eventBus, systemInfo);
     }
 
     @Test
@@ -95,7 +99,7 @@ public class ProfileManagerTest {
 
     @Test
     public void testGetDefaultProfile_EmptyList() {
-        final String nick = System.getProperty("user.name").replace(' ', '_');
+        final String nick = "UserName";
         final Profile profile = new Profile(nick, nick, Optional.empty(), Lists.newArrayList(nick));
         assertEquals(profile, instance.getDefault());
     }