Merge pull request #147 from greboid/master

Add tests + fix profiles migrator.

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

@@ -68,7 +68,7 @@ public class IdentitiesProfileMigrator implements Migrator {
             }
             profileManager.addProfile(
                     new Profile(p.getName(), p.getOption(DOMAIN_PROFILE, "realname"), ident,
-                            Lists.newArrayList(p.getOption(DOMAIN_PROFILE, "nicknames"))));
+                            p.getOptionList(DOMAIN_PROFILE, "nicknames")));
             try {
                 p.delete();
             } catch (IOException e) {

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

@@ -0,0 +1,118 @@
+/*
+ * 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.config.profiles;
+
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.config.ConfigProvider;
+
+import com.google.common.collect.Lists;
+
+import java.util.Optional;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertTrue;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class IdentitiesProfileMigratorTest {
+
+    @Mock private IdentityManager identityManager;
+    @Mock private ProfileManager profileManager;
+    @Mock private ConfigProvider configProvider1;
+    @Mock private ConfigProvider configProvider2;
+    @Mock private ConfigProvider configProvider3;
+
+    private IdentitiesProfileMigrator instance;
+
+    @Before
+    public void setup() {
+        instance = new IdentitiesProfileMigrator(identityManager, profileManager);
+        when(configProvider1.getName()).thenReturn("name1");
+        when(configProvider1.getOption("profile", "realname")).thenReturn("realname1");
+        when(configProvider1.hasOptionString("profile", "ident1")).thenReturn(false);
+        when(configProvider1.getOptionList("profile", "nicknames")).thenReturn(
+                Lists.newArrayList("nickname1")
+        );
+        when(configProvider2.getName()).thenReturn("name2");
+        when(configProvider2.getOption("profile", "realname")).thenReturn("realname2");
+        when(configProvider2.hasOptionString("profile", "ident")).thenReturn(true);
+        when(configProvider2.getOption("profile", "ident")).thenReturn("ident2");
+        when(configProvider2.getOptionList("profile", "nicknames")).thenReturn(
+                Lists.newArrayList("nickname2")
+        );
+        when(configProvider3.getName()).thenReturn("name3");
+        when(configProvider3.getOption("profile", "realname")).thenReturn("realname3");
+        when(configProvider3.hasOptionString("profile", "ident")).thenReturn(true);
+        when(configProvider3.getOption("profile", "ident")).thenReturn("ident3");
+        when(configProvider3.getOptionList("profile", "nicknames")).thenReturn(
+                Lists.newArrayList("nickname31", "nickname32", "nickname33")
+        );
+    }
+
+    @Test
+    public void testNeedsMigration_NoProfiles() {
+        when(identityManager.getProvidersByType("profile")).thenReturn(Lists.newArrayList());
+        assertFalse(instance.needsMigration());
+    }
+
+    @Test
+    public void testNeedsMigration_Profiles() {
+        when(identityManager.getProvidersByType("profile")).thenReturn(
+                Lists.newArrayList(configProvider1));
+        assertTrue(instance.needsMigration());
+    }
+
+    @Test
+    public void testMigrate_NoIdent() {
+        when(identityManager.getProvidersByType("profile")).thenReturn(
+                Lists.newArrayList(configProvider1));
+        instance.migrate();
+        verify(profileManager).addProfile(new Profile("name1", "realname1", Optional.empty(),
+                Lists.newArrayList("nickname1")));
+    }
+
+    @Test
+    public void testMigrate_Ident() {
+        when(identityManager.getProvidersByType("profile")).thenReturn(
+                Lists.newArrayList(configProvider2));
+        instance.migrate();
+        verify(profileManager).addProfile(new Profile("name2", "realname2", Optional.of("ident2"),
+                Lists.newArrayList("nickname2")));
+    }
+
+    @Test
+    public void testMigrate_MultipleNicknames() {
+        when(identityManager.getProvidersByType("profile")).thenReturn(
+                Lists.newArrayList(configProvider3));
+        instance.migrate();
+        verify(profileManager).addProfile(new Profile("name3", "realname3", Optional.of("ident3"),
+                Lists.newArrayList("nickname31", "nickname32", "nickname33")));
+    }
+}

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

@@ -26,6 +26,10 @@ import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ProfileAddedEvent;
 import com.dmdirc.events.ProfileDeletedEvent;
 
+import com.google.common.collect.Lists;
+
+import java.util.Optional;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -88,4 +92,25 @@ public class ProfileManagerTest {
         instance.deleteProfile(profile1);
         verify(eventBus).publishAsync(any(ProfileDeletedEvent.class));
     }
+
+    @Test
+    public void testGetDefaultProfile_EmptyList() {
+        final String nick = System.getProperty("user.name").replace(' ', '_');
+        final Profile profile = new Profile(nick, nick, Optional.empty(), Lists.newArrayList(nick));
+        assertEquals(profile, instance.getDefault());
+    }
+
+    @Test
+    public void testGetDefaultProfile_1() {
+        instance.addProfile(profile1);
+        instance.addProfile(profile2);
+        assertEquals(profile1, instance.getDefault());
+    }
+
+    @Test
+    public void testGetDefaultProfile_2() {
+        instance.addProfile(profile2);
+        instance.addProfile(profile1);
+        assertEquals(profile2, instance.getDefault());
+    }
 }