CSHARP-614, CSHARP-615: better unit tests.

Author: rstam

Driver/Core/MongoClient.cs

@@ -90,7 +90,27 @@ private static MongoClientSettings ParseConnectionString(string connectionString
 
         // public methods
         /// <summary>
-        /// Gets a MongoServer object using this client's settings.
+        /// Gets a MongoDatabase instance representing a database. See also GetServer.
+        /// </summary>
+        /// <param name="databaseSettings">The settings to use with this database.</param>
+        /// <returns>An instance of MongoDatabase.</returns>
+        public MongoDatabase GetDatabase(MongoDatabaseSettings databaseSettings)
+        {
+            return GetServer().GetDatabase(databaseSettings);
+        }
+
+        /// <summary>
+        /// Gets a MongoDatabase instance representing a database. See also GetServer.
+        /// </summary>
+        /// <param name="databaseName">The name of the database.</param>
+        /// <returns>An instance of MongoDatabase.</returns>
+        public virtual MongoDatabase GetDatabase(string databaseName)
+        {
+            return GetServer().GetDatabase(databaseName);
+        }
+
+        /// <summary>
+        /// Gets a MongoServer object using this client's settings. See also GetDatabase.
         /// </summary>
         /// <returns>A MongoServer.</returns>
         public MongoServer GetServer()

Driver/Core/MongoConnectionStringBuilder.cs

@@ -195,13 +195,16 @@ public bool? FireAndForget
             get { return _fireAndForget; }
             set
             {
-                if (_safe != null)
-                {
-                    throw new InvalidOperationException("FireAndForget and Safe are mutually exclusive.");
-                }
-                if ((value != null && value.Value) && AnyWriteConcernSettingsAreSet())
+                if (value != null)
                 {
-                    throw new InvalidOperationException("FireAndForget cannot be set to true if any other write concern values have been set.");
+                    if (_safe != null)
+                    {
+                        throw new InvalidOperationException("FireAndForget and Safe are mutually exclusive.");
+                    }
+                    if (value.Value && AnyWriteConcernSettingsAreSet())
+                    {
+                        throw new InvalidOperationException("FireAndForget cannot be set to true if any other write concern values have been set.");
+                    }
                 }
                 _fireAndForget = value;
                 base["fireAndForget"] = (value == null) ? null : XmlConvert.ToString(value.Value);
@@ -230,7 +233,8 @@ public GuidRepresentation GuidRepresentation
             get { return _guidRepresentation; }
             set
             {
-                base["uuidRepresentation"] = _guidRepresentation = value;
+                _guidRepresentation = value;
+                base["uuidRepresentation"] = (value == GuidRepresentation.CSharpLegacy) ? "csharpLegacy" : MongoUtils.ToCamelCase(value.ToString());
             }
         }
 
@@ -363,28 +367,28 @@ public ReadPreference ReadPreference
             }
             set
             {
-                if (_slaveOk.HasValue)
+                if (value != null && _slaveOk.HasValue)
                 {
                     throw new InvalidOperationException("ReadPreference cannot be set because SlaveOk already has a value.");
                 }
                 _readPreference = value;
 
-                base["readPreference"] = MongoUtils.ToCamelCase(_readPreference.ReadPreferenceMode.ToString());
-                if (_readPreference.TagSets == null)
-                {
-                    base["readPreferenceTags"] = null;
-                }
-                else
+                base["readPreference"] = (value == null) ? null : MongoUtils.ToCamelCase(value.ReadPreferenceMode.ToString());
+                if (value != null && value.TagSets != null)
                 {
                     var readPreferenceTagsString = string.Join(
                         "|",
-                        _readPreference.TagSets.Select(ts => string.Join(
+                        value.TagSets.Select(ts => string.Join(
                             ",",
                             ts.Tags.Select(t => string.Format("{0}:{1}", t.Name, t.Value)).ToArray()
                         )).ToArray()
                     );
                     base["readPreferenceTags"] = readPreferenceTagsString;
                 }
+                else
+                {
+                    base["readPreferenceTags"] = null;
+                }
             }
         }
 
@@ -409,13 +413,16 @@ public bool? Safe
             get { return _safe; }
             set
             {
-                if (_fireAndForget != null)
-                {
-                    throw new InvalidOperationException("FireAndForget and Safe are mutually exclusive.");
-                }
-                if ((value != null && !value.Value) && AnyWriteConcernSettingsAreSet())
+                if (value != null)
                 {
-                    throw new InvalidOperationException("Safe cannot be set to false if any other write concern values have been set.");
+                    if (_fireAndForget != null)
+                    {
+                        throw new InvalidOperationException("FireAndForget and Safe are mutually exclusive.");
+                    }
+                    if (!value.Value && AnyWriteConcernSettingsAreSet())
+                    {
+                        throw new InvalidOperationException("Safe cannot be set to false if any other write concern values have been set.");
+                    }
                 }
                 _safe = value;
                 base["safe"] = (value == null) ? null : XmlConvert.ToString(value.Value);
@@ -489,7 +496,7 @@ public TimeSpan SecondaryAcceptableLatency
         public MongoServerAddress Server
         {
             get { return (_servers == null) ? null : _servers.Single(); }
-            set { Servers = new[] { value }; }
+            set { Servers = (value == null) ? null : new[] { value }; }
         }
 
         /// <summary>
@@ -501,7 +508,7 @@ public IEnumerable<MongoServerAddress> Servers
             set
             {
                 _servers = value;
-                base["server"] = GetServersString();
+                base["server"] = (value == null) ? null : GetServersString(value);
             }
         }
 
@@ -912,10 +919,10 @@ private void EnsureFireAndForgetIsNotTrue(string propertyName)
             }
         }
 
