Make migrator use Path properly.

Finish unit tests.

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

src/com/dmdirc/commandparser/aliases/ActionAliasMigrator.java

@@ -102,8 +102,7 @@ public class ActionAliasMigrator implements Migrator {
      */
     private boolean migrate(final Path file) {
         try {
-            // TODO: Make ConfigFile take a Path.
-            final ConfigFile configFile = new ConfigFile(file.toFile());
+            final ConfigFile configFile = new ConfigFile(file);
             configFile.read();
 
             final String response = Joiner.on('\n').join(configFile.getFlatDomain("response"));
@@ -149,9 +148,13 @@ public class ActionAliasMigrator implements Migrator {
     private int getArguments(final ConfigFile configFile) throws NumberFormatException {
         for (Map<String, String> section : configFile.getKeyDomains().values()) {
             if (section.containsKey("comparison")
-                    && section.containsKey("target")
-                    && "INT_GREATER".equals(section.get("comparison"))) {
-                return 1 + Integer.valueOf(section.get("target"));
+                    && section.containsKey("target")) {
+                if ("INT_GREATER".equals(section.get("comparison"))) {
+                    return 1 + Integer.valueOf(section.get("target"));
+                }
+                if ("INT_EQUALS".equals(section.get("comparison"))) {
+                    return Integer.valueOf(section.get("target"));
+                }
             }
         }
         return 0;

test-res/com/dmdirc/commandparser/aliases/no-trigger

@@ -0,0 +1,29 @@
+# This is a DMDirc configuration file.
+# Written on: Sun Nov 25 13:32:17 GMT 2007
+
+# This section indicates which sections below take key/value
+# pairs, rather than a simple list. It should be placed above
+# any sections that take key/values.
+keysections:
+  condition 0
+  condition 1
+
+triggers:
+  UNKNOWN_COMMAND
+
+response:
+  /mode ooooooooooooooo $1-
+
+format:
+
+condition 0:
+  argument=2
+  component=STRINGARRAY_LENGTH
+  target=0
+  comparison=INT_GREATER
+
+condition 1:
+  argument=2
+  component=STRINGARRAY_LENGTH
+  target=16
+  comparison=INT_LESS

test/com/dmdirc/commandparser/aliases/ActionAliasMigratorTest.java

@@ -32,7 +32,6 @@ import java.nio.file.FileSystem;
 import java.nio.file.Files;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -40,32 +39,41 @@ import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.verify;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ActionAliasMigratorTest {
 
-    @Mock private AliasManager aliasManager;
     @Mock private AliasFactory aliasFactory;
+    @Mock private AliasManager aliasManager;
     @Mock private DMDircMBassador eventBus;
 
     private FileSystem fs;
     private ActionAliasMigrator migrator1;
     private ActionAliasMigrator migrator2;
+    private ActionAliasMigrator migrator3;
 
     @Before
     public void setup() throws IOException {
         fs = Jimfs.newFileSystem(Configuration.unix());
+
         Files.createDirectories(fs.getPath("test1/aliases"));
         Files.createDirectories(fs.getPath("test2/other-stuff/aliases"));
+        Files.createDirectories(fs.getPath("test3/aliases"));
+
         Files.copy(getClass().getResource("op-greater-0").openStream(),
                 fs.getPath("test1/aliases/op"));
         Files.copy(getClass().getResource("unset-equals-2").openStream(),
                 fs.getPath("test1/aliases/unset"));
+        Files.copy(getClass().getResource("no-trigger").openStream(),
+                fs.getPath("test3/aliases/bad"));
 
         migrator1 = new ActionAliasMigrator(fs.getPath("test1"), aliasFactory,
                 aliasManager, eventBus);
         migrator2 = new ActionAliasMigrator(fs.getPath("test2"), aliasFactory,
                 aliasManager, eventBus);
+        migrator3 = new ActionAliasMigrator(fs.getPath("test3"), aliasFactory,
+                aliasManager, eventBus);
     }
 
     @Test
@@ -75,7 +83,6 @@ public class ActionAliasMigratorTest {
     }
 
     @Test
-    @Ignore("Converts to a file, throws UnsupportedOperationException under JimFs")
     public void testDeletesFilesAfterMigration() {
         migrator1.migrate();
         assertFalse(Files.exists(fs.getPath("test1/aliases/unset")));
@@ -90,4 +97,17 @@ public class ActionAliasMigratorTest {
         assertTrue(Files.exists(fs.getPath("test2/other-stuff/aliases")));
     }
 
+    @Test
+    public void testMigrationCreatesAliases() {
+        migrator1.migrate();
+        verify(aliasFactory).createAlias("op", 1, "/mode ooooooooooooooo $1-");
+        verify(aliasFactory).createAlias("unset", 2, "/set --unset $1-");
+    }
+
+    @Test
+    public void testBadActionsLeftOnDisk() {
+        migrator3.migrate();
+        assertTrue(Files.exists(fs.getPath("test3/aliases/bad")));
+    }
+
 }