fixing unit tests.

Author: craiggwilson

MongoDB.Driver/Communication/Security/MongoCRAuthenticationProtocol.cs

@@ -77,7 +77,7 @@ public void Authenticate(MongoConnection connection, MongoCredential credential)
         /// </returns>
         public bool CanUse(MongoCredential credential)
         {
-            return credential.Mechanism == MongoAuthenticationMechanism.MongoCR &&
+            return credential.Mechanism == MongoAuthenticationMechanism.Mongo_CR &&
                 credential.Evidence is PasswordEvidence;
         }
     }

MongoDB.Driver/MongoAuthenticationMechanism.cs

@@ -23,7 +23,7 @@ public enum MongoAuthenticationMechanism
         /// <summary>
         /// Authenticate to the server using the Mongo Challenge Response (MONGO-CR) protocol.
         /// </summary>
-        MongoCR,
+        Mongo_CR,
         /// <summary>
         /// Authenticate to the server using GSSAPI.
         /// </summary>

MongoDB.Driver/MongoConnectionStringBuilder.cs

@@ -135,6 +135,7 @@ public MongoAuthenticationMechanism AuthenticationMechanism
                 _authenticationMechanism = value;
                 base["authMechanism"] = value
                     .ToString()
+                    .ToUpper()
                     .Replace("_", "-");
             }
         }
@@ -965,7 +966,7 @@ private IEnumerable<MongoServerAddress> ParseServersString(string value)
         private void ResetValues()
         {
             // set fields and not properties so base class items aren't set
-            _authenticationMechanism = MongoAuthenticationMechanism.MongoCR;
+            _authenticationMechanism = MongoAuthenticationMechanism.Mongo_CR;
             _authenticationSource = null;
             _connectionMode = ConnectionMode.Automatic;
             _connectTimeout = MongoDefaults.ConnectTimeout;

MongoDB.Driver/MongoCredential.cs

@@ -188,7 +188,7 @@ public static MongoCredential CreateGssapiCredential(string username, SecureStri
         /// <returns></returns>
         public static MongoCredential CreateMongoCRCredential(string databaseName, string username, string password)
         {
-            return FromComponents(MongoAuthenticationMechanism.MongoCR,
+            return FromComponents(MongoAuthenticationMechanism.Mongo_CR,
                 databaseName,
                 username,
                 new PasswordEvidence(password));
@@ -203,7 +203,7 @@ public static MongoCredential CreateMongoCRCredential(string databaseName, strin
         /// <returns></returns>
         public static MongoCredential CreateMongoCRCredential(string databaseName, string username, SecureString password)
         {
-            return FromComponents(MongoAuthenticationMechanism.MongoCR,
+            return FromComponents(MongoAuthenticationMechanism.Mongo_CR,
                 databaseName,
                 username,
                 new PasswordEvidence(password));
@@ -284,7 +284,7 @@ private static MongoCredential FromComponents(MongoAuthenticationMechanism mecha
 
             switch (mechanism)
             {
-                case MongoAuthenticationMechanism.MongoCR:
+                case MongoAuthenticationMechanism.Mongo_CR:
                     // it is allowed for a password to be an empty string, but not a username
                     source = source ?? "admin";
                     if (evidence == null || !(evidence is PasswordEvidence))

MongoDB.Driver/MongoUrlBuilder.cs

@@ -66,7 +66,7 @@ public class MongoUrlBuilder
         /// </summary>
         public MongoUrlBuilder()
         {
-            _authenticationMechanism = MongoAuthenticationMechanism.MongoCR;
+            _authenticationMechanism = MongoAuthenticationMechanism.Mongo_CR;
             _authenticationSource = null;
             _connectionMode = ConnectionMode.Automatic;
             _connectTimeout = MongoDefaults.ConnectTimeout;
@@ -1014,10 +1014,11 @@ public override string ToString()
                 url.Append(_databaseName);
             }
             var query = new StringBuilder();
-            if (_authenticationMechanism != MongoAuthenticationMechanism.MongoCR)
+            if (_authenticationMechanism != MongoAuthenticationMechanism.Mongo_CR)
             {
                 string mechanismName = _authenticationMechanism
                     .ToString()
+                    .ToUpper()
                     .Replace("_", "-");
 
                 query.AppendFormat("authMechanism={0};", mechanismName);

MongoDB.DriverUnitTests/MongoConnectionStringBuilderTests.cs

@@ -135,7 +135,7 @@ public void TestAll()
         }
 
         [Test]
-        [TestCase(MongoAuthenticationMechanism.MongoCR, "server=localhost;authMechanism=MONGO-CR")]
+        [TestCase(MongoAuthenticationMechanism.Mongo_CR, "server=localhost;authMechanism=MONGO-CR")]
         [TestCase(MongoAuthenticationMechanism.Gssapi, "server=localhost;authMechanism=GSSAPI")]
         public void TestAuthMechanism(MongoAuthenticationMechanism mechanism, string connectionString)
         {

MongoDB.DriverUnitTests/MongoUrlBuilderTests.cs

@@ -131,7 +131,7 @@ public void TestAll()
         }
 
         [Test]
-        [TestCase(MongoAuthenticationMechanism.MongoCR, "mongodb://localhost")]
+        [TestCase(MongoAuthenticationMechanism.Mongo_CR, "mongodb://localhost")]
         [TestCase(MongoAuthenticationMechanism.Gssapi, "mongodb://localhost/?authMechanism=GSSAPI")]
         public void TestAuthMechanism(MongoAuthenticationMechanism mechanism, string connectionString)
         {
@@ -279,7 +279,7 @@ public void TestDefaults()
 
             foreach (var builder in EnumerateBuiltAndParsedBuilders(built, connectionString))
             {
-                Assert.AreEqual(MongoAuthenticationMechanism.MongoCR, builder.AuthenticationMechanism);
+                Assert.AreEqual(MongoAuthenticationMechanism.Mongo_CR, builder.AuthenticationMechanism);
                 Assert.AreEqual(null, builder.AuthenticationSource);
                 Assert.AreEqual(MongoDefaults.ComputedWaitQueueSize, builder.ComputedWaitQueueSize);
                 Assert.AreEqual(ConnectionMode.Automatic, builder.ConnectionMode);