Test fixups

Author: danmoseley

src/Common/tests/System/Collections/ICollection.NonGeneric.Tests.cs

@@ -83,13 +83,6 @@ protected virtual ICollection NonGenericICollectionFactory(int count)
         /// </summary>
         protected virtual bool ICollection_NonGeneric_HasNullSyncRoot => false;
 
-        /// <summary>
-        /// Used for the ICollection_NonGeneric_SyncRootType_MatchesExcepted test. Most SyncRoots are created
-        /// using System.Threading.Interlocked.CompareExchange(ref _syncRoot, new Object(), null)
-        /// so we should test that the SyncRoot is the type we expect.
-        /// </summary>
-        protected virtual Type ICollection_NonGeneric_SyncRootType => typeof(object);
-
         /// <summary>
         /// Used for the ICollection_NonGeneric_CopyTo_IndexLargerThanArrayCount_ThrowsArgumentException tests. Some
         /// implementations throw a different exception type (e.g. ArgumentOutOfRangeException).
@@ -147,22 +140,6 @@ public void ICollection_NonGeneric_SyncRoot(int count)
             {
                 Assert.Equal(ICollection_NonGeneric_HasNullSyncRoot, collection.SyncRoot == null);
                 Assert.Same(collection.SyncRoot, collection.SyncRoot);
-
-                if (!ICollection_NonGeneric_HasNullSyncRoot)
-                {
-                    Assert.IsType(ICollection_NonGeneric_SyncRootType, collection.SyncRoot);
-
-                    if (ICollection_NonGeneric_SyncRootType == collection.GetType())
-                    {
-                        // If we expect the SyncRoot to be the same type as the collection, 
-                        // the SyncRoot should be the same as the collection (e.g. HybridDictionary)
-                        Assert.Same(collection, collection.SyncRoot);
-                    }
-                    else
-                    {
-                        Assert.NotSame(collection, collection.SyncRoot);
-                    }
-                }
             }
             else
             {

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

@@ -2576,12 +2576,12 @@ public void GetSyncRoot()
                 _arrGrandDaughter = ArrayList.Synchronized(arrMother2);
                 _arrDaughter = ArrayList.Synchronized(arrMother2);
 
-                Assert.False(arrMother2.SyncRoot is ArrayList);
-                Assert.False(arrSon1.SyncRoot is ArrayList);
-                Assert.False(arrSon2.SyncRoot is ArrayList);
-                Assert.False(_arrDaughter.SyncRoot is ArrayList);
+                Assert.True(arrMother2.SyncRoot is ArrayList);
+                Assert.True(arrSon1.SyncRoot is ArrayList);
+                Assert.True(arrSon2.SyncRoot is ArrayList);
+                Assert.True(_arrDaughter.SyncRoot is ArrayList);
                 Assert.Equal(arrSon1.SyncRoot, arrMother2.SyncRoot);
-                Assert.False(_arrGrandDaughter.SyncRoot is ArrayList);
+                Assert.True(_arrGrandDaughter.SyncRoot is ArrayList);
 
                 arrMother2 = new ArrayList();
                 for (int i = 0; i < NumberOfElements; i++)

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

@@ -299,8 +299,8 @@ public static void SyncRoot()
             // SyncRoot should be the reference to the underlying collection, not to MyCollection
             var collBase = new MyCollection();
             object syncRoot = collBase.SyncRoot;
-            Assert.NotEqual(syncRoot, collBase);
-            Assert.Equal(collBase.SyncRoot, collBase.SyncRoot);
+            Assert.NotNull(syncRoot);
+            Assert.Same(collBase.SyncRoot, collBase.SyncRoot);
         }
 
         [Fact]

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

@@ -850,7 +850,7 @@ public void SyncRoot()
             {
                 queueMother.Enqueue(i);
             }
-            Assert.Equal(queueMother.SyncRoot.GetType(), typeof(object));
+            Assert.Equal(queueMother.SyncRoot.GetType(), typeof(Queue));
 
             var queueSon = Queue.Synchronized(queueMother);
             _queueGrandDaughter = Queue.Synchronized(queueSon);

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

@@ -23,7 +23,7 @@ private static MyReadOnlyCollectionBase CreateCollection()
         public static void SyncRoot()
         {
             MyReadOnlyCollectionBase collection = CreateCollection();
-            Assert.False(collection.SyncRoot is ArrayList);
+            Assert.True(collection.SyncRoot is ArrayList);
             Assert.Same(collection.SyncRoot, collection.SyncRoot);
         }
 

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