-        private string GetServersString()
+        private string GetServersString(IEnumerable<MongoServerAddress> servers)
         {
             var sb = new StringBuilder();
-            foreach (var server in _servers)
+            foreach (var server in servers)
             {
                 if (sb.Length > 0) { sb.Append(","); }
                 if (server.Port == 27017)

Driver/Core/MongoCredentialsStore.cs

@@ -39,6 +39,15 @@ public MongoCredentialsStore()
         {
         }
 
+        // public properties
+        /// <summary>
+        /// Gets whether the credentials store has been frozen to prevent further changes.
+        /// </summary>
+        public bool IsFrozen
+        {
+            get { return _isFrozen; }
+        }
+
         // public methods
         /// <summary>
         /// Adds the credentials for a database to the store.

Driver/Core/MongoUrlBuilder.cs

@@ -150,13 +150,16 @@ public bool? FireAndForget
             get { return _fireAndForget; }
             set
             {
-                if (_safe != null)
-                {
-                    throw new InvalidOperationException("FireAndForget and Safe are mutually exclusive.");
-                }
-                if ((value != null && value.Value) && AnyWriteConcernSettingsAreSet())
+                if (value != null)
                 {
-                    throw new InvalidOperationException("FireAndForget cannot be set to true if any other write concern values have been set.");
+                    if (_safe != null)
+                    {
+                        throw new InvalidOperationException("FireAndForget and Safe are mutually exclusive.");
+                    }
+                    if (value.Value && AnyWriteConcernSettingsAreSet())
+                    {
+                        throw new InvalidOperationException("FireAndForget cannot be set to true if any other write concern values have been set.");
+                    }
                 }
                 _fireAndForget = value;
             }
@@ -292,7 +295,7 @@ public ReadPreference ReadPreference
             }
             set
             {
-                if (_slaveOk.HasValue)
+                if (value != null && _slaveOk.HasValue)
                 {
                     throw new InvalidOperationException("ReadPreference cannot be set because SlaveOk already has a value.");
                 }
@@ -318,13 +321,16 @@ public bool? Safe
             get { return _safe; }
             set
             {
-                if (_fireAndForget != null)
-                {
-                    throw new InvalidOperationException("FireAndForget and Safe are mutually exclusive.");
-                }
-                if ((value != null && !value.Value) && AnyWriteConcernSettingsAreSet())
+                if (value != null)
                 {
-                    throw new InvalidOperationException("Safe cannot be set to false if any other write concern values have been set.");
+                    if (_fireAndForget != null)
+                    {
+                        throw new InvalidOperationException("FireAndForget and Safe are mutually exclusive.");
+                    }
+                    if (!value.Value && AnyWriteConcernSettingsAreSet())
+                    {
+                        throw new InvalidOperationException("Safe cannot be set to false if any other write concern values have been set.");
+                    }
                 }
                 _safe = value; 
             }
@@ -396,7 +402,7 @@ public TimeSpan SecondaryAcceptableLatency
         public MongoServerAddress Server
         {
             get { return (_servers == null) ? null : _servers.Single(); }
-            set { _servers = new [] { value }; }
+            set { _servers = (value == null) ? null : new [] { value }; }
         }
 
         /// <summary>
@@ -765,7 +771,7 @@ public void Parse(string url)
             const string pattern =
                 @"^mongodb://" +
                 @"((?<username>[^:]+):(?<password>[^@]+)@)?" +
-                @"(?<servers>" + serverPattern + "(," + serverPattern + ")*)" +
+                @"(?<servers>" + serverPattern + "(," + serverPattern + ")*)?" +
                 @"(/(?<database>[^?]+)?(\?(?<query>.*))?)?$";
             Match match = Regex.Match(url, pattern);
             if (match.Success)
@@ -795,10 +801,6 @@ public void Parse(string url)
                     }
                     _servers = addresses;
                 }
