Replacing Assert.Equal(null, Assert.Equal(true \ false etc with

appropriate Xunit equivalents

test/Microsoft.AspNet.Mvc.Core.Test/AntiXsrf/TokenProviderTests.cs

@@ -52,9 +52,9 @@ namespace Microsoft.AspNet.Mvc.Core.Test
             Assert.NotNull(fieldToken);
             Assert.Equal(cookieToken.SecurityToken, fieldToken.SecurityToken);
             Assert.False(fieldToken.IsSessionToken);
-            Assert.Equal("", fieldToken.Username);
+            Assert.Empty(fieldToken.Username);
-            Assert.Equal(null, fieldToken.ClaimUid);
+            Assert.Null(fieldToken.ClaimUid);
-            Assert.Equal("", fieldToken.AdditionalData);
+            Assert.Empty(fieldToken.AdditionalData);
         }
 
         [Fact]
@@ -118,8 +118,8 @@ namespace Microsoft.AspNet.Mvc.Core.Test
             Assert.NotNull(fieldToken);
             Assert.Equal(cookieToken.SecurityToken, fieldToken.SecurityToken);
             Assert.False(fieldToken.IsSessionToken);
-            Assert.Equal("", fieldToken.Username);
+            Assert.Empty(fieldToken.Username);
-            Assert.Equal(null, fieldToken.ClaimUid);
+            Assert.Null(fieldToken.ClaimUid);
             Assert.Equal("additional-data", fieldToken.AdditionalData);
         }
 
@@ -191,8 +191,8 @@ namespace Microsoft.AspNet.Mvc.Core.Test
             Assert.Equal(cookieToken.SecurityToken, fieldToken.SecurityToken);
             Assert.False(fieldToken.IsSessionToken);
             Assert.Equal("my-username", fieldToken.Username);
-            Assert.Equal(null, fieldToken.ClaimUid);
+            Assert.Null(fieldToken.ClaimUid);
-            Assert.Equal("", fieldToken.AdditionalData);
+            Assert.Empty(fieldToken.AdditionalData);
         }
 
         [Fact]

test/Microsoft.AspNet.Mvc.Core.Test/MvcRouteHandlerTests.cs

@@ -32,21 +32,18 @@ namespace Microsoft.AspNet.Mvc
             await handler.RouteAsync(context);
 
             // Assert
-            Assert.Equal(1, sink.Scopes.Count);
+            var scope = Assert.Single(sink.Scopes);
-            var scope = sink.Scopes[0];
             Assert.Equal(typeof(MvcRouteHandler).FullName, scope.LoggerName);
             Assert.Equal("MvcRouteHandler.RouteAsync", scope.Scope);
 
-            Assert.Equal(1, sink.Writes.Count);
+            var write = Assert.Single(sink.Writes);
-
-            var write = sink.Writes[0];
             Assert.Equal(typeof(MvcRouteHandler).FullName, write.LoggerName);
             Assert.Equal("MvcRouteHandler.RouteAsync", write.Scope);
             var values = Assert.IsType<MvcRouteHandlerRouteAsyncValues>(write.State);
             Assert.Equal("MvcRouteHandler.RouteAsync", values.Name);
-            Assert.Equal(true, values.ActionSelected);
+            Assert.True(values.ActionSelected);
-            Assert.Equal(true, values.ActionInvoked);
+            Assert.True(values.ActionInvoked);
-            Assert.Equal(true, values.Handled);
+            Assert.True(values.Handled);
         }
 
         [Fact]
@@ -70,21 +67,18 @@ namespace Microsoft.AspNet.Mvc
             await handler.RouteAsync(context);
 
             // Assert
-            Assert.Equal(1, sink.Scopes.Count);
+            var scope = Assert.Single(sink.Scopes);
-            var scope = sink.Scopes[0];
             Assert.Equal(typeof(MvcRouteHandler).FullName, scope.LoggerName);
             Assert.Equal("MvcRouteHandler.RouteAsync", scope.Scope);
 
