Added support in build.gradle for setting the MongoDB URI, and fixed all the tests that failed when that URI contains a credential

Author: jyemin

build.gradle

@@ -80,6 +80,10 @@ tasks.withType(AbstractCompile) {
 }
 
 test {
+    systemProperties(
+            'org.mongodb.test.uri': System.getProperty('org.mongodb.test.uri', null)
+    )
+
     jvmArgs '-XX:MaxPermSize=1024m'
     maxHeapSize = "1024m"
 

src/test/com/mongodb/DBCollectionTest.java

@@ -208,7 +208,7 @@ public void testFindOneSort(){
      */
     @Test
     public void testDropDatabase() throws Exception {
-        final Mongo mongo = new MongoClient( "127.0.0.1" );
+        final Mongo mongo = new MongoClient(getMongoClientURI());
         mongo.getDB("com_mongodb_unittest_dropDatabaseTest").dropDatabase();
         mongo.close();
     }

src/test/com/mongodb/DBCursorTest.java

@@ -31,6 +31,7 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeoutException;
 
+import static java.util.Arrays.asList;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -470,7 +471,13 @@ public void testHasFinalizer() throws UnknownHostException {
 
         // finally, no finalizer if disabled in mongo options
         MongoClientOptions mongoOptions = new MongoClientOptions.Builder().cursorFinalizerEnabled(false).build();
-        Mongo m = new MongoClient("127.0.0.1", mongoOptions);
+        Mongo m;
+        if (getMongoClientURI().getCredentials() != null) {
+            m = new MongoClient(new ServerAddress(getMongoClientURI().getHosts().get(0)), asList(getMongoClientURI().getCredentials()),
+                                mongoOptions);
+        } else {
+            m = new MongoClient(new ServerAddress(getMongoClientURI().getHosts().get(0)), mongoOptions);
+        }
         try {
             c = m.getDB(getDatabase().getName()).getCollection("HasFinalizerTest");
             cursor = c.find();

src/test/com/mongodb/DBPortTest.java

@@ -24,13 +24,14 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 public class DBPortTest extends TestCase {
     @Test
     @SuppressWarnings("deprecation")
     public void testAuthentication() throws IOException {
-        Mongo m = new MongoClient();
+        Mongo m = new MongoClient(getMongoClientURI());
         DB db1 = m.getDB("DBPortTest1");
         DB db2 = m.getDB("DBPortTest2");
         db1.dropDatabase();
@@ -45,16 +46,16 @@ public void testAuthentication() throws IOException {
 
             Set<String> expected = new HashSet<String>();
 
-            assertEquals(expected, port.getAuthenticatedDatabases());
+            assertFalse(port.getAuthenticatedDatabases().contains("DBPortTest1"));
+            assertFalse(port.getAuthenticatedDatabases().contains("DBPortTest2"));
 
             m.getAuthority().getCredentialsStore().add(MongoCredential.createMongoCRCredential("u1", "DBPortTest1", "e".toCharArray()));
             m.getAuthority().getCredentialsStore().add(MongoCredential.createMongoCRCredential("u2", "DBPortTest2", "e".toCharArray()));
 
             port.checkAuth(m);
 
-            expected.add("DBPortTest1");
-            expected.add("DBPortTest2");
-            assertEquals(expected, port.getAuthenticatedDatabases());
+            assertTrue(port.getAuthenticatedDatabases().contains("DBPortTest1"));
+            assertTrue(port.getAuthenticatedDatabases().contains("DBPortTest2"));
 
             m.getAuthority().getCredentialsStore().add(MongoCredential.createMongoCRCredential("u2", "DBPortTest3", "e".toCharArray()));
 

src/test/com/mongodb/DBTCPConnectorTest.java

@@ -26,7 +26,6 @@
 import org.junit.Test;
 
 import java.net.UnknownHostException;
-import java.util.Arrays;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -46,12 +45,7 @@ public class DBTCPConnectorTest extends TestCase {
 
     @BeforeClass
     public static void beforeClass() throws UnknownHostException {
-        if (isStandalone(getMongoClient())) {
-            _mongoClient = new MongoClient();
-        }
-        else {
-            _mongoClient = new MongoClient(Arrays.asList(new ServerAddress("localhost:27017"), new ServerAddress("localhost:27018")));
-        }
+        _mongoClient = new MongoClient(getMongoClientURI());
         _db = _mongoClient.getDB(getDatabase().getName());
         _collection = _db.getCollection(DBTCPConnectorTest.class.getName());
     }

src/test/com/mongodb/DBTest.java

@@ -492,13 +492,13 @@ public void shouldAddReadWriteAdminUser() throws UnknownHostException {
         String userName = "newUser";
         String pwd = "pwd";
         MongoClient mongoClient = new MongoClient(getMongoClientURI());
-        DB adminDB = mongoClient.getDB("admin");
-        adminDB.addUser(userName, pwd.toCharArray(), false);
+        DB database = mongoClient.getDB(getDatabase().getName());
+        database.addUser(userName, pwd.toCharArray(), false);
         try {
-            assertTrue(adminDB.authenticate(userName, pwd.toCharArray()));
-            assertCorrectUserExists(userName, pwd, false, adminDB);
+            assertTrue(database.authenticate(userName, pwd.toCharArray()));
+            assertCorrectUserExists(userName, pwd, false, database);
         } finally {
-            adminDB.removeUser(userName);
+            database.removeUser(userName);
             mongoClient.close();
         }
     }
@@ -510,15 +510,15 @@ public void shouldAddReadOnlyAdminUser() throws UnknownHostException {
         String readOnlyUserName = "newUser";
         String pwd = "pwd";
         MongoClient mongoClient = new MongoClient(getMongoClientURI());
-        DB adminDB = mongoClient.getDB("admin");
-        adminDB.addUser(readWriteUserName, pwd.toCharArray(), false);
-        adminDB.authenticate(readWriteUserName, pwd.toCharArray());
-        adminDB.addUser(readOnlyUserName, pwd.toCharArray(), true);
+        DB database = mongoClient.getDB(getDatabase().getName());
+        database.addUser(readWriteUserName, pwd.toCharArray(), false);
+        database.authenticate(readWriteUserName, pwd.toCharArray());
+        database.addUser(readOnlyUserName, pwd.toCharArray(), true);
         try {
-            assertCorrectUserExists(readOnlyUserName, pwd, true, adminDB);
+            assertCorrectUserExists(readOnlyUserName, pwd, true, database);
         } finally {
-            adminDB.removeUser(readOnlyUserName);
-            adminDB.removeUser(readWriteUserName);
+            database.removeUser(readOnlyUserName);
+            database.removeUser(readWriteUserName);
             mongoClient.close();
         }
     }

src/test/com/mongodb/JavaClientTest.java

@@ -664,7 +664,7 @@ public void testMulti(){
     public void testAuthenticate() throws UnknownHostException {
         assertEquals( "26e3d12bd197368526409177b3e8aab6" , getDatabase()._hash( "e" , "j".toCharArray() ) );
 
-        Mongo m = new MongoClient();
+        Mongo m = new MongoClient(getMongoClientURI());
         DB db = m.getDB(getDatabase().getName());
 
         try {

src/test/com/mongodb/WriteConcernTest.java

@@ -176,7 +176,7 @@ public void shouldNotUseServerDefaultForAnyOtherWriteConcern() {
     // integration test to ensure that server doesn't mind a getlasterror command with wtimeout but no w.
     @Test
     public void testGetLastError() throws UnknownHostException {
-        MongoClient mc = new MongoClient();
+        MongoClient mc = new MongoClient(getMongoClientURI());
         DB db = mc.getDB("WriteConcernTest");
         DBCollection collection = db.getCollection("testGetLastError");
         try {