minor code review fixes.

craiggwilson · craiggwilson · commit 2d59d0d915a3 · 2012-09-24T12:25:38.000-05:00
diff --git a/Driver/Core/MongoConnectionStringBuilder.cs b/Driver/Core/MongoConnectionStringBuilder.cs
@@ -375,7 +375,7 @@ public TimeSpan SecondaryAcceptableLatency
             set
             {
                 _secondaryAcceptableLatency = value;
-                base["SecondaryAcceptableLatency"] = MongoUrlBuilder.FormatTimeSpan(value);
+                base["secondaryAcceptableLatency"] = MongoUrlBuilder.FormatTimeSpan(value);
             }
         }
 
diff --git a/Driver/Core/MongoServerSettings.cs b/Driver/Core/MongoServerSettings.cs
@@ -77,7 +77,7 @@ public MongoServerSettings()
             _readPreference = ReadPreference.Primary;
             _replicaSetName = null;
             _safeMode = MongoDefaults.SafeMode;
-            _secondaryAcceptableLatency = TimeSpan.FromMilliseconds(15);
+            _secondaryAcceptableLatency = MongoDefaults.SecondaryAcceptableLatency;
             _servers = new List<MongoServerAddress> { new MongoServerAddress("localhost") };
             _serversReadOnly = new ReadOnlyCollection<MongoServerAddress>(_servers);
             _socketTimeout = MongoDefaults.SocketTimeout;
@@ -103,12 +103,14 @@ public MongoServerSettings()
         /// <param name="readPreference">The default read preference.</param>
         /// <param name="replicaSetName">The name of the replica set.</param>
         /// <param name="safeMode">The safe mode.</param>
+        /// <param name="secondaryAcceptableLatency">The secondary acceptable latency.</param>
         /// <param name="servers">The server addresses (normally one unless it is the seed list for connecting to a replica set).</param>
         /// <param name="socketTimeout">The socket timeout.</param>
         /// <param name="useSsl">Whether to use SSL.</param>
         /// <param name="verifySslCertificate">Whether to verify an SSL certificate.</param>
         /// <param name="waitQueueSize">The wait queue size.</param>
         /// <param name="waitQueueTimeout">The wait queue timeout.</param>
+        /// <exception cref="System.ArgumentNullException"></exception>
         public MongoServerSettings(
             ConnectionMode connectionMode,
             TimeSpan connectTimeout,
diff --git a/Driver/Internal/MultipleInstanceMongoServerProxy.cs b/Driver/Internal/MultipleInstanceMongoServerProxy.cs
@@ -139,7 +139,7 @@ public MongoServerState State
             }
         }
 
-        //protected properties
+        // protected properties
         /// <summary>
         /// Gets the server.
         /// </summary>
diff --git a/DriverUnitTests/Core/MongoConnectionStringBuilderTests.cs b/DriverUnitTests/Core/MongoConnectionStringBuilderTests.cs
@@ -48,6 +48,7 @@ public void TestDefaults()
             Assert.AreEqual(null, builder.ReadPreference);
             Assert.AreEqual(null, builder.ReplicaSetName);
             Assert.AreEqual(null, builder.SafeMode);
+            Assert.AreEqual(MongoDefaults.SecondaryAcceptableLatency, builder.SecondaryAcceptableLatency);
 #pragma warning disable 618
             Assert.AreEqual(false, builder.SlaveOk);
 #pragma warning restore
@@ -984,58 +985,58 @@ public void TestSecondaryAcceptableLatency()
         {
             var builder = new MongoConnectionStringBuilder() { Server = __localhost, SecondaryAcceptableLatency = TimeSpan.FromMilliseconds(500) };
             Assert.AreEqual(TimeSpan.FromMilliseconds(500), builder.SecondaryAcceptableLatency);
-            var connectionString = "server=localhost;SecondaryAcceptableLatency=500ms";
+            var connectionString = "server=localhost;secondaryAcceptableLatency=500ms";
             Assert.AreEqual(connectionString, builder.ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=500ms").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=0.5").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=0.5s").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=00:00:00.500").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatencyMS=500").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=500ms").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=0.5").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=0.5s").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=00:00:00.500").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatencyMS=500").ToString());
 
             builder = new MongoConnectionStringBuilder() { Server = __localhost, SecondaryAcceptableLatency = TimeSpan.FromSeconds(30) };
             Assert.AreEqual(TimeSpan.FromSeconds(30), builder.SecondaryAcceptableLatency);
