Update unit tests for URI changes

Change-Id: I0dd005540f126b40c4d7f61384236ec21cfe5730
Reviewed-on: http://gerrit.dmdirc.com/57
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Tested-by: Chris Smith <chris@dmdirc.com>

test/com/dmdirc/InviteTest.java

@@ -25,6 +25,7 @@ package com.dmdirc;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.addons.ui_dummy.DummyController;
 
+import java.net.URI;
 import java.util.Date;
 
 import org.junit.BeforeClass;
@@ -42,7 +43,8 @@ public class InviteTest {
         Main.setUI(new DummyController());
         IdentityManager.load();
         
-        server = new Server("irc-test://255.255.255.255", IdentityManager.getProfiles().get(0));
+        server = new Server(new URI("irc-test://255.255.255.255"),
+                IdentityManager.getProfiles().get(0));
         server.connect();
         
         test = new Invite(server, "#channel", "nick!ident@host");

test/com/dmdirc/ServerManagerTest.java

@@ -26,8 +26,9 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.addons.ui_dummy.DummyController;
 import com.dmdirc.addons.ui_dummy.DummyQueryWindow;
 import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.util.InvalidAddressException;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -101,10 +102,10 @@ public class ServerManagerTest {
     }
     
     @Test
-    public void testGetServerFromFrame() throws InvalidAddressException {
-        final Server serverA = new Server("irc-test://255.255.255.255",
+    public void testGetServerFromFrame() throws URISyntaxException {
+        final Server serverA = new Server(new URI("irc-test://255.255.255.255"),
                 IdentityManager.getProfiles().get(0));
-        final Server serverB = new Server("irc-test://255.255.255.254",
+        final Server serverB = new Server(new URI("irc-test://255.255.255.254"),
                 IdentityManager.getProfiles().get(0));
         serverA.connect();
         serverB.connect();

test/com/dmdirc/ServerTest.java

@@ -25,6 +25,7 @@ package com.dmdirc;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.addons.ui_dummy.DummyController;
 
+import java.net.URI;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -37,7 +38,7 @@ public class ServerTest {
     public static void setUp() throws Exception {
         Main.setUI(new DummyController());
         IdentityManager.load();
-        server = new Server("irc-test://255.255.255.255",
+        server = new Server(new URI("irc-test://255.255.255.255"),
                 IdentityManager.getProfiles().get(0));
         server.connect();
     }

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

@@ -34,6 +34,7 @@ import com.dmdirc.addons.ui_dummy.DummyController;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.util.ConfigFile;
 
+import java.net.URI;
 import java.util.Map;
 
 import org.junit.BeforeClass;
@@ -51,7 +52,7 @@ public class LoggingPluginTest {
     public static void setUp() throws Exception {
         Main.setUI(new DummyController());
         IdentityManager.load();
-        server = new Server("irc-test://255.255.255.255",
+        server = new Server(new URI("irc-test://255.255.255.255"),
                 IdentityManager.getProfiles().get(0));
         server.connect();
         

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

@@ -27,8 +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 java.net.URI;
+import java.net.URISyntaxException;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.mockito.Mockito.*;
@@ -75,7 +75,7 @@ public class ChangeServerTest {
     }
 
     @Test
-    public void testExecuteBasic() throws InvalidAddressException {
+    public void testExecuteBasic() throws URISyntaxException {
         final InputWindow tiw = mock(InputWindow.class);
         final Identity profile = mock(Identity.class);
         final Server server = mock(Server.class);
@@ -83,11 +83,11 @@ public class ChangeServerTest {
 
         command.execute(tiw, server, false, new CommandArguments("/server foo:1234"));
 
-        verify(server).connect(eq(new IrcAddress("foo", 1234, "", false)), same(profile));
+        verify(server).connect(eq(new URI("irc://foo:1234")), same(profile));
     }
 
     @Test
-    public void testExecuteNoPort() throws InvalidAddressException {
+    public void testExecuteNoPort() throws URISyntaxException {
         final InputWindow tiw = mock(InputWindow.class);
         final Identity profile = mock(Identity.class);
         final Server server = mock(Server.class);
@@ -95,11 +95,11 @@ public class ChangeServerTest {
 
         command.execute(tiw, server, false, new CommandArguments("/server foo"));
 
-        verify(server).connect(eq(new IrcAddress("foo", 6667, "", false)), same(profile));
+        verify(server).connect(eq(new URI("irc://foo:6667")), same(profile));
     }
 
     @Test
-    public void testDeprecatedSSL() throws InvalidAddressException {
+    public void testDeprecatedSSL() throws URISyntaxException {
         final InputWindow tiw = mock(InputWindow.class);
         final Identity profile = mock(Identity.class);
         final Server server = mock(Server.class);
@@ -107,11 +107,11 @@ public class ChangeServerTest {
 
         command.execute(tiw, server, false, new CommandArguments("/server --ssl foo"));
 
-        verify(server).connect(eq(new IrcAddress("foo", 6667, "", true)), same(profile));
+        verify(server).connect(eq(new URI("ircs://foo:6667")), same(profile));
     }
 
     @Test
-    public void testExecuteComplex() throws InvalidAddressException {
+    public void testExecuteComplex() throws URISyntaxException {
         final InputWindow tiw = mock(InputWindow.class);
         final Identity profile = mock(Identity.class);
         final Server server = mock(Server.class);
@@ -119,7 +119,7 @@ public class ChangeServerTest {
 
         command.execute(tiw, server, false, new CommandArguments("/server foo:+1234 password"));
 
-        verify(server).connect(eq(new IrcAddress("foo", 1234, "password", true)), same(profile));
+        verify(server).connect(eq(new URI("ircs://password@foo:1234")), same(profile));
     }
 
 }

test/com/dmdirc/util/InvalidAddressExceptionTest.java

@@ -1,45 +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.util;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class InvalidAddressExceptionTest {
-
-    @Test
-    public void testMessage() {
-        final InvalidAddressException iae = new InvalidAddressException("message");
-        
-        assertEquals("message", iae.getMessage());
-    }
-    
-    @Test
-    public void testCause() {
-        final Exception e = new Exception("moo");
-        final InvalidAddressException iae = new InvalidAddressException("message",
-                e);
-        
-        assertEquals(e, iae.getCause());
-    }
-
-}

test/com/dmdirc/util/IrcAddressTest.java

@@ -1,165 +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.util;
-
-import com.dmdirc.Main;
-import com.dmdirc.ServerManager;
-import com.dmdirc.config.IdentityManager;
-import com.dmdirc.addons.ui_dummy.DummyController;
-import com.dmdirc.plugins.PluginManager;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class IrcAddressTest {
-
-    @BeforeClass
-    public static void setUp() {
-        IdentityManager.load();
-        Main.setUI(new DummyController());
-        Main.ensureExists(PluginManager.getPluginManager(), "tabcompletion");
-    }
-
-    @Test(expected=InvalidAddressException.class)
-    public void testInvalidProtocol() throws InvalidAddressException {
-        new IrcAddress("http://moo!");
-    }
-
-    @Test(expected=InvalidAddressException.class)
-    public void testNoProtocol() throws InvalidAddressException {
-        new IrcAddress("moo!");
-    }
-    
-    @Test(expected=InvalidAddressException.class)
-    public void testInvalidURL() throws InvalidAddressException {
-        new IrcAddress(":");
-    }    
-
-    @Test
-    public void testBasic() throws InvalidAddressException {
-        final IrcAddress address = new IrcAddress("irc://servername");
-        assertEquals("irc", address.getProtocol());
-        assertEquals("servername", address.getServer());
-        assertEquals("", address.getPassword());
-        assertEquals(-1, address.getPort());
-        assertFalse(address.isSSL());
-    }
-
-    @Test
-    public void testPasswordSSL() throws InvalidAddressException {
-        final IrcAddress address = new IrcAddress("ircs://password@servername");
-        assertEquals("irc", address.getProtocol());
-        assertEquals("servername", address.getServer());
-        assertEquals("password", address.getPassword());
-        assertEquals(-1, address.getPort());
-        assertTrue(address.isSSL());
-    }
-
-    @Test
-    public void testPort() throws InvalidAddressException {
-        final IrcAddress address = new IrcAddress("irc://servername:7000/");
-        assertEquals("irc", address.getProtocol());
-        assertEquals("servername", address.getServer());
-        assertEquals("", address.getPassword());
-        assertEquals(7000, address.getPort());
-        assertFalse(address.isSSL());
-    }
-
-    @Test(expected=InvalidAddressException.class)
-    public void testInvalidPort() throws InvalidAddressException {
-        new IrcAddress("irc://servername:port/");
-    }
-
-    @Test
-    public void testPortSSL() throws InvalidAddressException {
-        final IrcAddress address = new IrcAddress("ircs://servername:+7000/");
-        assertEquals("irc", address.getProtocol());
-        assertEquals("servername", address.getServer());
-        assertEquals("", address.getPassword());
-        assertEquals(7000, address.getPort());
-        assertTrue(address.isSSL());
-    }
-
-    @Test
-    public void testComplex() throws InvalidAddressException {
-        final IrcAddress address = new IrcAddress("ircs://password@servername:+7000/c1,c2,c3");
-        assertEquals("irc", address.getProtocol());
-        assertEquals("servername", address.getServer());
-        assertEquals("password", address.getPassword());
-        assertEquals(7000, address.getPort());
-        assertEquals(3, address.getChannels().size());
-        assertTrue(address.isSSL());
-    }
-
-    @Test
-    public void testConnect() throws InvalidAddressException {
-        final IrcAddress address = new IrcAddress("irc://255.255.255.205/a,b,c");
-
-        int initial = ServerManager.getServerManager().numServers();
-
-        address.connect();
-
-        assertEquals(initial + 1, ServerManager.getServerManager().numServers());
-
-        address.connect();
-
-        assertEquals(initial + 1, ServerManager.getServerManager().numServers());
-    }
-
-    @Test
-    public void testReservedChanNames() throws InvalidAddressException {
-        final IrcAddress address1 = new IrcAddress("irc://server/,needpass");
-        assertEquals(0, address1.getChannels().size());
-
-        final IrcAddress address2 = new IrcAddress("irc://server/MDbot,needkey");
-        assertEquals(1, address2.getChannels().size());
-        assertEquals("MDbot", address2.getChannels().get(0));
-
-        final IrcAddress address3 = new IrcAddress("irc://server/MDbot,isnick");
-        assertEquals(1, address3.getChannels().size());
-        assertEquals("MDbot", address3.getChannels().get(0));
-    }
-
-    @Test
-    public void testChannels() throws InvalidAddressException {
-        final IrcAddress address3 = new IrcAddress("irc://server/#MDbot");
-        assertEquals(1, address3.getChannels().size());
-        assertEquals("#MDbot", address3.getChannels().get(0));
-    }
-    
-    @Test
-    public void testChannelsQuery() throws InvalidAddressException {
-        final IrcAddress address3 = new IrcAddress("irc://server/MDbot?moo");
-        assertEquals(1, address3.getChannels().size());
-        assertEquals("MDbot?moo", address3.getChannels().get(0));
-    }    
-
-    @Test
-    public void testEncoding() throws InvalidAddressException {
-        final IrcAddress address1 = new IrcAddress("irc://server/%23DMDirc");
-        assertEquals(1, address1.getChannels().size());
-        assertEquals("#DMDirc", address1.getChannels().get(0));
-    }
-
-}