Index: URLNameTest.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/javamail/src/test/javax/mail/URLNameTest.java,v
retrieving revision 1.1
diff -u -r1.1 URLNameTest.java
--- URLNameTest.java	16 Aug 2003 01:55:49 -0000	1.1
+++ URLNameTest.java	18 Aug 2003 10:11:05 -0000
@@ -66,28 +66,32 @@
  * @version $Revision: 1.1 $ $Date: 2003/08/16 01:55:49 $
  */
 public class URLNameTest extends TestCase {
-    private String testURL =
-        "http://alex@www.thing.com:1234/jobby/jobby/jobby#splat";
-    ;
+    private static final String testURL = "http://www.thing.com:1234/jobby/jobby/jobby#splat";
+    private String testURLName =
+        "imap://alex:pw@www.thing.com:1234/jobby/jobby/jobby#splat";
+    
     public URLNameTest(String name) {
         super(name);
     }
     public void testHashCode() {
     }
     public void testURLNameString() {
-        URLName name = new URLName(testURL);
-        assertEquals("http", name.getProtocol());
+        URLName name = new URLName(testURLName);
+        assertEquals("imap", name.getProtocol());
         assertEquals("www.thing.com", name.getHost());
         assertEquals(1234, name.getPort());
         assertEquals("/jobby/jobby/jobby", name.getFile());
         assertEquals("splat", name.getRef());
         assertEquals("alex", name.getUsername());
+        assertEquals("pw", name.getPassword());
         name = new URLName("http://www.thing.com");
         assertEquals("http", name.getProtocol());
         assertEquals("www.thing.com", name.getHost());
         assertEquals(-1, name.getPort());
         assertEquals(null, name.getFile());
         assertEquals(null, name.getRef());
+        assertEquals(null, name.getUsername());
+        assertEquals(null, name.getPassword());
     }
     public void testURLNameAll() {
         URLName name =
@@ -116,8 +120,8 @@
         assertEquals("splat", name.getRef());
     }
     public void testEqualsObject() {
-        URLName name = new URLName(testURL);
-        URLName name2 = new URLName(testURL);
+        URLName name = new URLName(testURLName);
+        URLName name2 = new URLName(testURLName);
         assertEquals(name, name2);
     }
     public void testGetURL() throws MalformedURLException {
@@ -127,12 +131,21 @@
     }
     public void testParseString() {
         URLName name = new URLName("ftp://not.com");
-        URLName name2 = new URLName(testURL);
-        name.parseString(testURL);
+        URLName name2 = new URLName(testURLName);
+        name.parseString(testURLName);
         assertEquals(name, name2);
     }
-    public void testUser() {
-        URLName name = new URLName("ftp://alex@thing.com");
+    public void testUserPassword() {
+        URLName name;
+        name = new URLName("ftp://not.com");
+        assertEquals(null, name.getUsername());
+        assertEquals(null, name.getPassword());
+        name = new URLName("ftp://alex@not.com");
+        assertEquals("alex", name.getUsername());
+        assertEquals(null, name.getPassword());
+        name = new URLName("ftp://alex:pw@not.com");
         assertEquals("alex", name.getUsername());
+        assertEquals("pw", name.getPassword());
+
     }
 }