From ac6a1a6a808ca4d88231db65cf3e5d0b54a1b92f Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Thu, 29 Jan 2015 13:56:49 -0800 Subject: [PATCH] Replaced status code number with constants --- .../ActionResults/BadRequestObjectResult.cs | 5 ++-- .../ActionResults/BadRequestResult.cs | 4 ++- .../ActionResults/CreatedAtActionResult.cs | 3 ++- .../ActionResults/CreatedAtRouteResult.cs | 3 ++- .../ActionResults/CreatedResult.cs | 3 ++- .../ActionResults/HttpNotFoundResult.cs | 4 ++- .../ActionResults/NoContentResult.cs | 4 ++- .../ActionResults/ObjectResult.cs | 3 ++- .../UnsupportedMediaTypeResult.cs | 4 ++- .../Filters/AuthorizationFilterAttribute.cs | 3 ++- .../HttpNoContentOutputFormatter.cs | 3 ++- .../HttpNotAcceptableOutputFormatter.cs | 3 ++- .../RequireHttpsAttribute.cs | 3 ++- .../BadRequestErrorMessageResult.cs | 5 ++-- .../ActionResults/ConflictResult.cs | 6 ++--- .../ActionResults/ExceptionResult.cs | 6 ++--- .../InternalServerErrorResult.cs | 6 ++--- .../ActionResults/InvalidModelStateResult.cs | 6 ++--- .../ActionResults/OkResult.cs | 6 ++--- .../BadRequestObjectResultTests.cs | 7 +++--- .../ActionResults/BadRequestResultTests.cs | 3 ++- .../CreatedAtActionResultTests.cs | 3 ++- .../CreatedAtRouteResultTests.cs | 3 ++- .../ActionResults/CreatedResultTests.cs | 5 ++-- .../ActionResults/HttpNotFoundResultTests.cs | 3 ++- .../HttpStatusCodeResultTests.cs | 5 ++-- .../ActionResults/ObjectResultTests.cs | 5 ++-- .../ControllerTests.cs | 25 ++++++++++--------- .../ControllerUnitTestabilityTests.cs | 11 ++++---- .../Filters/AuthorizeAttributeTests.cs | 3 ++- .../Formatters/NoContentFormatterTests.cs | 7 +++--- .../RequireHttpsAttributeTests.cs | 7 +++--- .../InputObjectValidationTests.cs | 9 ++++--- .../BadRequestErrorMessageResultTest.cs | 3 ++- .../ActionResults/ConflictResultTest.cs | 3 ++- .../ActionResults/ExceptionResultTest.cs | 3 ++- .../InternalServerErrorResultTest.cs | 3 ++- .../InvalidModelStateResultTest.cs | 3 ++- .../OkNegotiatedContentResultTest.cs | 3 ++- .../ActionResults/OkResultTest.cs | 3 ++- .../ApiControllerTest.cs | 11 ++++---- .../ActionResultsVerificationController.cs | 3 ++- .../Controllers/HomeController.cs | 5 ++-- .../Controllers/JsonFormatterController.cs | 3 ++- .../ModelStateValidationFilterAttribute.cs | 6 ++++- .../ElmLogSerializerMiddleware.cs | 3 ++- .../Controllers/VehicleController.cs | 4 +-- .../ActionSelectionFilter.cs | 3 ++- 48 files changed, 142 insertions(+), 93 deletions(-) diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/BadRequestObjectResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/BadRequestObjectResult.cs index e1b3481a5d..e601ec9a63 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/BadRequestObjectResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/BadRequestObjectResult.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Mvc.ModelBinding; +using Microsoft.AspNet.WebUtilities; namespace Microsoft.AspNet.Mvc { @@ -17,7 +18,7 @@ public class BadRequestObjectResult : ObjectResult public BadRequestObjectResult(object error) : base(error) { - StatusCode = 400; + StatusCode = StatusCodes.Status400BadRequest; } /// @@ -27,7 +28,7 @@ public BadRequestObjectResult(object error) public BadRequestObjectResult([NotNull] ModelStateDictionary modelState) : base(new SerializableError(modelState)) { - StatusCode = 400; + StatusCode = StatusCodes.Status400BadRequest; } } } \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/BadRequestResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/BadRequestResult.cs index 052d026a67..1c29abe0df 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/BadRequestResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/BadRequestResult.cs @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using Microsoft.AspNet.WebUtilities; + namespace Microsoft.AspNet.Mvc { /// @@ -13,7 +15,7 @@ public class BadRequestResult : HttpStatusCodeResult /// Creates a new instance. /// public BadRequestResult() - : base(400) + : base(StatusCodes.Status400BadRequest) { } } diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedAtActionResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedAtActionResult.cs index 279b890ad0..3e10b090f1 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedAtActionResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedAtActionResult.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using Microsoft.AspNet.Mvc.Core; +using Microsoft.AspNet.WebUtilities; using Microsoft.Framework.DependencyInjection; namespace Microsoft.AspNet.Mvc @@ -30,7 +31,7 @@ public CreatedAtActionResult(string actionName, ActionName = actionName; ControllerName = controllerName; RouteValues = TypeHelper.ObjectToDictionary(routeValues); - StatusCode = 201; + StatusCode = StatusCodes.Status201Created; } /// diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedAtRouteResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedAtRouteResult.cs index ba0ea40f50..87491c4bec 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedAtRouteResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedAtRouteResult.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using Microsoft.AspNet.Mvc.Core; +using Microsoft.AspNet.WebUtilities; using Microsoft.Framework.DependencyInjection; namespace Microsoft.AspNet.Mvc @@ -38,7 +39,7 @@ public CreatedAtRouteResult(string routeName, { RouteName = routeName; RouteValues = TypeHelper.ObjectToDictionary(routeValues); - StatusCode = 201; + StatusCode = StatusCodes.Status201Created; } /// diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedResult.cs index 006e0d1b77..bf6e5befd1 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedResult.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using Microsoft.AspNet.WebUtilities; namespace Microsoft.AspNet.Mvc { @@ -22,7 +23,7 @@ public CreatedResult([NotNull] string location, object value) : base(value) { Location = location; - StatusCode = 201; + StatusCode = StatusCodes.Status201Created; } /// diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpNotFoundResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpNotFoundResult.cs index 350472853a..9180d6def5 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpNotFoundResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpNotFoundResult.cs @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using Microsoft.AspNet.WebUtilities; + namespace Microsoft.AspNet.Mvc { /// @@ -12,7 +14,7 @@ public class HttpNotFoundResult : HttpStatusCodeResult /// /// Creates a new instance. /// - public HttpNotFoundResult() : base(404) + public HttpNotFoundResult() : base(StatusCodes.Status404NotFound) { } } diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/NoContentResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/NoContentResult.cs index 2efda64bfe..c1ddb96246 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/NoContentResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/NoContentResult.cs @@ -1,12 +1,14 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using Microsoft.AspNet.WebUtilities; + namespace Microsoft.AspNet.Mvc { public class NoContentResult : HttpStatusCodeResult { public NoContentResult() - : base(204) + : base(StatusCodes.Status204NoContent) { } } diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs index 9884e3c5c6..ccf762d080 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs @@ -8,6 +8,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc.Core; +using Microsoft.AspNet.WebUtilities; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.OptionsModel; using Microsoft.Net.Http.Headers; @@ -53,7 +54,7 @@ public override async Task ExecuteResultAsync(ActionContext context) if (selectedFormatter == null) { // No formatter supports this. - context.HttpContext.Response.StatusCode = 406; + context.HttpContext.Response.StatusCode = StatusCodes.Status406NotAcceptable; return; } diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/UnsupportedMediaTypeResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/UnsupportedMediaTypeResult.cs index e84fbc5379..923fc7b58e 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/UnsupportedMediaTypeResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/UnsupportedMediaTypeResult.cs @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using Microsoft.AspNet.WebUtilities; + namespace Microsoft.AspNet.Mvc { /// @@ -12,7 +14,7 @@ public class UnsupportedMediaTypeResult : HttpStatusCodeResult /// /// Creates a new instance of . /// - public UnsupportedMediaTypeResult() : base(415) + public UnsupportedMediaTypeResult() : base(StatusCodes.Status415UnsupportedMediaType) { } } diff --git a/src/Microsoft.AspNet.Mvc.Core/Filters/AuthorizationFilterAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/AuthorizationFilterAttribute.cs index be3a462ff3..af16da26ef 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Filters/AuthorizationFilterAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Filters/AuthorizationFilterAttribute.cs @@ -4,6 +4,7 @@ using System; using System.Linq; using System.Threading.Tasks; +using Microsoft.AspNet.WebUtilities; namespace Microsoft.AspNet.Mvc { @@ -31,7 +32,7 @@ protected virtual bool HasAllowAnonymous([NotNull] AuthorizationContext context) protected virtual void Fail([NotNull] AuthorizationContext context) { - context.Result = new HttpStatusCodeResult(401); + context.Result = new HttpStatusCodeResult(StatusCodes.Status401Unauthorized); } } } diff --git a/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs index 8d675d30c1..56707b2128 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using Microsoft.AspNet.WebUtilities; using Microsoft.Net.Http.Headers; namespace Microsoft.AspNet.Mvc @@ -44,7 +45,7 @@ public Task WriteAsync(OutputFormatterContext context) { var response = context.ActionContext.HttpContext.Response; response.ContentLength = 0; - response.StatusCode = context.StatusCode ?? 204; + response.StatusCode = context.StatusCode ?? StatusCodes.Status204NoContent; 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 caacd959c0..ab91475c43 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNotAcceptableOutputFormatter.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNotAcceptableOutputFormatter.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using Microsoft.AspNet.WebUtilities; using Microsoft.Net.Http.Headers; namespace Microsoft.AspNet.Mvc @@ -32,7 +33,7 @@ public IReadOnlyList GetSupportedContentTypes(Type declare public Task WriteAsync(OutputFormatterContext context) { var response = context.ActionContext.HttpContext.Response; - response.StatusCode = 406; + response.StatusCode = StatusCodes.Status406NotAcceptable; return Task.FromResult(true); } } diff --git a/src/Microsoft.AspNet.Mvc.Core/RequireHttpsAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/RequireHttpsAttribute.cs index cc9745b59c..14cf9ad5b9 100644 --- a/src/Microsoft.AspNet.Mvc.Core/RequireHttpsAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.Core/RequireHttpsAttribute.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using Microsoft.AspNet.WebUtilities; namespace Microsoft.AspNet.Mvc { @@ -25,7 +26,7 @@ protected virtual void HandleNonHttpsRequest(AuthorizationContext filterContext) // body correctly. if (!string.Equals(filterContext.HttpContext.Request.Method, "GET", StringComparison.OrdinalIgnoreCase)) { - filterContext.Result = new HttpStatusCodeResult(403); + filterContext.Result = new HttpStatusCodeResult(StatusCodes.Status403Forbidden); } else { diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/BadRequestErrorMessageResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/BadRequestErrorMessageResult.cs index ff338c2280..f2c39fb9d0 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/BadRequestErrorMessageResult.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/BadRequestErrorMessageResult.cs @@ -4,11 +4,12 @@ using System.Net; using System.Threading.Tasks; using Microsoft.AspNet.Mvc; +using Microsoft.AspNet.WebUtilities; namespace System.Web.Http { /// - /// An action result that returns a response and performs + /// An action result that returns a response and performs /// content negotiation on an with a . /// public class BadRequestErrorMessageResult : ObjectResult @@ -29,7 +30,7 @@ public BadRequestErrorMessageResult([NotNull] string message) /// public override async Task ExecuteResultAsync(ActionContext context) { - context.HttpContext.Response.StatusCode = (int)HttpStatusCode.BadRequest; + context.HttpContext.Response.StatusCode = StatusCodes.Status400BadRequest; await base.ExecuteResultAsync(context); } } diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ConflictResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ConflictResult.cs index a2d5267247..38cd97ed01 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ConflictResult.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ConflictResult.cs @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System.Net; using Microsoft.AspNet.Mvc; +using Microsoft.AspNet.WebUtilities; namespace System.Web.Http { /// - /// An action result that returns an empty response. + /// An action result that returns an empty response. /// public class ConflictResult : HttpStatusCodeResult { @@ -15,7 +15,7 @@ public class ConflictResult : HttpStatusCodeResult /// Initializes a new instance of the class. /// public ConflictResult() - : base((int)HttpStatusCode.Conflict) + : base(StatusCodes.Status409Conflict) { } } diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ExceptionResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ExceptionResult.cs index b33d33bb6a..5e61217ffe 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ExceptionResult.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ExceptionResult.cs @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System.Net; using System.Threading.Tasks; using Microsoft.AspNet.Mvc; +using Microsoft.AspNet.WebUtilities; namespace System.Web.Http { /// - /// An action result that returns a response and + /// An action result that returns a response and /// performs content negotiation on an based on an . /// public class ExceptionResult : ObjectResult @@ -41,7 +41,7 @@ public ExceptionResult(Exception exception, bool includeErrorDetail) /// public override Task ExecuteResultAsync(ActionContext context) { - context.HttpContext.Response.StatusCode = (int)HttpStatusCode.InternalServerError; + context.HttpContext.Response.StatusCode = StatusCodes.Status500InternalServerError; return base.ExecuteResultAsync(context); } } diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/InternalServerErrorResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/InternalServerErrorResult.cs index 7c38db27e2..55123f8982 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/InternalServerErrorResult.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/InternalServerErrorResult.cs @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System.Net; using Microsoft.AspNet.Mvc; +using Microsoft.AspNet.WebUtilities; namespace System.Web.Http { /// - /// An action result that returns an empty response. + /// An action result that returns an empty response. /// public class InternalServerErrorResult : HttpStatusCodeResult { @@ -15,7 +15,7 @@ public class InternalServerErrorResult : HttpStatusCodeResult /// Initializes a new instance of the class. /// public InternalServerErrorResult() - : base((int)HttpStatusCode.InternalServerError) + : base(StatusCodes.Status500InternalServerError) { } } diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/InvalidModelStateResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/InvalidModelStateResult.cs index f03d108321..c7ea3780d8 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/InvalidModelStateResult.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/InvalidModelStateResult.cs @@ -1,15 +1,15 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System.Net; using System.Threading.Tasks; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.ModelBinding; +using Microsoft.AspNet.WebUtilities; namespace System.Web.Http { /// - /// An action result that returns a response and performs + /// An action result that returns a response and performs /// content negotiation on an based on a . /// public class InvalidModelStateResult : ObjectResult @@ -39,7 +39,7 @@ public InvalidModelStateResult([NotNull] ModelStateDictionary modelState, bool i /// public override async Task ExecuteResultAsync(ActionContext context) { - context.HttpContext.Response.StatusCode = (int)HttpStatusCode.BadRequest; + context.HttpContext.Response.StatusCode = StatusCodes.Status400BadRequest; await base.ExecuteResultAsync(context); } } diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/OkResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/OkResult.cs index fa7762a552..5cb1280f6a 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/OkResult.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/OkResult.cs @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System.Net; using Microsoft.AspNet.Mvc; +using Microsoft.AspNet.WebUtilities; namespace System.Web.Http { /// - /// An action result that returns an empty response. + /// An action result that returns an empty response. /// public class OkResult : HttpStatusCodeResult { @@ -15,7 +15,7 @@ public class OkResult : HttpStatusCodeResult /// Initializes a new instance of the class. /// public OkResult() - : base((int)HttpStatusCode.OK) + : base(StatusCodes.Status200OK) { } } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/BadRequestObjectResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/BadRequestObjectResultTests.cs index 775a899e13..1fa770a555 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/BadRequestObjectResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/BadRequestObjectResultTests.cs @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Xunit; using Microsoft.AspNet.Mvc.ModelBinding; +using Microsoft.AspNet.WebUtilities; +using Xunit; namespace Microsoft.AspNet.Mvc { @@ -16,7 +17,7 @@ public void BadRequestObjectResult_SetsStatusCodeAndValue() var badRequestObjecResult = new BadRequestObjectResult(obj); // Assert - Assert.Equal(400, badRequestObjecResult.StatusCode); + Assert.Equal(StatusCodes.Status400BadRequest, badRequestObjecResult.StatusCode); Assert.Equal(obj, badRequestObjecResult.Value); } @@ -27,7 +28,7 @@ public void BadRequestObjectResult_ModelState_SetsStatusCodeAndValue() var badRequestObjecResult = new BadRequestObjectResult(new ModelStateDictionary()); // Assert - Assert.Equal(400, badRequestObjecResult.StatusCode); + Assert.Equal(StatusCodes.Status400BadRequest, badRequestObjecResult.StatusCode); var errors = Assert.IsType(badRequestObjecResult.Value); Assert.Equal(0, errors.Count); } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/BadRequestResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/BadRequestResultTests.cs index fbb5cbb18c..3ab33b365a 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/BadRequestResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/BadRequestResultTests.cs @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using Microsoft.AspNet.WebUtilities; using Xunit; namespace Microsoft.AspNet.Mvc @@ -14,7 +15,7 @@ public void BadRequestResult_InitializesStatusCode() var badRequest = new BadRequestResult(); // Assert - Assert.Equal(400, badRequest.StatusCode); + Assert.Equal(StatusCodes.Status400BadRequest, badRequest.StatusCode); } } } \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtActionResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtActionResultTests.cs index f948290609..04d81201b9 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtActionResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtActionResultTests.cs @@ -10,6 +10,7 @@ using Microsoft.AspNet.Http.Core.Collections; using Microsoft.AspNet.Routing; using Microsoft.AspNet.Testing; +using Microsoft.AspNet.WebUtilities; using Microsoft.Framework.OptionsModel; using Moq; using Xunit; @@ -38,7 +39,7 @@ public async Task CreatedAtActionResult_ReturnsStatusCode_SetsLocationHeader() await result.ExecuteResultAsync(actionContext); // Assert - Assert.Equal(201, httpContext.Response.StatusCode); + Assert.Equal(StatusCodes.Status201Created, httpContext.Response.StatusCode); Assert.Equal(expectedUrl, httpContext.Response.Headers["Location"]); } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtRouteResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtRouteResultTests.cs index d9b5a222c3..4dd6801701 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtRouteResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtRouteResultTests.cs @@ -9,6 +9,7 @@ using Microsoft.AspNet.Http.Core; using Microsoft.AspNet.Routing; using Microsoft.AspNet.Testing; +using Microsoft.AspNet.WebUtilities; using Microsoft.Framework.OptionsModel; using Moq; using Xunit; @@ -52,7 +53,7 @@ public async Task CreatedAtRouteResult_ReturnsStatusCode_SetsLocationHeader(obje await result.ExecuteResultAsync(actionContext); // Assert - Assert.Equal(201, httpContext.Response.StatusCode); + Assert.Equal(StatusCodes.Status201Created, httpContext.Response.StatusCode); Assert.Equal(expectedUrl, httpContext.Response.Headers["Location"]); } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedResultTests.cs index 230744955d..023141ca17 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedResultTests.cs @@ -7,6 +7,7 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Core; using Microsoft.AspNet.Routing; +using Microsoft.AspNet.WebUtilities; using Microsoft.Framework.OptionsModel; using Moq; using Xunit; @@ -41,7 +42,7 @@ public async Task CreatedResult_ReturnsStatusCode_SetsLocationHeader() await result.ExecuteResultAsync(actionContext); // Assert - Assert.Equal(201, httpContext.Response.StatusCode); + Assert.Equal(StatusCodes.Status201Created, httpContext.Response.StatusCode); Assert.Equal(location, httpContext.Response.Headers["Location"]); } @@ -59,7 +60,7 @@ public async Task CreatedResult_OverwritesLocationHeader() await result.ExecuteResultAsync(actionContext); // Assert - Assert.Equal(201, httpContext.Response.StatusCode); + Assert.Equal(StatusCodes.Status201Created, httpContext.Response.StatusCode); Assert.Equal(location, httpContext.Response.Headers["Location"]); } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpNotFoundResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpNotFoundResultTests.cs index 9e971076c5..a29486b908 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpNotFoundResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpNotFoundResultTests.cs @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using Microsoft.AspNet.WebUtilities; using Xunit; namespace Microsoft.AspNet.Mvc @@ -14,7 +15,7 @@ public void HttpNotFoundResult_InitializesStatusCode() var notFound = new HttpNotFoundResult(); // Assert - Assert.Equal(404, notFound.StatusCode); + Assert.Equal(StatusCodes.Status404NotFound, notFound.StatusCode); } } } \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpStatusCodeResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpStatusCodeResultTests.cs index 8a2cc53cff..0c4d52689f 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpStatusCodeResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpStatusCodeResultTests.cs @@ -3,6 +3,7 @@ using Microsoft.AspNet.Http.Core; using Microsoft.AspNet.Routing; +using Microsoft.AspNet.WebUtilities; using Xunit; namespace Microsoft.AspNet.Mvc @@ -13,7 +14,7 @@ public class HttpStatusCodeResultTests public void HttpStatusCodeResult_ExecuteResultSetsResponseStatusCode() { // Arrange - var result = new HttpStatusCodeResult(404); + var result = new HttpStatusCodeResult(StatusCodes.Status404NotFound); var httpContext = new DefaultHttpContext(); var routeData = new RouteData(); @@ -25,7 +26,7 @@ public void HttpStatusCodeResult_ExecuteResultSetsResponseStatusCode() result.ExecuteResult(context); // Assert - Assert.Equal(404, httpContext.Response.StatusCode); + Assert.Equal(StatusCodes.Status404NotFound, httpContext.Response.StatusCode); } } } \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ObjectResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ObjectResultTests.cs index 34f9e6a359..93fd07f0af 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ObjectResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ObjectResultTests.cs @@ -11,6 +11,7 @@ using Microsoft.AspNet.Http.Core; using Microsoft.AspNet.Mvc.Xml; using Microsoft.AspNet.Routing; +using Microsoft.AspNet.WebUtilities; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection.Fallback; using Microsoft.Framework.OptionsModel; @@ -401,7 +402,7 @@ public async Task ObjectResult_NoFormatterFound_Returns406() // Assert // Asserts that content type is not text/custom. - httpResponse.VerifySet(r => r.StatusCode = 406); + httpResponse.VerifySet(r => r.StatusCode = StatusCodes.Status406NotAcceptable); } [Fact] @@ -436,7 +437,7 @@ public async Task ObjectResult_Execute_NullContent_SetsStatusCode() { // Arrange var stream = new MemoryStream(); - var expectedStatusCode = 201; + var expectedStatusCode = StatusCodes.Status201Created; var httpResponse = new Mock(); httpResponse.SetupGet(r => r.Body).Returns(stream); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ControllerTests.cs index 23e0ac6f1e..70145c2af7 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ControllerTests.cs @@ -12,6 +12,7 @@ using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Routing; using Microsoft.AspNet.Testing; +using Microsoft.AspNet.WebUtilities; #if ASPNET50 using Moq; #endif @@ -384,7 +385,7 @@ public void Created_WithStringParameter_SetsCreatedLocation() // Assert Assert.IsType(result); - Assert.Equal(201, result.StatusCode); + Assert.Equal(StatusCodes.Status201Created, result.StatusCode); Assert.Same(uri, result.Location); } @@ -400,7 +401,7 @@ public void Created_WithAbsoluteUriParameter_SetsCreatedLocation() // Assert Assert.IsType(result); - Assert.Equal(201, result.StatusCode); + Assert.Equal(StatusCodes.Status201Created, result.StatusCode); Assert.Equal(uri.OriginalString, result.Location); } @@ -416,7 +417,7 @@ public void Created_WithRelativeUriParameter_SetsCreatedLocation() // Assert Assert.IsType(result); - Assert.Equal(201, result.StatusCode); + Assert.Equal(StatusCodes.Status201Created, result.StatusCode); Assert.Equal(uri.OriginalString, result.Location); } @@ -431,7 +432,7 @@ public void CreatedAtAction_WithParameterActionName_SetsResultActionName() // Assert Assert.IsType(result); - Assert.Equal(201, result.StatusCode); + Assert.Equal(StatusCodes.Status201Created, result.StatusCode); Assert.Equal("SampleAction", result.ActionName); } @@ -450,7 +451,7 @@ public void CreatedAtAction_WithActionControllerAndNullRouteValue_SetsSameValue( // Assert Assert.IsType(result); - Assert.Equal(201, result.StatusCode); + Assert.Equal(StatusCodes.Status201Created, result.StatusCode); Assert.Equal("SampleAction", result.ActionName); Assert.Equal(controllerName, result.ControllerName); } @@ -474,7 +475,7 @@ public void CreatedAtAction_WithActionControllerRouteValues_SetsSameValues() // Assert Assert.IsType(result); - Assert.Equal(201, result.StatusCode); + Assert.Equal(StatusCodes.Status201Created, result.StatusCode); Assert.Equal("SampleAction", result.ActionName); Assert.Equal("SampleController", result.ControllerName); Assert.Equal(expected, result.RouteValues); @@ -511,7 +512,7 @@ public void CreatedAtRoute_WithParameterRouteValues_SetsResultSameRouteValues() // Assert Assert.IsType(result); - Assert.Equal(201, result.StatusCode); + Assert.Equal(StatusCodes.Status201Created, result.StatusCode); Assert.Equal(expected, result.RouteValues); } @@ -532,7 +533,7 @@ public void CreatedAtRoute_WithParameterRouteNameAndValues_SetsResultSamePropert // Assert Assert.IsType(result); - Assert.Equal(201, result.StatusCode); + Assert.Equal(StatusCodes.Status201Created, result.StatusCode); Assert.Same(routeName, result.RouteName); Assert.Equal(expected, result.RouteValues); } @@ -651,7 +652,7 @@ public void HttpNotFound_SetsStatusCode() // Assert Assert.IsType(result); - Assert.Equal(404, result.StatusCode); + Assert.Equal(StatusCodes.Status404NotFound, result.StatusCode); } [Fact] @@ -665,7 +666,7 @@ public void BadRequest_SetsStatusCode() // Assert Assert.IsType(result); - Assert.Equal(400, result.StatusCode); + Assert.Equal(StatusCodes.Status400BadRequest, result.StatusCode); } [Fact] @@ -680,7 +681,7 @@ public void BadRequest_SetsStatusCodeAndValue_Object() // Assert Assert.IsType(result); - Assert.Equal(400, result.StatusCode); + Assert.Equal(StatusCodes.Status400BadRequest, result.StatusCode); Assert.Equal(obj, result.Value); } @@ -695,7 +696,7 @@ public void BadRequest_SetsStatusCodeAndValue_ModelState() // Assert Assert.IsType(result); - Assert.Equal(400, result.StatusCode); + Assert.Equal(StatusCodes.Status400BadRequest, result.StatusCode); var errors = Assert.IsType(result.Value); Assert.Equal(0, errors.Count); } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerUnitTestabilityTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ControllerUnitTestabilityTests.cs index 9840ee7805..ad2aee496f 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerUnitTestabilityTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ControllerUnitTestabilityTests.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.IO; using System.Text; +using Microsoft.AspNet.WebUtilities; using Xunit; namespace Microsoft.AspNet.Mvc @@ -100,7 +101,7 @@ public void ControllerCreated_InvokedInUnitTests(string uri, string content) var createdResult = Assert.IsType(result); Assert.Equal(uri, createdResult.Location); Assert.Equal(content, createdResult.Value); - Assert.Equal(201, createdResult.StatusCode); + Assert.Equal(StatusCodes.Status201Created, createdResult.StatusCode); } [Theory] @@ -206,7 +207,7 @@ public void ControllerHttpNotFound_InvokedInUnitTests() Assert.NotNull(result); var httpNotFoundResult = Assert.IsType(result); - Assert.Equal(404, httpNotFoundResult.StatusCode); + Assert.Equal(StatusCodes.Status404NotFound, httpNotFoundResult.StatusCode); } [Fact] @@ -222,7 +223,7 @@ public void ControllerHttpBadRequest_InvokedInUnitTests() Assert.NotNull(result); var httpBadRequest = Assert.IsType(result); - Assert.Equal(400, httpBadRequest.StatusCode); + Assert.Equal(StatusCodes.Status400BadRequest, httpBadRequest.StatusCode); } [Fact] @@ -239,7 +240,7 @@ public void ControllerHttpBadRequestObject_InvokedInUnitTests() Assert.NotNull(result); var httpBadRequest = Assert.IsType(result); - Assert.Equal(400, httpBadRequest.StatusCode); + Assert.Equal(StatusCodes.Status400BadRequest, httpBadRequest.StatusCode); Assert.Same(error, httpBadRequest.Value); // Arrange @@ -252,7 +253,7 @@ public void ControllerHttpBadRequestObject_InvokedInUnitTests() Assert.NotNull(result); httpBadRequest = Assert.IsType(result); - Assert.Equal(400, httpBadRequest.StatusCode); + Assert.Equal(StatusCodes.Status400BadRequest, httpBadRequest.StatusCode); Assert.Null(httpBadRequest.Value); } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/AuthorizeAttributeTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/AuthorizeAttributeTests.cs index 2cb06587c2..ba77fc685a 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/AuthorizeAttributeTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/AuthorizeAttributeTests.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Security; +using Microsoft.AspNet.WebUtilities; using Microsoft.Framework.DependencyInjection; using Moq; using Xunit; @@ -227,7 +228,7 @@ public async Task Invoke_FailedContextShouldNotCheckPermission() services.AddInstance(authorizationService.Object) ); - authorizationContext.Result = new HttpStatusCodeResult(401); + authorizationContext.Result = new HttpStatusCodeResult(StatusCodes.Status401Unauthorized); // Act await authorizeAttribute.OnAuthorizationAsync(authorizationContext); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/NoContentFormatterTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/NoContentFormatterTests.cs index 50adfb3b11..28eafef394 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/NoContentFormatterTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/NoContentFormatterTests.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http.Core; using Microsoft.AspNet.Routing; +using Microsoft.AspNet.WebUtilities; using Microsoft.Net.Http.Headers; using Xunit; @@ -125,7 +126,7 @@ public async Task WriteAsync_WritesTheStatusCode204() await formatter.WriteAsync(formatterContext); // Assert - Assert.Equal(204, defaultHttpContext.Response.StatusCode); + Assert.Equal(StatusCodes.Status204NoContent, defaultHttpContext.Response.StatusCode); } [Fact] @@ -137,7 +138,7 @@ public async Task WriteAsync_ContextStatusCodeSet_WritesSameStatusCode() { Object = null, ActionContext = new ActionContext(defaultHttpContext, new RouteData(), new ActionDescriptor()), - StatusCode = 201 + StatusCode = StatusCodes.Status201Created }; var formatter = new HttpNoContentOutputFormatter(); @@ -146,7 +147,7 @@ public async Task WriteAsync_ContextStatusCodeSet_WritesSameStatusCode() await formatter.WriteAsync(formatterContext); // Assert - Assert.Equal(201, defaultHttpContext.Response.StatusCode); + Assert.Equal(StatusCodes.Status201Created, defaultHttpContext.Response.StatusCode); } } } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/RequireHttpsAttributeTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/RequireHttpsAttributeTests.cs index 516df14230..58cd3c27e9 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/RequireHttpsAttributeTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/RequireHttpsAttributeTests.cs @@ -6,6 +6,7 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Core; using Microsoft.AspNet.Routing; +using Microsoft.AspNet.WebUtilities; using Xunit; namespace Microsoft.AspNet.Mvc @@ -120,7 +121,7 @@ public void OnAuthorization_SignalsBadRequestStatusCode_ForNonHttpsAndNonGetRequ // Assert Assert.NotNull(authContext.Result); var result = Assert.IsType(authContext.Result); - Assert.Equal(403, result.StatusCode); + Assert.Equal(StatusCodes.Status403Forbidden, result.StatusCode); } [Fact] @@ -138,14 +139,14 @@ public void HandleNonHttpsRequestExtensibility() // Assert var result = Assert.IsType(authContext.Result); - Assert.Equal(404, result.StatusCode); + Assert.Equal(StatusCodes.Status404NotFound, result.StatusCode); } private class CustomRequireHttpsAttribute : RequireHttpsAttribute { protected override void HandleNonHttpsRequest(AuthorizationContext filterContext) { - filterContext.Result = new HttpStatusCodeResult(404); + filterContext.Result = new HttpStatusCodeResult(StatusCodes.Status404NotFound); } } diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/InputObjectValidationTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/InputObjectValidationTests.cs index 600f899cd8..b453cebe20 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/InputObjectValidationTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/InputObjectValidationTests.cs @@ -10,6 +10,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Builder; using Microsoft.AspNet.TestHost; +using Microsoft.AspNet.WebUtilities; using Newtonsoft.Json; using Xunit; @@ -27,17 +28,17 @@ public static IEnumerable SimpleTypePropertiesModelRequestData { yield return new object[] { "{\"ByteProperty\":1, \"NullableByteProperty\":5, \"ByteArrayProperty\":[1,2,3]}", - 400, + StatusCodes.Status400BadRequest, "The field ByteProperty must be between 2 and 8."}; yield return new object[] { "{\"ByteProperty\":8, \"NullableByteProperty\":1, \"ByteArrayProperty\":[1,2,3]}", - 400, + StatusCodes.Status400BadRequest, "The field NullableByteProperty must be between 2 and 8."}; yield return new object[] { "{\"ByteProperty\":8, \"NullableByteProperty\":2, \"ByteArrayProperty\":[1]}", - 400, + StatusCodes.Status400BadRequest, "The field ByteArrayProperty must be a string or array type with a minimum length of '2'."}; } } @@ -130,7 +131,7 @@ var shouldNotContainMessage var response = await client.PostAsync("http://localhost/Validation/CreateProject", content); //Assert - Assert.Equal(400, (int)response.StatusCode); + Assert.Equal(StatusCodes.Status400BadRequest, (int)response.StatusCode); var responseContent = await response.Content.ReadAsStringAsync(); var responseObject = JsonConvert.DeserializeObject>(responseContent); diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs index e43adb6db3..e82ea51cce 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs @@ -8,6 +8,7 @@ using Microsoft.AspNet.Http.Core; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Routing; +using Microsoft.AspNet.WebUtilities; using Microsoft.Framework.OptionsModel; using Moq; using Xunit; @@ -33,7 +34,7 @@ public async Task BadRequestErrorMessageResult_SetsStatusCode() await result.ExecuteResultAsync(context); // Assert - Assert.Equal(400, context.HttpContext.Response.StatusCode); + Assert.Equal(StatusCodes.Status400BadRequest, context.HttpContext.Response.StatusCode); } [Fact] diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ConflictResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ConflictResultTest.cs index dfb0d37986..35d0b8622a 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ConflictResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ConflictResultTest.cs @@ -5,6 +5,7 @@ using Microsoft.AspNet.Http.Core; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Routing; +using Microsoft.AspNet.WebUtilities; using Xunit; namespace System.Web.Http @@ -22,7 +23,7 @@ public async Task ConflictResult_SetsStatusCode() await result.ExecuteResultAsync(context); // Assert - Assert.Equal(409, context.HttpContext.Response.StatusCode); + Assert.Equal(StatusCodes.Status409Conflict, context.HttpContext.Response.StatusCode); } } } diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs index 9724f802ae..76b55d295c 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs @@ -8,6 +8,7 @@ using Microsoft.AspNet.Http.Core; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Routing; +using Microsoft.AspNet.WebUtilities; using Microsoft.Framework.OptionsModel; using Moq; using Xunit; @@ -33,7 +34,7 @@ public async Task ExceptionResult_SetsStatusCode() await result.ExecuteResultAsync(context); // Assert - Assert.Equal(500, context.HttpContext.Response.StatusCode); + Assert.Equal(StatusCodes.Status500InternalServerError, context.HttpContext.Response.StatusCode); } [Fact] diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InternalServerErrorResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InternalServerErrorResultTest.cs index 31b5c7f740..64212bab55 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InternalServerErrorResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InternalServerErrorResultTest.cs @@ -5,6 +5,7 @@ using Microsoft.AspNet.Http.Core; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Routing; +using Microsoft.AspNet.WebUtilities; using Xunit; namespace System.Web.Http @@ -22,7 +23,7 @@ public async Task InternalServerErrorResult_SetsStatusCode() await result.ExecuteResultAsync(context); // Assert - Assert.Equal(500, context.HttpContext.Response.StatusCode); + Assert.Equal(StatusCodes.Status500InternalServerError, context.HttpContext.Response.StatusCode); } } } diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs index 4bd875fd4a..8ba25a911d 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs @@ -9,6 +9,7 @@ using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Routing; +using Microsoft.AspNet.WebUtilities; using Microsoft.Framework.OptionsModel; using Moq; using Xunit; @@ -38,7 +39,7 @@ public async Task InvalidModelStateResult_SetsStatusCode() await result.ExecuteResultAsync(context); // Assert - Assert.Equal(400, context.HttpContext.Response.StatusCode); + Assert.Equal(StatusCodes.Status400BadRequest, context.HttpContext.Response.StatusCode); } [Fact] diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/OkNegotiatedContentResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/OkNegotiatedContentResultTest.cs index 84a39093df..3f3dddfa31 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/OkNegotiatedContentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/OkNegotiatedContentResultTest.cs @@ -8,6 +8,7 @@ using Microsoft.AspNet.Http.Core; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Routing; +using Microsoft.AspNet.WebUtilities; using Microsoft.Framework.OptionsModel; using Moq; using Xunit; @@ -33,7 +34,7 @@ public async Task OkNegotiatedContentResult_SetsStatusCode() await result.ExecuteResultAsync(context); // Assert - Assert.Equal(200, context.HttpContext.Response.StatusCode); + Assert.Equal(StatusCodes.Status200OK, context.HttpContext.Response.StatusCode); } private IServiceProvider CreateServices() diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/OkResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/OkResultTest.cs index 4ffbdf2af4..e16124290b 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/OkResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/OkResultTest.cs @@ -5,6 +5,7 @@ using Microsoft.AspNet.Http.Core; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Routing; +using Microsoft.AspNet.WebUtilities; using Xunit; namespace System.Web.Http @@ -22,7 +23,7 @@ public async Task OkResult_SetsStatusCode() await result.ExecuteResultAsync(context); // Assert - Assert.Equal(200, context.HttpContext.Response.StatusCode); + Assert.Equal(StatusCodes.Status200OK, context.HttpContext.Response.StatusCode); } } } diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerTest.cs index b58a9bf562..3a692c0477 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerTest.cs @@ -10,6 +10,7 @@ using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Routing; +using Microsoft.AspNet.WebUtilities; using Newtonsoft.Json; using Xunit; @@ -60,7 +61,7 @@ public void ApiController_BadRequest() var result = controller.BadRequest(); // Assert - Assert.Equal(400, Assert.IsType(result).StatusCode); + Assert.Equal(StatusCodes.Status400BadRequest, Assert.IsType(result).StatusCode); } [Fact] @@ -185,7 +186,7 @@ public void ApiController_Conflict() var result = controller.Conflict(); // Assert - Assert.Equal(409, Assert.IsType(result).StatusCode); + Assert.Equal(StatusCodes.Status409Conflict, Assert.IsType(result).StatusCode); } [Fact] @@ -201,7 +202,7 @@ public void ApiController_Content() // Assert var contentResult = Assert.IsType>(result); - Assert.Equal((int)HttpStatusCode.Found, contentResult.StatusCode); + Assert.Equal(StatusCodes.Status302Found, contentResult.StatusCode); Assert.Equal(content, contentResult.Value); } @@ -215,7 +216,7 @@ public void ApiController_InternalServerError() var result = controller.InternalServerError(); // Assert - Assert.Equal(500, Assert.IsType(result).StatusCode); + Assert.Equal(StatusCodes.Status500InternalServerError, Assert.IsType(result).StatusCode); } [Fact] @@ -419,7 +420,7 @@ public void ApiController_StatusCode() var result = controller.StatusCode(HttpStatusCode.ExpectationFailed); // Assert - Assert.Equal(417, Assert.IsType(result).StatusCode); + Assert.Equal(StatusCodes.Status417ExpectationFailed, Assert.IsType(result).StatusCode); } private class Product diff --git a/test/WebSites/ActionResultsWebSite/Controllers/ActionResultsVerificationController.cs b/test/WebSites/ActionResultsWebSite/Controllers/ActionResultsVerificationController.cs index 7337d4a5b9..e951a6b420 100644 --- a/test/WebSites/ActionResultsWebSite/Controllers/ActionResultsVerificationController.cs +++ b/test/WebSites/ActionResultsWebSite/Controllers/ActionResultsVerificationController.cs @@ -4,6 +4,7 @@ using System; using System.Text; using Microsoft.AspNet.Mvc; +using Microsoft.AspNet.WebUtilities; namespace ActionResultsWebSite { @@ -80,7 +81,7 @@ public IActionResult GetContentResultWithContentTypeAndEncoding() public IActionResult GetObjectResultWithNoContent() { var result = new ObjectResult(null); - result.StatusCode = 201; + result.StatusCode = StatusCodes.Status201Created; return result; } diff --git a/test/WebSites/BasicWebSite/Controllers/HomeController.cs b/test/WebSites/BasicWebSite/Controllers/HomeController.cs index e59bc78c8a..8914bd87ce 100644 --- a/test/WebSites/BasicWebSite/Controllers/HomeController.cs +++ b/test/WebSites/BasicWebSite/Controllers/HomeController.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Mvc; +using Microsoft.AspNet.WebUtilities; namespace BasicWebSite.Controllers { @@ -37,14 +38,14 @@ public IActionResult RedirectToRouteActionAsMethodAction() public IActionResult NoContentResult() { - return new HttpStatusCodeResult(204); + return new HttpStatusCodeResult(StatusCodes.Status204NoContent); } [AcceptVerbs("GET", "POST")] [RequireHttps] public IActionResult HttpsOnlyAction() { - return new HttpStatusCodeResult(200); + return new HttpStatusCodeResult(StatusCodes.Status200OK); } public Task ActionReturningTask() diff --git a/test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs b/test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs index 93561e114b..936c23b8bc 100644 --- a/test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs +++ b/test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Mvc; +using Microsoft.AspNet.WebUtilities; using Newtonsoft.Json; namespace FormatterWebSite.Controllers @@ -33,7 +34,7 @@ public IActionResult ReturnInput([FromBody]DummyClass dummyObject) { if (!ModelState.IsValid) { - return new HttpStatusCodeResult(400); + return new HttpStatusCodeResult(StatusCodes.Status400BadRequest); } return Content(dummyObject.SampleInt.ToString()); } diff --git a/test/WebSites/FormatterWebSite/Filters/ModelStateValidationFilterAttribute.cs b/test/WebSites/FormatterWebSite/Filters/ModelStateValidationFilterAttribute.cs index 7d7c71fad0..eba431bad9 100644 --- a/test/WebSites/FormatterWebSite/Filters/ModelStateValidationFilterAttribute.cs +++ b/test/WebSites/FormatterWebSite/Filters/ModelStateValidationFilterAttribute.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Mvc; +using Microsoft.AspNet.WebUtilities; namespace FormatterWebSite { @@ -11,7 +12,10 @@ public override void OnActionExecuting(ActionExecutingContext context) { if (!context.ModelState.IsValid) { - context.Result = new ObjectResult(context.ModelState) { StatusCode = 400 }; + context.Result = new ObjectResult(context.ModelState) + { + StatusCode = StatusCodes.Status400BadRequest + }; } } } diff --git a/test/WebSites/LoggingWebSite/ElmLogSerializerMiddleware.cs b/test/WebSites/LoggingWebSite/ElmLogSerializerMiddleware.cs index 8225fe8daa..c791991dfd 100644 --- a/test/WebSites/LoggingWebSite/ElmLogSerializerMiddleware.cs +++ b/test/WebSites/LoggingWebSite/ElmLogSerializerMiddleware.cs @@ -6,6 +6,7 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Diagnostics.Elm; using Microsoft.AspNet.Http; +using Microsoft.AspNet.WebUtilities; using Newtonsoft.Json; namespace LoggingWebSite @@ -25,7 +26,7 @@ public Task Invoke(HttpContext context, ElmStore elmStore) var logActivities = GetLogDetails(elmStore); - context.Response.StatusCode = 200; + context.Response.StatusCode = StatusCodes.Status200OK; context.Response.ContentType = "application/json"; var serializer = JsonSerializer.Create(); diff --git a/test/WebSites/ModelBindingWebSite/Controllers/VehicleController.cs b/test/WebSites/ModelBindingWebSite/Controllers/VehicleController.cs index ef26984c5d..4bf4eefd93 100644 --- a/test/WebSites/ModelBindingWebSite/Controllers/VehicleController.cs +++ b/test/WebSites/ModelBindingWebSite/Controllers/VehicleController.cs @@ -5,8 +5,8 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; -using System.Net; using Microsoft.AspNet.Mvc; +using Microsoft.AspNet.WebUtilities; using ModelBindingWebSite.Services; using ModelBindingWebSite.ViewModels; @@ -133,7 +133,7 @@ public IActionResult Edit(int id, VehicleViewModel vehicle) public IDictionary> SerializeModelState() { - Response.StatusCode = (int)HttpStatusCode.BadRequest; + Response.StatusCode = StatusCodes.Status400BadRequest; return ModelState.Where(item => item.Value.Errors.Count > 0) .ToDictionary(item => item.Key, item => item.Value.Errors.Select(e => e.ErrorMessage)); diff --git a/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs b/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs index 484980760c..b072270480 100644 --- a/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs +++ b/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Mvc; +using Microsoft.AspNet.WebUtilities; using Newtonsoft.Json; namespace WebApiCompatShimWebSite @@ -22,7 +23,7 @@ public override void OnActionExecuted(ActionExecutedContext context) }) }); - context.Result = new HttpStatusCodeResult(200); + context.Result = new HttpStatusCodeResult(StatusCodes.Status200OK); } } } \ No newline at end of file