@@ -563,7 +563,7 @@ public void GetSyncRootBasic()
                 stackMother.Push(i);
             }
 
-            Assert.Equal(typeof(object), stackMother.SyncRoot.GetType());
+            Assert.Equal(typeof(Stack), stackMother.SyncRoot.GetType());
 
             Stack stackSon = Stack.Synchronized(stackMother);
             _stackGrandDaughter = Stack.Synchronized(stackSon);

src/System.Collections.Specialized/tests/HybridDictionary/HybridDictionaryTests.cs

@@ -23,8 +23,6 @@ public abstract class HybridDictionaryTestBase : IDictionary_NonGeneric_Tests
         protected override Type ICollection_NonGeneric_CopyTo_ArrayOfIncorrectReferenceType_ThrowType => typeof(InvalidCastException);
         protected override Type ICollection_NonGeneric_CopyTo_ArrayOfIncorrectValueType_ThrowType => typeof(InvalidCastException);
 
-        protected override Type ICollection_NonGeneric_SyncRootType => typeof(HybridDictionary);
-
         protected override object CreateTKey(int seed)
         {
             int stringLength = seed % 10 + 5;

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

@@ -17,7 +17,7 @@ public void SyncRoot()
             Assert.False(nameObjectCollection1.IsSynchronized);
 
             Assert.Same(nameObjectCollection1.SyncRoot, nameObjectCollection1.SyncRoot);
-            Assert.NotEqual(nameObjectCollection1.SyncRoot, nameObjectCollection2.SyncRoot);
+            Assert.NotSame(nameObjectCollection1.SyncRoot, nameObjectCollection2.SyncRoot);
         }
     }
 }

src/System.Collections.Specialized/tests/OrderedDictionary/OrderedDictionaryTests.cs

@@ -144,7 +144,7 @@ public void KeysPropertyContainsAllKeys()
             ICollection keys = d.Keys;
 
             Assert.False(keys.IsSynchronized);
-            Assert.NotEqual(d, keys.SyncRoot);
+            Assert.NotSame(d, keys.SyncRoot);
             Assert.Equal(d.Count, keys.Count);
 
             foreach (var key in d.Keys)
@@ -186,16 +186,12 @@ public void SyncRootTests()
             object sync1 = orderedDictionary1.SyncRoot;
             object sync2 = orderedDictionary2.SyncRoot;
 
-            // Sync root does not refer to the dictionary
-            Assert.NotEqual(sync1, orderedDictionary1);
-            Assert.NotEqual(sync2, orderedDictionary2);
-
             // Sync root objects for the same dictionaries are equivalent
-            Assert.Equal(orderedDictionary1.SyncRoot, orderedDictionary1.SyncRoot);
-            Assert.Equal(orderedDictionary2.SyncRoot, orderedDictionary2.SyncRoot);
+            Assert.Same(orderedDictionary1.SyncRoot, orderedDictionary1.SyncRoot);
+            Assert.Same(orderedDictionary2.SyncRoot, orderedDictionary2.SyncRoot);
 
             // Sync root objects for different dictionaries are not equivalent
-            Assert.NotEqual(sync1, sync2);
+            Assert.NotSame(sync1, sync2);
         }
 
         // bool System.Collections.IDictionary.IsFixedSize { get; }
@@ -274,7 +270,7 @@ public void ValuesPropertyContainsAllValues()
             ICollection values = d.Values;
 
             Assert.False(values.IsSynchronized);
-            Assert.NotEqual(d, values.SyncRoot);
+            Assert.NotSame(d, values.SyncRoot);
             Assert.Equal(d.Count, values.Count);
 
             foreach (var val in values)

src/System.Collections.Specialized/tests/StringCollectionTests.cs

@@ -639,7 +639,7 @@ public static void SyncRootTest(StringCollection collection, string[] data)
         {
             object syncRoot = collection.SyncRoot;
             Assert.NotNull(syncRoot);
-            Assert.IsType<object>(syncRoot);
+            Assert.IsType<ArrayList>(syncRoot);
 
             Assert.Same(syncRoot, collection.SyncRoot);
             Assert.NotSame(syncRoot, new StringCollection().SyncRoot);