[tests] Fix TypeDescriptorTests compilation when NUnitLite is used
authorSebastien Pouliot <sebastien@xamarin.com>
Fri, 6 Feb 2015 14:37:06 +0000 (09:37 -0500)
committerSebastien Pouliot <sebastien@xamarin.com>
Fri, 6 Feb 2015 14:37:21 +0000 (09:37 -0500)
mcs/class/System/Test/System.ComponentModel/TypeDescriptorTests.cs

index 9df14f5da477e8c1a3ea05ca94ea5edadc6a8034..feea2aeaa9b7b10b17e5fc1d2d03ae1d864d87fc 100644 (file)
@@ -1541,8 +1541,8 @@ namespace MonoTests.System.ComponentModel
                        TypeDescriptor.AddAttributes(testType, new ProviderTestAttribute());
                        var registeredAttributeTypes = TypeDescriptor.GetAttributes(testType).Cast<Attribute>().Select(attr => attr.GetType()).ToArray();
                        Assert.AreEqual(2, registeredAttributeTypes.Length);
-                       Assert.Contains(typeof(ProviderTestAttribute), registeredAttributeTypes);
-                       Assert.Contains(typeof(SerializableAttribute), registeredAttributeTypes);
+                       Assert.IsTrue (registeredAttributeTypes.Contains (typeof(ProviderTestAttribute)), "Contains-1");
+                       Assert.IsTrue (registeredAttributeTypes.Contains (typeof(SerializableAttribute)), "Contains-2");
                }
 
                [Test]
@@ -1552,8 +1552,8 @@ namespace MonoTests.System.ComponentModel
                        TypeDescriptor.AddAttributes(testObj, new ProviderTestAttribute());
                        var registeredAttributeTypes = TypeDescriptor.GetAttributes(testObj).Cast<Attribute>().Select(attr => attr.GetType()).ToArray();
                        Assert.AreEqual(2, registeredAttributeTypes.Length);
-                       Assert.Contains(typeof(ProviderTestAttribute), registeredAttributeTypes);
-                       Assert.Contains(typeof(SerializableAttribute), registeredAttributeTypes);
+                       Assert.IsTrue (registeredAttributeTypes.Contains (typeof(ProviderTestAttribute)), "Contains-1");
+                       Assert.IsTrue (registeredAttributeTypes.Contains (typeof(SerializableAttribute)), "Contains-2");
                }
 
                [Test]
@@ -1564,11 +1564,11 @@ namespace MonoTests.System.ComponentModel
 
                        var registeredAttributeTypes = TypeDescriptor.GetAttributes(testType).Cast<Attribute>().Select(attr => attr.GetType()).ToArray();
                        Assert.AreEqual(1, registeredAttributeTypes.Length);
-                       Assert.Contains(typeof(ProviderTestAttribute), registeredAttributeTypes);
+                       Assert.IsTrue (registeredAttributeTypes.Contains (typeof(ProviderTestAttribute)), "Contains-1");
 
                        var registeredPropertyDescriptorTypes = TypeDescriptor.GetProperties(testType).Cast<PropertyDescriptor>().Select(prop => prop.GetType()).ToArray();
                        Assert.AreEqual(1, registeredPropertyDescriptorTypes.Length);
-                       Assert.Contains(typeof(ProviderTestPropertyDescriptor), registeredPropertyDescriptorTypes);
+                       Assert.IsTrue (registeredPropertyDescriptorTypes.Contains (typeof(ProviderTestPropertyDescriptor)), "Contains-2");
                }
 
                [Test]
@@ -1579,11 +1579,11 @@ namespace MonoTests.System.ComponentModel
 
                        var registeredAttributeTypes = TypeDescriptor.GetAttributes(testObj).Cast<Attribute>().Select(attr => attr.GetType()).ToArray();
                        Assert.AreEqual(1, registeredAttributeTypes.Length);
-                       Assert.Contains(typeof(ProviderTestAttribute), registeredAttributeTypes);
+                       Assert.IsTrue (registeredAttributeTypes.Contains (typeof(ProviderTestAttribute)), "Contains-1");
 
                        var registeredPropertyDescriptorTypes = TypeDescriptor.GetProperties(testObj).Cast<PropertyDescriptor>().Select(prop => prop.GetType()).ToArray();
                        Assert.AreEqual(1, registeredPropertyDescriptorTypes.Length);
-                       Assert.Contains(typeof(ProviderTestPropertyDescriptor), registeredPropertyDescriptorTypes);
+                       Assert.IsTrue (registeredPropertyDescriptorTypes.Contains (typeof(ProviderTestPropertyDescriptor)), "Contains-2");
                }
 
                private class CustomDescriptionTestProvider : TypeDescriptionProvider