Unit test for parser port range checking

Issue 1171, issue 1106

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

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

@@ -0,0 +1,36 @@
+/*
+ * 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.IConnectError;
+
+public class TestIConnectError implements IConnectError {
+
+    public boolean error = false;
+
+    @Override
+    public void onConnectError(IRCParser tParser, ParserError errorInfo) {
+        error = true;
+    }
+}

test/com/dmdirc/parser/IRCParserTest.java

@@ -25,25 +25,18 @@ package com.dmdirc.parser;
 import com.dmdirc.harness.parser.TestIPrivateCTCP;
 import com.dmdirc.harness.parser.TestParser;
 import com.dmdirc.harness.parser.TestIChannelKick;
+import com.dmdirc.harness.parser.TestIConnectError;
+import com.dmdirc.harness.parser.TestIErrorInfo;
 import com.dmdirc.harness.parser.TestINoticeAuth;
 import com.dmdirc.harness.parser.TestINumeric;
 import com.dmdirc.harness.parser.TestIServerError;
-import com.dmdirc.harness.parser.TestIChannelSelfJoin;
 import com.dmdirc.harness.parser.TestIPost005;
 import com.dmdirc.harness.parser.TestIPrivateMessage;
 import com.dmdirc.harness.parser.TestIPrivateAction;
 import com.dmdirc.parser.callbacks.CallbackNotFoundException;
 import com.dmdirc.parser.callbacks.interfaces.IAwayState;
-import com.dmdirc.parser.callbacks.interfaces.IChannelKick;
-import com.dmdirc.parser.callbacks.interfaces.IChannelSelfJoin;
-import com.dmdirc.parser.callbacks.interfaces.INoticeAuth;
-import com.dmdirc.parser.callbacks.interfaces.INumeric;
-import com.dmdirc.parser.callbacks.interfaces.IPost005;
-import com.dmdirc.parser.callbacks.interfaces.IPrivateAction;
-import com.dmdirc.parser.callbacks.interfaces.IPrivateCTCP;
-import com.dmdirc.parser.callbacks.interfaces.IPrivateMessage;
-import com.dmdirc.parser.callbacks.interfaces.IServerError;
 
+import java.io.IOException;
 import java.util.Arrays;
 
 import java.util.List;
@@ -52,7 +45,7 @@ import javax.net.ssl.TrustManager;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class IRCParserTest extends junit.framework.TestCase {
+public class IRCParserTest {
 
     @Test
     public void testIssue042() {
@@ -371,17 +364,17 @@ public class IRCParserTest extends junit.framework.TestCase {
         for (ChannelListModeItem item : items) {
             if (item.getItem().equals("ban1!ident@.host")) {
                 assertEquals("bansetter1", item.getOwner());
-                assertEquals(1001, item.getTime());
+                assertEquals(1001l, item.getTime());
                 assertFalse(gotOne);
                 gotOne = true;
             } else if (item.getItem().equals("ban2!*@.host")) {
                 assertEquals("bansetter2", item.getOwner());
-                assertEquals(1002, item.getTime());
+                assertEquals(1002l, item.getTime());
                 assertFalse(gotTwo);
                 gotTwo = true;
             } else if (item.toString().equals("ban3!ident@*")) {
                 assertEquals("bansetter3", item.getOwner());
-                assertEquals(1003, item.getTime());
+                assertEquals(1003l, item.getTime());
                 assertFalse(gotThree);
                 gotThree = true;
             }
@@ -442,6 +435,33 @@ public class IRCParserTest extends junit.framework.TestCase {
         doIRCdTest("Unreal3.2.6", "unreal");
         doIRCdTest("bahamut-1.8(04)", "bahamut");
     }
+    
+    @Test
+    public void testIllegalPort1() {
+        final TestParser tp = new TestParser(new MyInfo(), new ServerInfo("127.0.0.1", 0, ""));
+        final TestIConnectError tiei = new TestIConnectError();
+        tp.getCallbackManager().addCallback("OnConnectError", tiei);
+        tp.run();
+        assertTrue(tiei.error);
+    }
+    
+    @Test
+    public void testIllegalPort2() {
+        final TestParser tp = new TestParser(new MyInfo(), new ServerInfo("127.0.0.1", 1, ""));
+        final TestIConnectError tiei = new TestIConnectError();
+        tp.getCallbackManager().addCallback("OnConnectError", tiei);
+        tp.run();
+        assertTrue(tiei.error);
+    }    
+    
+    @Test
+    public void testIllegalPort3() {
+        final TestParser tp = new TestParser(new MyInfo(), new ServerInfo("127.0.0.1", 65570, ""));
+        final TestIConnectError tiei = new TestIConnectError();
+        tp.getCallbackManager().addCallback("OnConnectError", tiei);
+        tp.run();
+        assertTrue(tiei.error);
+    }
 
     private void doIRCdTest(final String ircd, final String expected) {
         final TestParser parser = new TestParser();
@@ -460,5 +480,9 @@ public class IRCParserTest extends junit.framework.TestCase {
         assertEquals(ircd, parser.getIRCD(false));
         assertEquals(expected.toLowerCase(), parser.getIRCD(true).toLowerCase());
     }
+    
+    public static junit.framework.Test suite() {
+        return new junit.framework.JUnit4TestAdapter(IRCParserTest.class);
+    }
 
 }

test/com/dmdirc/parser/ProcessModeTest.java

@@ -133,7 +133,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 324 nick #DMDirc_testing +stnl 1234");
-    
+
         assertEquals("1234", parser.getChannelInfo("#DMDirc_testing").getModeParam('l'));
         
         final String modes = parser.getChannelInfo("#DMDirc_testing").getModeStr().split(" ")[0];