-            Assert.Equal(1, sink.Writes.Count);
+            var write = Assert.Single(sink.Writes);
-
-            var write = sink.Writes[0];
             Assert.Equal(typeof(MvcRouteHandler).FullName, write.LoggerName);
             Assert.Equal("MvcRouteHandler.RouteAsync", write.Scope);
             var values = Assert.IsType<MvcRouteHandlerRouteAsyncValues>(write.State);
             Assert.Equal("MvcRouteHandler.RouteAsync", values.Name);
-            Assert.Equal(false, values.ActionSelected);
+            Assert.False(values.ActionSelected);
-            Assert.Equal(false, values.ActionInvoked);
+            Assert.False(values.ActionInvoked);
-            Assert.Equal(false, values.Handled);
+            Assert.False(values.Handled);
         }
 
         [Fact]
@@ -109,8 +103,7 @@ namespace Microsoft.AspNet.Mvc
                 await handler.RouteAsync(context));
 
             // Assert
-            Assert.Equal(1, sink.Scopes.Count);
+            var scope = Assert.Single(sink.Scopes);
-            var scope = sink.Scopes[0];
             Assert.Equal(typeof(MvcRouteHandler).FullName, scope.LoggerName);
             Assert.Equal("MvcRouteHandler.RouteAsync", scope.Scope);
 
@@ -121,9 +114,9 @@ namespace Microsoft.AspNet.Mvc
             Assert.Equal("MvcRouteHandler.RouteAsync", write.Scope);
             var values = Assert.IsType<MvcRouteHandlerRouteAsyncValues>(write.State);
             Assert.Equal("MvcRouteHandler.RouteAsync", values.Name);
-            Assert.Equal(true, values.ActionSelected);
+            Assert.True(values.ActionSelected);
-            Assert.Equal(false, values.ActionInvoked);
+            Assert.False(values.ActionInvoked);
-            Assert.Equal(false, values.Handled);
+            Assert.False(values.Handled);
         }
 
         [Fact]

test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRouteTests.cs

@@ -689,7 +689,7 @@ namespace Microsoft.AspNet.Mvc.Routing
             Assert.Equal("AttributeRoute.RouteAsync", write.Scope);
             var values = Assert.IsType<AttributeRouteRouteAsyncValues>(write.State);
             Assert.Equal("AttributeRoute.RouteAsync", values.Name);
-            Assert.Equal(true, values.Handled);
+            Assert.True(values.Handled);
         }
 
         [Fact]
@@ -720,7 +720,7 @@ namespace Microsoft.AspNet.Mvc.Routing
             Assert.Equal("AttributeRoute.RouteAsync", write.Scope);
             var values = Assert.IsType<AttributeRouteRouteAsyncValues>(write.State);
             Assert.Equal("AttributeRoute.RouteAsync", values.Name);
-            Assert.Equal(false, values.Handled);
+            Assert.False(values.Handled);
         }
 
         [Fact]

test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/CompositeModelBinderTest.cs

@@ -110,7 +110,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Test
             Assert.True(isBound);
             Assert.Equal(expectedModel, bindingContext.Model);
             Assert.True(validationCalled);
-            Assert.Equal(true, bindingContext.ModelState.IsValid);
+            Assert.True(bindingContext.ModelState.IsValid);
         }
 
         [Fact]
@@ -136,7 +136,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Test
             // Assert
             Assert.False(isBound);
             Assert.Null(bindingContext.Model);
-            Assert.Equal(true, bindingContext.ModelState.IsValid);
+            Assert.True(bindingContext.ModelState.IsValid);
             mockListBinder.Verify();
         }
 

test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/MutableObjectModelBinderTest.cs

