From 9de86892a7bd9a4010aefb3347f093871e6c86cb Mon Sep 17 00:00:00 2001 From: YishaiGalatzer Date: Thu, 2 Oct 2014 11:49:44 -0700 Subject: [PATCH] Cleanup namespaces and Task.FromResult --- .../HttpNoContentOutputFormatter.cs | 8 ++++--- .../HttpNotAcceptableOutputFormatter.cs | 2 +- .../ReflectedActionExecutor.cs | 2 +- .../Filters/ActionFilterAttributeTests.cs | 2 +- .../MvcRouteHandlerTests.cs | 2 +- .../ReflectedActionInvokerTest.cs | 24 +++++++++---------- .../Routing/AttributeRouteTests.cs | 3 +-- ...rResponseTypeWithoutAttributeController.cs | 4 ++-- .../Controllers/TextPlainController.cs | 2 +- 9 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs index 2416f32979..f3b7f693a6 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; -using System.Text; using System.Threading.Tasks; using Microsoft.AspNet.Mvc.HeaderValueAbstractions; @@ -21,7 +20,10 @@ namespace Microsoft.AspNet.Mvc return context.Object == null; } - public IReadOnlyList GetSupportedContentTypes(Type declaredType, Type runtimeType, MediaTypeHeaderValue contentType) + public IReadOnlyList GetSupportedContentTypes( + Type declaredType, + Type runtimeType, + MediaTypeHeaderValue contentType) { return null; } @@ -35,7 +37,7 @@ namespace Microsoft.AspNet.Mvc // TODO: By default the status code is set to 200. // https://github.com/aspnet/HttpAbstractions/issues/114 response.StatusCode = 204; - return Task.FromResult(true); + return Task.FromResult(true); } } } diff --git a/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNotAcceptableOutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNotAcceptableOutputFormatter.cs index 556585490f..d7596aee7d 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNotAcceptableOutputFormatter.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNotAcceptableOutputFormatter.cs @@ -33,7 +33,7 @@ namespace Microsoft.AspNet.Mvc { var response = context.ActionContext.HttpContext.Response; response.StatusCode = 406; - return Task.FromResult(true); + return Task.FromResult(true); } } } diff --git a/src/Microsoft.AspNet.Mvc.Core/ReflectedActionExecutor.cs b/src/Microsoft.AspNet.Mvc.Core/ReflectedActionExecutor.cs index c9d9f568dd..7e377812d3 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ReflectedActionExecutor.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ReflectedActionExecutor.cs @@ -97,7 +97,7 @@ namespace Microsoft.AspNet.Mvc } else { - return Task.FromResult(result); + return Task.FromResult(result); } } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs index 93ab2fbc2d..1bcf9095c0 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs @@ -260,7 +260,7 @@ namespace Microsoft.AspNet.Mvc.Test { public Task ExecuteResultAsync(ActionContext context) { - return Task.FromResult(null); + return Task.FromResult(true); } } } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/MvcRouteHandlerTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/MvcRouteHandlerTests.cs index 7792225df1..14e5edf4b3 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/MvcRouteHandlerTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/MvcRouteHandlerTests.cs @@ -209,7 +209,7 @@ namespace Microsoft.AspNet.Mvc { var mockInvoker = new Mock(); mockInvoker.Setup(i => i.InvokeAsync()) - .Returns(Task.FromResult(null)); + .Returns(Task.FromResult(true)); var mockInvokerFactory = new Mock(); mockInvokerFactory.Setup(f => f.CreateInvoker(It.IsAny())) diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ReflectedActionInvokerTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ReflectedActionInvokerTest.cs index ed4a110710..70d85031c3 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ReflectedActionInvokerTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ReflectedActionInvokerTest.cs @@ -55,7 +55,7 @@ namespace Microsoft.AspNet.Mvc var filter = new Mock(MockBehavior.Strict); filter .Setup(f => f.OnExceptionAsync(It.IsAny())) - .Returns((context) => Task.FromResult(null)) + .Returns((context) => Task.FromResult(true)) .Verifiable(); var invoker = CreateInvoker(filter.Object, actionThrows: false); @@ -119,7 +119,7 @@ namespace Microsoft.AspNet.Mvc // Handle the exception context.Result = new EmptyResult(); }) - .Returns((context) => Task.FromResult(null)) + .Returns((context) => Task.FromResult(true)) .Verifiable(); var invoker = CreateInvoker(filter.Object, actionThrows: true); @@ -177,7 +177,7 @@ namespace Microsoft.AspNet.Mvc filter2.ToString(); context.Exception = null; }) - .Returns((context) => Task.FromResult(null)) + .Returns((context) => Task.FromResult(true)) .Verifiable(); var invoker = CreateInvoker(new IFilter[] { filter1.Object, filter2.Object }, actionThrows: true); @@ -216,7 +216,7 @@ namespace Microsoft.AspNet.Mvc var result = new Mock(MockBehavior.Strict); result .Setup(r => r.ExecuteResultAsync(It.IsAny())) - .Returns((context) => Task.FromResult(null)) + .Returns((context) => Task.FromResult(true)) .Verifiable(); var filter = new Mock(MockBehavior.Strict); @@ -260,7 +260,7 @@ namespace Microsoft.AspNet.Mvc var filter = new Mock(MockBehavior.Strict); filter .Setup(f => f.OnAuthorizationAsync(It.IsAny())) - .Returns(context => Task.FromResult(null)) + .Returns(context => Task.FromResult(true)) .Verifiable(); var invoker = CreateInvoker(filter.Object); @@ -309,7 +309,7 @@ namespace Microsoft.AspNet.Mvc .Returns((context) => { context.Result = challenge; - return Task.FromResult(null); + return Task.FromResult(true); }) .Verifiable(); @@ -380,7 +380,7 @@ namespace Microsoft.AspNet.Mvc var challenge = new Mock(MockBehavior.Strict); challenge .Setup(r => r.ExecuteResultAsync(It.IsAny())) - .Returns((context) => Task.FromResult(null)) + .Returns((context) => Task.FromResult(true)) .Verifiable(); var authorizationFilter = new Mock(MockBehavior.Strict); @@ -528,7 +528,7 @@ namespace Microsoft.AspNet.Mvc { // Notice we're not calling next c.Result = result; - return Task.FromResult(null); + return Task.FromResult(true); }) .Verifiable(); @@ -583,7 +583,7 @@ namespace Microsoft.AspNet.Mvc .Returns((c, next) => { // Notice we're not calling next - return Task.FromResult(null); + return Task.FromResult(true); }) .Verifiable(); @@ -772,7 +772,7 @@ namespace Microsoft.AspNet.Mvc var result = new Mock(MockBehavior.Strict); result .Setup(r => r.ExecuteResultAsync(It.IsAny())) - .Returns((context) => Task.FromResult(null)) + .Returns((context) => Task.FromResult(true)) .Verifiable(); var actionFilter = new Mock(MockBehavior.Strict); @@ -906,7 +906,7 @@ namespace Microsoft.AspNet.Mvc { // Not calling next here c.Cancel = true; - return Task.FromResult(null); + return Task.FromResult(true); }) .Verifiable(); @@ -948,7 +948,7 @@ namespace Microsoft.AspNet.Mvc .Returns((c, next) => { // Not calling next here - return Task.FromResult(null); + return Task.FromResult(true); }) .Verifiable(); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRouteTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRouteTests.cs index 4582759f87..53c9bb48c0 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRouteTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRouteTests.cs @@ -13,7 +13,6 @@ using Microsoft.Framework.OptionsModel; using Microsoft.Framework.Logging; using Moq; using Xunit; -using Microsoft.AspNet.PipelineCore; namespace Microsoft.AspNet.Mvc.Routing { @@ -1302,7 +1301,7 @@ namespace Microsoft.AspNet.Mvc.Routing context.IsHandled = MatchingDelegate(context); } - return Task.FromResult(null); + return Task.FromResult(true); } } } diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs index fc7149f033..acc6df04f3 100644 --- a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs +++ b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs @@ -47,7 +47,7 @@ namespace ApiExplorer [HttpGet] public Task GetTask() { - return Task.FromResult(null); + return Task.FromResult(true); } [HttpGet] @@ -65,7 +65,7 @@ namespace ApiExplorer [HttpGet] public Task GetTaskOfDerivedActionResult() { - return Task.FromResult(new ObjectResult(null)); + return Task.FromResult(new ObjectResult(null)); } [HttpGet] diff --git a/test/WebSites/ConnegWebSite/Controllers/TextPlainController.cs b/test/WebSites/ConnegWebSite/Controllers/TextPlainController.cs index 1568dbafa8..1057cdd4fd 100644 --- a/test/WebSites/ConnegWebSite/Controllers/TextPlainController.cs +++ b/test/WebSites/ConnegWebSite/Controllers/TextPlainController.cs @@ -20,7 +20,7 @@ namespace ConnegWebsite public Task ReturnTaskOfObject_ObjectValue() { - return Task.FromResult(new object()); + return Task.FromResult(new object()); } public string ReturnString()