Enable xunit2012 analyzer (dotnet/corefx#39730)

Commit migrated from https://github.com/dotnet/corefx/commit/722ab9b7303ef14db74a1d09d464d180f18f512b

diff --git a/src/libraries/CodeAnalysis.ruleset b/src/libraries/CodeAnalysis.ruleset
index f088c28..01ddb68 100644 (file)
--- a/src/libraries/CodeAnalysis.ruleset
+++ b/src/libraries/CodeAnalysis.ruleset
@@ -91,7 +91,6 @@
     <Rule Id="xUnit2007" Action="None" /> <!-- Do not use typeof expression to check the type -->
     <Rule Id="xUnit2008" Action="None" /> <!-- Do not use boolean check to match on regular expressions -->
     <Rule Id="xUnit2009" Action="None" /> <!-- Do not use boolean check to check for substrings -->
-    <Rule Id="xUnit2012" Action="None" /> <!-- Do not use Enumerable.Any() to check if a value exists in a collection -->
     <Rule Id="xUnit2013" Action="None" /> <!-- Do not use equality check to check for collection size. -->
     <Rule Id="xUnit2017" Action="None" /> <!-- Do not use Contains() to check if a value exists in a collection -->
     <Rule Id="xUnit2018" Action="None" /> <!-- Do not compare an object's exact type to an abstract class or interface -->

diff --git a/src/libraries/System.Collections.Specialized/tests/StringDictionary/StringDictionary.KeysTests.cs b/src/libraries/System.Collections.Specialized/tests/StringDictionary/StringDictionary.KeysTests.cs
index eb8f300..a78a6eb 100644 (file)
--- a/src/libraries/System.Collections.Specialized/tests/StringDictionary/StringDictionary.KeysTests.cs
+++ b/src/libraries/System.Collections.Specialized/tests/StringDictionary/StringDictionary.KeysTests.cs
@@ -30,7 +30,7 @@ namespace System.Collections.Specialized.Tests
                 DictionaryEntry entry = (DictionaryEntry)enumerator.Current;
                 Assert.Equal(key, entry.Key);
 
-                Assert.False(key.Any(c => char.IsUpper(c)));
+                Assert.DoesNotContain(key, c => char.IsUpper(c));
                 Assert.True(stringDictionary.ContainsKey(key));
             }
         }

diff --git a/src/libraries/System.Composition/tests/InheritanceTests.cs b/src/libraries/System.Composition/tests/InheritanceTests.cs
index ba40e84..d58e0d0 100644 (file)
--- a/src/libraries/System.Composition/tests/InheritanceTests.cs
+++ b/src/libraries/System.Composition/tests/InheritanceTests.cs
@@ -199,7 +199,7 @@ namespace System.Composition.Lightweight.UnitTests
             var c = CreateContainer(typeof(ABHandler));
             var handlers = c.GetExports<Lazy<IHandler, HandlerMetadata>>().ToArray();
             Assert.Equal(1, handlers.Length);
-            Assert.True(handlers.Any(h => h.Metadata.HandledMessage == "B"));
+            Assert.Contains(handlers, h => h.Metadata.HandledMessage == "B");
         }
 
         public class BaseVirtualExporter

diff --git a/src/libraries/System.IO.FileSystem.AccessControl/tests/DirectoryObjectSecurityTests.cs b/src/libraries/System.IO.FileSystem.AccessControl/tests/DirectoryObjectSecurityTests.cs
index 5e46f91..13841b8 100644 (file)
--- a/src/libraries/System.IO.FileSystem.AccessControl/tests/DirectoryObjectSecurityTests.cs
+++ b/src/libraries/System.IO.FileSystem.AccessControl/tests/DirectoryObjectSecurityTests.cs
@@ -244,13 +244,11 @@ namespace System.Security.AccessControl
             Assert.NotNull(ruleCollection);
             List<CustomAuditRule> existingRules = ruleCollection.Cast<CustomAuditRule>().ToList();
             Assert.True(existingRules.Count > 0);
-            Assert.True(
-                existingRules.Any(
-                    x => x.AccessMaskValue == ReadAccessMask &&
-                    x.AuditFlags == AuditFlags.Success &&
-                    x.IdentityReference == Helpers.s_LocalSystemNTAccount
-                    )
-                );
+            Assert.Contains(existingRules, x =>
+                x.AccessMaskValue == ReadAccessMask &&
+                x.AuditFlags == AuditFlags.Success &&
+                x.IdentityReference == Helpers.s_LocalSystemNTAccount
+            );
         }
 
         [Fact]

