IrcAddress now parses the query and fragment parts of URIs

Fixes issue 944
Added unit test to test behaviour described in 944

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

src/com/dmdirc/util/IrcAddress.java

@@ -91,7 +91,9 @@ public class IrcAddress implements Serializable {
             doPass(uri.getUserInfo());
         }
         
-        doChannels(uri.getPath());
+        doChannels(uri.getPath() + (uri.getQuery() == null ? "" :
+            "?" + uri.getQuery()) + (uri.getFragment() == null ? "" :
+            "#" + uri.getFragment()));
 
         if (uri.getPort() > -1) {
             doPort(uri.getPort());

test/com/dmdirc/util/IrcAddressTest.java

@@ -179,7 +179,18 @@ public class IrcAddressTest extends junit.framework.TestCase {
             assertFalse(true);
         }
     }
-    
+
+    @Test
+    public void testChannels() throws InvalidAddressException {
+        try {
+            final IrcAddress address3 = new IrcAddress("irc://server/#MDbot");
+            assertEquals(1, address3.getChannels().size());
+            assertEquals("#MDbot", address3.getChannels().get(0));
+        } catch (InvalidAddressException ex) {
+            fail();
+        }
+    }
+
     @Test
     public void testEncoding() {
         try {
@@ -188,7 +199,7 @@ public class IrcAddressTest extends junit.framework.TestCase {
             assertEquals("#DMDirc", address1.getChannels().get(0));
         } catch (InvalidAddressException ex) {
             assertFalse(true);
-        }        
+        }
     }
 
 }