@@ -255,7 +255,15 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
         public void GetMetadataForProperties_WithoutBindAttribute()
         {
             // Arrange
-            var expectedPropertyNames = new[] { "DateOfBirth", "DateOfDeath", "ValueTypeRequired", "FirstName", "LastName", "PropertyWithDefaultValue" };
+            var expectedPropertyNames = new[]
+            {
+                "DateOfBirth",
+                "DateOfDeath",
+                "ValueTypeRequired",
+                "FirstName",
+                "LastName",
+                "PropertyWithDefaultValue"
+            };
             var bindingContext = new ModelBindingContext
             {
                 ModelMetadata = GetMetadataForType(typeof(Person)),
@@ -435,15 +443,13 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
 
             // Assert
             var modelStateDictionary = bindingContext.ModelState;
-            Assert.Equal(false, modelStateDictionary.IsValid);
+            Assert.False(modelStateDictionary.IsValid);
-            Assert.Equal(1, modelStateDictionary.Count);
+            Assert.Single(modelStateDictionary);
 
             // Check Age error.
             ModelState modelState;
             Assert.True(modelStateDictionary.TryGetValue("theModel.Age", out modelState));
-            Assert.Equal(1, modelState.Errors.Count);
+            var modelError = Assert.Single(modelState.Errors);
-
-            var modelError = modelState.Errors[0];
             Assert.Null(modelError.Exception);
             Assert.NotNull(modelError.ErrorMessage);
             Assert.Equal("The 'Age' property is required.", modelError.ErrorMessage);
@@ -493,7 +499,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
 
             // Assert
             var modelStateDictionary = bindingContext.ModelState;
-            Assert.Equal(false, modelStateDictionary.IsValid);
+            Assert.False(modelStateDictionary.IsValid);
             Assert.Equal(2, modelStateDictionary.Count);
 
             // Check Name field
@@ -504,10 +510,9 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
 
             // Check Age error.
             Assert.True(modelStateDictionary.TryGetValue("theModel.Age", out modelState));
-            Assert.Equal(1, modelState.Errors.Count);
             Assert.Equal(ModelValidationState.Invalid, modelState.ValidationState);
 
-            var modelError = modelState.Errors[0];
+            var modelError = Assert.Single(modelState.Errors);
             Assert.Null(modelError.Exception);
             Assert.NotNull(modelError.ErrorMessage);
             Assert.Equal("A value is required.", modelError.ErrorMessage);
@@ -531,15 +536,14 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
 
             // Assert
             var modelStateDictionary = bindingContext.ModelState;
-            Assert.Equal(false, modelStateDictionary.IsValid);
+            Assert.False(modelStateDictionary.IsValid);
             Assert.Equal(2, modelStateDictionary.Count);
 
             // Check Age error.
             ModelState modelState;
             Assert.True(modelStateDictionary.TryGetValue("theModel.Age", out modelState));
-            Assert.Equal(1, modelState.Errors.Count);
 
-            var modelError = modelState.Errors[0];
+            var modelError = Assert.Single(modelState.Errors);
             Assert.Null(modelError.Exception);
             Assert.NotNull(modelError.ErrorMessage);
             var expected = ValidationAttributeUtil.GetRequiredErrorMessage(nameof(ModelWithRequired.Age));
@@ -547,9 +551,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
 
             // Check City error.
             Assert.True(modelStateDictionary.TryGetValue("theModel.City", out modelState));
-            Assert.Equal(1, modelState.Errors.Count);
 
-            modelError = modelState.Errors[0];
+            modelError = Assert.Single(modelState.Errors);
             Assert.Null(modelError.Exception);
             Assert.NotNull(modelError.ErrorMessage);
             expected = ValidationAttributeUtil.GetRequiredErrorMessage(nameof(ModelWithRequired.City));
@@ -581,15 +584,14 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
 
             // Assert
             var modelStateDictionary = bindingContext.ModelState;
-            Assert.Equal(false, modelStateDictionary.IsValid);
+            Assert.False(modelStateDictionary.IsValid);
-            Assert.Equal(1, modelStateDictionary.Count);
+            Assert.Single(modelStateDictionary);
 
             // Check City error.
             ModelState modelState;
             Assert.True(modelStateDictionary.TryGetValue("theModel.City", out modelState));
-            Assert.Equal(1, modelState.Errors.Count);
 
-            var modelError = modelState.Errors[0];
+            var modelError = Assert.Single(modelState.Errors);
             Assert.Null(modelError.Exception);
             Assert.NotNull(modelError.ErrorMessage);
             var expected = ValidationAttributeUtil.GetRequiredErrorMessage(nameof(ModelWithRequired.City));
@@ -613,15 +615,14 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
 
             // Assert
             var modelStateDictionary = bindingContext.ModelState;
-            Assert.Equal(false, modelStateDictionary.IsValid);
+            Assert.False(modelStateDictionary.IsValid);
-            Assert.Equal(1, modelStateDictionary.Count);
+            Assert.Single(modelStateDictionary);
 
             // Check ValueTypeRequired error.
             ModelState modelState;
             Assert.True(modelStateDictionary.TryGetValue("theModel.ValueTypeRequired", out modelState));
-            Assert.Equal(1, modelState.Errors.Count);
 
-            var modelError = modelState.Errors[0];
+            var modelError = Assert.Single(modelState.Errors);
             Assert.Null(modelError.Exception);
             Assert.NotNull(modelError.ErrorMessage);
             Assert.Equal("Sample message", modelError.ErrorMessage);
@@ -649,15 +650,14 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
 
             // Assert
             var modelStateDictionary = bindingContext.ModelState;
-            Assert.Equal(false, modelStateDictionary.IsValid);
+            Assert.False(modelStateDictionary.IsValid);
-            Assert.Equal(1, modelStateDictionary.Count);
+            Assert.Single(modelStateDictionary);
 
             // Check ValueTypeRequired error.
             ModelState modelState;
             Assert.True(modelStateDictionary.TryGetValue("theModel.ValueTypeRequired", out modelState));
-            Assert.Equal(1, modelState.Errors.Count);
 
-            var modelError = modelState.Errors[0];
+            var modelError = Assert.Single(modelState.Errors);
             Assert.Null(modelError.Exception);
             Assert.NotNull(modelError.ErrorMessage);
             Assert.Equal("Sample message", modelError.ErrorMessage);
@@ -693,7 +693,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
             Assert.Equal("John", model.FirstName);
             Assert.Equal("Doe", model.LastName);
             Assert.Equal(dob, model.DateOfBirth);
-            Assert.Equal(true, bindingContext.ModelState.IsValid);
+            Assert.True(bindingContext.ModelState.IsValid);
         }
 
         [Fact]
@@ -717,7 +717,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
             // Assert
             var person = Assert.IsType<Person>(bindingContext.Model);
             Assert.Equal(123.456m, person.PropertyWithDefaultValue);
-            Assert.Equal(true, bindingContext.ModelState.IsValid);
+            Assert.True(bindingContext.ModelState.IsValid);
         }
 
         [Fact]
