Added processNickTest. Uncomment failing ChannelInfo tests and @Ignore them instead

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

test/com/dmdirc/parser/ChannelInfoTest.java

@@ -24,10 +24,11 @@ package com.dmdirc.parser;
 import com.dmdirc.harness.parser.TestParser;
 import java.util.HashMap;
 import java.util.Map;
+import org.junit.Ignore;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ChannelInfoTest extends junit.framework.TestCase {
+public class ChannelInfoTest {
 
     final ChannelInfo ci = new ChannelInfo(null, "name");
 
@@ -205,7 +206,7 @@ public class ChannelInfoTest extends junit.framework.TestCase {
         assertTrue(modes.indexOf('N') > -1);
     }
     
-    /*@Test
+    @Test @Ignore
     public void testModeSendOptimisation1() {
         final TestParser parser = new TestParser();
         final ChannelInfo info = getChannelInfo(parser);
@@ -227,9 +228,9 @@ public class ChannelInfoTest extends junit.framework.TestCase {
                 -1, modes.indexOf('i'));
         
         assertTrue(modes.indexOf('m') > -1);
-    }*/
+    }
     
-    /*@Test
+    @Test @Ignore
     public void testModeSendOptimisation2() {
         final TestParser parser = new TestParser();
         final ChannelInfo info = getChannelInfo(parser);
@@ -249,7 +250,7 @@ public class ChannelInfoTest extends junit.framework.TestCase {
                 modes.indexOf('n'), modes.lastIndexOf('n'));
         
         assertTrue(modes.indexOf('m') > -1);
-    }*/
+    }
     
     private String getModes(final String line) {
         final String res = line.substring("MODE #DMDirc_testing ".length());

test/com/dmdirc/parser/ProcessNickTest.java

@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2006-2008 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.parser;
+
+import com.dmdirc.harness.parser.TestParser;
+import com.dmdirc.harness.parser.TestIErrorInfo;
+import com.dmdirc.parser.callbacks.CallbackNotFoundException;
+import org.junit.Ignore;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class ProcessNickTest {
+    
+    @Test
+    public void testNickSameName() {
+        final TestParser parser = new TestParser();
+
+        parser.injectConnectionStrings();
+        parser.injectLine(":nick JOIN #DMDirc_testing");
+        parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser @+nick2 nick3");
+        parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
+        parser.injectLine(":luser!lu@ser.com NICK LUSER");
+
+        assertNotNull(parser.getClientInfo("LUSER"));
+        assertEquals(1, parser.getClientInfo("LUSER").getChannelClients().size());
+
+        ChannelClientInfo cci = parser.getClientInfo("LUSER").getChannelClients().get(0);
+        assertEquals(parser.getChannelInfo("#DMDirc_testing"), cci.getChannel());
+        assertEquals("+", cci.getChanModeStr(true));
+    }
+    
+    @Test
+    public void testNickDifferent() {
+        final TestParser parser = new TestParser();
+
+        parser.injectConnectionStrings();
+        parser.injectLine(":nick JOIN #DMDirc_testing");
+        parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser @+nick2 nick3");
+        parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
+        parser.injectLine(":luser!lu@ser.com NICK foobar");
+
+        assertNotNull(parser.getClientInfo("foobar"));
+        assertNull(parser.getClientInfo("luser"));
+        assertEquals(1, parser.getClientInfo("foobar").getChannelClients().size());
+
+        ChannelClientInfo cci = parser.getClientInfo("foobar").getChannelClients().get(0);
+        assertEquals(parser.getChannelInfo("#DMDirc_testing"), cci.getChannel());
+        assertEquals("+", cci.getChanModeStr(true));
+    }    
+    
+    @Test @Ignore
+    public void testOverrideNick() throws CallbackNotFoundException {
+        final TestParser parser = new TestParser();
+        final TestIErrorInfo info = new TestIErrorInfo();
+        
+        parser.getCallbackManager().addCallback("OnErrorInfo", info);
+        parser.injectConnectionStrings();
+        parser.injectLine(":nick JOIN #DMDirc_testing");
+        parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser @+nick2 nick3");
+        parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
+        parser.injectLine(":luser!lu@ser.com NICK nick3");
+
+        assertTrue("Parser should raise an error if a nick change overrides an "
+                + "existing client", info.error);
+    }    
+    
+    public static junit.framework.Test suite() {
+        return new junit.framework.JUnit4TestAdapter(ProcessNickTest.class);
+    }
+
+}