Unit test for issue 1674

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

@@ -30,6 +30,8 @@ import java.util.Timer;
 public class TestParser extends IRCParser {
 
     public final List<String> sentLines = new ArrayList<String>();
+
+    public String nick = "nick";
     
     public String network = null;
 
@@ -59,14 +61,14 @@ public class TestParser extends IRCParser {
     public void injectConnectionStrings() {
         final String[] lines = new String[]{
             "NOTICE AUTH :Blah, blah",
-            ":server 001 nick :Welcome to the Testing IRC Network, nick",
-            ":server 002 nick :Your host is server.net, running version foo",
-            ":server 003 nick :This server was created Sun Jan 6 2008 at 17:34:54 CET",
-            ":server 004 nick server.net foo dioswkgxRXInP bRIeiklmnopstvrDcCNuMT bklov",
-            ":server 005 nick WHOX WALLCHOPS WALLVOICES USERIP PREFIX=(ov)@+ " +
+            ":server 001 " + nick + " :Welcome to the Testing IRC Network, " + nick,
+            ":server 002 " + nick + " :Your host is server.net, running version foo",
+            ":server 003 " + nick + " :This server was created Sun Jan 6 2008 at 17:34:54 CET",
+            ":server 004 " + nick + " server.net foo dioswkgxRXInP bRIeiklmnopstvrDcCNuMT bklov",
+            ":server 005 " + nick + " WHOX WALLCHOPS WALLVOICES USERIP PREFIX=(ov)@+ " +
                     (network == null ? "" : "NETWORK=" + network + " ") +
                     ":are supported by this server",
-            ":server 005 nick MAXNICKLEN=15 TOPICLEN=250 AWAYLEN=160 MODES=6 " +
+            ":server 005 " + nick + " MAXNICKLEN=15 TOPICLEN=250 AWAYLEN=160 MODES=6 " +
                     "CHANMODES=bIeR,k,l,imnpstrDducCNMT :are supported by this server",
         };
         

test/com/dmdirc/parser/irc/IRCParserTest.java

@@ -35,6 +35,7 @@ import com.dmdirc.parser.irc.callbacks.CallbackNotFoundException;
 import com.dmdirc.parser.irc.callbacks.interfaces.IAwayState;
 import com.dmdirc.parser.irc.callbacks.interfaces.IChannelKick;
 
+import com.dmdirc.parser.irc.callbacks.interfaces.IErrorInfo;
 import java.util.Arrays;
 import java.util.List;
 
@@ -47,23 +48,35 @@ import static org.mockito.Mockito.*;
 public class IRCParserTest {
 
     @Test
-    public void testIssue042() {
+    public void testIssue42() {
+        // Invalid callback names are silently ignored instead of raising exceptions
+        
         boolean res = false;
 
         try {
             final IRCParser myParser = new IRCParser();
-            myParser.getCallbackManager().addCallback("non-existant",new IAwayState() {
-                public void onAwayState(IRCParser tParser, boolean currentState,
-                        String reason) {
-                    throw new UnsupportedOperationException("Not supported yet.");
-                }
-            });
+            myParser.getCallbackManager().addCallback("non-existant", mock(IAwayState.class));
         } catch (CallbackNotFoundException ex) {
             res = true;
         }
 
         assertTrue("addCallback() should throw exception for non-existant callbacks", res);
     }
+
+    @Test
+    public void testIssue1674() {
+        // parser nick change error with dual 001
+        final IErrorInfo error = mock(IErrorInfo.class);
+
+        final TestParser myParser = new TestParser();
+        myParser.getCallbackManager().addCallback("onErrorInfo", error);
+        myParser.injectConnectionStrings();
+        myParser.nick = "nick2";
+        myParser.injectConnectionStrings();
+        myParser.injectLine(":nick2!ident@host NICK :nick");
+
+        verify(error, never()).onErrorInfo((IRCParser) anyObject(), (ParserError) anyObject());
+    }
     
     @Test
     public void testProxyPortWithBindIP() {