code review changes.

craiggwilson · craiggwilson · commit 5be73ced33e4 · 2014-06-26T10:47:06.000-05:00
diff --git a/CSharpDriver.sln b/CSharpDriver.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30110.0
+VisualStudioVersion = 12.0.30501.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Bson", "MongoDB.Bson\MongoDB.Bson.csproj", "{0E9A3A2A-49CD-4F6C-847C-DC79B4B65CE6}"
 EndProject
@@ -68,6 +68,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Release Notes", "Release No
 		Release Notes\Release Notes v1.8.3.md = Release Notes\Release Notes v1.8.3.md
 		Release Notes\Release Notes v1.8.md = Release Notes\Release Notes v1.8.md
 		Release Notes\Release Notes v1.9.1.md = Release Notes\Release Notes v1.9.1.md
+		Release Notes\Release Notes v1.9.2.md = Release Notes\Release Notes v1.9.2.md
 		Release Notes\Release Notes v1.9.md = Release Notes\Release Notes v1.9.md
 	EndProjectSection
 EndProject
diff --git a/MongoDB.DriverUnitTests/ReadPreferenceTests.cs b/MongoDB.DriverUnitTests/ReadPreferenceTests.cs
@@ -49,7 +49,7 @@ public void TestGetHashCodeIsSameWhenEverythingIsTheSame()
                     new ReplicaSetTag("dc", "ny")
                 }
             };
-            var rp1 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets1);
+            var readPreference1 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets1);
 
             var tagSets2 = new List<ReplicaSetTagSet>()
             {
@@ -58,13 +58,13 @@ public void TestGetHashCodeIsSameWhenEverythingIsTheSame()
                     new ReplicaSetTag("dc", "ny")
                 }
             };
-            var rp2 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets2);
+            var readPreference2 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets2);
 
-            Assert.AreEqual(rp1.GetHashCode(), rp2.GetHashCode());
+            Assert.AreEqual(readPreference1.GetHashCode(), readPreference2.GetHashCode());
         }
 
         [Test]
-        public void TestGetHashCodeIsDifferentWhenTagsAreDifferent()
+        public void TestEquality()
         {
             var tagSets1 = new List<ReplicaSetTagSet>()
             {
@@ -73,22 +73,22 @@ public void TestGetHashCodeIsDifferentWhenTagsAreDifferent()
                     new ReplicaSetTag("dc", "ny")
                 }
             };
-            var rp1 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets1);
+            var readPreference1 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets1);
 
             var tagSets2 = new List<ReplicaSetTagSet>()
             {
                 new ReplicaSetTagSet
                 {
-                    new ReplicaSetTag("dc", "tx")
+                    new ReplicaSetTag("dc", "ny")
                 }
             };
-            var rp2 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets2);
+            var readPreference2 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets1);
 
-            Assert.AreNotEqual(rp1.GetHashCode(), rp2.GetHashCode());
+            Assert.AreEqual(readPreference1, readPreference2);
         }
 
         [Test]
-        public void TestEquality()
+        public void TestAreNotEqualWhenTagSetsAreDifferent()
         {
             var tagSets1 = new List<ReplicaSetTagSet>()
             {
@@ -97,7 +97,7 @@ public void TestEquality()
                     new ReplicaSetTag("dc", "ny")
                 }
             };
-            var rp1 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets1);
+            var readPreference1 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets1);
 
             var tagSets2 = new List<ReplicaSetTagSet>()
             {
@@ -106,9 +106,9 @@ public void TestEquality()
                     new ReplicaSetTag("dc", "ny")
                 }
             };
-            var rp2 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets1);
+            var readPreference2 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets1);
 
-            Assert.AreEqual(rp1, rp2);
+            Assert.AreEqual(readPreference1, readPreference2);
         }
     }
 }
diff --git a/MongoDB.DriverUnitTests/ReplicaSetTagSetTests.cs b/MongoDB.DriverUnitTests/ReplicaSetTagSetTests.cs
@@ -38,22 +38,6 @@ public void TestGetHashCodeIsSameWhenTagsAreTheSame()
             Assert.AreEqual(tagSet1.GetHashCode(), tagSet2.GetHashCode());
         }
 