-                else
-                {
-                    throw new FormatException("Invalid connection string. Server missing.");
-                }
 
                 _databaseName = (databaseName != "") ? databaseName : null;
 
@@ -980,13 +982,12 @@ public override string ToString()
             if (_useSsl)
             {
                 query.AppendFormat("ssl=true;");
-                if (!_verifySslCertificate)
-                {
-                    query.AppendFormat("sslVerifyCertificate=false;");
-                }
             }
-            if (_connectionMode == ConnectionMode.Direct && _servers != null && _servers.Count() != 1 ||
-                _connectionMode == ConnectionMode.ReplicaSet && (_servers == null || _servers.Count() == 1))
+            if (!_verifySslCertificate)
+            {
+                query.AppendFormat("sslVerifyCertificate=false;");
+            }
+            if (_connectionMode != ConnectionMode.Automatic)
             {
                 query.AppendFormat("connect={0};", MongoUtils.ToCamelCase(_connectionMode.ToString()));
             }
@@ -1075,7 +1076,7 @@ public override string ToString()
             }
             if (_guidRepresentation != MongoDefaults.GuidRepresentation)
             {
-                query.AppendFormat("uuidRepresentation={0};", _guidRepresentation);
+                query.AppendFormat("uuidRepresentation={0};", (_guidRepresentation == GuidRepresentation.CSharpLegacy) ? "csharpLegacy" : MongoUtils.ToCamelCase(_guidRepresentation.ToString()));
             }
             if (query.Length != 0)
             {

Driver/Core/ReadPreference.cs

@@ -394,7 +394,7 @@ public override string ToString()
         // internal methods
         internal bool ToSlaveOk()
         {
-            return _readPreferenceMode != ReadPreferenceMode.Primary;
+            return _readPreferenceMode != ReadPreferenceMode.Primary && _readPreferenceMode != ReadPreferenceMode.PrimaryPreferred;
         }
 
         // private methods

DriverUnitTests/Configuration.cs

@@ -31,6 +31,7 @@ namespace MongoDB.DriverUnitTests
     public static class Configuration
     {
         // private static fields
+        private static MongoClient __testClient;
         private static MongoServer __testServer;
         private static MongoDatabase __testDatabase;
         private static MongoCollection<BsonDocument> __testCollection;
@@ -40,19 +41,28 @@ static Configuration()
         {
             var connectionString = "mongodb://localhost/?safe=true"; // TODO: make this configurable
 
-            var mongoUrlBuilder = new MongoUrlBuilder(connectionString);
-            var serverSettings = mongoUrlBuilder.ToServerSettings();
-            if (!serverSettings.SafeMode.Enabled)
+            var mongoUrl = new MongoUrl(connectionString);
+            var clientSettings = MongoClientSettings.FromUrl(mongoUrl);
+            if (clientSettings.WriteConcern.FireAndForget)
             {
-                serverSettings.SafeMode = SafeMode.True;
+                clientSettings.WriteConcern.FireAndForget = false;
             }
 
-            __testServer = MongoServer.Create(serverSettings);
-            __testDatabase = __testServer["csharpdriverunittests"];
-            __testCollection = __testDatabase["testcollection"];
+            __testClient = new MongoClient(clientSettings);
+            __testServer = __testClient.GetServer();
+            __testDatabase = __testServer.GetDatabase("csharpdriverunittests");
+            __testCollection = __testDatabase.GetCollection("testcollection");
+        }
+
+        // public static properties
+        /// <summary>
+        /// Gets the test client.
+        /// </summary>
+        public static MongoClient TestClient
+        {
+            get { return __testClient; }
         }
 
-        // public static methods
         /// <summary>
         /// Gets the test collection.
         /// </summary>