Skip to content

Enable classes derived from EnableQueryAttribute to unit test OnActio… #776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
habbes merged 1 commit into from
Dec 20, 2022
Merged

Enable classes derived from EnableQueryAttribute to unit test OnActio… #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Microsoft.AspNetCore.OData/Query/EnableQueryAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ private ODataQueryOptions CreateAndValidateQueryOptions(HttpRequest request, ODa
{
RequestQueryData requestQueryData = request.HttpContext.Items[nameof(RequestQueryData)] as RequestQueryData;

if (requestQueryData.QueryValidationRunBeforeActionExecution)
if (requestQueryData != null && requestQueryData.QueryValidationRunBeforeActionExecution)
{
return requestQueryData.ProcessedQueryOptions;
}
Expand Down
37 changes: 37 additions & 0 deletions test/Microsoft.AspNetCore.OData.Tests/Query/EnableQueryAttributeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,43 @@ private static IEnumerable<ControllerActionDescriptor> CreateDescriptors(string
return descriptors;
}

[Fact]
public void Derived_Class_Can_Unit_Test_When_OnActionExecuted_Is_Overridden()
{
// https://github.com/OData/AspNetCoreOData/issues/239: unit tests for derived classes fail because RequestQueryOptions missing from HttpContext.Items
IEdmModel model = new CustomersModelWithInheritance().Model;

var request = RequestFactory.Create("Get", "http://localhost/Customers?$filter=Id+eq+1", opt => opt.AddRouteComponents("odata", model, services => { }).Filter());

ODataUriParser parser = new ODataUriParser(model, new Uri("Customers", UriKind.Relative));
HttpContext httpContext = request.HttpContext;

Assert.NotNull(httpContext.RequestServices);

httpContext.Request.Method = "Get";
request.Configure("odata", model, parser.ParsePath());
ActionDescriptor actionDescriptor = CreateDescriptors("CustomersController", typeof(CustomersController))
.First(descriptor => descriptor.ActionName.StartsWith("Get", StringComparison.OrdinalIgnoreCase));
ActionContext actionContext = new ActionContext(httpContext, new RouteData(), actionDescriptor);

ActionExecutedContext context = new ActionExecutedContext(actionContext, new List<IFilterMetadata>(), new CustomersController());
context.Result = new ObjectResult(new List<Customer>() { new Customer { Id = 1, Name = "John Doe" } }) { StatusCode = 200 };

MyEnableQueryAttribute attribute = new MyEnableQueryAttribute();

// Act and Assert
ExceptionAssert.DoesNotThrow(() => attribute.OnActionExecuted(context));

}

private class MyEnableQueryAttribute : EnableQueryAttribute
{
public override void OnActionExecuted(ActionExecutedContext actionExecutedContext)
{
base.OnActionExecuted(actionExecutedContext);
}
}

#if NETCORE // Following functionality is only supported in NetCore.
[Fact]
public void OnActionExecuting_Throws_Null_Context()
Expand Down