From 432cfa00357ab0fe7ea5f08821deb632ef099a8a Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 16 Mar 2016 20:33:41 -0700 Subject: [PATCH] Fix failing functional tests --- .../WebApiCompatShimBasicTest.cs | 2 +- .../Filters/AuthorizeUserAttribute.cs | 6 +++++- .../Filters/ChangeContentActionFilter.cs | 6 +++++- .../Filters/ControllerActionFilter.cs | 13 ++++++++++--- .../Filters/ControllerResultFilter.cs | 10 ++++++++-- .../FiltersWebSite/Filters/GlobalActionFilter.cs | 16 ++++++++++++---- .../Filters/GlobalAuthorizationFilter.cs | 6 +++++- .../FiltersWebSite/Filters/GlobalResultFilter.cs | 13 ++++++++++--- .../Filters/PassThroughResultFilter.cs | 10 ++++++++-- 9 files changed, 64 insertions(+), 18 deletions(-) diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs index cd42ad1d29..a78651fcfa 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs @@ -36,7 +36,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests // Assert Assert.Equal(HttpStatusCode.OK, response.StatusCode); Assert.Equal( - "Hello, Anonymous User from WebApiCompatShimWebSite.BasicApiController.WriteToHttpContext", + "Hello, Anonymous User from WebApiCompatShimWebSite.BasicApiController.WriteToHttpContext (WebApiCompatShimWebSite)", content); } diff --git a/test/WebSites/FiltersWebSite/Filters/AuthorizeUserAttribute.cs b/test/WebSites/FiltersWebSite/Filters/AuthorizeUserAttribute.cs index a3e91fdf8e..9af9ccca64 100644 --- a/test/WebSites/FiltersWebSite/Filters/AuthorizeUserAttribute.cs +++ b/test/WebSites/FiltersWebSite/Filters/AuthorizeUserAttribute.cs @@ -1,8 +1,10 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System.Reflection; using System.Security.Claims; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; namespace FiltersWebSite @@ -11,7 +13,9 @@ namespace FiltersWebSite { public override void OnAuthorization(AuthorizationFilterContext context) { - if (context.ActionDescriptor.DisplayName == "FiltersWebSite.ProductsController.GetPrice") + var controllerActionDescriptor = (ControllerActionDescriptor)context.ActionDescriptor; + if (controllerActionDescriptor.MethodInfo == + typeof(ProductsController).GetMethod(nameof(ProductsController.GetPrice))) { context.HttpContext.Response.Headers.Append("filters", "Authorize Filter On Action - OnAuthorization"); diff --git a/test/WebSites/FiltersWebSite/Filters/ChangeContentActionFilter.cs b/test/WebSites/FiltersWebSite/Filters/ChangeContentActionFilter.cs index 8dbafde978..55e74a1e1f 100644 --- a/test/WebSites/FiltersWebSite/Filters/ChangeContentActionFilter.cs +++ b/test/WebSites/FiltersWebSite/Filters/ChangeContentActionFilter.cs @@ -1,8 +1,10 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System.Reflection; using System.Collections.Generic; using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; namespace FiltersWebSite @@ -16,7 +18,9 @@ namespace FiltersWebSite public override void OnActionExecuting(ActionExecutingContext context) { - if (context.ActionDescriptor.DisplayName == "FiltersWebSite.ActionFilterController.GetHelloWorld") + var controllerActionDescriptor = (ControllerActionDescriptor)context.ActionDescriptor; + if (controllerActionDescriptor.MethodInfo == + typeof(ActionFilterController).GetMethod(nameof(ActionFilterController.GetHelloWorld))) { (context.ActionArguments["fromGlobalActionFilter"] as List). Add(Helpers.GetContentResult(context.Result, "Action Filter - OnActionExecuting")); diff --git a/test/WebSites/FiltersWebSite/Filters/ControllerActionFilter.cs b/test/WebSites/FiltersWebSite/Filters/ControllerActionFilter.cs index 5129bfb487..b887935756 100644 --- a/test/WebSites/FiltersWebSite/Filters/ControllerActionFilter.cs +++ b/test/WebSites/FiltersWebSite/Filters/ControllerActionFilter.cs @@ -1,9 +1,11 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System.Reflection; using System.Collections.Generic; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; namespace FiltersWebSite @@ -12,7 +14,9 @@ namespace FiltersWebSite { public override void OnActionExecuted(ActionExecutedContext context) { - if (context.ActionDescriptor.DisplayName == "FiltersWebSite.ProductsController.GetPrice") + var controllerActionDescriptor = (ControllerActionDescriptor)context.ActionDescriptor; + if (controllerActionDescriptor.MethodInfo == + typeof(ProductsController).GetMethod(nameof(ProductsController.GetPrice))) { context.HttpContext.Response.Headers.Append("filters", "On Controller Action Filter - OnActionExecuted"); @@ -25,13 +29,16 @@ namespace FiltersWebSite public override void OnActionExecuting(ActionExecutingContext context) { - if (context.ActionDescriptor.DisplayName == "FiltersWebSite.ProductsController.GetPrice") + var controllerActionDescriptor = (ControllerActionDescriptor)context.ActionDescriptor; + if (controllerActionDescriptor.MethodInfo == + typeof(ProductsController).GetMethod(nameof(ProductsController.GetPrice))) { context.HttpContext.Response.Headers.Append("filters", "On Controller Action Filter - OnActionExecuting"); } - if (context.ActionDescriptor.DisplayName == "FiltersWebSite.ActionFilterController.GetHelloWorld") + if (controllerActionDescriptor.MethodInfo == + typeof(ActionFilterController).GetMethod(nameof(ActionFilterController.GetHelloWorld))) { (context.ActionArguments["fromGlobalActionFilter"] as List) .Add(Helpers.GetContentResult(context.Result, "Controller Action filter - OnActionExecuting")); diff --git a/test/WebSites/FiltersWebSite/Filters/ControllerResultFilter.cs b/test/WebSites/FiltersWebSite/Filters/ControllerResultFilter.cs index 3180d826b8..c94a1ebad8 100644 --- a/test/WebSites/FiltersWebSite/Filters/ControllerResultFilter.cs +++ b/test/WebSites/FiltersWebSite/Filters/ControllerResultFilter.cs @@ -1,7 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System.Reflection; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; namespace FiltersWebSite @@ -10,7 +12,9 @@ namespace FiltersWebSite { public override void OnResultExecuting(ResultExecutingContext context) { - if (context.ActionDescriptor.DisplayName == "FiltersWebSite.ProductsController.GetPrice") + var controllerActionDescriptor = (ControllerActionDescriptor)context.ActionDescriptor; + if (controllerActionDescriptor.MethodInfo == + typeof(ProductsController).GetMethod(nameof(ProductsController.GetPrice))) { context.HttpContext.Response.Headers.Append("filters", "On Controller Result Filter - OnResultExecuting"); @@ -23,7 +27,9 @@ namespace FiltersWebSite public override void OnResultExecuted(ResultExecutedContext context) { - if (context.ActionDescriptor.DisplayName == "FiltersWebSite.ProductsController.GetPrice") + var controllerActionDescriptor = (ControllerActionDescriptor)context.ActionDescriptor; + if (controllerActionDescriptor.MethodInfo == + typeof(ProductsController).GetMethod(nameof(ProductsController.GetPrice))) { context.HttpContext.Response.Headers.Append("filters", "On Controller Result Filter - OnResultExecuted"); diff --git a/test/WebSites/FiltersWebSite/Filters/GlobalActionFilter.cs b/test/WebSites/FiltersWebSite/Filters/GlobalActionFilter.cs index 3b126eff90..861769fd67 100644 --- a/test/WebSites/FiltersWebSite/Filters/GlobalActionFilter.cs +++ b/test/WebSites/FiltersWebSite/Filters/GlobalActionFilter.cs @@ -2,8 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; +using System.Reflection; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; namespace FiltersWebSite @@ -12,12 +14,15 @@ namespace FiltersWebSite { public void OnActionExecuted(ActionExecutedContext context) { - if (context.ActionDescriptor.DisplayName == "FiltersWebSite.ActionFilterController.GetHelloWorld") + var controllerActionDescriptor = (ControllerActionDescriptor)context.ActionDescriptor; + if (controllerActionDescriptor.MethodInfo == + typeof(ActionFilterController).GetMethod(nameof(ActionFilterController.GetHelloWorld))) { context.Result = Helpers.GetContentResult(context.Result, "GlobalActionFilter.OnActionExecuted"); } - if (context.ActionDescriptor.DisplayName == "FiltersWebSite.ProductsController.GetPrice") + if (controllerActionDescriptor.MethodInfo == + typeof(ProductsController).GetMethod(nameof(ProductsController.GetPrice))) { context.HttpContext.Response.Headers.Append("filters", "Global Action Filter - OnActionExecuted"); @@ -26,13 +31,16 @@ namespace FiltersWebSite public void OnActionExecuting(ActionExecutingContext context) { - if (context.ActionDescriptor.DisplayName == "FiltersWebSite.ActionFilterController.GetHelloWorld") + var controllerActionDescriptor = (ControllerActionDescriptor)context.ActionDescriptor; + if (controllerActionDescriptor.MethodInfo == + typeof(ActionFilterController).GetMethod(nameof(ActionFilterController.GetHelloWorld))) { (context.ActionArguments["fromGlobalActionFilter"] as List) .Add(Helpers.GetContentResult(null, "GlobalActionFilter.OnActionExecuting")); } - if (context.ActionDescriptor.DisplayName == "FiltersWebSite.ProductsController.GetPrice") + if (controllerActionDescriptor.MethodInfo == + typeof(ProductsController).GetMethod(nameof(ProductsController.GetPrice))) { context.HttpContext.Response.Headers.Append("filters", "Global Action Filter - OnActionExecuting"); diff --git a/test/WebSites/FiltersWebSite/Filters/GlobalAuthorizationFilter.cs b/test/WebSites/FiltersWebSite/Filters/GlobalAuthorizationFilter.cs index 58818f329c..6cc3cba698 100644 --- a/test/WebSites/FiltersWebSite/Filters/GlobalAuthorizationFilter.cs +++ b/test/WebSites/FiltersWebSite/Filters/GlobalAuthorizationFilter.cs @@ -1,7 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System.Reflection; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; namespace FiltersWebSite @@ -10,7 +12,9 @@ namespace FiltersWebSite { public override void OnAuthorization(AuthorizationFilterContext context) { - if (context.ActionDescriptor.DisplayName == "FiltersWebSite.ProductsController.GetPrice") + var controllerActionDescriptor = (ControllerActionDescriptor)context.ActionDescriptor; + if (controllerActionDescriptor.MethodInfo == + typeof(ProductsController).GetMethod(nameof(ProductsController.GetPrice))) { context.HttpContext.Response.Headers.Append("filters", "Global Authorization Filter - OnAuthorization"); diff --git a/test/WebSites/FiltersWebSite/Filters/GlobalResultFilter.cs b/test/WebSites/FiltersWebSite/Filters/GlobalResultFilter.cs index 7f5a8ae51f..79630e1daa 100644 --- a/test/WebSites/FiltersWebSite/Filters/GlobalResultFilter.cs +++ b/test/WebSites/FiltersWebSite/Filters/GlobalResultFilter.cs @@ -1,7 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System.Reflection; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; namespace FiltersWebSite @@ -10,7 +12,9 @@ namespace FiltersWebSite { public void OnResultExecuted(ResultExecutedContext context) { - if (context.ActionDescriptor.DisplayName == "FiltersWebSite.ProductsController.GetPrice") + var controllerActionDescriptor = (ControllerActionDescriptor)context.ActionDescriptor; + if (controllerActionDescriptor.MethodInfo == + typeof(ProductsController).GetMethod(nameof(ProductsController.GetPrice))) { context.HttpContext.Response.Headers.Append("filters", "Global Result Filter - OnResultExecuted"); @@ -19,12 +23,15 @@ namespace FiltersWebSite public void OnResultExecuting(ResultExecutingContext context) { - if (context.ActionDescriptor.DisplayName == "FiltersWebSite.ResultFilterController.GetHelloWorld") + var controllerActionDescriptor = (ControllerActionDescriptor)context.ActionDescriptor; + if (controllerActionDescriptor.MethodInfo == + typeof(ResultFilterController).GetMethod(nameof(ResultFilterController.GetHelloWorld))) { context.Result = Helpers.GetContentResult(context.Result, "GlobalResultFilter.OnResultExecuting"); } - if (context.ActionDescriptor.DisplayName == "FiltersWebSite.ProductsController.GetPrice") + if (controllerActionDescriptor.MethodInfo == + typeof(ProductsController).GetMethod(nameof(ProductsController.GetPrice))) { context.HttpContext.Response.Headers.Append("filters", "Global Result Filter - OnResultExecuted"); diff --git a/test/WebSites/FiltersWebSite/Filters/PassThroughResultFilter.cs b/test/WebSites/FiltersWebSite/Filters/PassThroughResultFilter.cs index d362275e33..25d30f6d57 100644 --- a/test/WebSites/FiltersWebSite/Filters/PassThroughResultFilter.cs +++ b/test/WebSites/FiltersWebSite/Filters/PassThroughResultFilter.cs @@ -1,7 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System.Reflection; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; namespace FiltersWebSite @@ -10,7 +12,9 @@ namespace FiltersWebSite { public override void OnResultExecuting(ResultExecutingContext context) { - if (context.ActionDescriptor.DisplayName == "FiltersWebSite.ProductsController.GetPrice") + var controllerActionDescriptor = (ControllerActionDescriptor)context.ActionDescriptor; + if (controllerActionDescriptor.MethodInfo == + typeof(ProductsController).GetMethod(nameof(ProductsController.GetPrice))) { context.HttpContext.Response.Headers.Append("filters", "On Action Result Filter - OnResultExecuting"); @@ -19,7 +23,9 @@ namespace FiltersWebSite public override void OnResultExecuted(ResultExecutedContext context) { - if (context.ActionDescriptor.DisplayName == "FiltersWebSite.ProductsController.GetPrice") + var controllerActionDescriptor = (ControllerActionDescriptor)context.ActionDescriptor; + if (controllerActionDescriptor.MethodInfo == + typeof(ProductsController).GetMethod(nameof(ProductsController.GetPrice))) { context.HttpContext.Response.Headers.Append("filters", "On Action Result Filter - OnResultExecuted");