Random parsery unit tests

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

test/com/dmdirc/harness/parser/TestINickChanged.java

@@ -0,0 +1,39 @@
+/*
+ * 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.harness.parser;
+
+import com.dmdirc.parser.*;
+import com.dmdirc.parser.callbacks.interfaces.INickChanged;
+
+public class TestINickChanged implements INickChanged {
+
+    public String oldNick = null;
+    public ClientInfo client;
+
+    @Override
+    public void onNickChanged(IRCParser tParser, ClientInfo cClient,
+                              String sOldNick) {
+        oldNick = sOldNick;
+        client = cClient;
+    }
+}

test/com/dmdirc/parser/ProcessModeTest.java

@@ -92,7 +92,7 @@ public class ProcessModeTest extends junit.framework.TestCase {
         parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser");
         parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
 
-        parser.injectLine(":server MODE #DMDirc_testing +v moo");
+        parser.injectLine(":luser!me@my MODE #DMDirc_testing +v :moo");
         
         assertNotNull(parser.getClientInfo("moo"));
         assertEquals(1, parser.getClientInfo("moo").channelCount());
@@ -100,6 +100,10 @@ public class ProcessModeTest extends junit.framework.TestCase {
         final ChannelClientInfo cci = parser.getClientInfo("moo").getChannelClients().get(0);
         
         assertEquals("+", cci.getChanModeStr(true));        
+        assertEquals("Parser should update ident when it sees a MODE line",
+                "me", parser.getClientInfo("luser").getIdent());
+        assertEquals("Parser should update host when it sees a MODE line",
+                "my", parser.getClientInfo("luser").getHost());
     }
     
     @Test
@@ -132,17 +136,28 @@ public class ProcessModeTest extends junit.framework.TestCase {
         parser.injectLine(":nick JOIN #DMDirc_testing");
         parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser");
         parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
-        parser.injectLine(":server 324 nick #DMDirc_testing +stnl 1234");
+        parser.injectLine(":server 324 nick #DMDirc_testing +Zstnl 1234");
 
         assertEquals("1234", parser.getChannelInfo("#DMDirc_testing").getModeParam('l'));
         
-        final String modes = parser.getChannelInfo("#DMDirc_testing").getModeStr().split(" ")[0];
-        assertEquals(5, modes.length());
+        String modes = parser.getChannelInfo("#DMDirc_testing").getModeStr().split(" ")[0];
+        assertEquals(6, modes.length());
         assertEquals('+', modes.charAt(0));
+        assertTrue(modes.indexOf('Z') > -1);
         assertTrue(modes.indexOf('s') > -1);
         assertTrue(modes.indexOf('t') > -1);
         assertTrue(modes.indexOf('n') > -1);
         assertTrue(modes.indexOf('l') > -1);
+        
+        parser.injectLine(":server MODE #DMDirc_testing :-Z");
+        
+        modes = parser.getChannelInfo("#DMDirc_testing").getModeStr().split(" ")[0];
+        assertEquals(5, modes.length());
+        assertEquals('+', modes.charAt(0));
+        assertTrue(modes.indexOf('s') > -1);
+        assertTrue(modes.indexOf('t') > -1);
+        assertTrue(modes.indexOf('n') > -1);
+        assertTrue(modes.indexOf('l') > -1);        
     }
 
 }

test/com/dmdirc/parser/ProcessNickTest.java

@@ -24,8 +24,8 @@ package com.dmdirc.parser;
 
 import com.dmdirc.harness.parser.TestParser;
 import com.dmdirc.harness.parser.TestIErrorInfo;
+import com.dmdirc.harness.parser.TestINickChanged;
 import com.dmdirc.parser.callbacks.CallbackNotFoundException;
-import org.junit.Ignore;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
@@ -34,9 +34,13 @@ public class ProcessNickTest {
     @Test
     public void testNickSameName() {
         final TestParser parser = new TestParser();
+        final TestINickChanged tinc = new TestINickChanged();
 
+        parser.getCallbackManager().addCallback("OnNickChanged", tinc);
+        
         parser.injectConnectionStrings();
         parser.injectLine(":nick JOIN #DMDirc_testing");
+        parser.injectLine(":nick JOIN #DMDirc_testing2");
         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");
@@ -47,6 +51,9 @@ public class ProcessNickTest {
         ChannelClientInfo cci = parser.getClientInfo("LUSER").getChannelClients().get(0);
         assertEquals(parser.getChannelInfo("#DMDirc_testing"), cci.getChannel());
         assertEquals("+", cci.getChanModeStr(true));
+        
+        assertSame(cci.getClient(), tinc.client);
+        assertEquals("luser", tinc.oldNick);
     }
     
     @Test
@@ -82,7 +89,21 @@ public class ProcessNickTest {
 
         assertTrue("Parser should raise an error if a nick change overrides an "
                 + "existing client", info.error);
-    }    
+    }
+    
+    @Test
+    public void testUnknownNick() {
+        final TestParser parser = new TestParser();
+        final TestINickChanged tinc = new TestINickChanged();
+        
+        parser.getCallbackManager().addCallback("OnNickChanged", tinc);
+        
+        parser.injectConnectionStrings();
+        parser.injectLine(":random!lu@ser NICK rand");
+        
+        assertNull(tinc.client);
+        assertNull(tinc.oldNick);
+    }
     
     public static junit.framework.Test suite() {
         return new junit.framework.JUnit4TestAdapter(ProcessNickTest.class);