-        [Test]
-        public void TestGetHashCodeIsSameWhenTagsAreDifferent()
-        {
-            var tagSet1 = new ReplicaSetTagSet
-            {
-                new ReplicaSetTag("dc", "ny")
-            };
-
-            var tagSet2 = new ReplicaSetTagSet
-            {
-                new ReplicaSetTag("dc", "tx")
-            };
-
-            Assert.AreNotEqual(tagSet1.GetHashCode(), tagSet2.GetHashCode());
-        }
-
         [Test]
         public void TestAreEqualWhenTagsAreEqual()
         {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public void TestGetHashCodeIsSameWhenEverythingIsTheSame()`
`49`	`49`	`new ReplicaSetTag("dc", "ny")`
`50`	`50`	`}`
`51`	`51`	`};`
`52`		`- var rp1 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets1);`
	`52`	`+ var readPreference1 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets1);`
`53`	`53`
`54`	`54`	`var tagSets2 = new List<ReplicaSetTagSet>()`
`55`	`55`	`{`
`@@ -58,13 +58,13 @@ public void TestGetHashCodeIsSameWhenEverythingIsTheSame()`
`58`	`58`	`new ReplicaSetTag("dc", "ny")`
`59`	`59`	`}`
`60`	`60`	`};`
`61`		`- var rp2 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets2);`
	`61`	`+ var readPreference2 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets2);`
`62`	`62`
`63`		`- Assert.AreEqual(rp1.GetHashCode(), rp2.GetHashCode());`
	`63`	`+ Assert.AreEqual(readPreference1.GetHashCode(), readPreference2.GetHashCode());`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`[Test]`
`67`		`- public void TestGetHashCodeIsDifferentWhenTagsAreDifferent()`
	`67`	`+ public void TestEquality()`
`68`	`68`	`{`
`69`	`69`	`var tagSets1 = new List<ReplicaSetTagSet>()`
`70`	`70`	`{`
`@@ -73,22 +73,22 @@ public void TestGetHashCodeIsDifferentWhenTagsAreDifferent()`
`73`	`73`	`new ReplicaSetTag("dc", "ny")`
`74`	`74`	`}`
`75`	`75`	`};`
`76`		`- var rp1 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets1);`
	`76`	`+ var readPreference1 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets1);`
`77`	`77`
`78`	`78`	`var tagSets2 = new List<ReplicaSetTagSet>()`
`79`	`79`	`{`
`80`	`80`	`new ReplicaSetTagSet`
`81`	`81`	`{`
`82`		`- new ReplicaSetTag("dc", "tx")`
	`82`	`+ new ReplicaSetTag("dc", "ny")`
`83`	`83`	`}`
`84`	`84`	`};`
`85`		`- var rp2 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets2);`
	`85`	`+ var readPreference2 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets1);`
`86`	`86`
`87`		`- Assert.AreNotEqual(rp1.GetHashCode(), rp2.GetHashCode());`
	`87`	`+ Assert.AreEqual(readPreference1, readPreference2);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`[Test]`
`91`		`- public void TestEquality()`
	`91`	`+ public void TestAreNotEqualWhenTagSetsAreDifferent()`
`92`	`92`	`{`
`93`	`93`	`var tagSets1 = new List<ReplicaSetTagSet>()`
`94`	`94`	`{`
`@@ -97,7 +97,7 @@ public void TestEquality()`
`97`	`97`	`new ReplicaSetTag("dc", "ny")`
`98`	`98`	`}`
`99`	`99`	`};`
`100`		`- var rp1 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets1);`
	`100`	`+ var readPreference1 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets1);`
`101`	`101`
`102`	`102`	`var tagSets2 = new List<ReplicaSetTagSet>()`
`103`	`103`	`{`
`@@ -106,9 +106,9 @@ public void TestEquality()`
`106`	`106`	`new ReplicaSetTag("dc", "ny")`
`107`	`107`	`}`
`108`	`108`	`};`
`109`		`- var rp2 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets1);`
	`109`	`+ var readPreference2 = new ReadPreference(ReadPreferenceMode.Nearest, tagSets1);`
`110`	`110`
`111`		`- Assert.AreEqual(rp1, rp2);`
	`111`	`+ Assert.AreEqual(readPreference1, readPreference2);`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`	`}`