Added unit tests for invites, topics, and server's handling of invites.

Fixed invites not being removed on disconnect - fixes issue 637

git-svn-id: http://svn.dmdirc.com/trunk@3134 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/Server.java

@@ -326,6 +326,7 @@ public final class Server extends WritableFrameContainer implements Serializable
             myState = ServerState.DISCONNECTED;
         }
 
+        removeInvites();
         updateIcon();
 
         if (parser != null && parser.getSocketState() == IRCParser.STATE_OPEN) {
@@ -826,6 +827,7 @@ public final class Server extends WritableFrameContainer implements Serializable
         myState = ServerState.CLOSING;
         closeChannels();
         closeQueries();
+        removeInvites();
 
         if (raw != null) {
             raw.close();
@@ -1082,6 +1084,8 @@ public final class Server extends WritableFrameContainer implements Serializable
         if (configManager.getOptionBool(DOMAIN_GENERAL, "closequeriesondisconnect", false)) {
             closeQueries();
         }
+        
+        removeInvites();
 
         if (configManager.getOptionBool(DOMAIN_GENERAL, "reconnectondisconnect", false)) {
             doDelayedReconnect();
@@ -1326,6 +1330,15 @@ public final class Server extends WritableFrameContainer implements Serializable
             }
         }
     }
+    
+    /**
+     * Removes all invites for all channels.
+     */
+    private void removeInvites() {
+        for (Invite invite : new ArrayList<Invite>(invites)) {
+            removeInvite(invite);
+        }
+    }    
 
     /**
      * Removes an invite from this server, and fires the appropriate listeners.

test/com/dmdirc/InviteTest.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * 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;
+
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.ui.dummy.DummyController;
+import java.util.Date;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class InviteTest extends junit.framework.TestCase {
+    
+    private Server server;
+    private Invite test;
+    private long ts;
+    
+    @Before
+    public void setUp() throws Exception {
+        Main.setUI(new DummyController());
+        IdentityManager.load();
+        
+        server = new Server("255.255.255.255", 6667, "", false, IdentityManager.getProfiles().get(0));
+        test = new Invite(server, "#channel", "nick!ident@host");
+        server.addInvite(test);
+        ts = new Date().getTime();
+    }    
+
+    @Test
+    public void testGetServer() {
+        assertEquals(server, test.getServer());
+    }
+
+    @Test
+    public void testGetChannel() {
+        assertEquals("#channel", test.getChannel());
+    }
+
+    @Test
+    public void testGetTimestamp() {
+        assertTrue(test.getTimestamp() - ts < 10000);
+        assertTrue(test.getTimestamp() - ts > -10000);
+    }
+
+    @Test
+    public void testGetSource() {
+        assertEquals(3, test.getSource().length);
+        assertEquals("nick", test.getSource()[0]);
+        assertEquals("ident", test.getSource()[1]);
+        assertEquals("host", test.getSource()[2]);
+    }
+
+    @Test
+    public void testAccept() {
+        test.accept();
+        assertEquals(0, server.getInvites().size());
+    }
+
+}

test/com/dmdirc/ServerTest.java

@@ -22,11 +22,23 @@
 
 package com.dmdirc;
 
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.ui.dummy.DummyController;
+import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
 public class ServerTest extends junit.framework.TestCase {
 
+    private Server server;
+
+    @Before
+    public void setUp() throws Exception {
+        Main.setUI(new DummyController());
+        IdentityManager.load();
+        server = new Server("255.255.255.255", 6667, "", false, IdentityManager.getProfiles().get(0));
+    }
+
     @Test
     public void testGetNetworkFromServerName() {
         final String[][] tests = {
@@ -38,10 +50,44 @@ public class ServerTest extends junit.framework.TestCase {
             {"localhost", "localhost"},
             {"foo.de", "foo.de"}
         };
-        
+
         for (String[] test : tests) {
             assertEquals(test[1], Server.getNetworkFromServerName(test[0]));
         }
     }
-    
+
+    @Test
+    public void testDuplicateInviteRemoval() {
+        server.disconnect();
+        
+        server.addInvite(new Invite(server, "#chan1", "a!b@c"));
+        server.addInvite(new Invite(server, "#chan1", "d!e@f"));
+
+        assertEquals(1, server.getInvites().size());
+        assertEquals("d", server.getInvites().get(0).getSource()[0]);
+        server.removeInvites("#chan1");
+    }
+
+    @Test
+    public void testRemoveInvites() {
+        server.disconnect();
+        
+        server.addInvite(new Invite(server, "#chan1", "a!b@c"));
+        server.addInvite(new Invite(server, "#chan2", "d!e@f"));
+
+        server.removeInvites("#chan1");
+        assertEquals(1, server.getInvites().size());
+
+        server.removeInvites("#chan2");
+        assertEquals(0, server.getInvites().size());
+    }
+
+    @Test
+    public void testRemoveInvitesOnDisconnect() {
+        server.reconnect();
+        server.addInvite(new Invite(server, "#chan1", "a!b@c"));
+        server.disconnect();
+        assertEquals(0, server.getInvites().size());
+    }
+
 }

test/com/dmdirc/TopicTest.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * 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;
+
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.ui.dummy.DummyController;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class TopicTest extends junit.framework.TestCase {
+    
+    @Before
+    public void setUp() throws Exception {
+        Main.setUI(new DummyController());
+        IdentityManager.load();
+    }
+
+    @Test
+    public void testGetClient() {
+        final Topic test = new Topic("abc", "123!456@789", 1);
+        assertEquals("123!456@789", test.getClient());
+    }
+
+    @Test
+    public void testGetTime() {
+        final Topic test = new Topic("abc", "123!456@789", 1);
+        assertEquals(1, test.getTime());        
+    }
+
+    @Test
+    public void testGetTopic() {
+        final Topic test = new Topic("abc", "123!456@789", 1);
+        assertEquals("abc", test.getTopic());        
+    }
+
+    @Test
+    public void testToString() {
+        final Topic test = new Topic("abc", "123!456@789", 1);
+        assertEquals("abc", test.toString());        
+    }
+
+}