Fix IdentityManager extraction, test.

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

src/com/dmdirc/config/IdentityManager.java

@@ -36,8 +36,8 @@ import com.dmdirc.updater.Version;
 import com.dmdirc.util.collections.MapList;
 import com.dmdirc.util.collections.WeakMapList;
 import com.dmdirc.util.io.ConfigFile;
+import com.dmdirc.util.io.FileUtils;
 import com.dmdirc.util.io.InvalidConfigFileException;
-import com.dmdirc.util.resourcemanager.ResourceManager;
 
 import java.io.IOException;
 import java.nio.file.DirectoryStream;
@@ -227,9 +227,8 @@ public class IdentityManager implements IdentityFactory, IdentityController {
      */
     private void extractFormatters() {
         try {
-            ResourceManager.getResourceManager().extractResource(
-                    "com/dmdirc/config/defaults/default/formatter",
-                    identitiesDirectory + "default/", false);
+            FileUtils.copyResources(getClass().getResource("defaults/default/formatter"),
+                    identitiesDirectory.resolve("default"));
         } catch (IOException ex) {
             eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, null,
                     "Unable to extract default formatters: " + ex.getMessage(), ""));
@@ -243,9 +242,8 @@ public class IdentityManager implements IdentityFactory, IdentityController {
      */
     private void extractIdentities(final String target) {
         try {
-            ResourceManager.getResourceManager().extractResources(
-                    "com/dmdirc/config/defaults/" + target,
-                    identitiesDirectory + target, false);
+            FileUtils.copyResources(getClass().getResource("defaults/" + target),
+                    identitiesDirectory);
         } catch (IOException ex) {
             eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, null,
                     "Unable to extract default identities: " + ex.getMessage(), ""));

test/com/dmdirc/config/IdentityManagerTest.java

@@ -48,13 +48,13 @@ public class IdentityManagerTest {
 
     @Mock private DMDircMBassador eventBus;
 
-    private FileSystem fs;
     private Path baseDirectory;
     private Path identitiesDirectory;
 
     @Before
+    @SuppressWarnings("resource")
     public void setUp() throws Exception {
-        fs = Jimfs.newFileSystem(Configuration.unix());
+        final FileSystem fs = Jimfs.newFileSystem(Configuration.unix());
         baseDirectory = fs.getPath("config");
         identitiesDirectory = baseDirectory.resolve("identities");
     }
@@ -102,4 +102,30 @@ public class IdentityManagerTest {
         assertTrue(Files.isDirectory(identitiesDirectory.resolve("default")));
     }
 
+    @Test
+    public void testExtractsDefaults() throws InvalidIdentityFileException {
+        final IdentityManager identityManager = new IdentityManager(
+                baseDirectory, identitiesDirectory, eventBus);
+        identityManager.initialise();
+
+        assertTrue(Files.isDirectory(identitiesDirectory.resolve("default")));
+        assertTrue(Files.exists(identitiesDirectory.resolve("default").resolve("defaults")));
+        assertTrue(Files.exists(identitiesDirectory.resolve("default").resolve("formatter")));
+    }
+
+    @Test
+    public void testAlwaysUpdatesFormatter() throws InvalidIdentityFileException, IOException {
+        final Path formatterPath = identitiesDirectory.resolve("default").resolve("formatter");
+
+        Files.createDirectories(identitiesDirectory.resolve("default"));
+        Files.createFile(formatterPath);
+
+        final IdentityManager identityManager = new IdentityManager(
+                baseDirectory, identitiesDirectory, eventBus);
+        identityManager.initialise();
+
+        assertTrue(Files.exists(formatterPath));
+        assertTrue(Files.size(formatterPath) > 0);
+    }
+
 }