Bugfix: JAVA-299 - MongoURI does not parse URIs as specified in the documentation (http://www.mongodb.org/display/DOCS/Connections)

Author: rcugut

src/main/com/mongodb/MongoURI.java

@@ -60,14 +60,15 @@ public MongoURI( String uri ){
             List<String> all = new LinkedList<String>();
 
 
-            if ( serverPart.indexOf( "@" ) > 0 ){
-                int idx = serverPart.indexOf( "@" );
-                _username = serverPart.substring( 0 , idx );
+            int idx = serverPart.indexOf( "@" );
+            
+            if ( idx > 0 ){
+                String authPart = serverPart.substring( 0 , idx );
                 serverPart = serverPart.substring( idx + 1 );
 
-                idx = serverPart.indexOf( ":" );
-                _password = serverPart.substring( 0 , idx ).toCharArray();
-                serverPart = serverPart.substring( idx + 1 );
+                idx = authPart.indexOf( ":" );
+                _username = authPart.substring( 0, idx );
+                _password = authPart.substring( idx + 1 ).toCharArray();
             }
             else {
                 _username = null;

src/test/com/mongodb/MongoURITest.java

@@ -54,13 +54,34 @@ public void testBasic2(){
 
     @Test()
     public void testUserPass(){
-        MongoURI u = new MongoURI( "mongodb://aaa@bbb:foo/bar" );
+        MongoURI u = new MongoURI( "mongodb://user:pass@host/bar" );
         assertEquals( 1 , u.getHosts().size() );
-        assertEquals( "foo" , u.getHosts().get(0) );
-        assertEquals( "aaa" , u.getUsername() );
-        assertEquals( "bbb" , new String( u.getPassword() ) );
+        assertEquals( "host" , u.getHosts().get(0) );
+        assertEquals( "user" , u.getUsername() );
+        assertEquals( "pass" , new String( u.getPassword() ) );
+    }
+    
+    @Test()
+    public void testUserPassAndPort(){
+        MongoURI u = new MongoURI( "mongodb://user:pass@host:27011/bar" );
+        assertEquals( 1 , u.getHosts().size() );
+        assertEquals( "host:27011" , u.getHosts().get(0) );
+        assertEquals( "user" , u.getUsername() );
+        assertEquals( "pass" , new String( u.getPassword() ) );
+    }
+
+    @Test()
+    public void testUserPassAndMultipleHostsWithPort(){
+        MongoURI u = new MongoURI( "mongodb://user:pass@host:27011,host2:27012,host3:27013/bar" );
+        assertEquals( 3 , u.getHosts().size() );
+        assertEquals( "host:27011" , u.getHosts().get(0) );
+        assertEquals( "host2:27012" , u.getHosts().get(1) );
+        assertEquals( "host3:27013" , u.getHosts().get(2) );
+        assertEquals( "user" , u.getUsername() );
+        assertEquals( "pass" , new String( u.getPassword() ) );
     }
 
+    
     @Test()
     public void testOptions(){
         MongoURI uAmp = new MongoURI( "mongodb://localhost/test?" +