diff --git a/src/libraries/System.Private.Xml/tests/XmlResolver/System.Xml.XmlResolver.Tests/XmlPreloadedResolverConstructionTests.cs b/src/libraries/System.Private.Xml/tests/XmlResolver/System.Xml.XmlResolver.Tests/XmlPreloadedResolverConstructionTests.cs
index f8f2c56..edf1b37 100644 (file)
--- a/src/libraries/System.Private.Xml/tests/XmlResolver/System.Xml.XmlResolver.Tests/XmlPreloadedResolverConstructionTests.cs
+++ b/src/libraries/System.Private.Xml/tests/XmlResolver/System.Xml.XmlResolver.Tests/XmlPreloadedResolverConstructionTests.cs
@@ -31,7 +31,7 @@ namespace System.Xml.XmlResolver.Tests
             Assert.Equal(expectedUris.Length, resolver.PreloadedUris.Count());
             foreach (string uriString in expectedUris)
             {
-                Assert.True(resolver.PreloadedUris.Any(u => u.OriginalString.Equals(uriString)));
+                Assert.Contains(resolver.PreloadedUris, u => u.OriginalString.Equals(uriString));
             }
         }
 
@@ -43,7 +43,7 @@ namespace System.Xml.XmlResolver.Tests
             Assert.Equal(expectedUris.Length, resolver.PreloadedUris.Count());
             foreach (string uriString in expectedUris)
             {
-                Assert.True(resolver.PreloadedUris.Any(u => u.OriginalString.Equals(uriString)));
+                Assert.Contains(resolver.PreloadedUris, u => u.OriginalString.Equals(uriString));
             }
         }
 
@@ -62,7 +62,7 @@ namespace System.Xml.XmlResolver.Tests
             Assert.Equal(expectedUris.Length, resolver.PreloadedUris.Count());            
             foreach (string uriString in expectedUris)
             {
-                Assert.True(resolver.PreloadedUris.Any(u => u.OriginalString.Equals(uriString)));
+                Assert.Contains(resolver.PreloadedUris, u => u.OriginalString.Equals(uriString));
             }
         }
 
@@ -75,7 +75,7 @@ namespace System.Xml.XmlResolver.Tests
             Assert.Equal(expectedUris.Length, resolver.PreloadedUris.Count());
             foreach (string uriString in expectedUris)
             {
-                Assert.True(resolver.PreloadedUris.Any(u => u.OriginalString.Equals(uriString)));
+                Assert.Contains(resolver.PreloadedUris, u => u.OriginalString.Equals(uriString));
             }
         }
 
@@ -94,7 +94,7 @@ namespace System.Xml.XmlResolver.Tests
             Assert.Equal(expectedUris.Length, resolver.PreloadedUris.Count());
             foreach (string uriString in expectedUris)
             {
-                Assert.True(resolver.PreloadedUris.Any(u => u.OriginalString.Equals(uriString)));
+                Assert.Contains(resolver.PreloadedUris, u => u.OriginalString.Equals(uriString));
             }
         }
     }

diff --git a/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/Type/TypeInvariants.cs b/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/Type/TypeInvariants.cs
index 0a36374..ca428b5 100644 (file)
--- a/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/Type/TypeInvariants.cs
+++ b/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/Type/TypeInvariants.cs
@@ -490,7 +490,7 @@ namespace System.Reflection.Tests
             {
                 Assert.True(declaringType.IsTypeDefinition());
                 Type[] nestedTypes = declaringType.GetNestedTypes(BindingFlags.Public | BindingFlags.NonPublic);
-                Assert.True(nestedTypes.Any(nt => object.ReferenceEquals(nt, type)));
+                Assert.Contains(nestedTypes, nt => object.ReferenceEquals(nt, type));
             }
 
             Assert.Equal<Type>(type.GetTypeInfo().GenericTypeParameters, type.GetGenericArguments());

diff --git a/src/libraries/System.Runtime.Loader/tests/AssemblyLoadContextTest.cs b/src/libraries/System.Runtime.Loader/tests/AssemblyLoadContextTest.cs
index 9b642f6..1f3a48a 100644 (file)
--- a/src/libraries/System.Runtime.Loader/tests/AssemblyLoadContextTest.cs
+++ b/src/libraries/System.Runtime.Loader/tests/AssemblyLoadContextTest.cs
@@ -54,7 +54,7 @@ namespace System.Runtime.Loader.Tests
             var asm = loadContext.LoadFromAssemblyName(asmName);
 
             Assert.NotNull(asm);