@@ -760,7 +760,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
 
             // Assert
             validationNode.Validate(validationContext);
-            Assert.Equal(true, bindingContext.ModelState.IsValid);
+            Assert.True(bindingContext.ModelState.IsValid);
             Assert.Equal(new DateTime(2001, 1, 1), model.DateOfBirth);
         }
 
@@ -807,9 +807,9 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
             testableBinder.SetPropertyPublic(bindingContext, propertyMetadata, dtoResult, requiredValidator);
 
             // Assert
-            Assert.Equal(true, bindingContext.ModelState.IsValid);
+            Assert.True(bindingContext.ModelState.IsValid);
             validationNode.Validate(validationContext, bindingContext.ValidationNode);
-            Assert.Equal(false, bindingContext.ModelState.IsValid);
+            Assert.False(bindingContext.ModelState.IsValid);
         }
 
         [Fact]
@@ -829,7 +829,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
             testableBinder.SetPropertyPublic(bindingContext, propertyMetadata, dtoResult, requiredValidator);
 
             // Assert
-            Assert.Equal(false, bindingContext.ModelState.IsValid);
+            Assert.False(bindingContext.ModelState.IsValid);
             Assert.Equal("Sample message", bindingContext.ModelState["foo.ValueTypeRequired"].Errors[0].ErrorMessage);
         }
 
