Finish CoreProfilesDialogModel.

This model should happily cope with the existing profiles wrapper
being rewritten and when the UI uses this model should mean no UI
changes required to add support.

Change-Id: Iea3b7838cef94514865ecb77064c133ca4556030
Reviewed-on: http://gerrit.dmdirc.com/3619
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/ui/core/profiles/CoreProfilesDialogModel.java

@@ -53,7 +53,7 @@ public class CoreProfilesDialogModel implements ProfilesDialogModel {
     private final ListenerList listeners;
     private final IdentityFactory identityFactory;
     private final IdentityController identityController;
-    private HashMap<String, Profile> profiles;
+    private final HashMap<String, Profile> profiles;
     private Optional<Profile> selectedProfile = Optional.absent();
     private Optional<String> name = Optional.absent();
     private Optional<List<String>> nicknames = Optional.absent();
@@ -68,6 +68,7 @@ public class CoreProfilesDialogModel implements ProfilesDialogModel {
         this.identityController = identityController;
         listeners = new ListenerList();
         final List<ConfigProvider> identities = identityController.getProvidersByType("profile");
+        profiles = new HashMap<>(identities.size());
         for (ConfigProvider identity : identities) {
             profiles.put(identity.getName(), getProfile(identity));
         }
@@ -75,6 +76,10 @@ public class CoreProfilesDialogModel implements ProfilesDialogModel {
 
     private Profile getProfile(final ConfigProvider configProvider) {
         final Profile newProfile = new Profile(configProvider.getName(), identityFactory);
+        newProfile.setName(configProvider.getOption("identity", "name"));
+        newProfile.setRealname(configProvider.getOption("profile", "realname"));
+        newProfile.setIdent(configProvider.getOption("profile", "ident"));
+        newProfile.setNicknames(configProvider.getOptionList("profile", "nicknames"));
         this.name = Optional.fromNullable(configProvider.getOption("identity", "name"));
         this.nicknames = Optional.fromNullable(configProvider.getOptionList("profile", "nicknames"));
         this.realname = Optional.fromNullable(configProvider.getOption("profile", "realname"));
@@ -366,7 +371,7 @@ public class CoreProfilesDialogModel implements ProfilesDialogModel {
         checkState(selectedProfile.isPresent(), "There must be a profile selected");
         checkState(nicknames.isPresent(), "There must be nicknames present");
         checkArgument(nicknames.get().contains(nickname), "Nickname must exist");
-        nicknames.get().add(nickname);
+        nicknames.get().remove(nickname);
         listeners.getCallable(ProfilesDialogModelListener.class).selectedProfileNicknameRemoved(
                 nickname);
     }

src/com/dmdirc/ui/core/profiles/EditSelectedNicknameValidator.java

@@ -42,6 +42,10 @@ public class EditSelectedNicknameValidator implements Validator<String> {
         if (model.getSelectedProfile().isPresent()
                 && model.getSelectedProfileNicknames().isPresent()) {
             for (String nickname : model.getSelectedProfileNicknames().get()) {
+                if (model.getSelectedProfileSelectedNickname().isPresent()
+                        && model.getSelectedProfileSelectedNickname().get().equals(object)) {
+                    continue;
+                }
                 if (nickname.equals(object)) {
                     return new ValidationResponse("This valid already exists.");
                 }

src/com/dmdirc/ui/core/profiles/EditSelectedProfileNameValidator.java

@@ -41,6 +41,10 @@ public class EditSelectedProfileNameValidator implements Validator<String> {
     @Override
     public ValidationResponse validate(final String object) {
         for (Profile nickname : model.getProfileList()) {
+            if (model.getSelectedProfile().isPresent()
+                    && model.getSelectedProfile().get().getName().equals(object)) {
+                continue;
+            }
             if (nickname.getName().equals(object)) {
                 return new ValidationResponse("This valid already exists.");
             }

test/com/dmdirc/ui/core/profiles/AddNicknameValidatorTest.java

@@ -0,0 +1,80 @@
+/*
+ * 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.ui.core.profiles;
+
+import com.dmdirc.actions.wrappers.Profile;
+import com.dmdirc.interfaces.ui.ProfilesDialogModel;
+
+import com.google.common.base.Optional;
+
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import clover.com.google.common.collect.Lists;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class AddNicknameValidatorTest {
+
+    @Mock private ProfilesDialogModel model;
+    @Mock private Profile profile;
+    private List<String> nicknames;
+
+    @Before
+    public void setupModel() {
+        nicknames = Lists.newArrayList("nickname1", "nickname2", "nickname3");
+        when(model.getSelectedProfile())
+                .thenReturn(Optional.fromNullable(profile));
+        when(model.getSelectedProfileNicknames())
+                .thenReturn(Optional.fromNullable(nicknames));
+        when(model.getSelectedProfileSelectedNickname())
+                .thenReturn(Optional.fromNullable("nickname2"));
+    }
+
+    @Test
+    public void testDuplicateName() {
+        final AddNicknameValidator instance = new AddNicknameValidator(model);
+        assertTrue("testDuplicateName", instance.validate("nickname1").isFailure());
+    }
+
+    @Test
+    public void testNonDuplicateName() {
+        final AddNicknameValidator instance = new AddNicknameValidator(model);
+        assertFalse("testNonDuplicateName", instance.validate("nickname4").isFailure());
+    }
+
+    @Test
+    public void testSelectedName() {
+        final AddNicknameValidator instance = new AddNicknameValidator(model);
+        assertTrue("testSelectedName", instance.validate("nickname2").isFailure());
+    }
+
+}

test/com/dmdirc/ui/core/profiles/CoreProfilesDialogModelTest.java

@@ -0,0 +1,307 @@
+/*
+ * 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.ui.core.profiles;
+
+import com.dmdirc.actions.wrappers.Profile;
+import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.interfaces.config.IdentityController;
+import com.dmdirc.interfaces.config.IdentityFactory;
+import com.dmdirc.interfaces.ui.ProfilesDialogModelListener;
+
+import com.google.common.base.Optional;
+
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import clover.com.google.common.collect.Lists;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class CoreProfilesDialogModelTest {
+
+    @Mock private IdentityController identityController;
+    @Mock private ProfilesDialogModelListener listener;
+    @Mock private IdentityFactory identityFactory;
+    @Mock private ConfigProvider profileProvider1;
+    @Mock private ConfigProvider profileProvider2;
+    @Mock private ConfigProvider profileProvider3;
+    private List<ConfigProvider> profiles;
+
+    @Before
+    public void setupMocks() {
+        mockProfile("profile1", profileProvider1);
+        mockProfile("profile2", profileProvider2);
+        mockProfile("profile3", profileProvider3);
+        profiles = Lists.newArrayList(profileProvider1, profileProvider2, profileProvider3);
+        when(identityController.getProvidersByType(anyString()))
+                .thenReturn(profiles);
+    }
+
+    private void mockProfile(final String name, final ConfigProvider mock) {
+        when(mock.getName()).thenReturn(name);
+        when(mock.getOption("identity", "name")).thenReturn(name);
+        when(mock.getOptionList("profile", "nicknames"))
+                .thenReturn(Lists.newArrayList("nickname1", "nickname2", "nickname3"));
+        when(mock.getOption("profile", "realname")).thenReturn("realname");
+        when(mock.getOption("profile", "ident")).thenReturn("ident");
+        when(mock.toString()).thenReturn("Identity: " + name);
+    }
+
+    @Test
+    public void testGetProfileList() {
+        final CoreProfilesDialogModel instance = new CoreProfilesDialogModel(identityController,
+                identityFactory);
+        assertEquals("testGetProfileList", profiles.size(), instance.getProfileList().size());
+    }
+
+    @Test
+    public void testGetProfileNotExist() {
+        final CoreProfilesDialogModel instance = new CoreProfilesDialogModel(identityController,
+                identityFactory);
+        assertFalse("testGetProfileNotExist", instance.getProfile("").isPresent());
+    }
+
+    @Test
+    public void testGetProfileExist() {
+        final CoreProfilesDialogModel instance = new CoreProfilesDialogModel(identityController,
+                identityFactory);
+        assertTrue("testGetProfileExist", instance.getProfile("profile1").isPresent());
+    }
+
+    @Test
+    public void testIsProfileListValidEmptyList() {
+        when(identityController.getProvidersByType(anyString()))
+                .thenReturn(Lists.<ConfigProvider>newArrayList());
+        final CoreProfilesDialogModel instance = new CoreProfilesDialogModel(identityController,
+                identityFactory);
+        assertFalse("testIsProfileListValidEmptyList", instance.isProfileListValid());
+    }
+
+    @Test
+    public void testIsProfileListValid() {
+        final CoreProfilesDialogModel instance = new CoreProfilesDialogModel(identityController,
+                identityFactory);
+        assertTrue("testIsProfileListValid", instance.isProfileListValid());
+    }
+
+    @Test
+    public void testAddProfile() {
+        when(identityController.getProvidersByType(anyString()))
+                .thenReturn(Lists.<ConfigProvider>newArrayList());
+        final CoreProfilesDialogModel instance = new CoreProfilesDialogModel(identityController,
+                identityFactory);
+        assertFalse("testAddProfile", instance.getProfile("profile4").isPresent());
+        instance.addProfile("profile4", "realname", "ident", Lists.newArrayList("nickname"));
+        assertTrue("testAddProfile", instance.getProfile("profile4").isPresent());
+    }
+
+    @Test
+    public void testEditProfile() {
+        final CoreProfilesDialogModel instance = new CoreProfilesDialogModel(identityController,
+                identityFactory);
+        final Profile preEdit = instance.getProfile("profile1").get();
+        assertEquals("testEditProfile", "profile1", preEdit.getName());
+        assertEquals("testEditProfile", "realname", preEdit.getRealname());
+        assertEquals("testEditProfile", "ident", preEdit.getIdent());
+        assertEquals("testEditProfile", Lists.newArrayList("nickname1", "nickname2", "nickname3"),
+                preEdit.getNicknames());
+        instance.editProfile("profile1", "newRealname", "newIdent", Lists.newArrayList("nickname"));
+        final Profile postEdit = instance.getProfile("profile1").get();
+        assertEquals("testEditProfile", "profile1", postEdit.getName());
+        assertEquals("testEditProfile", "newRealname", postEdit.getRealname());
+        assertEquals("testEditProfile", "newIdent", postEdit.getIdent());
+        assertEquals("testEditProfile", Lists.newArrayList("nickname"),
+                postEdit.getNicknames());
+    }
+
+    @Test
+    public void testRenameProfile() {
+        final CoreProfilesDialogModel instance = new CoreProfilesDialogModel(identityController,
+                identityFactory);
+        assertTrue("testRenameProfile", instance.getProfile("profile1").isPresent());
+        assertFalse("testRenameProfile", instance.getProfile("profile4").isPresent());
+        instance.renameProfile("profile1", "profile4");
+        assertFalse("testRenameProfile", instance.getProfile("profile1").isPresent());
+        assertTrue("testRenameProfile", instance.getProfile("profile4").isPresent());
+    }
+
+    @Test
+    public void testRemoveProfile() {
+        final CoreProfilesDialogModel instance = new CoreProfilesDialogModel(identityController,
+                identityFactory);
+        assertEquals("testRemoveProfile", 3, instance.getProfileList().size());
+        assertTrue("testRemoveProfile", instance.getProfile("profile3").isPresent());
+        instance.removeProfile("profile3");
+        assertEquals("testRemoveProfile", 2, instance.getProfileList().size());
+        assertFalse("testRemoveProfile", instance.getProfile("profile3").isPresent());
+    }
+
+    @Test
+    public void testSave() {
+
+    }
+
+    @Test
+    public void testSetSelectedProfile() {
+    }
+
+    @Test
+    public void testGetSelectedProfile() {
+        final CoreProfilesDialogModel instance = new CoreProfilesDialogModel(identityController,
+                identityFactory);
+        assertFalse("testGetSelectedProfile", instance.getSelectedProfile().isPresent());
+        instance.setSelectedProfile(instance.getProfile("profile2"));
+        assertEquals("testGetSelectedProfile", "profile2",
+                instance.getSelectedProfile().get().getName());
+    }
+
+    @Test
+    public void testGetSelectedProfileDetails() {
+        final CoreProfilesDialogModel instance = new CoreProfilesDialogModel(identityController,
+                identityFactory);
+        instance.setSelectedProfile(instance.getProfile("profile1"));
+        assertEquals("testGetSelectedProfileDetails", "profile1",
+                instance.getSelectedProfileName().get());
+        assertEquals("testGetSelectedProfileDetails", "ident",
+                instance.getSelectedProfileIdent().get());
+        assertEquals("testGetSelectedProfileDetails", "realname",
+                instance.getSelectedProfileRealname().get());
+        assertEquals("testGetSelectedProfileDetails",
+                Lists.newArrayList("nickname1", "nickname2", "nickname3"),
+                instance.getSelectedProfileNicknames().get());
+    }
+
+    @Test
+    public void testSetSelectedProfileSelectedNickname() {
+        final CoreProfilesDialogModel instance = new CoreProfilesDialogModel(identityController,
+                identityFactory);
+        instance.setSelectedProfile(instance.getProfile("profile1"));
+        assertEquals("testSetSelectedProfileSelectedNickname",
+                Optional.absent(), instance.getSelectedProfileSelectedNickname());
+        instance.setSelectedProfileSelectedNickname(Optional.fromNullable("nickname2"));
+        assertEquals("testSetSelectedProfileSelectedNickname",
+                Optional.fromNullable("nickname2"),
+                instance.getSelectedProfileSelectedNickname());
+    }
+
+    @Test
+    public void testSetSelectedProfileDetails() {
+        final CoreProfilesDialogModel instance = new CoreProfilesDialogModel(identityController,
+                identityFactory);
+        instance.setSelectedProfile(instance.getProfile("profile1"));
+        instance.setSelectedProfileName(Optional.fromNullable("testName"));
+        instance.setSelectedProfileIdent(Optional.fromNullable("testIdent"));
+        instance.setSelectedProfileRealname(Optional.fromNullable("testRealname"));
+        instance.setSelectedProfileNicknames(Optional.fromNullable((List<String>) Lists.
+                newArrayList("testNickname")));
+        assertEquals("testGetSelectedProfileDetails", "testName",
+                instance.getSelectedProfileName().get());
+        assertEquals("testGetSelectedProfileDetails", "testIdent",
+                instance.getSelectedProfileIdent().get());
+        assertEquals("testGetSelectedProfileDetails", "testRealname",
+                instance.getSelectedProfileRealname().get());
+        assertEquals("testGetSelectedProfileDetails",
+                Lists.newArrayList("testNickname"),
+                instance.getSelectedProfileNicknames().get());
+    }
+
+    @Test
+    public void testAddSelectedProfileNickname() {
+        final CoreProfilesDialogModel instance = new CoreProfilesDialogModel(identityController,
+                identityFactory);
+        instance.setSelectedProfile(instance.getProfile("profile1"));
+        assertEquals("testAddSelectedProfileNickname",
+                Lists.newArrayList("nickname1", "nickname2", "nickname3"),
+                instance.getSelectedProfileNicknames().get());
+        instance.addSelectedProfileNickname("nickname4");
+        assertEquals("testAddSelectedProfileNickname",
+                Lists.newArrayList("nickname1", "nickname2", "nickname3", "nickname4"),
+                instance.getSelectedProfileNicknames().get());
+    }
+
+    @Test
+    public void testRemoveSelectedProfileNickname() {
+        final CoreProfilesDialogModel instance = new CoreProfilesDialogModel(identityController,
+                identityFactory);
+        instance.setSelectedProfile(instance.getProfile("profile1"));
+        assertEquals("testRemoveSelectedProfileNickname",
+                Lists.newArrayList("nickname1", "nickname2", "nickname3"),
+                instance.getSelectedProfileNicknames().get());
+        instance.removeSelectedProfileNickname("nickname3");
+        assertEquals("testRemoveSelectedProfileNickname",
+                Lists.newArrayList("nickname1", "nickname2"),
+                instance.getSelectedProfileNicknames().get());
+    }
+
+    @Test
+    public void testEditSelectedProfileSelectedNickname() {
+        final CoreProfilesDialogModel instance = new CoreProfilesDialogModel(identityController,
+                identityFactory);
+        instance.setSelectedProfile(instance.getProfile("profile1"));
+        instance.setSelectedProfileSelectedNickname(Optional.fromNullable("nickname2"));
+        assertEquals("testSetSelectedProfileSelectedNickname",
+                Optional.fromNullable("nickname2"),
+                instance.getSelectedProfileSelectedNickname());
+        instance.editSelectedProfileNickname("nickname2", "nickname4");
+        assertEquals("testAddSelectedProfileNickname",
+                Lists.newArrayList("nickname1", "nickname4", "nickname3"),
+                instance.getSelectedProfileNicknames().get());
+    }
+
+    @Test
+    public void testAddListener() {
+        final CoreProfilesDialogModel instance = new CoreProfilesDialogModel(identityController,
+                identityFactory);
+        instance.addListener(listener);
+        instance.addProfile("profile4", "realname", "ident", Lists.newArrayList("nickname"));
+        verify(listener).profileAdded(any(Profile.class));
+    }
+
+    @Test
+    public void testRemoveListener() {
+        final CoreProfilesDialogModel instance = new CoreProfilesDialogModel(identityController,
+                identityFactory);
+        instance.addListener(listener);
+        instance.addProfile("profile4", "realname", "ident", Lists.newArrayList("nickname"));
+        assertTrue(instance.getProfile("profile4").isPresent());
+        final Profile profile4 = instance.getProfile("profile4").get();
+        verify(listener).profileAdded(profile4);
+        instance.removeListener(listener);
+        instance.setSelectedProfile(Optional.fromNullable(profile4));
+        verify(listener, never()).profileRemoved(profile4);
+    }
+
+}

test/com/dmdirc/ui/core/profiles/EditSelectedNicknameValidatorTest.java

@@ -0,0 +1,80 @@
+/*
+ * 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.ui.core.profiles;
+
+import com.dmdirc.actions.wrappers.Profile;
+import com.dmdirc.interfaces.ui.ProfilesDialogModel;
+
+import com.google.common.base.Optional;
+
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import clover.com.google.common.collect.Lists;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class EditSelectedNicknameValidatorTest {
+
+    @Mock private ProfilesDialogModel model;
+    @Mock private Profile profile;
+    private List<String> nicknames;
+
+    @Before
+    public void setupModel() {
+        nicknames = Lists.newArrayList("nickname1", "nickname2", "nickname3");
+        when(model.getSelectedProfile())
+                .thenReturn(Optional.fromNullable(profile));
+        when(model.getSelectedProfileNicknames())
+                .thenReturn(Optional.fromNullable(nicknames));
+        when(model.getSelectedProfileSelectedNickname())
+                .thenReturn(Optional.fromNullable("nickname2"));
+    }
+
+    @Test
+    public void testDuplicateName() {
+        final EditSelectedNicknameValidator instance = new EditSelectedNicknameValidator(model);
+        assertTrue("testDuplicateName", instance.validate("nickname1").isFailure());
+    }
+
+    @Test
+    public void testNonDuplicateName() {
+        final EditSelectedNicknameValidator instance = new EditSelectedNicknameValidator(model);
+        assertFalse("testNonDuplicateName", instance.validate("nickname4").isFailure());
+    }
+
+    @Test
+    public void testSelectedName() {
+        final EditSelectedNicknameValidator instance = new EditSelectedNicknameValidator(model);
+        assertFalse("testSelectedName", instance.validate("nickname2").isFailure());
+    }
+
+}

test/com/dmdirc/ui/core/profiles/EditSelectedProfileNameValidatorTest.java

@@ -0,0 +1,84 @@
+/*
+ * 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.ui.core.profiles;
+
+import com.dmdirc.actions.wrappers.Profile;
+import com.dmdirc.interfaces.ui.ProfilesDialogModel;
+
+import com.google.common.base.Optional;
+
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import clover.com.google.common.collect.Lists;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class EditSelectedProfileNameValidatorTest {
+
+    @Mock private ProfilesDialogModel model;
+    @Mock private Profile profile1;
+    @Mock private Profile profile2;
+    @Mock private Profile profile3;
+    private List<Profile> profiles;
+
+    @Before
+    public void setupModel() {
+        profiles = Lists.newArrayList(profile1, profile2, profile3);
+        when(profile1.getName()).thenReturn("profile1");
+        when(profile2.getName()).thenReturn("profile2");
+        when(profile3.getName()).thenReturn("profile3");
+        when(model.getProfileList()).thenReturn(profiles);
+        when(model.getSelectedProfile()).thenReturn(Optional.fromNullable(profile2));
+    }
+
+    @Test
+    public void testDuplicateName() {
+        final EditSelectedProfileNameValidator instance
+                = new EditSelectedProfileNameValidator(model);
+        assertTrue("testDuplicateName", instance.validate("profile1").isFailure());
+    }
+
+    @Test
+    public void testNonDuplicateName() {
+        final EditSelectedProfileNameValidator instance
+                = new EditSelectedProfileNameValidator(model);
+        assertFalse("testNonDuplicateName", instance.validate("profile4").isFailure());
+    }
+
+    @Test
+    public void testSelectedName() {
+        final EditSelectedProfileNameValidator instance
+                = new EditSelectedProfileNameValidator(model);
+        assertFalse("testSelectedName", instance.validate("profile2").isFailure());
+    }
+
+}

test/com/dmdirc/ui/core/profiles/NewProfileNameValidatorTest.java

@@ -0,0 +1,84 @@
+/*
+ * 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.ui.core.profiles;
+
+import com.dmdirc.actions.wrappers.Profile;
+import com.dmdirc.interfaces.ui.ProfilesDialogModel;
+
+import com.google.common.base.Optional;
+
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import clover.com.google.common.collect.Lists;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class NewProfileNameValidatorTest {
+
+    @Mock private ProfilesDialogModel model;
+    @Mock private Profile profile1;
+    @Mock private Profile profile2;
+    @Mock private Profile profile3;
+    private List<Profile> profiles;
+
+    @Before
+    public void setupModel() {
+        profiles = Lists.newArrayList(profile1, profile2, profile3);
+        when(profile1.getName()).thenReturn("profile1");
+        when(profile2.getName()).thenReturn("profile2");
+        when(profile3.getName()).thenReturn("profile3");
+        when(model.getProfileList()).thenReturn(profiles);
+        when(model.getSelectedProfile()).thenReturn(Optional.fromNullable(profile2));
+    }
+
+    @Test
+    public void testDuplicateName() {
+        final NewProfileNameValidator instance
+                = new NewProfileNameValidator(model);
+        assertTrue("testDuplicateName", instance.validate("profile1").isFailure());
+    }
+
+    @Test
+    public void testNonDuplicateName() {
+        final NewProfileNameValidator instance
+                = new NewProfileNameValidator(model);
+        assertFalse("testNonDuplicateName", instance.validate("profile4").isFailure());
+    }
+
+    @Test
+    public void testSelectedName() {
+        final NewProfileNameValidator instance
+                = new NewProfileNameValidator(model);
+        assertTrue("testSelectedName", instance.validate("profile2").isFailure());
+    }
+
+}