Upgrade to xunit 2.3.0-beta4

Includes changes to assertions as required by xunit.analyzers 0.6

build/dependencies.props

@@ -10,7 +10,8 @@
     <NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
     <OwinVersion>3.0.1</OwinVersion>
     <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
-    <TestSdkVersion>15.3.0-*</TestSdkVersion>
+    <TestSdkVersion>15.3.0</TestSdkVersion>
-    <XunitVersion>2.3.0-beta2-*</XunitVersion>
+    <XunitAnalyzersVersion>0.6.1</XunitAnalyzersVersion>
+    <XunitVersion>2.3.0-beta4-build3742</XunitVersion>
   </PropertyGroup>
 </Project>

test/Microsoft.AspNetCore.Authentication.Test/CookieTests.cs

@@ -54,8 +54,8 @@ namespace Microsoft.AspNetCore.Authentication.Cookies
             var transaction = await SendAsync(server, "http://example.com/challenge?X-Requested-With=XMLHttpRequest");
             Assert.Equal(HttpStatusCode.Unauthorized, transaction.Response.StatusCode);
             var responded = transaction.Response.Headers.GetValues("Location");
-            Assert.Equal(1, responded.Count());
+            Assert.Single(responded);
-            Assert.True(responded.Single().StartsWith("http://example.com/login"));
+            Assert.StartsWith("http://example.com/login", responded.Single());
         }
 
         [Fact]
@@ -65,8 +65,8 @@ namespace Microsoft.AspNetCore.Authentication.Cookies
             var transaction = await SendAsync(server, "http://example.com/forbid?X-Requested-With=XMLHttpRequest");
             Assert.Equal(HttpStatusCode.Forbidden, transaction.Response.StatusCode);
             var responded = transaction.Response.Headers.GetValues("Location");
-            Assert.Equal(1, responded.Count());
+            Assert.Single(responded);
-            Assert.True(responded.Single().StartsWith("http://example.com/denied"));
+            Assert.StartsWith("http://example.com/denied", responded.Single());
         }
 
         [Fact]
@@ -76,8 +76,8 @@ namespace Microsoft.AspNetCore.Authentication.Cookies
             var transaction = await SendAsync(server, "http://example.com/signout?X-Requested-With=XMLHttpRequest&ReturnUrl=/");
             Assert.Equal(HttpStatusCode.OK, transaction.Response.StatusCode);
             var responded = transaction.Response.Headers.GetValues("Location");
-            Assert.Equal(1, responded.Count());
+            Assert.Single(responded);
-            Assert.True(responded.Single().StartsWith("/"));
+            Assert.StartsWith("/", responded.Single());
         }
 
         [Fact]
@@ -87,8 +87,8 @@ namespace Microsoft.AspNetCore.Authentication.Cookies
             var transaction = await SendAsync(server, "http://example.com/challenge?X-Requested-With=XMLHttpRequest&ReturnUrl=/");
             Assert.Equal(HttpStatusCode.Unauthorized, transaction.Response.StatusCode);
             var responded = transaction.Response.Headers.GetValues("Location");
-            Assert.Equal(1, responded.Count());
+            Assert.Single(responded);
-            Assert.True(responded.Single().StartsWith("http://example.com/Account/Login"));
+            Assert.StartsWith("http://example.com/Account/Login", responded.Single());
         }
 
         [Fact]
@@ -439,7 +439,7 @@ namespace Microsoft.AspNetCore.Authentication.Cookies
 
             // signout wins over renew
             var transaction4 = await server.SendAsync("http://example.com/signout", transaction3.SetCookie[0]);
-            Assert.Equal(1, transaction4.SetCookie.Count());
+            Assert.Single(transaction4.SetCookie);
             Assert.Contains(".AspNetCore.Cookies=; expires=", transaction4.SetCookie[0]);
         }
 
@@ -717,7 +717,7 @@ namespace Microsoft.AspNetCore.Authentication.Cookies
             new Uri("http://example.com/base"));
 
             var transaction1 = await SendAsync(server, "http://example.com/base/testpath");
-            Assert.True(transaction1.SetCookie.Contains("path=/base"));
+            Assert.Contains("path=/base", transaction1.SetCookie);
         }
 
         [Fact]
@@ -848,7 +848,7 @@ namespace Microsoft.AspNetCore.Authentication.Cookies
             var transaction = await server.SendAsync("http://example.com");
 
             Assert.Equal(HttpStatusCode.OK, transaction.Response.StatusCode);
-            Assert.True(transaction.SetCookie[0].StartsWith("One="));
+            Assert.StartsWith("One=", transaction.SetCookie[0]);
         }
 
         [Fact]
