Fixed some unit tests that were failing against server 2.5.2.

Author: rstam

MongoDB.DriverUnitTests/Configuration.cs

@@ -47,6 +47,9 @@ static Configuration()
             __testServer = __testClient.GetServer();
             __testDatabase = __testServer.GetDatabase("csharpdriverunittests");
             __testCollection = __testDatabase.GetCollection("testcollection");
+
+            // connect early so BuildInfo will be populated
+            __testServer.Connect();
         }
 
         // public static properties

MongoDB.DriverUnitTests/Jira/CSharp111Tests.cs

@@ -13,6 +13,7 @@
 * limitations under the License.
 */
 
+using System;
 using System.Collections.Generic;
 using MongoDB.Bson;
 using MongoDB.Driver.Builders;
@@ -62,7 +63,16 @@ public void TestAddToSetEach()
 
             var document = collection.FindOneAs<BsonDocument>();
             var json = document.ToJson();
-            var expected = "{ 'InnerObjects' : [1, { 'X' : 1 }, { 'X' : 2 }, { 'X' : 3 }], '_id' : ObjectId('#ID') }"; // server put _id at end?
+            string expected;
+            if (server.BuildInfo.Version >= new Version(2, 5, 2))
+            {
+                expected = "{ '_id' : ObjectId('#ID'), 'InnerObjects' : [1, { 'X' : 1 }, { 'X' : 2 }, { 'X' : 3 }] }";
+            }
+            else
+            {
+                // prior to version 2.5.2 the server would reorder the elements when Update was used
+                expected = "{ 'InnerObjects' : [1, { 'X' : 1 }, { 'X' : 2 }, { 'X' : 3 }], '_id' : ObjectId('#ID') }";
+            }
             expected = expected.Replace("#ID", id.ToString());
             expected = expected.Replace("'", "\"");
             Assert.AreEqual(expected, json);

MongoDB.DriverUnitTests/Jira/CSharp253Tests.cs

@@ -13,6 +13,7 @@
 * limitations under the License.
 */
 
+using System;
 using MongoDB.Bson;
 using MongoDB.Driver;
 using NUnit.Framework;
@@ -73,20 +74,25 @@ public void TestLegacyDollar()
             {
                 { "_id", ObjectId.GenerateNewId() },
                 { "BsonNull", new BsonDocument("_csharpnull", true) },
-                { "Code", new BsonDocument
-                    {
-                        { "$code", "code" },
-                        { "$scope", "scope" }
-                    }
-                },
                 { "DBRef", new BsonDocument
                     {
-                        { "$db", "db" },
+                        // starting with server version 2.5.2 the order of the fields must be exactly as below
+                        { "$ref", "ref" },
                         { "$id", "id" },
-                        { "$ref", "ref" }
+                        { "$db", "db" }
                     }
                 }
             };
+            if (_server.BuildInfo.Version < new Version(2, 5, 2))
+            {
+                // starting with version 2.5.2 the server got stricter about dollars in element names
+                // so the Code element below can only be added when testing against older servers
+                document["Code"] = new BsonDocument
+                {
+                    { "$code", "code" },
+                    { "$scope", "scope" }
+                };
+            }
             _collection.Insert(document);
         }
 

MongoDB.DriverUnitTests/Jira/CSharp358Tests.cs

@@ -13,6 +13,7 @@
 * limitations under the License.
 */
 
+using System;
 using MongoDB.Bson;
 using MongoDB.Driver;
 using MongoDB.Driver.Builders;
@@ -26,33 +27,38 @@ public class CSharp358Tests
         [Test]
         public void TestInsertUpdateAndSaveWithElementNameStartingWithDollarSign()
         {
+            // starting with version 2.5.2 the server got stricter about dollars in element names
+            // so this test should only be run when testing against older servers
             var server = Configuration.TestServer;
-            var database = Configuration.TestDatabase;
-            var collection = Configuration.TestCollection;
-            collection.Drop();
-
-            var document = new BsonDocument
+            if (server.BuildInfo.Version < new Version(2, 5, 2))
             {
-                { "_id", 1 },
-                { "v", new BsonDocument("$x", 1) } // server doesn't allow "$" at top level
-            };
-            var insertOptions = new MongoInsertOptions { CheckElementNames = false };
-            collection.Insert(document, insertOptions);
-            document = collection.FindOne();
-            Assert.AreEqual(1, document["v"]["$x"].AsInt32);
+                var database = Configuration.TestDatabase;
+                var collection = Configuration.TestCollection;
+                collection.Drop();
+
+                var document = new BsonDocument
+                {
+                    { "_id", 1 },
+                    { "v", new BsonDocument("$x", 1) } // server doesn't allow "$" at top level
+                };
+                var insertOptions = new MongoInsertOptions { CheckElementNames = false };
+                collection.Insert(document, insertOptions);
+                document = collection.FindOne();
+                Assert.AreEqual(1, document["v"]["$x"].AsInt32);
 
-            document["v"]["$x"] = 2;
-            var query = Query.EQ("_id", 1);
-            var update = Update.Replace(document);
-            var updateOptions = new MongoUpdateOptions { CheckElementNames = false };
-            collection.Update(query, update, updateOptions);
-            document = collection.FindOne();
-            Assert.AreEqual(2, document["v"]["$x"].AsInt32);
+                document["v"]["$x"] = 2;
+                var query = Query.EQ("_id", 1);
+                var update = Update.Replace(document);
+                var updateOptions = new MongoUpdateOptions { CheckElementNames = false };
+                collection.Update(query, update, updateOptions);
+                document = collection.FindOne();
+                Assert.AreEqual(2, document["v"]["$x"].AsInt32);
 
-            document["v"]["$x"] = 3;
-            collection.Save(document, insertOptions);
-            document = collection.FindOne();
-            Assert.AreEqual(3, document["v"]["$x"].AsInt32);
+                document["v"]["$x"] = 3;
+                collection.Save(document, insertOptions);
+                document = collection.FindOne();
+                Assert.AreEqual(3, document["v"]["$x"].AsInt32);
+            }
         }
     }
 }