CLR test fixes

Author: danmoseley

src/System.Collections.NonGeneric/tests/DictionaryBaseTests.cs

@@ -295,8 +295,8 @@ public static void SyncRoot()
             // SyncRoot should be the reference to the underlying dictionary, not to MyDictionary
             var dictBase = new MyDictionary();
             object syncRoot = dictBase.SyncRoot;
-            Assert.NotEqual(syncRoot, dictBase);
-            Assert.Equal(dictBase.SyncRoot, dictBase.SyncRoot);
+            Assert.NotSame(syncRoot, dictBase);
+            Assert.Same(dictBase.SyncRoot, dictBase.SyncRoot);
         }
 
         [Fact]

src/System.Collections.NonGeneric/tests/HashtableTests.cs

@@ -1207,16 +1207,16 @@ public void SyncRoot()
             var hash1 = new Hashtable();
             var hash2 = new Hashtable();
 
-            Assert.NotEqual(hash1.SyncRoot, hash2.SyncRoot);
-            Assert.Equal(hash1.SyncRoot.GetType(), typeof(object));
+            Assert.NotSame(hash1.SyncRoot, hash2.SyncRoot);
+            Assert.Equal(hash1.SyncRoot.GetType(), typeof(Hashtable));
 
             // Cloned hashtables have different SyncRoots
             hash1 = new Hashtable();
             hash2 = Hashtable.Synchronized(hash1);
             Hashtable hash3 = (Hashtable)hash2.Clone();
 
-            Assert.NotEqual(hash2.SyncRoot, hash3.SyncRoot);
-            Assert.NotEqual(hash1.SyncRoot, hash3.SyncRoot);
+            Assert.NotSame(hash2.SyncRoot, hash3.SyncRoot);
+            Assert.NotSame(hash1.SyncRoot, hash3.SyncRoot);
 
             // Testing SyncRoot is not as simple as its implementation looks like. This is the working
             // scenario we have in mind.
@@ -1236,11 +1236,11 @@ public void SyncRoot()
             _hashGrandDaughter = Hashtable.Synchronized(hashSon);
             _hashDaughter = Hashtable.Synchronized(hashMother);
 
+            Assert.Same(hashSon.SyncRoot, hashMother.SyncRoot);
             Assert.Equal(hashSon.SyncRoot, hashMother.SyncRoot);
-            Assert.Equal(hashSon.SyncRoot, hashMother.SyncRoot);
-            Assert.Equal(_hashGrandDaughter.SyncRoot, hashMother.SyncRoot);
-            Assert.Equal(_hashDaughter.SyncRoot, hashMother.SyncRoot);
-            Assert.Equal(hashSon.SyncRoot, hashMother.SyncRoot);
+            Assert.Same(_hashGrandDaughter.SyncRoot, hashMother.SyncRoot);
+            Assert.Same(_hashDaughter.SyncRoot, hashMother.SyncRoot);
+            Assert.Same(hashSon.SyncRoot, hashMother.SyncRoot);
 
             // We are going to rumble with the Hashtables with some threads
             int iNumberOfWorkers = 30;

src/System.Collections.Specialized/tests/StringDictionary/StringDictionary.SyncRootTests.cs

@@ -17,7 +17,7 @@ public void SyncRoot(int count)
             StringDictionary stringDictionary2 = Helpers.CreateStringDictionary(count);
 
             Assert.Same(stringDictionary1.SyncRoot, stringDictionary1.SyncRoot);
-            Assert.IsType<object>(stringDictionary1.SyncRoot);
+            Assert.IsType<Hashtable>(stringDictionary1.SyncRoot);
 
             Assert.NotSame(stringDictionary1.SyncRoot, stringDictionary2.SyncRoot);
         }