@@ -871,7 +871,7 @@ namespace Microsoft.AspNetCore.Authentication.Cookies
             var transaction = await server.SendAsync("http://example.com");
 
             Assert.Equal(HttpStatusCode.OK, transaction.Response.StatusCode);
-            Assert.True(transaction.SetCookie[0].StartsWith("One="));
+            Assert.StartsWith("One=", transaction.SetCookie[0]);
         }
 
         [Fact]

test/Microsoft.AspNetCore.Authentication.Test/Microsoft.AspNetCore.Authentication.Test.csproj

@@ -23,6 +23,7 @@
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
+    <PackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
     <PackageReference Include="xunit" Version="$(XunitVersion)" />
   </ItemGroup>

test/Microsoft.AspNetCore.Authentication.Test/TicketSerializerTests.cs

@@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Authentication
                 serializer.Write(writer, ticket);
                 stream.Position = 0;
                 var readTicket = serializer.Read(reader);
-                Assert.Equal(0, readTicket.Principal.Identities.Count());
+                Assert.Empty(readTicket.Principal.Identities);
                 Assert.Equal("bye", readTicket.Properties.RedirectUri);
                 Assert.Equal("Hello", readTicket.AuthenticationScheme);
             }
@@ -50,7 +50,7 @@ namespace Microsoft.AspNetCore.Authentication
                 serializer.Write(writer, ticket);
                 stream.Position = 0;
                 var readTicket = serializer.Read(reader);
-                Assert.Equal(1, readTicket.Principal.Identities.Count());
+                Assert.Single(readTicket.Principal.Identities);
                 Assert.Equal("misc", readTicket.Principal.Identity.AuthenticationType);
                 Assert.Equal("bootstrap", readTicket.Principal.Identities.First().BootstrapContext);
             }
@@ -73,7 +73,7 @@ namespace Microsoft.AspNetCore.Authentication
                 serializer.Write(writer, ticket);
                 stream.Position = 0;
                 var readTicket = serializer.Read(reader);
-                Assert.Equal(1, readTicket.Principal.Identities.Count());
+                Assert.Single(readTicket.Principal.Identities);
                 Assert.Equal("misc", readTicket.Principal.Identity.AuthenticationType);
 
                 var identity = (ClaimsIdentity) readTicket.Principal.Identity;
@@ -108,7 +108,7 @@ namespace Microsoft.AspNetCore.Authentication
                 serializer.Write(writer, ticket);
                 stream.Position = 0;
                 var readTicket = serializer.Read(reader);
-                Assert.Equal(1, readTicket.Principal.Identities.Count());
+                Assert.Single(readTicket.Principal.Identities);
                 Assert.Equal("misc", readTicket.Principal.Identity.AuthenticationType);
 
                 var readClaim = readTicket.Principal.FindFirst("type");

test/Microsoft.AspNetCore.Authentication.Test/TokenExtensionTests.cs

@@ -48,7 +48,7 @@ namespace Microsoft.AspNetCore.Authentication
             Assert.Null(props.GetTokenValue("One"));
             Assert.Null(props.GetTokenValue("Two"));
             Assert.Null(props.GetTokenValue("Three"));
-            Assert.Equal(1, props.GetTokens().Count());
+            Assert.Single(props.GetTokens());
         }
 
         [Fact]

test/Microsoft.AspNetCore.Authorization.Test/AuthorizationPolicyFacts.cs

@@ -40,12 +40,12 @@ namespace Microsoft.AspNetCore.Authroization.Test
 
             // Assert
             Assert.Equal(2, combined.AuthenticationSchemes.Count());
-            Assert.True(combined.AuthenticationSchemes.Contains("dupe"));
+            Assert.Contains("dupe", combined.AuthenticationSchemes);
-            Assert.True(combined.AuthenticationSchemes.Contains("roles"));
+            Assert.Contains("roles", combined.AuthenticationSchemes);
             Assert.Equal(4, combined.Requirements.Count());
-            Assert.True(combined.Requirements.Any(r => r is DenyAnonymousAuthorizationRequirement));
+            Assert.Contains(combined.Requirements, r => r is DenyAnonymousAuthorizationRequirement);
             Assert.Equal(2, combined.Requirements.OfType<ClaimsAuthorizationRequirement>().Count());
-            Assert.Equal(1, combined.Requirements.OfType<RolesAuthorizationRequirement>().Count());
+            Assert.Single(combined.Requirements.OfType<RolesAuthorizationRequirement>());
         }
 
         [Fact]
@@ -67,10 +67,10 @@ namespace Microsoft.AspNetCore.Authroization.Test
 
             // Assert
             Assert.Equal(2, combined.AuthenticationSchemes.Count());
