Fixed tests that only run against replica sets and were failing with auth enabled

Conflicts:
	src/test/com/mongodb/DBCollectionTest.java

Author: jyemin

src/test/com/mongodb/AggregationTest.java

@@ -189,7 +189,7 @@ public void testDollarOutOnSecondary() throws UnknownHostException {
         assumeTrue(isReplicaSet(cleanupMongo));
 
         ServerAddress primary = new ServerAddress("localhost");
-        MongoClient rsClient = new MongoClient(asList(primary, new ServerAddress("localhost", 27018)));
+        MongoClient rsClient = new MongoClient(getMongoClientURI());
         DB rsDatabase = rsClient.getDB(database.getName());
         DBCollection aggCollection = rsDatabase.getCollection(collection.getName());
         aggCollection.drop();

src/test/com/mongodb/DBCollectionTest.java

@@ -525,7 +525,7 @@ public void testFindAndReplaceA16MDocument() {
     @Test
     public void testWriteConcernExceptionOnInsert() throws UnknownHostException {
         assumeTrue(isReplicaSet(getMongoClient()));
-        MongoClient mongoClient = new MongoClient(Arrays.asList(new ServerAddress()));
+        MongoClient mongoClient = new MongoClient(getMongoClientURI());
         try {
             DBCollection localCollection = mongoClient.getDB(collection.getDB().getName()).getCollection(collection.getName());
             WriteResult writeResult = localCollection.insert(new BasicDBObject(), new WriteConcern(5, 1, false, false));
@@ -541,7 +541,7 @@ public void testWriteConcernExceptionOnInsert() throws UnknownHostException {
     @Test
     public void testWriteConcernExceptionOnUpdate() throws UnknownHostException {
         assumeTrue(isReplicaSet(getMongoClient()));
-        MongoClient mongoClient = new MongoClient(Arrays.asList(new ServerAddress()));
+        MongoClient mongoClient = new MongoClient(getMongoClientURI());
         ObjectId id = new ObjectId();
         try {
             DBCollection localCollection = mongoClient.getDB(collection.getDB().getName()).getCollection(collection.getName());
@@ -562,7 +562,7 @@ public void testWriteConcernExceptionOnUpdate() throws UnknownHostException {
     @Test
     public void testWriteConcernExceptionOnRemove() throws UnknownHostException {
         assumeTrue(isReplicaSet(getMongoClient()));
-        MongoClient mongoClient = new MongoClient(Arrays.asList(new ServerAddress()));
+        MongoClient mongoClient = new MongoClient(getMongoClientURI());
         try {
             DBCollection localCollection = mongoClient.getDB(collection.getDB().getName()).getCollection(collection.getName());
             localCollection.insert(new BasicDBObject());
@@ -578,7 +578,7 @@ public void testWriteConcernExceptionOnRemove() throws UnknownHostException {
     @Test
     public void testBulkWriteConcernException() throws UnknownHostException {
         assumeTrue(isReplicaSet(getMongoClient()));
-        MongoClient mongoClient = new MongoClient(Arrays.asList(new ServerAddress()));
+        MongoClient mongoClient = new MongoClient(getMongoClientURI());
         try {
             DBCollection localCollection = mongoClient.getDB(collection.getDB().getName()).getCollection(collection.getName());
             BulkWriteOperation bulkWriteOperation = localCollection.initializeUnorderedBulkOperation();

src/test/com/mongodb/DBTest.java

@@ -568,7 +568,7 @@ private String getExpectedRole(final boolean isReadOnly, final DB database) {
 
 
     private DB getReplicaSetDB() throws UnknownHostException {
-        Mongo mongo = new MongoClient(Arrays.asList(new ServerAddress("127.0.0.1"), new ServerAddress("127.0.0.1", 27018)));
+        Mongo mongo = new MongoClient(getMongoClientURI());
         return mongo.getDB("database-" + System.nanoTime());
     }
 

src/test/com/mongodb/DBTests.java

@@ -20,8 +20,8 @@
 import org.junit.Test;
 
 import java.net.UnknownHostException;
-import java.util.Arrays;
 
+import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -122,12 +122,16 @@ public void testGetCollectionNamesToSecondary() throws MongoException, UnknownHo
             return;
         }
 
-        Mongo mongo = new MongoClient(Arrays.asList(new ServerAddress("127.0.0.1"), new ServerAddress("127.0.0.1", 27018)));
+        Mongo mongo = new MongoClient(getMongoClientURI());
 
         try {
             String secondary = getASecondaryAsString(mongo);
             mongo.close();
-            mongo = new MongoClient(secondary);
+            if (getMongoClientURI().getCredentials() == null) {
+                mongo = new MongoClient(secondary);
+            } else {
+                mongo = new MongoClient(new ServerAddress(secondary), asList(getMongoClientURI().getCredentials()));
+            }
             DB db = mongo.getDB("secondaryTest");
             db.setReadPreference(ReadPreference.secondary());
             db.getCollectionNames();

src/test/com/mongodb/JavaClientTest.java

@@ -492,8 +492,8 @@ public void testMapReduceInlineSecondary() throws Exception {
             return;
         }
 
-        Mongo mongo = new MongoClient(asList(new ServerAddress("127.0.0.1", 27017), new ServerAddress("127.0.0.1", 27018)),
-                MongoClientOptions.builder().writeConcern(WriteConcern.UNACKNOWLEDGED).build());
+        Mongo mongo = new MongoClient(getMongoClientURI());
+        mongo.setWriteConcern(WriteConcern.UNACKNOWLEDGED);
 
         int size = getReplicaSetSize(mongo);
         DBCollection c = mongo.getDB(getDatabase().getName()).getCollection( "imr2" );

src/test/com/mongodb/SecondaryReadTest.java

@@ -24,6 +24,7 @@
 import java.util.List;
 
 import static java.lang.String.format;
+import static java.util.Arrays.asList;
 import static org.junit.Assert.assertTrue;
 
 public class SecondaryReadTest extends TestCase {
@@ -163,8 +164,7 @@ private boolean serverIsSecondary(final ServerAddress pServerAddr, final List<Te
     }
 
     private Mongo loadMongo() throws Exception {
-        return new MongoClient(new MongoClientURI(
-                "mongodb://127.0.0.1:27017,127.0.0.1:27018,127.0.0.1:27019/?connectTimeoutMS=30000;socketTimeoutMS=30000;maxpoolsize=5;autoconnectretry=true"));
+        return new MongoClient(getMongoClientURI());
     }
 
     @SuppressWarnings({"unchecked"})
@@ -180,8 +180,7 @@ private List<TestHost> extractHosts(Mongo mongo) {
                 hostnameAndPort = hostnameAndPort + ":27017";
             }
 
-            final String stateStr = member.getString("stateStr");
-
+            String stateStr = member.getString("stateStr");
             pHosts.add(new TestHost(hostnameAndPort, stateStr));
         }
 
@@ -237,19 +236,25 @@ private void verifySecondaryCounts(final int pSecondaryCount, final List<TestHos
     }
 
     private static void loadQueryCount(final List<TestHost> pHosts, final boolean pBefore) throws Exception {
-        for (final TestHost testHost : pHosts) {
-            final Mongo mongoHost = new MongoClient(new MongoClientURI("mongodb://"+testHost.hostnameAndPort
-                                                                       + "/?connectTimeoutMS=30000;socketTimeoutMS=30000;maxpoolsize=5;"
-                                                                       + "autoconnectretry=true"));
+        for (TestHost testHost : pHosts) {
+            Mongo mongoHost;
+            if (getMongoClientURI().getCredentials() == null || testHost.stateStr.equals("ARBITER")) {
+                mongoHost = new MongoClient(testHost.hostnameAndPort);
+            } else {
+                mongoHost = new MongoClient(new ServerAddress(testHost.hostnameAndPort), asList(getMongoClientURI().getCredentials()));
+            }
             mongoHost.setReadPreference(ReadPreference.nearest());
             try {
-                final CommandResult serverStatusResult
-                = mongoHost.getDB("com_mongodb_unittest_SecondaryReadTest").command(new BasicDBObject("serverStatus", 1));
+                CommandResult serverStatusResult = mongoHost.getDB("com_mongodb_unittest_SecondaryReadTest")
+                                                            .command(new BasicDBObject("serverStatus", 1));
 
-                final BasicDBObject opcounters = (BasicDBObject)serverStatusResult.get("opcounters");
+                BasicDBObject opcounters = (BasicDBObject) serverStatusResult.get("opcounters");
 
-                if (pBefore) testHost.queriesBefore = opcounters.getLong("query");
-                else testHost.queriesAfter = opcounters.getLong("query");
+                if (pBefore) {
+                    testHost.queriesBefore = opcounters.getLong("query");
+                } else {
+                    testHost.queriesAfter = opcounters.getLong("query");
+                }
 
             } finally {
                 mongoHost.close();