@@ -851,7 +851,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
             testableBinder.SetPropertyPublic(bindingContext, propertyMetadata, dtoResult, requiredValidator);
 
             // Assert
-            Assert.Equal(false, bindingContext.ModelState.IsValid);
+            Assert.False(bindingContext.ModelState.IsValid);
             Assert.Equal(1, bindingContext.ModelState["foo.NameNoAttribute"].Errors.Count);
             Assert.Equal("This is a different exception." + Environment.NewLine
                        + "Parameter name: value",
@@ -875,9 +875,9 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
             testableBinder.SetPropertyPublic(bindingContext, propertyMetadata, dtoResult, requiredValidator);
 
             // Assert
-            Assert.Equal(false, bindingContext.ModelState.IsValid);
+            Assert.False(bindingContext.ModelState.IsValid);
-            Assert.Equal(1, bindingContext.ModelState["foo.Name"].Errors.Count);
+            var error = Assert.Single(bindingContext.ModelState["foo.Name"].Errors);
-            Assert.Equal("This message comes from the [Required] attribute.", bindingContext.ModelState["foo.Name"].Errors[0].ErrorMessage);
+            Assert.Equal("This message comes from the [Required] attribute.", error.ErrorMessage);
         }
 
         private static ModelBindingContext CreateContext(ModelMetadata metadata)
@@ -1075,12 +1075,18 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
                 return GetMetadataForPropertiesPublic(bindingContext);
             }
 
-            public virtual void SetPropertyPublic(ModelBindingContext bindingContext, ModelMetadata propertyMetadata, ComplexModelDtoResult dtoResult, IModelValidator requiredValidator)
+            public virtual void SetPropertyPublic(ModelBindingContext bindingContext,
+                                                  ModelMetadata propertyMetadata,
+                                                  ComplexModelDtoResult dtoResult,
+                                                  IModelValidator requiredValidator)
             {
                 base.SetProperty(bindingContext, propertyMetadata, dtoResult, requiredValidator);
             }
 
-            protected override void SetProperty(ModelBindingContext bindingContext, ModelMetadata propertyMetadata, ComplexModelDtoResult dtoResult, IModelValidator requiredValidator)
+            protected override void SetProperty(ModelBindingContext bindingContext,
+                                                ModelMetadata propertyMetadata,
+                                                ComplexModelDtoResult dtoResult,
+                                                IModelValidator requiredValidator)
             {
                 SetPropertyPublic(bindingContext, propertyMetadata, dtoResult, requiredValidator);
             }

test/Microsoft.AspNet.Mvc.ModelBinding.Test/ValueProviders/ValueProviderResultTest.cs

@@ -17,7 +17,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
 
             var convertedValue = valueProviderResult.ConvertTo(typeof(string));
 
-            Assert.Equal(null, convertedValue);
+            Assert.Null(convertedValue);
         }
 
         [Fact]

test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageTest.cs

@@ -241,7 +241,7 @@ namespace Microsoft.AspNet.Mvc.Razor
             await page.ExecuteAsync();
 
             // Assert
-            Assert.Equal(false, actual);
+            Assert.False(actual);
         }
 
         [Fact]
@@ -265,7 +265,7 @@ namespace Microsoft.AspNet.Mvc.Razor
             await page.ExecuteAsync();
 
             // Assert
-            Assert.Equal(true, actual);
+            Assert.True(actual);
         }
 
         [Fact]