Add events to ProfileManager, add tests.

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

@@ -22,7 +22,9 @@
 
 package com.dmdirc.config.profiles;
 
-import com.dmdirc.util.validators.Validator;
+import com.dmdirc.DMDircMBassador;
+import com.dmdirc.events.ProfileAddedEvent;
+import com.dmdirc.events.ProfileDeletedEvent;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -37,10 +39,12 @@ import javax.inject.Singleton;
 @Singleton
 public class ProfileManager {
 
+    private final DMDircMBassador eventBus;
     private final Collection<Profile> profiles;
 
     @Inject
-    public ProfileManager() {
+    public ProfileManager(final DMDircMBassador eventBus) {
+        this.eventBus = eventBus;
         profiles = new ArrayList<>();
     }
 
@@ -51,6 +55,7 @@ public class ProfileManager {
      */
     public void addProfile(final Profile profile) {
         profiles.add(profile);
+        eventBus.publishAsync(new ProfileAddedEvent(profile));
     }
 
     /**
@@ -60,6 +65,7 @@ public class ProfileManager {
      */
     public void deleteProfile(final Profile profile) {
         profiles.remove(profile);
+        eventBus.publishAsync(new ProfileDeletedEvent(profile));
     }
 
     /**

src/com/dmdirc/events/ProfileAddedEvent.java

@@ -0,0 +1,41 @@
+/*
+ * 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.events;
+
+import com.dmdirc.config.profiles.Profile;
+
+/**
+ * Fired when a profile is added to the config.
+ */
+public class ProfileAddedEvent extends DMDircEvent {
+
+    private final Profile profile;
+
+    public ProfileAddedEvent(final Profile profile) {
+        this.profile = profile;
+    }
+
+    public Profile getProfile() {
+        return profile;
+    }
+}

src/com/dmdirc/events/ProfileDeletedEvent.java

@@ -0,0 +1,41 @@
+/*
+ * 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.events;
+
+import com.dmdirc.config.profiles.Profile;
+
+/**
+ * Fired when a profile is deleted from the config.
+ */
+public class ProfileDeletedEvent extends DMDircEvent {
+
+    private final Profile profile;
+
+    public ProfileDeletedEvent(final Profile profile) {
+        this.profile = profile;
+    }
+
+    public Profile getProfile() {
+        return profile;
+    }
+}

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

@@ -0,0 +1,91 @@
+/*
+ * 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.DMDircMBassador;
+import com.dmdirc.events.ProfileAddedEvent;
+import com.dmdirc.events.ProfileDeletedEvent;
+
+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.assertEquals;
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ProfileManagerTest {
+
+    @Mock private DMDircMBassador eventBus;
+    @Mock private Profile profile1;
+    @Mock private Profile profile2;
+
+    private ProfileManager instance;
+
+    @Before
+    public void setUp() throws Exception {
+        instance = new ProfileManager(eventBus);
+    }
+
+    @Test
+    public void testAddProfile() {
+        assertTrue(instance.getProfiles().isEmpty());
+        instance.addProfile(profile1);
+        assertEquals(1, instance.getProfiles().size());
+        assertTrue(instance.getProfiles().contains(profile1));
+    }
+
+    @Test
+    public void testAddProfile_Event() {
+        instance.addProfile(profile1);
+        verify(eventBus).publishAsync(any(ProfileAddedEvent.class));
+    }
+
+    @Test
+    public void testDeleteProfile() {
+        instance.addProfile(profile1);
+        instance.addProfile(profile2);
+        assertEquals(2, instance.getProfiles().size());
+        assertTrue(instance.getProfiles().contains(profile1));
+        assertTrue(instance.getProfiles().contains(profile2));
+        instance.deleteProfile(profile2);
+        assertEquals(1, instance.getProfiles().size());
+        assertTrue(instance.getProfiles().contains(profile1));
+        assertFalse(instance.getProfiles().contains(profile2));
+    }
+
+    @Test
+    public void testDeleteProfile_Event() {
+        instance.addProfile(profile1);
+        //Fairly certain this shouldn't be needed, but the any matcher below seems to match the add
+        reset(eventBus);
+        instance.deleteProfile(profile1);
+        verify(eventBus).publishAsync(any(ProfileDeletedEvent.class));
+    }
+}