-            Assert.True(asm.DefinedTypes.Any(t => t.Name == "TestClass"));
+            Assert.Contains(asm.DefinedTypes, t => t.Name == "TestClass");
         }       
 
         [Fact]
@@ -67,7 +67,7 @@ namespace System.Runtime.Loader.Tests
             var asm = loadContext.LoadFromAssemblyName(asmName);
 
             Assert.NotNull(asm);
-            Assert.True(asm.DefinedTypes.Any(t => t.Name == "TestClass"));
+            Assert.Contains(asm.DefinedTypes, t => t.Name == "TestClass");
         }
 
         [Fact]

diff --git a/src/libraries/System.Security.Claims/tests/ClaimsPrincipalTests.cs b/src/libraries/System.Security.Claims/tests/ClaimsPrincipalTests.cs
index 84f118f..c18d2ca 100644 (file)
--- a/src/libraries/System.Security.Claims/tests/ClaimsPrincipalTests.cs
+++ b/src/libraries/System.Security.Claims/tests/ClaimsPrincipalTests.cs
@@ -43,7 +43,7 @@ namespace System.Security.Claims
 
             Assert.NotNull(cp.Claims);
             Assert.Equal(1, cp.Claims.Count());
-            Assert.True(cp.Claims.Any(claim => claim.Type == "claim_type" && claim.Value == "claim_value"));
+            Assert.Contains(cp.Claims, claim => claim.Type == "claim_type" && claim.Value == "claim_value");
         }
 
         [Fact]
@@ -61,7 +61,7 @@ namespace System.Security.Claims
 
             Assert.NotNull(cp.Claims);
             Assert.Equal(1, cp.Claims.Count());
-            Assert.True(cp.Claims.Any(claim => claim.Type == ClaimsIdentity.DefaultNameClaimType && claim.Value == "NonClaimsIdentity_Name"));
+            Assert.Contains(cp.Claims, claim => claim.Type == ClaimsIdentity.DefaultNameClaimType && claim.Value == "NonClaimsIdentity_Name");
         }
 
         [Fact]
@@ -84,7 +84,7 @@ namespace System.Security.Claims
 
             Assert.NotNull(cp.Claims);
             Assert.Equal(1, cp.Claims.Count());
-            Assert.True(cp.Claims.Any(claim => claim.Type == "claim_type" && claim.Value == "claim_value"), "#7");
+            Assert.Contains(cp.Claims, claim => claim.Type == "claim_type" && claim.Value == "claim_value");
         }
 
         [Fact]
@@ -103,7 +103,7 @@ namespace System.Security.Claims
 
             Assert.NotNull(cp.Claims);
             Assert.Equal(1, cp.Claims.Count());
-            Assert.True(cp.Claims.Any(claim => claim.Type == ClaimsIdentity.DefaultNameClaimType && claim.Value == "NonClaimsIdentity_Name"));
+            Assert.Contains(cp.Claims, claim => claim.Type == ClaimsIdentity.DefaultNameClaimType && claim.Value == "NonClaimsIdentity_Name");
         }
 
         [Fact]
@@ -153,7 +153,7 @@ namespace System.Security.Claims
 
             Assert.Equal(baseId1, cp.Identity);
 
-            Assert.True(cp.Claims.Any(claim => claim.Type == ClaimsIdentity.DefaultNameClaimType && claim.Value == "generic_name"));
+            Assert.Contains(cp.Claims, claim => claim.Type == ClaimsIdentity.DefaultNameClaimType && claim.Value == "generic_name");
 
             Assert.Equal(baseId2.Claims.First(), cp.Claims.First());
         }
@@ -185,8 +185,8 @@ namespace System.Security.Claims
 
             Assert.Equal(baseId1, cp.Identity);
 
-            Assert.True(cp.Claims.Any(claim => claim.Type == ClaimsIdentity.DefaultNameClaimType && claim.Value == "generic_name2"));
-            Assert.True(cp.Claims.Any(claim => claim.Type == ClaimsIdentity.DefaultNameClaimType && claim.Value == "generic_name3"));
+            Assert.Contains(cp.Claims, claim => claim.Type == ClaimsIdentity.DefaultNameClaimType && claim.Value == "generic_name2");
+            Assert.Contains(cp.Claims, claim => claim.Type == ClaimsIdentity.DefaultNameClaimType && claim.Value == "generic_name3");
 
             Assert.Equal(baseId2.Claims.First(), cp.Claims.First());
             Assert.Equal(baseId3.Claims.Last(), cp.Claims.Last());