Issue 2736.

src/com/dmdirc/ParserFactory.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc;
 
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.parser.irc.MyInfo;
@@ -45,11 +47,24 @@ public class ParserFactory {
      * @since 0.6.3m2
      */
     public Parser getParser(final MyInfo myInfo, final IrcAddress address) {
-        final ServerInfo info = new ServerInfo(address.getServer(), address.getPort(),
+        // TODO: Hacky Hack McHack
+        final ServerInfo info = new ServerInfo(address.getServer(), address.getPort(6667),
                 address.getPassword());
         info.setSSL(address.isSSL());
-        
-        return new IRCParser(myInfo, info);
+
+        if ("irc".equals(address.getProtocol())) {
+            return new IRCParser(myInfo, info);
+        } else if ("irc-test".equals(address.getProtocol())) {
+            try {
+                return (Parser) Class.forName("com.dmdirc.harness.parser.TestParser")
+                        .getConstructor(MyInfo.class, ServerInfo.class)
+                        .newInstance(myInfo, info);
+            } catch (Exception ex) {
+                Logger.userError(ErrorLevel.UNKNOWN, "Unable to create parser", ex);
+            }
+        }
+
+        return null;
     }
 
 }

src/com/dmdirc/util/IrcAddress.java

@@ -50,10 +50,12 @@ public class IrcAddress implements Serializable {
 
     /** Whether or not this address uses SSL. */
     private boolean usesSSL;
+    /** The protocol for this address. */
+    private String protocol;
     /** The server name for this address. */
     private String server;
     /** The port number for this address. */
-    private int port = 6667;
+    private int port;
     /** A list of channels to auto-connect to. */
     private List<String> channels = new ArrayList<String>();
     /** The password for this address. */
@@ -80,12 +82,17 @@ public class IrcAddress implements Serializable {
         } catch (URISyntaxException ex) {
             throw new InvalidAddressException("Unable to parse URI", ex);
         }
-        
-        if (uri.getScheme() != null && uri.getScheme().equalsIgnoreCase("ircs")) {
-            usesSSL = true;
-        } else if (uri.getScheme() == null || !uri.getScheme().equalsIgnoreCase("irc")) {
+
+        if (uri.getScheme() == null) {
             throw new InvalidAddressException("Invalid protocol specified");
         }
+
+        protocol = uri.getScheme();
+
+        if (protocol.endsWith("s")) {
+            protocol = protocol.substring(0, protocol.length() - 1);
+            usesSSL = true;
+        }
         
         if (uri.getUserInfo() != null) {
             doPass(uri.getUserInfo());
@@ -95,9 +102,7 @@ public class IrcAddress implements Serializable {
             "?" + uri.getQuery()) + (uri.getFragment() == null ? "" :
             "#" + uri.getFragment()));
 
-        if (uri.getPort() > -1) {
-            doPort(uri.getPort());
-        }
+        doPort(uri.getPort());
 
         if (uri.getHost() == null) {
             throw new InvalidAddressException("Invalid host or port specified");
@@ -155,9 +160,8 @@ public class IrcAddress implements Serializable {
      * Processes the port part of this address.
      *
      * @param port The port part of this address
-     * @throws InvalidAddressException if the port is non-numeric
      */
-    private void doPort(final int port) throws InvalidAddressException {
+    private void doPort(final int port) {
         this.port = port;
     }
 
@@ -179,6 +183,16 @@ public class IrcAddress implements Serializable {
         return usesSSL;
     }
 
+    /**
+     * Retrieves the protocol from this address.
+     *
+     * @since 0.6.3m2
+     * @return This address's protocol
+     */
+    public String getProtocol() {
+        return protocol;
+    }
+
     /**
      * Retrieves the server from this address.
      *
@@ -191,12 +205,23 @@ public class IrcAddress implements Serializable {
     /**
      * Retrieves the port used for this address.
      *
-     * @return This address's port
+     * @return This address's port, or -1 if none specified.
      */
     public int getPort() {
         return port;
     }
 
+    /**
+     * Retrieves the port used for this address.
+     *
+     * @since 0.6.3m2
+     * @param fallback The port to fall back to if none was specified
+     * @return This address's port, or the fallback value if none is specified
+     */
+    public int getPort(final int fallback) {
+        return port == -1 ? fallback : port;
+    }
+
     /**
      * Retrieves the password used for this address.
      *
@@ -239,4 +264,65 @@ public class IrcAddress implements Serializable {
             }
         }
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean equals(final Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+
+        final IrcAddress other = (IrcAddress) obj;
+
+        if (this.usesSSL != other.usesSSL) {
+            return false;
+        }
+        
+        if ((this.protocol == null) ? (other.protocol != null)
+                : !this.protocol.equals(other.protocol)) {
+            return false;
+        }
+
+        if ((this.server == null) ? (other.server != null)
+                : !this.server.equals(other.server)) {
+            return false;
+        }
+
+        if (this.port != other.port) {
+            return false;
+        }
+
+        if (this.channels != other.channels && (this.channels == null
+                || !this.channels.equals(other.channels))) {
+            return false;
+        }
+        
+        if ((this.pass == null) ? (other.pass != null) : !this.pass.equals(other.pass)) {
+            return false;
+        }
+        
+        return true;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int hashCode() {
+        int hash = 5;
+        hash = 67 * hash + (this.usesSSL ? 1 : 0);
+        hash = 67 * hash + (this.protocol != null ? this.protocol.hashCode() : 0);
+        hash = 67 * hash + (this.server != null ? this.server.hashCode() : 0);
+        hash = 67 * hash + this.port;
+        hash = 67 * hash + (this.channels != null ? this.channels.hashCode() : 0);
+        hash = 67 * hash + (this.pass != null ? this.pass.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public String toString() {
+        return protocol + "://" + pass + "@" + server + ":" + (isSSL() ? "+" : "")
+                + port + "/" + channels;
+    }
 }

test/com/dmdirc/InviteTest.java

@@ -23,10 +23,10 @@
 package com.dmdirc;
 
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.harness.parser.TestParserFactory;
 import com.dmdirc.addons.ui_dummy.DummyController;
-import java.util.ArrayList;
+
 import java.util.Date;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -42,9 +42,7 @@ public class InviteTest {
         Main.setUI(new DummyController());
         IdentityManager.load();
         
-        server = new Server("255.255.255.255", 6667, "", false,
-                IdentityManager.getProfiles().get(0), new ArrayList<String>(),
-                new TestParserFactory());
+        server = new Server("irc-test://255.255.255.255", IdentityManager.getProfiles().get(0));
         test = new Invite(server, "#channel", "nick!ident@host");
         server.addInvite(test);
         ts = new Date().getTime();

test/com/dmdirc/ServerManagerTest.java

@@ -23,12 +23,10 @@
 package com.dmdirc;
 
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.harness.parser.TestParserFactory;
 import com.dmdirc.addons.ui_dummy.DummyController;
 import com.dmdirc.addons.ui_dummy.DummyQueryWindow;
 import com.dmdirc.plugins.PluginManager;
-
-import java.util.ArrayList;
+import com.dmdirc.util.InvalidAddressException;
 
 import org.junit.After;
 import org.junit.BeforeClass;
@@ -103,13 +101,11 @@ public class ServerManagerTest {
     }
     
     @Test
-    public void testGetServerFromFrame() {
-        final Server serverA = new Server("255.255.255.255", 6667, "", false,
-                IdentityManager.getProfiles().get(0), new ArrayList<String>(),
-                new TestParserFactory());
-        final Server serverB = new Server("255.255.255.254", 6667, "", false,
-                IdentityManager.getProfiles().get(0), new ArrayList<String>(),
-                new TestParserFactory());
+    public void testGetServerFromFrame() throws InvalidAddressException {
+        final Server serverA = new Server("irc-test://255.255.255.255",
+                IdentityManager.getProfiles().get(0));
+        final Server serverB = new Server("irc-test://255.255.255.254",
+                IdentityManager.getProfiles().get(0));
         
         final ServerManager sm = ServerManager.getServerManager();
         

test/com/dmdirc/ServerTest.java

@@ -23,9 +23,8 @@
 package com.dmdirc;
 
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.harness.parser.TestParserFactory;
 import com.dmdirc.addons.ui_dummy.DummyController;
-import java.util.ArrayList;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -38,9 +37,8 @@ public class ServerTest {
     public static void setUp() throws Exception {
         Main.setUI(new DummyController());
         IdentityManager.load();
-        server = new Server("255.255.255.255", 6667, "", false, 
-                IdentityManager.getProfiles().get(0), new ArrayList<String>(),
-                new TestParserFactory());
+        server = new Server("irc-test://255.255.255.255",
+                IdentityManager.getProfiles().get(0));
     }
 
     @Test

test/com/dmdirc/addons/logging/LoggingPluginTest.java

@@ -29,13 +29,13 @@ import com.dmdirc.Query;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.harness.TestLoggingPlugin;
-import com.dmdirc.harness.parser.TestParserFactory;
 import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.addons.ui_dummy.DummyController;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.util.ConfigFile;
-import java.util.ArrayList;
+
 import java.util.Map;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -51,9 +51,8 @@ public class LoggingPluginTest {
     public static void setUp() throws Exception {
         Main.setUI(new DummyController());
         IdentityManager.load();
-        server = new Server("255.255.255.255", 6667, "", false,
-                IdentityManager.getProfiles().get(0), new ArrayList<String>(),
-                new TestParserFactory());
+        server = new Server("irc-test://255.255.255.255",
+                IdentityManager.getProfiles().get(0));
         channel = new Channel(server, new IRCChannelInfo((IRCParser) server.getParser(), "#test"));
         query = new Query(server, "foo!bar@baz");
 

test/com/dmdirc/commandparser/commands/server/ChangeServerTest.java

@@ -27,6 +27,8 @@ import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.interfaces.InputWindow;
 
+import com.dmdirc.util.InvalidAddressException;
+import com.dmdirc.util.IrcAddress;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.mockito.Mockito.*;
@@ -67,57 +69,57 @@ public class ChangeServerTest {
     @Test
     public void testOutOfRangePort2() {
         final InputWindow tiw = mock(InputWindow.class);
-        command.execute(tiw, null, false,new CommandArguments("/server foo:65537"));
+        command.execute(tiw, null, false, new CommandArguments("/server foo:65537"));
         
         verify(tiw).addLine(eq("commandError"), anyString());
     }
 
     @Test
-    public void testExecuteBasic() {
+    public void testExecuteBasic() throws InvalidAddressException {
         final InputWindow tiw = mock(InputWindow.class);
         final Identity profile = mock(Identity.class);
         final Server server = mock(Server.class);
         when(server.getProfile()).thenReturn(profile);
 
-        command.execute(tiw, server, false,new CommandArguments("/server foo:1234"));
+        command.execute(tiw, server, false, new CommandArguments("/server foo:1234"));
 
-        verify(server).connect("foo", 1234, "", false, profile);
+        verify(server).connect(eq(new IrcAddress("foo", 1234, "", false)), same(profile));
     }
 
     @Test
-    public void testExecuteNoPort() {
+    public void testExecuteNoPort() throws InvalidAddressException {
         final InputWindow tiw = mock(InputWindow.class);
         final Identity profile = mock(Identity.class);
         final Server server = mock(Server.class);
         when(server.getProfile()).thenReturn(profile);
 
-        command.execute(tiw, server, false,new CommandArguments("/server foo"));
+        command.execute(tiw, server, false, new CommandArguments("/server foo"));
 
-        verify(server).connect("foo", 6667, "", false, profile);
+        verify(server).connect(eq(new IrcAddress("foo", 6667, "", false)), same(profile));
     }
 
     @Test
-    public void testDeprecatedSSL() {
+    public void testDeprecatedSSL() throws InvalidAddressException {
         final InputWindow tiw = mock(InputWindow.class);
         final Identity profile = mock(Identity.class);
         final Server server = mock(Server.class);
         when(server.getProfile()).thenReturn(profile);
 
-        command.execute(tiw, server, false,new CommandArguments("/server --ssl foo"));
+        command.execute(tiw, server, false, new CommandArguments("/server --ssl foo"));
 
-        verify(server).connect("foo", 6667, "", true, profile);
+        verify(server).connect(eq(new IrcAddress("foo", 6667, "", true)), same(profile));
     }
 
     @Test
-    public void testExecuteComplex() {
+    public void testExecuteComplex() throws InvalidAddressException {
         final InputWindow tiw = mock(InputWindow.class);
         final Identity profile = mock(Identity.class);
         final Server server = mock(Server.class);
         when(server.getProfile()).thenReturn(profile);
 
-        command.execute(tiw, server, false,new CommandArguments("/server foo:+1234 password"));
+        command.execute(tiw, server, false, new CommandArguments("/server foo:+1234 password"));
 
-        verify(server).connect("foo", 1234, "password", true, profile);
+        verify(server).connect(eq(new IrcAddress("foo", 1234, "password", true)), same(profile));
     }
 
 }

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

@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2006-2009 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.ParserFactory;
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.MyInfo;
-import com.dmdirc.parser.irc.ServerInfo;
-
-public class TestParserFactory extends ParserFactory {
-
-    protected String network;
-
-    public TestParserFactory() {
-        this(null);
-    }
-
-    public TestParserFactory(String network) {
-        this.network = network;
-    }
-    
-    @Override
-    public IRCParser getParser(MyInfo myInfo, ServerInfo serverInfo) {
-        final TestParser parser = new TestParser(myInfo, serverInfo);
-        
-        if (this.network != null) {
-            parser.network = network;
-        }
-        
-        return parser;
-    }
-
-}

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

@@ -33,7 +33,7 @@ public class ClientInfoTest {
     @Test
     public void testMap() {
         final IRCClientInfo ci = new IRCClientInfo(new IRCParser(), "nick!ident@host");
-        final Map map = new HashMap();
+        final Map<Object, Object> map = new HashMap<Object, Object>();
         
         ci.setMap(map);
         assertEquals(map, ci.getMap());