From 3e26142de1c74db1ed1269db08099a44eb04e5c3 Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Thu, 11 Dec 2014 15:51:15 -0800 Subject: [PATCH] Remove use of `Assert.DoesNotThrow()` - no longer in xunit :smiley: --- .../ActionResults/EmptyResultTests.cs | 4 +-- .../DefaultActionSelectorTests.cs | 8 ++++-- .../DefaultControllerFactoryTest.cs | 4 +-- .../Internal/MvcServicesHelperTests.cs | 4 +-- .../Internal/TaskHelperTest.cs | 4 +-- .../DependencyResolverTests.cs | 14 ++++------- .../DefaultBodyModelValidatorTests.cs | 25 ++++++------------- .../ReferenceEqualityComparerTest.cs | 7 ++++-- .../RazorPageTest.cs | 4 +-- .../OptionTagHelperTest.cs | 8 +++--- 10 files changed, 38 insertions(+), 44 deletions(-) diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/EmptyResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/EmptyResultTests.cs index f6cb2d9f2f..0ab66ae52f 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/EmptyResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/EmptyResultTests.cs @@ -22,8 +22,8 @@ namespace Microsoft.AspNet.Mvc var context = new ActionContext(httpContext.Object, routeData, actionDescriptor); - // Act & Assert - Assert.DoesNotThrow(() => emptyResult.ExecuteResult(context)); + // Act & Assert (does not throw) + emptyResult.ExecuteResult(context); } } } \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionSelectorTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionSelectorTests.cs index cb709acaf7..c8b5b71b49 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionSelectorTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionSelectorTests.cs @@ -55,7 +55,9 @@ namespace Microsoft.AspNet.Mvc Assert.Empty(values.ActionsMatchingActionConstraints); Assert.Empty(values.FinalMatches); Assert.Null(values.SelectedAction); - Assert.DoesNotThrow(() => values.Summary); + + // (does not throw) + Assert.NotEmpty(values.Summary); } [Fact] @@ -146,7 +148,9 @@ namespace Microsoft.AspNet.Mvc Assert.Equal(actions, values.ActionsMatchingActionConstraints); Assert.Equal(actions, values.FinalMatches); Assert.Null(values.SelectedAction); - Assert.DoesNotThrow(() => values.Summary); + + // (does not throw) + Assert.NotEmpty(values.Summary); } [Fact] diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerFactoryTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerFactoryTest.cs index 1cd7631771..6a40b3db9b 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerFactoryTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerFactoryTest.cs @@ -40,8 +40,8 @@ namespace Microsoft.AspNet.Mvc.Core.Test var controller = new Object(); - // Act + Assert - Assert.DoesNotThrow(() => factory.ReleaseController(controller)); + // Act + Assert (does not throw) + factory.ReleaseController(controller); } private class MyController : Controller diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Internal/MvcServicesHelperTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Internal/MvcServicesHelperTests.cs index fca8f1eb20..5637d35546 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Internal/MvcServicesHelperTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Internal/MvcServicesHelperTests.cs @@ -37,8 +37,8 @@ namespace Microsoft.AspNet.Mvc services.Setup(o => o.GetService(typeof(MvcMarkerService))) .Returns(expectedOutput); - // Act & Assert - Assert.DoesNotThrow(() => MvcServicesHelper.ThrowIfMvcNotRegistered(services.Object)); + // Act & Assert (does not throw) + MvcServicesHelper.ThrowIfMvcNotRegistered(services.Object); } } } \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Internal/TaskHelperTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Internal/TaskHelperTest.cs index c764fddc94..346d3dd8e7 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Internal/TaskHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Internal/TaskHelperTest.cs @@ -15,8 +15,8 @@ namespace Microsoft.AspNet.Mvc.Internal // Arrange var task = Task.FromResult(0); - // Act and Assert - Assert.DoesNotThrow(() => TaskHelper.WaitAndThrowIfFaulted(task)); + // Act and Assert (does not throw) + TaskHelper.WaitAndThrowIfFaulted(task); } [Fact] diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/DependencyResolverTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/DependencyResolverTests.cs index d23e036c24..6543101b8b 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/DependencyResolverTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/DependencyResolverTests.cs @@ -22,17 +22,13 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests // Arrange var provider = TestHelper.CreateServices("AutofacWebSite"); Action app = new Startup().Configure; - HttpResponseMessage response = null; - // Act & Assert - await Assert.DoesNotThrowAsync(async () => - { - // This essentially calls into the Startup.Configuration method - var server = TestServer.Create(provider, app); + // Act & Assert (does not throw) + // This essentially calls into the Startup.Configuration method + var server = TestServer.Create(provider, app); - // Make a request to start resolving DI pieces - response = await server.CreateClient().GetAsync(url); - }); + // Make a request to start resolving DI pieces + var response = await server.CreateClient().GetAsync(url); var actualResponseBody = await response.Content.ReadAsStringAsync(); Assert.Equal(expectedResponseBody, actualResponseBody); diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DefaultBodyModelValidatorTests.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DefaultBodyModelValidatorTests.cs index db9629e88d..6234649072 100644 --- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DefaultBodyModelValidatorTests.cs +++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DefaultBodyModelValidatorTests.cs @@ -214,10 +214,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding // Arrange var validationContext = GetModelValidationContext(model, type); - // Act - Assert.DoesNotThrow(() => - new DefaultBodyModelValidator().Validate(validationContext, keyPrefix: string.Empty) - ); + // Act (does not throw) + new DefaultBodyModelValidator().Validate(validationContext, keyPrefix: string.Empty); // Assert var actualErrors = new Dictionary(); @@ -278,12 +276,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding // Arrange var validationContext = GetModelValidationContext(input, type, excludedTypes); - // Act & Assert - Assert.DoesNotThrow( - () => - { - new DefaultBodyModelValidator().Validate(validationContext, keyPrefix: string.Empty); - }); + // Act & Assert (does not throw) + new DefaultBodyModelValidator().Validate(validationContext, keyPrefix: string.Empty); Assert.True(validationContext.ModelState.IsValid); } @@ -312,10 +306,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding var model = new Address() { Street = "Microsoft Way" }; var validationContext = GetModelValidationContext(model, model.GetType()); - // Act - Assert.DoesNotThrow(() => - new DefaultBodyModelValidator().Validate(validationContext, keyPrefix: string.Empty) - ); + // Act (does not throw) + new DefaultBodyModelValidator().Validate(validationContext, keyPrefix: string.Empty); // Assert Assert.Contains("Street", validationContext.ModelState.Keys); @@ -336,9 +328,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding }; var validationContext = GetModelValidationContext(instance, typeof(TypeThatOverridesEquals[])); - // Act & Assert - Assert.DoesNotThrow( - () => new DefaultBodyModelValidator().Validate(validationContext, keyPrefix: string.Empty)); + // Act & Assert (does not throw) + new DefaultBodyModelValidator().Validate(validationContext, keyPrefix: string.Empty); } private ModelValidationContext GetModelValidationContext( diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/ReferenceEqualityComparerTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/ReferenceEqualityComparerTest.cs index 3c89a16c65..bdd5398ca5 100644 --- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/ReferenceEqualityComparerTest.cs +++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/ReferenceEqualityComparerTest.cs @@ -30,7 +30,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding var t1 = new TypeThatOverridesEquals(); var t2 = new TypeThatOverridesEquals(); - Assert.DoesNotThrow(() => ReferenceEqualityComparer.Instance.Equals(t1, t2)); + // Act & Assert (does not throw) + ReferenceEqualityComparer.Instance.Equals(t1, t2); } [Fact] @@ -58,7 +59,9 @@ namespace Microsoft.AspNet.Mvc.ModelBinding public void GetHashCode_DoesNotThrowForNull() { var comparer = ReferenceEqualityComparer.Instance; - Assert.DoesNotThrow(() => comparer.GetHashCode(null)); + + // Act & Assert (does not throw) + comparer.GetHashCode(null); } private class TypeThatOverridesEquals diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageTest.cs index 48c77e8125..9a91842158 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageTest.cs @@ -522,9 +522,9 @@ namespace Microsoft.AspNet.Mvc.Razor await page.ExecuteAsync(); page.IsLayoutBeingRendered = true; - // Assert + // Assert (does not throw) var renderAsyncDelegate = page.SectionWriters["test-section"]; - await Assert.DoesNotThrowAsync(() => renderAsyncDelegate(TextWriter.Null)); + await renderAsyncDelegate(TextWriter.Null); } [Fact] diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/OptionTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/OptionTagHelperTest.cs index 24a06d3e8e..72d83f837f 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/OptionTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/OptionTagHelperTest.cs @@ -208,9 +208,9 @@ namespace Microsoft.AspNet.Mvc.TagHelpers ViewContext = viewContext, }; - // Act & Assert + // Act & Assert (does not throw) // Tag helper would throw an NRE if it used Generator value. - await Assert.DoesNotThrowAsync(() => tagHelper.ProcessAsync(tagHelperContext, output)); + await tagHelper.ProcessAsync(tagHelperContext, output); } [Theory] @@ -247,9 +247,9 @@ namespace Microsoft.AspNet.Mvc.TagHelpers Value = value, }; - // Act & Assert + // Act & Assert (does not throw) // Tag helper would throw an NRE if it used ViewContext or Generator values. - await Assert.DoesNotThrowAsync(() => tagHelper.ProcessAsync(tagHelperContext, output)); + await tagHelper.ProcessAsync(tagHelperContext, output); } } }