-            Assert.True(combined.AuthenticationSchemes.Contains("dupe"));
+            Assert.Contains("dupe", combined.AuthenticationSchemes);
-            Assert.True(combined.AuthenticationSchemes.Contains("default"));
+            Assert.Contains("default", combined.AuthenticationSchemes);
             Assert.Equal(2, combined.Requirements.Count());
-            Assert.False(combined.Requirements.Any(r => r is DenyAnonymousAuthorizationRequirement));
+            Assert.DoesNotContain(combined.Requirements, r => r is DenyAnonymousAuthorizationRequirement);
             Assert.Equal(2, combined.Requirements.OfType<ClaimsAuthorizationRequirement>().Count());
         }
 
@@ -88,11 +88,11 @@ namespace Microsoft.AspNetCore.Authroization.Test
             var combined = await AuthorizationPolicy.CombineAsync(provider, attributes);
 
             // Assert
-            Assert.True(combined.Requirements.Any(r => r is RolesAuthorizationRequirement));
+            Assert.Contains(combined.Requirements, r => r is RolesAuthorizationRequirement);
             var rolesAuthorizationRequirement = combined.Requirements.OfType<RolesAuthorizationRequirement>().First();
             Assert.Equal(2, rolesAuthorizationRequirement.AllowedRoles.Count());
-            Assert.True(rolesAuthorizationRequirement.AllowedRoles.Any(r => r.Equals("r1")));
+            Assert.Contains(rolesAuthorizationRequirement.AllowedRoles, r => r.Equals("r1"));
-            Assert.True(rolesAuthorizationRequirement.AllowedRoles.Any(r => r.Equals("r2")));
+            Assert.Contains(rolesAuthorizationRequirement.AllowedRoles, r => r.Equals("r2"));
         }
 
         [Fact]
@@ -111,8 +111,8 @@ namespace Microsoft.AspNetCore.Authroization.Test
 
             // Assert
             Assert.Equal(2, combined.AuthenticationSchemes.Count());
-            Assert.True(combined.AuthenticationSchemes.Any(a => a.Equals("a1")));
+            Assert.Contains(combined.AuthenticationSchemes, a => a.Equals("a1"));
-            Assert.True(combined.AuthenticationSchemes.Any(a => a.Equals("a2")));
+            Assert.Contains(combined.AuthenticationSchemes, a => a.Equals("a2"));
         }
         
         [Fact]
@@ -131,8 +131,8 @@ namespace Microsoft.AspNetCore.Authroization.Test
 
             // Assert
             Assert.Equal(2, combined.AuthenticationSchemes.Count());
-            Assert.True(combined.AuthenticationSchemes.Any(a => a.Equals("a1")));
+            Assert.Contains(combined.AuthenticationSchemes, a => a.Equals("a1"));
-            Assert.True(combined.AuthenticationSchemes.Any(a => a.Equals("a2")));
+            Assert.Contains(combined.AuthenticationSchemes, a => a.Equals("a2"));
         }
         
         [Fact]
@@ -149,11 +149,11 @@ namespace Microsoft.AspNetCore.Authroization.Test
             var combined = await AuthorizationPolicy.CombineAsync(provider, attributes);
 
             // Assert
-            Assert.True(combined.Requirements.Any(r => r is RolesAuthorizationRequirement));
+            Assert.Contains(combined.Requirements, r => r is RolesAuthorizationRequirement);
             var rolesAuthorizationRequirement = combined.Requirements.OfType<RolesAuthorizationRequirement>().First();
             Assert.Equal(2, rolesAuthorizationRequirement.AllowedRoles.Count());
-            Assert.True(rolesAuthorizationRequirement.AllowedRoles.Any(r => r.Equals("r1")));
+            Assert.Contains(rolesAuthorizationRequirement.AllowedRoles, r => r.Equals("r1"));
-            Assert.True(rolesAuthorizationRequirement.AllowedRoles.Any(r => r.Equals("r2")));
+            Assert.Contains(rolesAuthorizationRequirement.AllowedRoles, r => r.Equals("r2"));
         }
     }
 }

test/Microsoft.Owin.Security.Interop.Test/TicketInteropTests.cs

@@ -35,7 +35,7 @@ namespace Microsoft.Owin.Security.Interop.Test
             var newTicket = newSerializer.Deserialize(bytes);
 
             Assert.NotNull(newTicket);
-            Assert.Equal(1, newTicket.Principal.Identities.Count());
+            Assert.Single(newTicket.Principal.Identities);
             var newIdentity = newTicket.Principal.Identity as ClaimsIdentity;
             Assert.NotNull(newIdentity);
             Assert.Equal("scheme", newIdentity.AuthenticationType);