-            connectionString = "server=localhost;SecondaryAcceptableLatency=30s";
+            connectionString = "server=localhost;secondaryAcceptableLatency=30s";
             Assert.AreEqual(connectionString, builder.ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=30000ms").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=30").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=30s").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=0.5m").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=00:00:30").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatencyMS=30000").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=30000ms").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=30").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=30s").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=0.5m").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=00:00:30").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatencyMS=30000").ToString());
 
             builder = new MongoConnectionStringBuilder() { Server = __localhost, SecondaryAcceptableLatency = TimeSpan.FromMinutes(30) };
             Assert.AreEqual(TimeSpan.FromMinutes(30), builder.SecondaryAcceptableLatency);
-            connectionString = "server=localhost;SecondaryAcceptableLatency=30m";
+            connectionString = "server=localhost;secondaryAcceptableLatency=30m";
             Assert.AreEqual(connectionString, builder.ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=1800000ms").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=1800").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=1800s").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=30m").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=0.5h").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=00:30:00").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatencyMS=1800000").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=1800000ms").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=1800").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=1800s").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=30m").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=0.5h").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=00:30:00").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatencyMS=1800000").ToString());
 
             builder = new MongoConnectionStringBuilder() { Server = __localhost, SecondaryAcceptableLatency = TimeSpan.FromHours(1) };
             Assert.AreEqual(TimeSpan.FromHours(1), builder.SecondaryAcceptableLatency);
-            connectionString = "server=localhost;SecondaryAcceptableLatency=1h";
+            connectionString = "server=localhost;secondaryAcceptableLatency=1h";
             Assert.AreEqual(connectionString, builder.ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=3600000ms").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=3600").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=3600s").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=60m").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=1h").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=01:00:00").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatencyMS=3600000").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=3600000ms").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=3600").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=3600s").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=60m").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=1h").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=01:00:00").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatencyMS=3600000").ToString());
 
             builder = new MongoConnectionStringBuilder() { Server = __localhost, SecondaryAcceptableLatency = new TimeSpan(1, 2, 3) };
             Assert.AreEqual(new TimeSpan(1, 2, 3), builder.SecondaryAcceptableLatency);
-            connectionString = "server=localhost;SecondaryAcceptableLatency=01:02:03";
+            connectionString = "server=localhost;secondaryAcceptableLatency=01:02:03";
             Assert.AreEqual(connectionString, builder.ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=3723000ms").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=3723").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=3723s").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatency=01:02:03").ToString());
-            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;SecondaryAcceptableLatencyMS=3723000").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=3723000ms").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=3723").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=3723s").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatency=01:02:03").ToString());
+            Assert.AreEqual(connectionString, new MongoConnectionStringBuilder("server=localhost;secondaryAcceptableLatencyMS=3723000").ToString());
         }
 
         [Test]
diff --git a/DriverUnitTests/Core/MongoUrlBuilderTests.cs b/DriverUnitTests/Core/MongoUrlBuilderTests.cs
@@ -48,6 +48,7 @@ public void TestDefaults()
             Assert.AreEqual(null, builder.ReadPreference);
             Assert.AreEqual(null, builder.ReplicaSetName);
             Assert.AreEqual(null, builder.SafeMode);
+            Assert.AreEqual(MongoDefaults.SecondaryAcceptableLatency, builder.SecondaryAcceptableLatency);
 #pragma warning disable 618
             Assert.AreEqual(false, builder.SlaveOk);
 #pragma warning restore

Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,7 @@ public TimeSpan SecondaryAcceptableLatency`
`375`	`375`	`set`
`376`	`376`	`{`
`377`	`377`	`_secondaryAcceptableLatency = value;`
`378`		`- base["SecondaryAcceptableLatency"] = MongoUrlBuilder.FormatTimeSpan(value);`
	`378`	`+ base["secondaryAcceptableLatency"] = MongoUrlBuilder.FormatTimeSpan(value);`
`379`	`379`	`}`
`380`	`380`	`}`
`381`	`381`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ public MongoServerState State`
`139`	`139`	`}`
`140`	`140`	`}`
`141`	`141`
`142`		`- //protected properties`
	`142`	`+ // protected properties`
`143`	`143`	`/// <summary>`
`144`	`144`	`/// Gets the server.`
`145`	`145`	`/// </summary>`