huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adds ActionContext to Validation contexts 

This change makes it possible to access the ActionContext/ActionDescriptor
from inside of validators and client validators.
This commit is contained in:
Ryan Nowak 2015-11-25 14:05:38 -08:00
parent 017bf1a20f
commit d8cc2b85d5
42 changed files with 659 additions and 690 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Microsoft.AspNet.Mvc.Abstractions/ModelBinding/ModelBindingContext.cs
View File

@ -37,7 +37,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
/// <returns>A new instance of <see cref="ModelBindingContext"/>.</returns> /// <returns>A new instance of <see cref="ModelBindingContext"/>.</returns>
public static ModelBindingContext CreateBindingContext( public static ModelBindingContext CreateBindingContext(
OperationBindingContext operationBindingContext, OperationBindingContext operationBindingContext,
ModelStateDictionary modelState,
ModelMetadata metadata, ModelMetadata metadata,
BindingInfo bindingInfo, BindingInfo bindingInfo,
string modelName) string modelName)
@ -47,11 +46,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
throw new ArgumentNullException(nameof(operationBindingContext)); throw new ArgumentNullException(nameof(operationBindingContext));
} }
if (modelState == null)
{
throw new ArgumentNullException(nameof(modelState));
}
if (metadata == null) if (metadata == null)
{ {
throw new ArgumentNullException(nameof(metadata)); throw new ArgumentNullException(nameof(metadata));
@ -83,7 +77,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
IsTopLevelObject = true, IsTopLevelObject = true,
ModelMetadata = metadata, ModelMetadata = metadata,
ModelState = modelState, ModelState = operationBindingContext.ActionContext.ModelState,
OperationBindingContext = operationBindingContext, OperationBindingContext = operationBindingContext,
ValueProvider = operationBindingContext.ValueProvider, ValueProvider = operationBindingContext.ValueProvider,

20
src/Microsoft.AspNet.Mvc.Abstractions/ModelBinding/Validation/ClientModelValidationContext.cs
View File

@ -8,10 +8,15 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
public class ClientModelValidationContext public class ClientModelValidationContext
{ {
public ClientModelValidationContext( public ClientModelValidationContext(
ActionContext actionContext,
ModelMetadata metadata, ModelMetadata metadata,
IModelMetadataProvider metadataProvider, IModelMetadataProvider metadataProvider)
IServiceProvider requestServices)
{ {
if (actionContext == null)
{
throw new ArgumentNullException(nameof(actionContext));
}
if (metadata == null) if (metadata == null)
{ {
throw new ArgumentNullException(nameof(metadata)); throw new ArgumentNullException(nameof(metadata));
@ -22,20 +27,15 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
throw new ArgumentNullException(nameof(metadataProvider)); throw new ArgumentNullException(nameof(metadataProvider));
} }
if (requestServices == null) ActionContext = actionContext;
{
throw new ArgumentNullException(nameof(requestServices));
}
ModelMetadata = metadata; ModelMetadata = metadata;
MetadataProvider = metadataProvider; MetadataProvider = metadataProvider;
RequestServices = requestServices;
} }
public ActionContext ActionContext { get; }
public ModelMetadata ModelMetadata { get; } public ModelMetadata ModelMetadata { get; }
public IModelMetadataProvider MetadataProvider { get; } public IModelMetadataProvider MetadataProvider { get; }
public IServiceProvider RequestServices { get; }
} }
} }

5
src/Microsoft.AspNet.Mvc.Abstractions/ModelBinding/Validation/ModelValidationContext.cs
View File

@ -8,6 +8,11 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
/// </summary> /// </summary>
public class ModelValidationContext public class ModelValidationContext
{ {
/// <summary>
/// Gets or sets the <see cref="Mvc.ActionContext"/>
/// </summary>
public ActionContext ActionContext { get; set; }
/// <summary> /// <summary>
/// Gets or sets the model object. /// Gets or sets the model object.
/// </summary> /// </summary>

14
src/Microsoft.AspNet.Mvc.Core/Controllers/DefaultControllerActionArgumentBinder.cs
View File

@ -82,7 +82,6 @@ namespace Microsoft.AspNet.Mvc.Controllers
var controllerProperties = new Dictionary<string, object>(StringComparer.Ordinal); var controllerProperties = new Dictionary<string, object>(StringComparer.Ordinal);
await PopulateArgumentsAsync( await PopulateArgumentsAsync(
operationBindingContext, operationBindingContext,
context.ModelState,
controllerProperties, controllerProperties,
actionDescriptor.BoundProperties); actionDescriptor.BoundProperties);
var controllerType = actionDescriptor.ControllerTypeInfo.AsType(); var controllerType = actionDescriptor.ControllerTypeInfo.AsType();
@ -91,7 +90,6 @@ namespace Microsoft.AspNet.Mvc.Controllers
var actionArguments = new Dictionary<string, object>(StringComparer.Ordinal); var actionArguments = new Dictionary<string, object>(StringComparer.Ordinal);
await PopulateArgumentsAsync( await PopulateArgumentsAsync(
operationBindingContext, operationBindingContext,
context.ModelState,
actionArguments, actionArguments,
actionDescriptor.Parameters); actionDescriptor.Parameters);
return actionArguments; return actionArguments;
@ -99,7 +97,6 @@ namespace Microsoft.AspNet.Mvc.Controllers
public async Task<ModelBindingResult> BindModelAsync( public async Task<ModelBindingResult> BindModelAsync(
ParameterDescriptor parameter, ParameterDescriptor parameter,
ModelStateDictionary modelState,
OperationBindingContext operationContext) OperationBindingContext operationContext)
{ {
if (parameter == null) if (parameter == null)
@ -107,11 +104,6 @@ namespace Microsoft.AspNet.Mvc.Controllers
throw new ArgumentNullException(nameof(parameter)); throw new ArgumentNullException(nameof(parameter));
} }
if (modelState == null)
{
throw new ArgumentNullException(nameof(modelState));
}
if (operationContext == null) if (operationContext == null)
{ {
throw new ArgumentNullException(nameof(operationContext)); throw new ArgumentNullException(nameof(operationContext));
@ -120,7 +112,6 @@ namespace Microsoft.AspNet.Mvc.Controllers
var metadata = _modelMetadataProvider.GetMetadataForType(parameter.ParameterType); var metadata = _modelMetadataProvider.GetMetadataForType(parameter.ParameterType);
var modelBindingContext = ModelBindingContext.CreateBindingContext( var modelBindingContext = ModelBindingContext.CreateBindingContext(
operationContext, operationContext,
modelState,
metadata, metadata,
parameter.BindingInfo, parameter.BindingInfo,
parameter.Name); parameter.Name);
@ -129,8 +120,8 @@ namespace Microsoft.AspNet.Mvc.Controllers
if (modelBindingResult.IsModelSet) if (modelBindingResult.IsModelSet)
{ {
_validator.Validate( _validator.Validate(
operationContext.ActionContext,
operationContext.ValidatorProvider, operationContext.ValidatorProvider,
modelState,
modelBindingContext.ValidationState, modelBindingContext.ValidationState,
modelBindingResult.Key, modelBindingResult.Key,
modelBindingResult.Model); modelBindingResult.Model);
@ -204,7 +195,6 @@ namespace Microsoft.AspNet.Mvc.Controllers
private async Task PopulateArgumentsAsync( private async Task PopulateArgumentsAsync(
OperationBindingContext operationContext, OperationBindingContext operationContext,
ModelStateDictionary modelState,
IDictionary<string, object> arguments, IDictionary<string, object> arguments,
IList<ParameterDescriptor> parameterMetadata) IList<ParameterDescriptor> parameterMetadata)
{ {
@ -212,7 +202,7 @@ namespace Microsoft.AspNet.Mvc.Controllers
for (var i = 0; i < parameterMetadata.Count; i++) for (var i = 0; i < parameterMetadata.Count; i++)
{ {
var parameter = parameterMetadata[i]; var parameter = parameterMetadata[i];
var modelBindingResult = await BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await BindModelAsync(parameter, operationContext);
if (modelBindingResult.IsModelSet) if (modelBindingResult.IsModelSet)
{ {
arguments[parameter.Name] = modelBindingResult.Model; arguments[parameter.Name] = modelBindingResult.Model;

90
src/Microsoft.AspNet.Mvc.Core/ModelBinding/ModelBindingHelper.cs
View File

@ -29,8 +29,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
/// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>. /// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>.
/// </param> /// </param>
/// <param name="actionContext">The <see cref="ActionContext"/> for the current executing request.</param> /// <param name="actionContext">The <see cref="ActionContext"/> for the current executing request.</param>
/// <param name="modelState">The <see cref="ModelStateDictionary"/> used for maintaining state and
/// results of model-binding validation.</param>
/// <param name="metadataProvider">The provider used for reading metadata for the model type.</param> /// <param name="metadataProvider">The provider used for reading metadata for the model type.</param>
/// <param name="modelBinder">The <see cref="IModelBinder"/> used for binding.</param> /// <param name="modelBinder">The <see cref="IModelBinder"/> used for binding.</param>
/// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param> /// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param>
@ -46,7 +44,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
TModel model, TModel model,
string prefix, string prefix,
ActionContext actionContext, ActionContext actionContext,
ModelStateDictionary modelState,
IModelMetadataProvider metadataProvider, IModelMetadataProvider metadataProvider,
IModelBinder modelBinder, IModelBinder modelBinder,
IValueProvider valueProvider, IValueProvider valueProvider,
@ -70,11 +67,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
throw new ArgumentNullException(nameof(actionContext)); throw new ArgumentNullException(nameof(actionContext));
} }
if (modelState == null)
{
throw new ArgumentNullException(nameof(modelState));
}
if (metadataProvider == null) if (metadataProvider == null)
{ {
throw new ArgumentNullException(nameof(metadataProvider)); throw new ArgumentNullException(nameof(metadataProvider));
@ -110,7 +102,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
model, model,
prefix, prefix,
actionContext, actionContext,
modelState,
metadataProvider, metadataProvider,
modelBinder, modelBinder,
valueProvider, valueProvider,
@ -130,8 +121,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
/// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>. /// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>.
/// </param> /// </param>
/// <param name="actionContext">The <see cref="ActionContext"/> for the current executing request.</param> /// <param name="actionContext">The <see cref="ActionContext"/> for the current executing request.</param>
/// <param name="modelState">The <see cref="ModelStateDictionary"/> used for maintaining state and
/// results of model-binding validation.</param>
/// <param name="metadataProvider">The provider used for reading metadata for the model type.</param> /// <param name="metadataProvider">The provider used for reading metadata for the model type.</param>
/// <param name="modelBinder">The <see cref="IModelBinder"/> used for binding.</param> /// <param name="modelBinder">The <see cref="IModelBinder"/> used for binding.</param>
/// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param> /// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param>
@ -147,17 +136,16 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
/// which need to be included for the current model.</param> /// which need to be included for the current model.</param>
/// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful</returns> /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful</returns>
public static Task<bool> TryUpdateModelAsync<TModel>( public static Task<bool> TryUpdateModelAsync<TModel>(
TModel model, TModel model,
string prefix, string prefix,
ActionContext actionContext, ActionContext actionContext,
ModelStateDictionary modelState, IModelMetadataProvider metadataProvider,
IModelMetadataProvider metadataProvider, IModelBinder modelBinder,
IModelBinder modelBinder, IValueProvider valueProvider,
IValueProvider valueProvider, IList<IInputFormatter> inputFormatters,
IList<IInputFormatter> inputFormatters, IObjectModelValidator objectModelValidator,
IObjectModelValidator objectModelValidator, IModelValidatorProvider validatorProvider,
IModelValidatorProvider validatorProvider, params Expression<Func<TModel, object>>[] includeExpressions)
params Expression<Func<TModel, object>>[] includeExpressions)
where TModel : class where TModel : class
{ {
if (model == null) if (model == null)
@ -175,11 +163,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
throw new ArgumentNullException(nameof(actionContext)); throw new ArgumentNullException(nameof(actionContext));
} }
if (modelState == null)
{
throw new ArgumentNullException(nameof(modelState));
}
if (metadataProvider == null) if (metadataProvider == null)
{ {
throw new ArgumentNullException(nameof(metadataProvider)); throw new ArgumentNullException(nameof(metadataProvider));
@ -222,7 +205,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
model, model,
prefix, prefix,
actionContext, actionContext,
modelState,
metadataProvider, metadataProvider,
modelBinder, modelBinder,
valueProvider, valueProvider,
@ -242,8 +224,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
/// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>. /// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>.
/// </param> /// </param>
/// <param name="actionContext">The <see cref="ActionContext"/> for the current executing request.</param> /// <param name="actionContext">The <see cref="ActionContext"/> for the current executing request.</param>
/// <param name="modelState">The <see cref="ModelStateDictionary"/> used for maintaining state and
/// results of model-binding validation.</param>
/// <param name="metadataProvider">The provider used for reading metadata for the model type.</param> /// <param name="metadataProvider">The provider used for reading metadata for the model type.</param>
/// <param name="modelBinder">The <see cref="IModelBinder"/> used for binding.</param> /// <param name="modelBinder">The <see cref="IModelBinder"/> used for binding.</param>
/// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param> /// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param>
@ -258,18 +238,17 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
/// filter properties(for inclusion/exclusion) at runtime.</param> /// filter properties(for inclusion/exclusion) at runtime.</param>
/// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful</returns> /// <returns>A <see cref="Task"/> that on completion returns <c>true</c> if the update is successful</returns>
public static Task<bool> TryUpdateModelAsync<TModel>( public static Task<bool> TryUpdateModelAsync<TModel>(
TModel model, TModel model,
string prefix, string prefix,
ActionContext actionContext, ActionContext actionContext,
ModelStateDictionary modelState, IModelMetadataProvider metadataProvider,
IModelMetadataProvider metadataProvider, IModelBinder modelBinder,
IModelBinder modelBinder, IValueProvider valueProvider,
IValueProvider valueProvider, IList<IInputFormatter> inputFormatters,
IList<IInputFormatter> inputFormatters, IObjectModelValidator objectModelValidator,
IObjectModelValidator objectModelValidator, IModelValidatorProvider validatorProvider,
IModelValidatorProvider validatorProvider, Func<ModelBindingContext, string, bool> predicate)
Func<ModelBindingContext, string, bool> predicate) where TModel : class
where TModel : class
{ {
if (model == null) if (model == null)
{ {
@ -286,11 +265,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
throw new ArgumentNullException(nameof(actionContext)); throw new ArgumentNullException(nameof(actionContext));
} }
if (modelState == null)
{
throw new ArgumentNullException(nameof(modelState));
}
if (metadataProvider == null) if (metadataProvider == null)
{ {
throw new ArgumentNullException(nameof(metadataProvider)); throw new ArgumentNullException(nameof(metadataProvider));
@ -331,7 +305,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
typeof(TModel), typeof(TModel),
prefix, prefix,
actionContext, actionContext,
modelState,
metadataProvider, metadataProvider,
modelBinder, modelBinder,
valueProvider, valueProvider,
@ -351,8 +324,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
/// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>. /// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>.
/// </param> /// </param>
/// <param name="actionContext">The <see cref="ActionContext"/> for the current executing request.</param> /// <param name="actionContext">The <see cref="ActionContext"/> for the current executing request.</param>
/// <param name="modelState">The <see cref="ModelStateDictionary"/> used for maintaining state and
/// results of model-binding validation.</param>
/// <param name="metadataProvider">The provider used for reading metadata for the model type.</param> /// <param name="metadataProvider">The provider used for reading metadata for the model type.</param>
/// <param name="modelBinder">The <see cref="IModelBinder"/> used for binding.</param> /// <param name="modelBinder">The <see cref="IModelBinder"/> used for binding.</param>
/// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param> /// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param>
@ -369,7 +340,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
Type modelType, Type modelType,
string prefix, string prefix,
ActionContext actionContext, ActionContext actionContext,
ModelStateDictionary modelState,
IModelMetadataProvider metadataProvider, IModelMetadataProvider metadataProvider,
IModelBinder modelBinder, IModelBinder modelBinder,
IValueProvider valueProvider, IValueProvider valueProvider,
@ -397,11 +367,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
throw new ArgumentNullException(nameof(actionContext)); throw new ArgumentNullException(nameof(actionContext));
} }
if (modelState == null)
{
throw new ArgumentNullException(nameof(modelState));
}
if (metadataProvider == null) if (metadataProvider == null)
{ {
throw new ArgumentNullException(nameof(metadataProvider)); throw new ArgumentNullException(nameof(metadataProvider));
@ -438,7 +403,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
modelType, modelType,
prefix, prefix,
actionContext, actionContext,
modelState,
metadataProvider, metadataProvider,
modelBinder, modelBinder,
valueProvider, valueProvider,
@ -458,8 +422,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
/// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>. /// <param name="prefix">The prefix to use when looking up values in the <paramref name="valueProvider"/>.
/// </param> /// </param>
/// <param name="actionContext">The <see cref="ActionContext"/> for the current executing request.</param> /// <param name="actionContext">The <see cref="ActionContext"/> for the current executing request.</param>
/// <param name="modelState">The <see cref="ModelStateDictionary"/> used for maintaining state and
/// results of model-binding validation.</param>
/// <param name="metadataProvider">The provider used for reading metadata for the model type.</param> /// <param name="metadataProvider">The provider used for reading metadata for the model type.</param>
/// <param name="modelBinder">The <see cref="IModelBinder"/> used for binding.</param> /// <param name="modelBinder">The <see cref="IModelBinder"/> used for binding.</param>
/// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param> /// <param name="valueProvider">The <see cref="IValueProvider"/> used for looking up values.</param>
@ -478,7 +440,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
Type modelType, Type modelType,
string prefix, string prefix,
ActionContext actionContext, ActionContext actionContext,
ModelStateDictionary modelState,
IModelMetadataProvider metadataProvider, IModelMetadataProvider metadataProvider,
IModelBinder modelBinder, IModelBinder modelBinder,
IValueProvider valueProvider, IValueProvider valueProvider,
@ -507,11 +468,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
throw new ArgumentNullException(nameof(actionContext)); throw new ArgumentNullException(nameof(actionContext));
} }
if (modelState == null)
{
throw new ArgumentNullException(nameof(modelState));
}
if (metadataProvider == null) if (metadataProvider == null)
{ {
throw new ArgumentNullException(nameof(metadataProvider)); throw new ArgumentNullException(nameof(metadataProvider));
@ -558,6 +514,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
var modelMetadata = metadataProvider.GetMetadataForType(modelType); var modelMetadata = metadataProvider.GetMetadataForType(modelType);
// Clear ModelStateDictionary entries for the model so that it will be re-validated. // Clear ModelStateDictionary entries for the model so that it will be re-validated.
var modelState = actionContext.ModelState;
ClearValidationStateForModel(modelType, modelState, metadataProvider, prefix); ClearValidationStateForModel(modelType, modelState, metadataProvider, prefix);
var operationBindingContext = new OperationBindingContext var operationBindingContext = new OperationBindingContext
@ -572,7 +529,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
var modelBindingContext = ModelBindingContext.CreateBindingContext( var modelBindingContext = ModelBindingContext.CreateBindingContext(
operationBindingContext, operationBindingContext,
modelState,
modelMetadata, modelMetadata,
bindingInfo: null, bindingInfo: null,
modelName: prefix ?? string.Empty); modelName: prefix ?? string.Empty);
@ -583,8 +539,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
if (modelBindingResult.IsModelSet) if (modelBindingResult.IsModelSet)
{ {
objectModelValidator.Validate( objectModelValidator.Validate(
operationBindingContext.ActionContext,
operationBindingContext.ValidatorProvider, operationBindingContext.ValidatorProvider,
modelState,
modelBindingContext.ValidationState, modelBindingContext.ValidationState,
modelBindingResult.Key, modelBindingResult.Key,
modelBindingResult.Model); modelBindingResult.Model);

14
src/Microsoft.AspNet.Mvc.Core/ModelBinding/Validation/DefaultObjectValidator.cs
View File

@ -40,26 +40,26 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
/// <inheritdoc /> /// <inheritdoc />
public void Validate( public void Validate(
ActionContext actionContext,
IModelValidatorProvider validatorProvider, IModelValidatorProvider validatorProvider,
ModelStateDictionary modelState,
ValidationStateDictionary validationState, ValidationStateDictionary validationState,
string prefix, string prefix,
object model) object model)
{ {
if (actionContext == null)
{
throw new ArgumentNullException(nameof(actionContext));
}
if (validatorProvider == null) if (validatorProvider == null)
{ {
throw new ArgumentNullException(nameof(validatorProvider)); throw new ArgumentNullException(nameof(validatorProvider));
} }
if (modelState == null)
{
throw new ArgumentNullException(nameof(modelState));
}
var visitor = new ValidationVisitor( var visitor = new ValidationVisitor(
actionContext,
validatorProvider, validatorProvider,
_excludeFilters, _excludeFilters,
modelState,
validationState); validationState);
var metadata = model == null ? null : _modelMetadataProvider.GetMetadataForType(model.GetType()); var metadata = model == null ? null : _modelMetadataProvider.GetMetadataForType(model.GetType());

6
src/Microsoft.AspNet.Mvc.Core/ModelBinding/Validation/IObjectModelValidator.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved. // 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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.Extensions.Internal;
namespace Microsoft.AspNet.Mvc.ModelBinding.Validation namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
/// <summary> /// <summary>
@ -13,16 +11,16 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
/// <summary> /// <summary>
/// Validates the provided object. /// Validates the provided object.
/// </summary> /// </summary>
/// <param name="actionContext">The <see cref="ActionContext"/> associated with the current request.</param>
/// <param name="validatorProvider">The <see cref="IModelValidatorProvider"/>.</param> /// <param name="validatorProvider">The <see cref="IModelValidatorProvider"/>.</param>
/// <param name="modelState">The <see cref="ModelStateDictionary"/>.</param>
/// <param name="validationState">The <see cref="ValidationStateDictionary"/>. May be null.</param> /// <param name="validationState">The <see cref="ValidationStateDictionary"/>. May be null.</param>
/// <param name="prefix"> /// <param name="prefix">
/// The model prefix. Used to map the model object to entries in <paramref name="modelState"/>. /// The model prefix. Used to map the model object to entries in <paramref name="modelState"/>.
/// </param> /// </param>
/// <param name="model">The model object.</param> /// <param name="model">The model object.</param>
void Validate( void Validate(
ActionContext actionContext,
IModelValidatorProvider validatorProvider, IModelValidatorProvider validatorProvider,
ModelStateDictionary modelState,
ValidationStateDictionary validationState, ValidationStateDictionary validationState,
string prefix, string prefix,
object model); object model);

19
src/Microsoft.AspNet.Mvc.Core/ModelBinding/Validation/ValidationVisitor.cs
View File

@ -15,6 +15,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
private readonly IModelValidatorProvider _validatorProvider; private readonly IModelValidatorProvider _validatorProvider;
private readonly IList<IExcludeTypeValidationFilter> _excludeFilters; private readonly IList<IExcludeTypeValidationFilter> _excludeFilters;
private readonly ActionContext _actionContext;
private readonly ModelStateDictionary _modelState; private readonly ModelStateDictionary _modelState;
private readonly ValidationStateDictionary _validationState; private readonly ValidationStateDictionary _validationState;
@ -30,16 +31,21 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
/// <summary> /// <summary>
/// Creates a new <see cref="ValidationVisitor"/>. /// Creates a new <see cref="ValidationVisitor"/>.
/// </summary> /// </summary>
/// <param name="actionContext">The <see cref="ActionContext"/> associated with the current request.</param>
/// <param name="validatorProvider">The <see cref="IModelValidatorProvider"/>.</param> /// <param name="validatorProvider">The <see cref="IModelValidatorProvider"/>.</param>
/// <param name="excludeFilters">The list of <see cref="IExcludeTypeValidationFilter"/>.</param> /// <param name="excludeFilters">The list of <see cref="IExcludeTypeValidationFilter"/>.</param>
/// <param name="modelState">The <see cref="ModelStateDictionary"/>.</param>
/// <param name="validationState">The <see cref="ValidationStateDictionary"/>.</param> /// <param name="validationState">The <see cref="ValidationStateDictionary"/>.</param>
public ValidationVisitor( public ValidationVisitor(
ActionContext actionContext,
IModelValidatorProvider validatorProvider, IModelValidatorProvider validatorProvider,
IList<IExcludeTypeValidationFilter> excludeFilters, IList<IExcludeTypeValidationFilter> excludeFilters,
ModelStateDictionary modelState,
ValidationStateDictionary validationState) ValidationStateDictionary validationState)
{ {
if (actionContext == null)
{
throw new ArgumentNullException(nameof(actionContext));
}
if (validatorProvider == null) if (validatorProvider == null)
{ {
throw new ArgumentNullException(nameof(validatorProvider)); throw new ArgumentNullException(nameof(validatorProvider));
@ -50,16 +56,12 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
throw new ArgumentNullException(nameof(excludeFilters)); throw new ArgumentNullException(nameof(excludeFilters));
} }
if (modelState == null) _actionContext = actionContext;
{
throw new ArgumentNullException(nameof(modelState));
}
_validatorProvider = validatorProvider; _validatorProvider = validatorProvider;
_excludeFilters = excludeFilters; _excludeFilters = excludeFilters;
_modelState = modelState;
_validationState = validationState; _validationState = validationState;
_modelState = actionContext.ModelState;
_currentPath = new HashSet<object>(ReferenceEqualityComparer.Instance); _currentPath = new HashSet<object>(ReferenceEqualityComparer.Instance);
} }
@ -101,6 +103,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
var context = new ModelValidationContext() var context = new ModelValidationContext()
{ {
ActionContext = _actionContext,
Container = _container, Container = _container,
Model = _model, Model = _model,
Metadata = _metadata, Metadata = _metadata,

11
src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs
View File

@ -97,7 +97,7 @@ namespace Microsoft.AspNet.Mvc
{ {
get get
{ {
return ViewData?.ModelState; return ControllerContext?.ModelState;
} }
} }
@ -1447,7 +1447,6 @@ namespace Microsoft.AspNet.Mvc
model, model,
prefix, prefix,
ControllerContext, ControllerContext,
ModelState,
MetadataProvider, MetadataProvider,
new CompositeModelBinder(ControllerContext.ModelBinders), new CompositeModelBinder(ControllerContext.ModelBinders),
valueProvider, valueProvider,
@ -1488,7 +1487,6 @@ namespace Microsoft.AspNet.Mvc
model, model,
prefix, prefix,
ControllerContext, ControllerContext,
ModelState,
MetadataProvider, MetadataProvider,
new CompositeModelBinder(ControllerContext.ModelBinders), new CompositeModelBinder(ControllerContext.ModelBinders),
new CompositeValueProvider(ControllerContext.ValueProviders), new CompositeValueProvider(ControllerContext.ValueProviders),
@ -1529,7 +1527,6 @@ namespace Microsoft.AspNet.Mvc
model, model,
prefix, prefix,
ControllerContext, ControllerContext,
ModelState,
MetadataProvider, MetadataProvider,
new CompositeModelBinder(ControllerContext.ModelBinders), new CompositeModelBinder(ControllerContext.ModelBinders),
new CompositeValueProvider(ControllerContext.ValueProviders), new CompositeValueProvider(ControllerContext.ValueProviders),
@ -1578,7 +1575,6 @@ namespace Microsoft.AspNet.Mvc
model, model,
prefix, prefix,
ControllerContext, ControllerContext,
ModelState,
MetadataProvider, MetadataProvider,
new CompositeModelBinder(ControllerContext.ModelBinders), new CompositeModelBinder(ControllerContext.ModelBinders),
valueProvider, valueProvider,
@ -1626,7 +1622,6 @@ namespace Microsoft.AspNet.Mvc
model, model,
prefix, prefix,
ControllerContext, ControllerContext,
ModelState,
MetadataProvider, MetadataProvider,
new CompositeModelBinder(ControllerContext.ModelBinders), new CompositeModelBinder(ControllerContext.ModelBinders),
valueProvider, valueProvider,
@ -1666,7 +1661,6 @@ namespace Microsoft.AspNet.Mvc
modelType, modelType,
prefix, prefix,
ControllerContext, ControllerContext,
ModelState,
MetadataProvider, MetadataProvider,
new CompositeModelBinder(ControllerContext.ModelBinders), new CompositeModelBinder(ControllerContext.ModelBinders),
new CompositeValueProvider(ControllerContext.ValueProviders), new CompositeValueProvider(ControllerContext.ValueProviders),
@ -1719,7 +1713,6 @@ namespace Microsoft.AspNet.Mvc
modelType, modelType,
prefix, prefix,
ControllerContext, ControllerContext,
ModelState,
MetadataProvider, MetadataProvider,
new CompositeModelBinder(ControllerContext.ModelBinders), new CompositeModelBinder(ControllerContext.ModelBinders),
valueProvider, valueProvider,
@ -1773,8 +1766,8 @@ namespace Microsoft.AspNet.Mvc
modelName); modelName);
ObjectValidator.Validate( ObjectValidator.Validate(
ControllerContext,
new CompositeModelValidatorProvider(ControllerContext.ValidatorProviders), new CompositeModelValidatorProvider(ControllerContext.ValidatorProviders),
ModelState,
validationState: null, validationState: null,
prefix: prefix, prefix: prefix,
model: model); model: model);

3
src/Microsoft.AspNet.Mvc.ViewFeatures/RemoteAttribute.cs
View File

@ -198,7 +198,8 @@ namespace Microsoft.AspNet.Mvc
throw new ArgumentNullException(nameof(context)); throw new ArgumentNullException(nameof(context));
} }
var urlHelper = context.RequestServices.GetRequiredService<IUrlHelper>(); var services = context.ActionContext.HttpContext.RequestServices;
var urlHelper = services.GetRequiredService<IUrlHelper>();
var url = urlHelper.RouteUrl(new UrlRouteContext() var url = urlHelper.RouteUrl(new UrlRouteContext()
{ {
RouteName = this.RouteName, RouteName = this.RouteName,

4
src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs
View File

@ -858,9 +858,9 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures
modelExplorer = modelExplorer ?? modelExplorer = modelExplorer ??
ExpressionMetadataProvider.FromStringExpression(expression, viewContext.ViewData, _metadataProvider); ExpressionMetadataProvider.FromStringExpression(expression, viewContext.ViewData, _metadataProvider);
var validationContext = new ClientModelValidationContext( var validationContext = new ClientModelValidationContext(
viewContext,
modelExplorer.Metadata, modelExplorer.Metadata,
_metadataProvider, _metadataProvider);
viewContext.HttpContext.RequestServices);
var validatorProviderContext = new ClientValidatorProviderContext(modelExplorer.Metadata); var validatorProviderContext = new ClientValidatorProviderContext(modelExplorer.Metadata);
_clientModelValidatorProvider.GetValidators(validatorProviderContext); _clientModelValidatorProvider.GetValidators(validatorProviderContext);

2
src/Microsoft.AspNet.Mvc.WebApiCompatShim/ApiController.cs
View File

@ -572,8 +572,8 @@ namespace System.Web.Http
{ {
var validatidationState = new ValidationStateDictionary(); var validatidationState = new ValidationStateDictionary();
ObjectValidator.Validate( ObjectValidator.Validate(
ControllerContext,
new CompositeModelValidatorProvider(ControllerContext.ValidatorProviders), new CompositeModelValidatorProvider(ControllerContext.ValidatorProviders),
ModelState,
validatidationState, validatidationState,
keyPrefix, keyPrefix,
entity); entity);

22
test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ControllerActionArgumentBinderTests.cs
View File

@ -143,8 +143,8 @@ namespace Microsoft.AspNet.Mvc.Controllers
var mockValidator = new Mock<IObjectModelValidator>(MockBehavior.Strict); var mockValidator = new Mock<IObjectModelValidator>(MockBehavior.Strict);
mockValidator mockValidator
.Setup(o => o.Validate( .Setup(o => o.Validate(
It.IsAny<ActionContext>(),
It.IsAny<IModelValidatorProvider>(), It.IsAny<IModelValidatorProvider>(),
It.IsAny<ModelStateDictionary>(),
It.IsAny<ValidationStateDictionary>(), It.IsAny<ValidationStateDictionary>(),
It.IsAny<string>(), It.IsAny<string>(),
It.IsAny<object>())); It.IsAny<object>()));
@ -157,12 +157,12 @@ namespace Microsoft.AspNet.Mvc.Controllers
// Assert // Assert
mockValidator mockValidator
.Verify(o => o.Validate( .Verify(o => o.Validate(
It.IsAny<ActionContext>(),
It.IsAny<IModelValidatorProvider>(), It.IsAny<IModelValidatorProvider>(),
It.IsAny<ModelStateDictionary>(),
It.IsAny<ValidationStateDictionary>(), It.IsAny<ValidationStateDictionary>(),
It.IsAny<string>(), It.IsAny<string>(),
It.IsAny<object>()), It.IsAny<object>()),
Times.Once()); Times.Once());
} }
[Fact] [Fact]
@ -191,8 +191,8 @@ namespace Microsoft.AspNet.Mvc.Controllers
var mockValidator = new Mock<IObjectModelValidator>(MockBehavior.Strict); var mockValidator = new Mock<IObjectModelValidator>(MockBehavior.Strict);
mockValidator mockValidator
.Setup(o => o.Validate( .Setup(o => o.Validate(
It.IsAny<ActionContext>(),
It.IsAny<IModelValidatorProvider>(), It.IsAny<IModelValidatorProvider>(),
It.IsAny<ModelStateDictionary>(),
It.IsAny<ValidationStateDictionary>(), It.IsAny<ValidationStateDictionary>(),
It.IsAny<string>(), It.IsAny<string>(),
It.IsAny<object>())); It.IsAny<object>()));
@ -205,8 +205,8 @@ namespace Microsoft.AspNet.Mvc.Controllers
// Assert // Assert
mockValidator mockValidator
.Verify(o => o.Validate( .Verify(o => o.Validate(
It.IsAny<ActionContext>(),
It.IsAny<IModelValidatorProvider>(), It.IsAny<IModelValidatorProvider>(),
It.IsAny<ModelStateDictionary>(),
It.IsAny<ValidationStateDictionary>(), It.IsAny<ValidationStateDictionary>(),
It.IsAny<string>(), It.IsAny<string>(),
It.IsAny<object>()), It.IsAny<object>()),
@ -230,8 +230,8 @@ namespace Microsoft.AspNet.Mvc.Controllers
var mockValidator = new Mock<IObjectModelValidator>(MockBehavior.Strict); var mockValidator = new Mock<IObjectModelValidator>(MockBehavior.Strict);
mockValidator mockValidator
.Setup(o => o.Validate( .Setup(o => o.Validate(
It.IsAny<ActionContext>(),
It.IsAny<IModelValidatorProvider>(), It.IsAny<IModelValidatorProvider>(),
It.IsAny<ModelStateDictionary>(),
It.IsAny<ValidationStateDictionary>(), It.IsAny<ValidationStateDictionary>(),
It.IsAny<string>(), It.IsAny<string>(),
It.IsAny<object>())); It.IsAny<object>()));
@ -244,8 +244,8 @@ namespace Microsoft.AspNet.Mvc.Controllers
// Assert // Assert
mockValidator mockValidator
.Verify(o => o.Validate( .Verify(o => o.Validate(
It.IsAny<ActionContext>(),
It.IsAny<IModelValidatorProvider>(), It.IsAny<IModelValidatorProvider>(),
It.IsAny<ModelStateDictionary>(),
It.IsAny<ValidationStateDictionary>(), It.IsAny<ValidationStateDictionary>(),
It.IsAny<string>(), It.IsAny<string>(),
It.IsAny<object>()), It.IsAny<object>()),
@ -277,8 +277,8 @@ namespace Microsoft.AspNet.Mvc.Controllers
var mockValidator = new Mock<IObjectModelValidator>(MockBehavior.Strict); var mockValidator = new Mock<IObjectModelValidator>(MockBehavior.Strict);
mockValidator mockValidator
.Setup(o => o.Validate( .Setup(o => o.Validate(
It.IsAny<ActionContext>(),
It.IsAny<IModelValidatorProvider>(), It.IsAny<IModelValidatorProvider>(),
It.IsAny<ModelStateDictionary>(),
It.IsAny<ValidationStateDictionary>(), It.IsAny<ValidationStateDictionary>(),
It.IsAny<string>(), It.IsAny<string>(),
It.IsAny<object>())); It.IsAny<object>()));
@ -291,8 +291,8 @@ namespace Microsoft.AspNet.Mvc.Controllers
// Assert // Assert
mockValidator mockValidator
.Verify(o => o.Validate( .Verify(o => o.Validate(
It.IsAny<ActionContext>(),
It.IsAny<IModelValidatorProvider>(), It.IsAny<IModelValidatorProvider>(),
It.IsAny<ModelStateDictionary>(),
It.IsAny<ValidationStateDictionary>(), It.IsAny<ValidationStateDictionary>(),
It.IsAny<string>(), It.IsAny<string>(),
It.IsAny<object>()), It.IsAny<object>()),
@ -635,8 +635,8 @@ namespace Microsoft.AspNet.Mvc.Controllers
var mockValidator = new Mock<IObjectModelValidator>(MockBehavior.Strict); var mockValidator = new Mock<IObjectModelValidator>(MockBehavior.Strict);
mockValidator mockValidator
.Setup(o => o.Validate( .Setup(o => o.Validate(
It.IsAny<IModelValidatorProvider>(), It.IsAny<ActionContext>(),
It.IsAny<ModelStateDictionary>(), It.IsAny<IModelValidatorProvider>(),
It.IsAny<ValidationStateDictionary>(), It.IsAny<ValidationStateDictionary>(),
It.IsAny<string>(), It.IsAny<string>(),
It.IsAny<object>())); It.IsAny<object>()));

39
test/Microsoft.AspNet.Mvc.Core.Test/ModelBinding/ModelBindingHelperTest.cs
View File

@ -10,6 +10,7 @@ using System.Threading.Tasks;
using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Http.Internal;
using Microsoft.AspNet.Mvc.Formatters; using Microsoft.AspNet.Mvc.Formatters;
using Microsoft.AspNet.Mvc.ModelBinding.Validation; using Microsoft.AspNet.Mvc.ModelBinding.Validation;
using Microsoft.AspNet.Routing;
using Moq; using Moq;
using Xunit; using Xunit;
@ -46,7 +47,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
model, model,
string.Empty, string.Empty,
new ActionContext() { HttpContext = new DefaultHttpContext() }, new ActionContext() { HttpContext = new DefaultHttpContext() },
new ModelStateDictionary(),
metadataProvider, metadataProvider,
GetCompositeBinder(binder.Object), GetCompositeBinder(binder.Object),
Mock.Of<IValueProvider>(), Mock.Of<IValueProvider>(),
@ -75,7 +75,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
new TestOptionsManager<MvcDataAnnotationsLocalizationOptions>(), new TestOptionsManager<MvcDataAnnotationsLocalizationOptions>(),
stringLocalizerFactory: null); stringLocalizerFactory: null);
var model = new MyModel(); var model = new MyModel();
var modelStateDictionary = new ModelStateDictionary();
var values = new Dictionary<string, object> var values = new Dictionary<string, object>
{ {
{ "", null } { "", null }
@ -83,12 +83,14 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
var valueProvider = new TestValueProvider(values); var valueProvider = new TestValueProvider(values);
var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider(); var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
var actionContext = new ActionContext() { HttpContext = new DefaultHttpContext() };
var modelState = actionContext.ModelState;
// Act // Act
var result = await ModelBindingHelper.TryUpdateModelAsync( var result = await ModelBindingHelper.TryUpdateModelAsync(
model, model,
"", "",
new ActionContext() { HttpContext = new DefaultHttpContext() }, actionContext,
modelStateDictionary,
modelMetadataProvider, modelMetadataProvider,
GetCompositeBinder(binders), GetCompositeBinder(binders),
valueProvider, valueProvider,
@ -98,7 +100,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
// Assert // Assert
Assert.False(result); Assert.False(result);
var error = Assert.Single(modelStateDictionary["MyProperty"].Errors); var error = Assert.Single(modelState["MyProperty"].Errors);
Assert.Equal(expectedMessage, error.ErrorMessage); Assert.Equal(expectedMessage, error.ErrorMessage);
} }
@ -116,7 +118,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
new TestOptionsManager<MvcDataAnnotationsLocalizationOptions>(), new TestOptionsManager<MvcDataAnnotationsLocalizationOptions>(),
stringLocalizerFactory: null); stringLocalizerFactory: null);
var model = new MyModel { MyProperty = "Old-Value" }; var model = new MyModel { MyProperty = "Old-Value" };
var modelStateDictionary = new ModelStateDictionary();
var values = new Dictionary<string, object> var values = new Dictionary<string, object>
{ {
{ "", null }, { "", null },
@ -130,7 +132,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
model, model,
"", "",
new ActionContext() { HttpContext = new DefaultHttpContext() }, new ActionContext() { HttpContext = new DefaultHttpContext() },
modelStateDictionary,
metadataProvider, metadataProvider,
GetCompositeBinder(binders), GetCompositeBinder(binders),
valueProvider, valueProvider,
@ -162,7 +163,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
model, model,
string.Empty, string.Empty,
new ActionContext() { HttpContext = new DefaultHttpContext() }, new ActionContext() { HttpContext = new DefaultHttpContext() },
new ModelStateDictionary(),
metadataProvider, metadataProvider,
GetCompositeBinder(binder.Object), GetCompositeBinder(binder.Object),
Mock.Of<IValueProvider>(), Mock.Of<IValueProvider>(),
@ -196,8 +196,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
IncludedProperty = "Old-IncludedPropertyValue", IncludedProperty = "Old-IncludedPropertyValue",
ExcludedProperty = "Old-ExcludedPropertyValue" ExcludedProperty = "Old-ExcludedPropertyValue"
}; };
var modelStateDictionary = new ModelStateDictionary();
var values = new Dictionary<string, object> var values = new Dictionary<string, object>
{ {
{ "", null }, { "", null },
@ -218,7 +217,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
model, model,
"", "",
new ActionContext() { HttpContext = new DefaultHttpContext() }, new ActionContext() { HttpContext = new DefaultHttpContext() },
modelStateDictionary,
metadataProvider, metadataProvider,
GetCompositeBinder(binders), GetCompositeBinder(binders),
valueProvider, valueProvider,
@ -252,7 +250,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
model, model,
string.Empty, string.Empty,
new ActionContext() { HttpContext = new DefaultHttpContext() }, new ActionContext() { HttpContext = new DefaultHttpContext() },
new ModelStateDictionary(),
metadataProvider, metadataProvider,
GetCompositeBinder(binder.Object), GetCompositeBinder(binder.Object),
Mock.Of<IValueProvider>(), Mock.Of<IValueProvider>(),
@ -287,8 +284,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
IncludedProperty = "Old-IncludedPropertyValue", IncludedProperty = "Old-IncludedPropertyValue",
ExcludedProperty = "Old-ExcludedPropertyValue" ExcludedProperty = "Old-ExcludedPropertyValue"
}; };
var modelStateDictionary = new ModelStateDictionary();
var values = new Dictionary<string, object> var values = new Dictionary<string, object>
{ {
{ "", null }, { "", null },
@ -305,7 +301,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
model, model,
"", "",
new ActionContext() { HttpContext = new DefaultHttpContext() }, new ActionContext() { HttpContext = new DefaultHttpContext() },
modelStateDictionary,
TestModelMetadataProvider.CreateDefaultProvider(), TestModelMetadataProvider.CreateDefaultProvider(),
GetCompositeBinder(binders), GetCompositeBinder(binders),
valueProvider, valueProvider,
@ -341,8 +336,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
IncludedProperty = "Old-IncludedPropertyValue", IncludedProperty = "Old-IncludedPropertyValue",
ExcludedProperty = "Old-ExcludedPropertyValue" ExcludedProperty = "Old-ExcludedPropertyValue"
}; };
var modelStateDictionary = new ModelStateDictionary();
var values = new Dictionary<string, object> var values = new Dictionary<string, object>
{ {
{ "", null }, { "", null },
@ -359,7 +353,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
model, model,
"", "",
new ActionContext() { HttpContext = new DefaultHttpContext() }, new ActionContext() { HttpContext = new DefaultHttpContext() },
modelStateDictionary,
metadataProvider, metadataProvider,
GetCompositeBinder(binders), GetCompositeBinder(binders),
valueProvider, valueProvider,
@ -514,7 +507,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
model.GetType(), model.GetType(),
prefix: "", prefix: "",
actionContext: new ActionContext() { HttpContext = new DefaultHttpContext() }, actionContext: new ActionContext() { HttpContext = new DefaultHttpContext() },
modelState: new ModelStateDictionary(),
metadataProvider: metadataProvider, metadataProvider: metadataProvider,
modelBinder: GetCompositeBinder(binder.Object), modelBinder: GetCompositeBinder(binder.Object),
valueProvider: Mock.Of<IValueProvider>(), valueProvider: Mock.Of<IValueProvider>(),
@ -549,8 +541,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
IncludedProperty = "Old-IncludedPropertyValue", IncludedProperty = "Old-IncludedPropertyValue",
ExcludedProperty = "Old-ExcludedPropertyValue" ExcludedProperty = "Old-ExcludedPropertyValue"
}; };
var modelStateDictionary = new ModelStateDictionary();
var values = new Dictionary<string, object> var values = new Dictionary<string, object>
{ {
{ "", null }, { "", null },
@ -573,7 +564,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
model.GetType(), model.GetType(),
"", "",
new ActionContext() { HttpContext = new DefaultHttpContext() }, new ActionContext() { HttpContext = new DefaultHttpContext() },
modelStateDictionary,
metadataProvider, metadataProvider,
GetCompositeBinder(binders), GetCompositeBinder(binders),
valueProvider, valueProvider,
@ -610,7 +600,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
modelType: model.GetType(), modelType: model.GetType(),
prefix: "", prefix: "",
actionContext: new ActionContext() { HttpContext = new DefaultHttpContext() }, actionContext: new ActionContext() { HttpContext = new DefaultHttpContext() },
modelState: new ModelStateDictionary(),
metadataProvider: metadataProvider, metadataProvider: metadataProvider,
modelBinder: GetCompositeBinder(binder.Object), modelBinder: GetCompositeBinder(binder.Object),
valueProvider: Mock.Of<IValueProvider>(), valueProvider: Mock.Of<IValueProvider>(),
@ -637,7 +626,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
new TestOptionsManager<MvcDataAnnotationsLocalizationOptions>(), new TestOptionsManager<MvcDataAnnotationsLocalizationOptions>(),
stringLocalizerFactory: null); stringLocalizerFactory: null);
var model = new MyModel { MyProperty = "Old-Value" }; var model = new MyModel { MyProperty = "Old-Value" };
var modelStateDictionary = new ModelStateDictionary();
var values = new Dictionary<string, object> var values = new Dictionary<string, object>
{ {
{ "", null }, { "", null },
@ -652,7 +641,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
model.GetType(), model.GetType(),
"", "",
new ActionContext() { HttpContext = new DefaultHttpContext() }, new ActionContext() { HttpContext = new DefaultHttpContext() },
modelStateDictionary,
TestModelMetadataProvider.CreateDefaultProvider(), TestModelMetadataProvider.CreateDefaultProvider(),
GetCompositeBinder(binders), GetCompositeBinder(binders),
valueProvider, valueProvider,
@ -687,7 +675,6 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
typeof(User), typeof(User),
"", "",
new ActionContext() { HttpContext = new DefaultHttpContext() }, new ActionContext() { HttpContext = new DefaultHttpContext() },
new ModelStateDictionary(),
metadataProvider, metadataProvider,
GetCompositeBinder(binder.Object), GetCompositeBinder(binder.Object),
Mock.Of<IValueProvider>(), Mock.Of<IValueProvider>(),

120
test/Microsoft.AspNet.Mvc.Core.Test/ModelBinding/Validation/DefaultObjectValidatorTests.cs
View File

@ -23,7 +23,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(); var validator = CreateValidator();
@ -34,7 +35,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
validationState.Add(model, new ValidationStateEntry() { Key = "parameter" }); validationState.Add(model, new ValidationStateEntry() { Key = "parameter" });
// Act // Act
validator.Validate(validatorProvider, modelState, validationState, "parameter", model); validator.Validate(actionContext, validatorProvider, validationState, "parameter", model);
// Assert // Assert
AssertKeysEqual(modelState, "parameter"); AssertKeysEqual(modelState, "parameter");
@ -49,7 +50,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(); var validator = CreateValidator();
@ -60,7 +62,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
validationState.Add(model, new ValidationStateEntry() { Key = "parameter" }); validationState.Add(model, new ValidationStateEntry() { Key = "parameter" });
// Act // Act
validator.Validate(validatorProvider, modelState, validationState, "parameter", model); validator.Validate(actionContext, validatorProvider, validationState, "parameter", model);
// Assert // Assert
Assert.True(modelState.IsValid); Assert.True(modelState.IsValid);
@ -76,7 +78,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(); var validator = CreateValidator();
@ -89,7 +92,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
validationState.Add(model, new ValidationStateEntry() { Key = "parameter" }); validationState.Add(model, new ValidationStateEntry() { Key = "parameter" });
// Act // Act
validator.Validate(validatorProvider, modelState, validationState, "parameter", model); validator.Validate(actionContext, validatorProvider, validationState, "parameter", model);
// Assert // Assert
Assert.False(modelState.IsValid); Assert.False(modelState.IsValid);
@ -105,7 +108,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(); var validator = CreateValidator();
@ -116,7 +120,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
validationState.Add(model, new ValidationStateEntry() { Key = "parameter", SuppressValidation = true }); validationState.Add(model, new ValidationStateEntry() { Key = "parameter", SuppressValidation = true });
// Act // Act
validator.Validate(validatorProvider, modelState, validationState, "parameter", model); validator.Validate(actionContext, validatorProvider, validationState, "parameter", model);
// Assert // Assert
Assert.True(modelState.IsValid); Assert.True(modelState.IsValid);
@ -133,7 +137,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(); var validator = CreateValidator();
@ -145,7 +150,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
validationState.Add(model, new ValidationStateEntry() { Key = "parameter" }); validationState.Add(model, new ValidationStateEntry() { Key = "parameter" });
// Act // Act
validator.Validate(validatorProvider, modelState, validationState, "parameter", model); validator.Validate(actionContext, validatorProvider, validationState, "parameter", model);
// Assert // Assert
Assert.True(modelState.IsValid); Assert.True(modelState.IsValid);
@ -165,7 +170,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(); var validator = CreateValidator();
@ -177,7 +183,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
validationState.Add(model, new ValidationStateEntry() { Key = "parameter" }); validationState.Add(model, new ValidationStateEntry() { Key = "parameter" });
// Act // Act
validator.Validate(validatorProvider, modelState, validationState, "parameter", model); validator.Validate(actionContext, validatorProvider, validationState, "parameter", model);
// Assert // Assert
Assert.True(modelState.IsValid); Assert.True(modelState.IsValid);
@ -197,7 +203,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(); var validator = CreateValidator();
@ -207,7 +214,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
validationState.Add(model, new ValidationStateEntry() { Key = string.Empty }); validationState.Add(model, new ValidationStateEntry() { Key = string.Empty });
// Act // Act
validator.Validate(validatorProvider, modelState, validationState, string.Empty, model); validator.Validate(actionContext, validatorProvider, validationState, string.Empty, model);
// Assert // Assert
Assert.False(modelState.IsValid); Assert.False(modelState.IsValid);
@ -229,7 +236,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(); var validator = CreateValidator();
@ -250,7 +258,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
}); });
// Act // Act
validator.Validate(validatorProvider, modelState, validationState, "person", model); validator.Validate(actionContext, validatorProvider, validationState, "person", model);
// Assert // Assert
Assert.True(modelState.IsValid); Assert.True(modelState.IsValid);
@ -271,7 +279,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(); var validator = CreateValidator();
@ -282,7 +291,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
validationState.Add(model, new ValidationStateEntry() { Key = "parameter" }); validationState.Add(model, new ValidationStateEntry() { Key = "parameter" });
// Act // Act
validator.Validate(validatorProvider, modelState, validationState, "parameter", model); validator.Validate(actionContext, validatorProvider, validationState, "parameter", model);
// Assert // Assert
Assert.False(modelState.IsValid); Assert.False(modelState.IsValid);
@ -303,7 +312,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(); var validator = CreateValidator();
@ -314,7 +324,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
validationState.Add(model, new ValidationStateEntry() { Key = string.Empty }); validationState.Add(model, new ValidationStateEntry() { Key = string.Empty });
// Act // Act
validator.Validate(validatorProvider, modelState, validationState, string.Empty, model); validator.Validate(actionContext, validatorProvider, validationState, string.Empty, model);
// Assert // Assert
Assert.False(modelState.IsValid); Assert.False(modelState.IsValid);
@ -335,7 +345,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(); var validator = CreateValidator();
@ -346,7 +357,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
validationState.Add(model, new ValidationStateEntry() { Key = string.Empty }); validationState.Add(model, new ValidationStateEntry() { Key = string.Empty });
// Act // Act
validator.Validate(validatorProvider, modelState, validationState, string.Empty, model); validator.Validate(actionContext, validatorProvider, validationState, string.Empty, model);
// Assert // Assert
Assert.False(modelState.IsValid); Assert.False(modelState.IsValid);
@ -379,7 +390,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(); var validator = CreateValidator();
@ -391,7 +403,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
validationState.Add(model, new ValidationStateEntry() { Key = "parameter" }); validationState.Add(model, new ValidationStateEntry() { Key = "parameter" });
// Act // Act
validator.Validate(validatorProvider, modelState, validationState, "parameter", model); validator.Validate(actionContext, validatorProvider, validationState, "parameter", model);
// Assert // Assert
Assert.False(modelState.IsValid); Assert.False(modelState.IsValid);
@ -424,7 +436,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(); var validator = CreateValidator();
@ -435,7 +448,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
validationState.Add(model, new ValidationStateEntry() { Key = "parameter" }); validationState.Add(model, new ValidationStateEntry() { Key = "parameter" });
// Act // Act
validator.Validate(validatorProvider, modelState, validationState, "parameter", model); validator.Validate(actionContext, validatorProvider, validationState, "parameter", model);
// Assert // Assert
Assert.True(modelState.IsValid); Assert.True(modelState.IsValid);
@ -452,7 +465,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(); var validator = CreateValidator();
@ -466,7 +480,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
validationState.Add(model, new ValidationStateEntry() { Key = "parameter" }); validationState.Add(model, new ValidationStateEntry() { Key = "parameter" });
// Act // Act
validator.Validate(validatorProvider, modelState, validationState, "parameter", model); validator.Validate(actionContext, validatorProvider, validationState, "parameter", model);
// Assert // Assert
Assert.False(modelState.IsValid); Assert.False(modelState.IsValid);
@ -487,7 +501,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(typeof(string)); var validator = CreateValidator(typeof(string));
@ -506,7 +521,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
validationState.Add(model, new ValidationStateEntry() { Key = "user", }); validationState.Add(model, new ValidationStateEntry() { Key = "user", });
// Act // Act
validator.Validate(validatorProvider, modelState, validationState, "user", model); validator.Validate(actionContext, validatorProvider, validationState, "user", model);
// Assert // Assert
Assert.False(modelState.IsValid); Assert.False(modelState.IsValid);
@ -524,7 +539,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(); var validator = CreateValidator();
@ -536,7 +552,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
validationState.Add(model, new ValidationStateEntry() { Key = "parameter" }); validationState.Add(model, new ValidationStateEntry() { Key = "parameter" });
// Act // Act
validator.Validate(validatorProvider, modelState, validationState, "parameter", model); validator.Validate(actionContext, validatorProvider, validationState, "parameter", model);
// Assert // Assert
Assert.True(modelState.IsValid); Assert.True(modelState.IsValid);
@ -557,7 +573,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(); var validator = CreateValidator();
@ -567,7 +584,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
validationState.Add(model, new ValidationStateEntry() { Key = string.Empty }); validationState.Add(model, new ValidationStateEntry() { Key = string.Empty });
// Act // Act
validator.Validate(validatorProvider, modelState, validationState, string.Empty, model); validator.Validate(actionContext, validatorProvider, validationState, string.Empty, model);
// Assert // Assert
Assert.False(modelState.IsValid); Assert.False(modelState.IsValid);
@ -600,7 +617,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(); var validator = CreateValidator();
@ -610,7 +628,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
validationState.Add(model, new ValidationStateEntry() { Key = string.Empty }); validationState.Add(model, new ValidationStateEntry() { Key = string.Empty });
// Act // Act
validator.Validate(validatorProvider, modelState, validationState, string.Empty, model); validator.Validate(actionContext, validatorProvider, validationState, string.Empty, model);
// Assert // Assert
Assert.False(modelState.IsValid); Assert.False(modelState.IsValid);
@ -648,7 +666,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(new SimpleTypesExcludeFilter()); var validator = CreateValidator(new SimpleTypesExcludeFilter());
@ -665,7 +684,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
}); });
// Act // Act
validator.Validate(validatorProvider, modelState, validationState, "items", model); validator.Validate(actionContext, validatorProvider, validationState, "items", model);
// Assert // Assert
Assert.True(modelState.IsValid); Assert.True(modelState.IsValid);
@ -689,7 +708,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(new SimpleTypesExcludeFilter()); var validator = CreateValidator(new SimpleTypesExcludeFilter());
@ -707,7 +727,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
validationState.Add(model, new ValidationStateEntry() { Key = "items" }); validationState.Add(model, new ValidationStateEntry() { Key = "items" });
// Act // Act
validator.Validate(validatorProvider, modelState, validationState, "items", model); validator.Validate(actionContext, validatorProvider, validationState, "items", model);
// Assert // Assert
Assert.True(modelState.IsValid); Assert.True(modelState.IsValid);
@ -736,7 +756,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(); var validator = CreateValidator();
@ -748,7 +769,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
validationState.Add(model, new ValidationStateEntry() { Key = string.Empty }); validationState.Add(model, new ValidationStateEntry() { Key = string.Empty });
// Act // Act
validator.Validate(validatorProvider, modelState, validationState, string.Empty, model); validator.Validate(actionContext, validatorProvider, validationState, string.Empty, model);
// Assert // Assert
Assert.False(modelState.IsValid); Assert.False(modelState.IsValid);
@ -796,7 +817,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(); var validator = CreateValidator();
@ -808,7 +830,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
typeof(InvalidTimeZoneException), typeof(InvalidTimeZoneException),
() => () =>
{ {
validator.Validate(validatorProvider, modelState, validationState, string.Empty, model); validator.Validate(actionContext, validatorProvider, validationState, string.Empty, model);
}); });
} }
@ -818,7 +840,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(); var validator = CreateValidator();
@ -830,7 +853,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
}; };
// Act & Assert (does not throw) // Act & Assert (does not throw)
validator.Validate(validatorProvider, modelState, validationState, string.Empty, model); validator.Validate(actionContext, validatorProvider, validationState, string.Empty, model);
} }
[Fact] [Fact]
@ -838,7 +861,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
{ {
// Arrange // Arrange
var validatorProvider = CreateValidatorProvider(); var validatorProvider = CreateValidatorProvider();
var modelState = new ModelStateDictionary(); var actionContext = new ActionContext();
var modelState = actionContext.ModelState;
var validationState = new ValidationStateDictionary(); var validationState = new ValidationStateDictionary();
var validator = CreateValidator(typeof(User)); var validator = CreateValidator(typeof(User));
@ -855,7 +879,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
validationState.Add(model, new ValidationStateEntry() { Key = "user", }); validationState.Add(model, new ValidationStateEntry() { Key = "user", });
// Act // Act
validator.Validate(validatorProvider, modelState, validationState, "user", model); validator.Validate(actionContext, validatorProvider, validationState, "user", model);
// Assert // Assert
Assert.Equal(ModelValidationState.Valid, modelState.ValidationState); Assert.Equal(ModelValidationState.Valid, modelState.ValidationState);

27
test/Microsoft.AspNet.Mvc.DataAnnotations.Test/CompareAttributeAdapterTest.cs
View File

@ -22,10 +22,8 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
var attribute = new CompareAttribute("OtherProperty"); var attribute = new CompareAttribute("OtherProperty");
var adapter = new CompareAttributeAdapter(attribute, stringLocalizer: null); var adapter = new CompareAttributeAdapter(attribute, stringLocalizer: null);
var serviceCollection = new ServiceCollection(); var actionContext = new ActionContext();
var requestServices = serviceCollection.BuildServiceProvider(); var context = new ClientModelValidationContext(actionContext, metadata, metadataProvider);
var context = new ClientModelValidationContext(metadata, metadataProvider, requestServices);
// Act // Act
var rules = adapter.GetClientValidationRules(context); var rules = adapter.GetClientValidationRules(context);
@ -46,12 +44,13 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
// Arrange // Arrange
var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider(); var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
var metadata = metadataProvider.GetMetadataForProperty(typeof(PropertyNameModel), "MyProperty"); var metadata = metadataProvider.GetMetadataForProperty(typeof(PropertyNameModel), "MyProperty");
var attribute = new CompareAttribute("OtherProperty"); var attribute = new CompareAttribute("OtherProperty");
var serviceCollection = new ServiceCollection();
var requestServices = serviceCollection.BuildServiceProvider();
var context = new ClientModelValidationContext(metadata, metadataProvider, requestServices);
var adapter = new CompareAttributeAdapter(attribute, stringLocalizer: null); var adapter = new CompareAttributeAdapter(attribute, stringLocalizer: null);
var actionContext = new ActionContext();
var context = new ClientModelValidationContext(actionContext, metadata, metadataProvider);
// Act // Act
var rules = adapter.GetClientValidationRules(context); var rules = adapter.GetClientValidationRules(context);
@ -69,15 +68,16 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
// Arrange // Arrange
var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider(); var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
var metadata = metadataProvider.GetMetadataForProperty( typeof(PropertyNameModel), "MyProperty"); var metadata = metadataProvider.GetMetadataForProperty( typeof(PropertyNameModel), "MyProperty");
var attribute = new CompareAttribute("OtherProperty") var attribute = new CompareAttribute("OtherProperty")
{ {
ErrorMessage = "Hello '{0}', goodbye '{1}'." ErrorMessage = "Hello '{0}', goodbye '{1}'."
}; };
var serviceCollection = new ServiceCollection();
var requestServices = serviceCollection.BuildServiceProvider();
var context = new ClientModelValidationContext(metadata, metadataProvider, requestServices);
var adapter = new CompareAttributeAdapter(attribute, stringLocalizer: null); var adapter = new CompareAttributeAdapter(attribute, stringLocalizer: null);
var actionContext = new ActionContext();
var context = new ClientModelValidationContext(actionContext, metadata, metadataProvider);
// Act // Act
var rules = adapter.GetClientValidationRules(context); var rules = adapter.GetClientValidationRules(context);
@ -94,16 +94,17 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
// Arrange // Arrange
var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider(); var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
var metadata = metadataProvider.GetMetadataForProperty(typeof(PropertyNameModel), "MyProperty"); var metadata = metadataProvider.GetMetadataForProperty(typeof(PropertyNameModel), "MyProperty");
var attribute = new CompareAttribute("OtherProperty") var attribute = new CompareAttribute("OtherProperty")
{ {
ErrorMessageResourceName = "CompareAttributeTestResource", ErrorMessageResourceName = "CompareAttributeTestResource",
ErrorMessageResourceType = typeof(DataAnnotations.Test.Resources), ErrorMessageResourceType = typeof(DataAnnotations.Test.Resources),
}; };
var serviceCollection = new ServiceCollection();
var requestServices = serviceCollection.BuildServiceProvider();
var context = new ClientModelValidationContext(metadata, metadataProvider, requestServices);
var adapter = new CompareAttributeAdapter(attribute, stringLocalizer: null); var adapter = new CompareAttributeAdapter(attribute, stringLocalizer: null);
var actionContext = new ActionContext();
var context = new ClientModelValidationContext(actionContext, metadata, metadataProvider);
// Act // Act
var rules = adapter.GetClientValidationRules(context); var rules = adapter.GetClientValidationRules(context);

23
test/Microsoft.AspNet.Mvc.DataAnnotations.Test/MaxLengthAttributeAdapterTest.cs
View File

@ -19,11 +19,12 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
// Arrange // Arrange
var provider = TestModelMetadataProvider.CreateDefaultProvider(); var provider = TestModelMetadataProvider.CreateDefaultProvider();
var metadata = provider.GetMetadataForProperty(typeof(string), "Length"); var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
var attribute = new MaxLengthAttribute(10); var attribute = new MaxLengthAttribute(10);
var adapter = new MaxLengthAttributeAdapter(attribute, stringLocalizer: null); var adapter = new MaxLengthAttributeAdapter(attribute, stringLocalizer: null);
var serviceCollection = new ServiceCollection();
var requestServices = serviceCollection.BuildServiceProvider(); var actionContext = new ActionContext();
var context = new ClientModelValidationContext(metadata, provider, requestServices); var context = new ClientModelValidationContext(actionContext, metadata, provider);
// Act // Act
var rules = adapter.GetClientValidationRules(context); var rules = adapter.GetClientValidationRules(context);
@ -45,11 +46,12 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
var message = "{0} must be at most {1}"; var message = "{0} must be at most {1}";
var provider = TestModelMetadataProvider.CreateDefaultProvider(); var provider = TestModelMetadataProvider.CreateDefaultProvider();
var metadata = provider.GetMetadataForProperty(typeof(string), propertyName); var metadata = provider.GetMetadataForProperty(typeof(string), propertyName);
var attribute = new MaxLengthAttribute(5) { ErrorMessage = message }; var attribute = new MaxLengthAttribute(5) { ErrorMessage = message };
var adapter = new MaxLengthAttributeAdapter(attribute, stringLocalizer: null); var adapter = new MaxLengthAttributeAdapter(attribute, stringLocalizer: null);
var serviceCollection = new ServiceCollection();
var requestServices = serviceCollection.BuildServiceProvider(); var actionContext = new ActionContext();
var context = new ClientModelValidationContext(metadata, provider, requestServices); var context = new ClientModelValidationContext(actionContext, metadata, provider);
// Act // Act
var rules = adapter.GetClientValidationRules(context); var rules = adapter.GetClientValidationRules(context);
@ -69,18 +71,17 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
// Arrange // Arrange
var provider = TestModelMetadataProvider.CreateDefaultProvider(); var provider = TestModelMetadataProvider.CreateDefaultProvider();
var metadata = provider.GetMetadataForProperty(typeof(string), "Length"); var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
var errorKey = metadata.GetDisplayName(); var errorKey = metadata.GetDisplayName();
var attribute = new MaxLengthAttribute(10); var attribute = new MaxLengthAttribute(10);
attribute.ErrorMessage = errorKey; attribute.ErrorMessage = errorKey;
var localizedString = new LocalizedString(errorKey, "Longueur est invalide"); var localizedString = new LocalizedString(errorKey, "Longueur est invalide");
var stringLocalizer = new Mock<IStringLocalizer>(); var stringLocalizer = new Mock<IStringLocalizer>();
stringLocalizer.Setup(s => s[errorKey]).Returns(localizedString); stringLocalizer.Setup(s => s[errorKey]).Returns(localizedString);
var adapter = new MaxLengthAttributeAdapter(attribute, stringLocalizer.Object); var adapter = new MaxLengthAttributeAdapter(attribute, stringLocalizer.Object);
var serviceCollection = new ServiceCollection();
var requestServices = serviceCollection.BuildServiceProvider(); var actionContext = new ActionContext();
var context = new ClientModelValidationContext(metadata, provider, requestServices); var context = new ClientModelValidationContext(actionContext, metadata, provider);
// Act // Act
var rules = adapter.GetClientValidationRules(context); var rules = adapter.GetClientValidationRules(context);

15
test/Microsoft.AspNet.Mvc.DataAnnotations.Test/MinLengthAttributeAdapterTest.cs
View File

@ -3,7 +3,6 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using Microsoft.AspNet.Testing; using Microsoft.AspNet.Testing;
using Microsoft.Extensions.DependencyInjection;
using Xunit; using Xunit;
namespace Microsoft.AspNet.Mvc.ModelBinding.Validation namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
@ -17,11 +16,12 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
// Arrange // Arrange
var provider = TestModelMetadataProvider.CreateDefaultProvider(); var provider = TestModelMetadataProvider.CreateDefaultProvider();
var metadata = provider.GetMetadataForProperty(typeof(string), "Length"); var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
var attribute = new MinLengthAttribute(6); var attribute = new MinLengthAttribute(6);
var adapter = new MinLengthAttributeAdapter(attribute, stringLocalizer: null); var adapter = new MinLengthAttributeAdapter(attribute, stringLocalizer: null);
var serviceCollection = new ServiceCollection();
var requestServices = serviceCollection.BuildServiceProvider(); var actionContext = new ActionContext();
var context = new ClientModelValidationContext(metadata, provider, requestServices); var context = new ClientModelValidationContext(actionContext, metadata, provider);
// Act // Act
var rules = adapter.GetClientValidationRules(context); var rules = adapter.GetClientValidationRules(context);
@ -43,11 +43,12 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
var message = "Array must have at least {1} items."; var message = "Array must have at least {1} items.";
var provider = TestModelMetadataProvider.CreateDefaultProvider(); var provider = TestModelMetadataProvider.CreateDefaultProvider();
var metadata = provider.GetMetadataForProperty(typeof(string), propertyName); var metadata = provider.GetMetadataForProperty(typeof(string), propertyName);
var attribute = new MinLengthAttribute(2) { ErrorMessage = message }; var attribute = new MinLengthAttribute(2) { ErrorMessage = message };
var adapter = new MinLengthAttributeAdapter(attribute, stringLocalizer: null); var adapter = new MinLengthAttributeAdapter(attribute, stringLocalizer: null);
var serviceCollection = new ServiceCollection();
var requestServices = serviceCollection.BuildServiceProvider(); var actionContext = new ActionContext();
var context = new ClientModelValidationContext(metadata, provider, requestServices); var context = new ClientModelValidationContext(actionContext, metadata, provider);
// Act // Act
var rules = adapter.GetClientValidationRules(context); var rules = adapter.GetClientValidationRules(context);

9
test/Microsoft.AspNet.Mvc.DataAnnotations.Test/NumericClientModelValidatorTest.cs
View File

@ -3,7 +3,6 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using Microsoft.AspNet.Testing; using Microsoft.AspNet.Testing;
using Microsoft.Extensions.DependencyInjection;
using Xunit; using Xunit;
namespace Microsoft.AspNet.Mvc.ModelBinding.Validation namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
@ -17,10 +16,12 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
// Arrange // Arrange
var provider = TestModelMetadataProvider.CreateDefaultProvider(); var provider = TestModelMetadataProvider.CreateDefaultProvider();
var metadata = provider.GetMetadataForProperty(typeof(TypeWithNumericProperty), "Id"); var metadata = provider.GetMetadataForProperty(typeof(TypeWithNumericProperty), "Id");
var adapter = new NumericClientModelValidator(); var adapter = new NumericClientModelValidator();
var serviceCollection = new ServiceCollection();
var requestServices = serviceCollection.BuildServiceProvider(); var actionContext = new ActionContext();
var context = new ClientModelValidationContext(metadata, provider, requestServices); var context = new ClientModelValidationContext(actionContext, metadata, provider);
var expectedMessage = "The field DisplayId must be a number."; var expectedMessage = "The field DisplayId must be a number.";
// Act // Act

8
test/Microsoft.AspNet.Mvc.DataAnnotations.Test/RangeAttributeAdapterTest.cs
View File

@ -3,7 +3,6 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using Microsoft.AspNet.Testing; using Microsoft.AspNet.Testing;
using Microsoft.Extensions.DependencyInjection;
using Xunit; using Xunit;
namespace Microsoft.AspNet.Mvc.ModelBinding.Validation namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
@ -17,11 +16,12 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
// Arrange // Arrange
var provider = TestModelMetadataProvider.CreateDefaultProvider(); var provider = TestModelMetadataProvider.CreateDefaultProvider();
var metadata = provider.GetMetadataForProperty(typeof(string), "Length"); var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
var attribute = new RangeAttribute(typeof(decimal), "0", "100"); var attribute = new RangeAttribute(typeof(decimal), "0", "100");
var adapter = new RangeAttributeAdapter(attribute, stringLocalizer: null); var adapter = new RangeAttributeAdapter(attribute, stringLocalizer: null);
var serviceCollection = new ServiceCollection();
var requestServices = serviceCollection.BuildServiceProvider(); var actionContext = new ActionContext();
var context = new ClientModelValidationContext(metadata, provider, requestServices); var context = new ClientModelValidationContext(actionContext, metadata, provider);
// Act // Act
var rules = adapter.GetClientValidationRules(context); var rules = adapter.GetClientValidationRules(context);

8
test/Microsoft.AspNet.Mvc.DataAnnotations.Test/RequiredAttributeAdapterTest.cs
View File

@ -3,7 +3,6 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using Microsoft.AspNet.Testing; using Microsoft.AspNet.Testing;
using Microsoft.Extensions.DependencyInjection;
using Xunit; using Xunit;
namespace Microsoft.AspNet.Mvc.ModelBinding.Validation namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
@ -18,11 +17,12 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
var expected = ValidationAttributeUtil.GetRequiredErrorMessage("Length"); var expected = ValidationAttributeUtil.GetRequiredErrorMessage("Length");
var provider = TestModelMetadataProvider.CreateDefaultProvider(); var provider = TestModelMetadataProvider.CreateDefaultProvider();
var metadata = provider.GetMetadataForProperty(typeof(string), "Length"); var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
var attribute = new RequiredAttribute(); var attribute = new RequiredAttribute();
var adapter = new RequiredAttributeAdapter(attribute, stringLocalizer: null); var adapter = new RequiredAttributeAdapter(attribute, stringLocalizer: null);
var serviceCollection = new ServiceCollection();
var requestServices = serviceCollection.BuildServiceProvider(); var actionContext = new ActionContext();
var context = new ClientModelValidationContext(metadata, provider, requestServices); var context = new ClientModelValidationContext(actionContext, metadata, provider);
// Act // Act
var rules = adapter.GetClientValidationRules(context); var rules = adapter.GetClientValidationRules(context);

15
test/Microsoft.AspNet.Mvc.DataAnnotations.Test/StringLengthAttributeAdapterTest.cs
View File

@ -3,7 +3,6 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using Microsoft.AspNet.Testing; using Microsoft.AspNet.Testing;
using Microsoft.Extensions.DependencyInjection;
using Xunit; using Xunit;
namespace Microsoft.AspNet.Mvc.ModelBinding.Validation namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
@ -17,11 +16,12 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
// Arrange // Arrange
var provider = TestModelMetadataProvider.CreateDefaultProvider(); var provider = TestModelMetadataProvider.CreateDefaultProvider();
var metadata = provider.GetMetadataForProperty(typeof(string), "Length"); var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
var attribute = new StringLengthAttribute(8); var attribute = new StringLengthAttribute(8);
var adapter = new StringLengthAttributeAdapter(attribute, stringLocalizer: null); var adapter = new StringLengthAttributeAdapter(attribute, stringLocalizer: null);
var serviceCollection = new ServiceCollection();
var requestServices = serviceCollection.BuildServiceProvider(); var actionContext = new ActionContext();
var context = new ClientModelValidationContext(metadata, provider, requestServices); var context = new ClientModelValidationContext(actionContext, metadata, provider);
// Act // Act
var rules = adapter.GetClientValidationRules(context); var rules = adapter.GetClientValidationRules(context);
@ -41,11 +41,12 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
// Arrange // Arrange
var provider = TestModelMetadataProvider.CreateDefaultProvider(); var provider = TestModelMetadataProvider.CreateDefaultProvider();
var metadata = provider.GetMetadataForProperty(typeof(string), "Length"); var metadata = provider.GetMetadataForProperty(typeof(string), "Length");
var attribute = new StringLengthAttribute(10) { MinimumLength = 3 }; var attribute = new StringLengthAttribute(10) { MinimumLength = 3 };
var adapter = new StringLengthAttributeAdapter(attribute, stringLocalizer: null); var adapter = new StringLengthAttributeAdapter(attribute, stringLocalizer: null);
var serviceCollection = new ServiceCollection();
var requestServices = serviceCollection.BuildServiceProvider(); var actionContext = new ActionContext();
var context = new ClientModelValidationContext(metadata, provider, requestServices); var context = new ClientModelValidationContext(actionContext, metadata, provider);
// Act // Act
var rules = adapter.GetClientValidationRules(context); var rules = adapter.GetClientValidationRules(context);

32
test/Microsoft.AspNet.Mvc.IntegrationTests/ActionParametersIntegrationTest.cs
View File

@ -53,11 +53,11 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet"); request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new Person3(); var model = new Person3();
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -104,10 +104,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet"); request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -157,10 +157,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet"); request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new Person4(); var model = new Person4();
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -209,9 +209,9 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet"); request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -254,10 +254,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet"); request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -303,10 +303,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet"); request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -355,10 +355,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet"); request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -405,10 +405,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet"); request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);

32
test/Microsoft.AspNet.Mvc.IntegrationTests/ArrayModelBinderIntegrationTest.cs
View File

@ -28,10 +28,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter[0]=10&parameter[1]=11"); request.QueryString = new QueryString("?parameter[0]=10&parameter[1]=11");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -72,10 +72,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?prefix[0]=10&prefix[1]=11"); request.QueryString = new QueryString("?prefix[0]=10&prefix[1]=11");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -112,10 +112,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?[0]=10&[1]=11"); request.QueryString = new QueryString("?[0]=10&[1]=11");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -152,10 +152,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -187,10 +187,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter[0].Name=bill&parameter[1].Name=lang"); request.QueryString = new QueryString("?parameter[0].Name=bill&parameter[1].Name=lang");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -232,10 +232,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?prefix[0].Name=bill&prefix[1].Name=lang"); request.QueryString = new QueryString("?prefix[0].Name=bill&prefix[1].Name=lang");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -273,10 +273,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?[0].Name=bill&[1].Name=lang"); request.QueryString = new QueryString("?[0].Name=bill&[1].Name=lang");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -314,10 +314,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);

28
test/Microsoft.AspNet.Mvc.IntegrationTests/BinderTypeBasedModelBinderIntegrationTest.cs
View File

@ -31,10 +31,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
// No data is passed. // No data is passed.
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(); var operationContext = ModelBindingTestHelper.GetOperationBindingContext();
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -69,10 +69,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
// No data is passed. // No data is passed.
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(); var operationContext = ModelBindingTestHelper.GetOperationBindingContext();
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.Equal(ModelBindingResult.NoResult, modelBindingResult); Assert.Equal(ModelBindingResult.NoResult, modelBindingResult);
@ -104,10 +104,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
// No data is passed. // No data is passed.
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(); var operationContext = ModelBindingTestHelper.GetOperationBindingContext();
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -140,10 +140,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
// No data is passed. // No data is passed.
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(); var operationContext = ModelBindingTestHelper.GetOperationBindingContext();
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -175,10 +175,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}; };
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(); var operationContext = ModelBindingTestHelper.GetOperationBindingContext();
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -218,10 +218,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}; };
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(); var operationContext = ModelBindingTestHelper.GetOperationBindingContext();
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -259,10 +259,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}; };
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(); var operationContext = ModelBindingTestHelper.GetOperationBindingContext();
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert

28
test/Microsoft.AspNet.Mvc.IntegrationTests/BodyValidationIntegrationTests.cs
View File

@ -47,10 +47,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.ContentType = "application/json"; request.ContentType = "application/json";
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -88,10 +88,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}); });
var httpContext = operationContext.HttpContext; var httpContext = operationContext.HttpContext;
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -132,10 +132,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.ContentType = "application/json"; request.ContentType = "application/json";
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -191,10 +191,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.ContentType = "application/json"; request.ContentType = "application/json";
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -234,10 +234,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.ContentType = "application/json"; request.ContentType = "application/json";
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -304,10 +304,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.ContentType = "application/json"; request.ContentType = "application/json";
}); });
var httpContext = operationContext.HttpContext; var httpContext = operationContext.HttpContext;
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -363,10 +363,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.Body = new MemoryStream(Encoding.UTF8.GetBytes(inputText)); request.Body = new MemoryStream(Encoding.UTF8.GetBytes(inputText));
request.ContentType = "application/json"; request.ContentType = "application/json";
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);

12
test/Microsoft.AspNet.Mvc.IntegrationTests/ByteArrayModelBinderIntegrationTest.cs
View File

@ -50,10 +50,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
{ {
request.QueryString = QueryString.Create(queryStringKey, value); request.QueryString = QueryString.Create(queryStringKey, value);
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -95,10 +95,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
// No data is passed. // No data is passed.
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(); var operationContext = ModelBindingTestHelper.GetOperationBindingContext();
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -134,10 +134,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("CustomParameter", value); request.QueryString = QueryString.Create("CustomParameter", value);
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert

12
test/Microsoft.AspNet.Mvc.IntegrationTests/CancellationTokenModelBinderIntegrationTest.cs
View File

@ -37,10 +37,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}; };
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(); var operationContext = ModelBindingTestHelper.GetOperationBindingContext();
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -71,10 +71,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}; };
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(); var operationContext = ModelBindingTestHelper.GetOperationBindingContext();
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -108,10 +108,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}; };
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(); var operationContext = ModelBindingTestHelper.GetOperationBindingContext();
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert

68
test/Microsoft.AspNet.Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs
View File

@ -37,10 +37,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter[0]=10&parameter[1]=11"); request.QueryString = new QueryString("?parameter[0]=10&parameter[1]=11");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -83,10 +83,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString(queryString); request.QueryString = new QueryString(queryString);
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -117,10 +117,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString(queryString); request.QueryString = new QueryString(queryString);
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -149,10 +149,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -188,10 +188,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString(queryString); request.QueryString = new QueryString(queryString);
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -227,10 +227,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString(queryString); request.QueryString = new QueryString(queryString);
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -260,10 +260,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -298,10 +298,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter[0].Id=10&parameter[1].Id=11"); request.QueryString = new QueryString("?parameter[0].Id=10&parameter[1].Id=11");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -357,10 +357,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?prefix[0].Id=10&prefix[1].Id=11"); request.QueryString = new QueryString("?prefix[0].Id=10&prefix[1].Id=11");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -408,10 +408,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?[0].Id=10&[1].Id=11"); request.QueryString = new QueryString("?[0].Id=10&[1].Id=11");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -460,10 +460,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
new QueryString("?parameter.index=low&parameter.index=high&parameter[low]=10&parameter[high]=11"); new QueryString("?parameter.index=low&parameter.index=high&parameter[low]=10&parameter[high]=11");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -503,10 +503,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?index=low&index=high&[high].Id=11&[low].Id=10"); request.QueryString = new QueryString("?index=low&index=high&[high].Id=11&[low].Id=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -554,10 +554,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -604,10 +604,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.ContentType = "application/x-www-form-urlencoded"; request.ContentType = "application/x-www-form-urlencoded";
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -661,10 +661,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.ContentType = "application/x-www-form-urlencoded"; request.ContentType = "application/x-www-form-urlencoded";
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -700,10 +700,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString(queryString); request.QueryString = new QueryString(queryString);
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -920,14 +920,14 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}; };
var argumentBinder = ModelBindingTestHelper.GetArgumentBinder(); var argumentBinder = ModelBindingTestHelper.GetArgumentBinder();
var modelState = new ModelStateDictionary();
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(request => var operationContext = ModelBindingTestHelper.GetOperationBindingContext(request =>
{ {
request.Form = new FormCollection(formContent); request.Form = new FormCollection(formContent);
}); });
var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);

44
test/Microsoft.AspNet.Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs
View File

@ -32,10 +32,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter[0].Key=key0&parameter[0].Value=10"); request.QueryString = new QueryString("?parameter[0].Key=key0&parameter[0].Value=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -72,10 +72,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter[key0]=10"); request.QueryString = new QueryString("?parameter[key0]=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -110,10 +110,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
new QueryString("?parameter.index=low&parameter[low].Key=key0&parameter[low].Value=10"); new QueryString("?parameter.index=low&parameter[low].Key=key0&parameter[low].Value=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -163,10 +163,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString(queryString); request.QueryString = new QueryString(queryString);
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -198,10 +198,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString(queryString); request.QueryString = new QueryString(queryString);
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -230,10 +230,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -291,10 +291,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString(queryString); request.QueryString = new QueryString(queryString);
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -331,10 +331,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString(queryString); request.QueryString = new QueryString(queryString);
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -370,10 +370,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString(queryString); request.QueryString = new QueryString(queryString);
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -410,10 +410,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -517,14 +517,14 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}; };
var argumentBinder = ModelBindingTestHelper.GetArgumentBinder(); var argumentBinder = ModelBindingTestHelper.GetArgumentBinder();
var modelState = new ModelStateDictionary();
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(request => var operationContext = ModelBindingTestHelper.GetOperationBindingContext(request =>
{ {
request.QueryString = new QueryString(queryString); request.QueryString = new QueryString(queryString);
}); });
var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);

12
test/Microsoft.AspNet.Mvc.IntegrationTests/FormCollectionModelBindingIntegrationTest.cs
View File

@ -49,10 +49,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
UpdateRequest(request, data, "Address.File"); UpdateRequest(request, data, "Address.File");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -99,10 +99,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
UpdateRequest(request, data, "CustomParameter"); UpdateRequest(request, data, "CustomParameter");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
// ModelBindingResult // ModelBindingResult
@ -139,10 +139,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
// No data is passed. // No data is passed.
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(); var operationContext = ModelBindingTestHelper.GetOperationBindingContext();
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert

12
test/Microsoft.AspNet.Mvc.IntegrationTests/FormFileModelBindingIntegrationTest.cs
View File

@ -49,10 +49,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
UpdateRequest(request, data, "Address.File"); UpdateRequest(request, data, "Address.File");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -100,10 +100,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
UpdateRequest(request, data, "CustomParameter"); UpdateRequest(request, data, "CustomParameter");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
// ModelBindingResult // ModelBindingResult
@ -146,10 +146,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
var operationContext = ModelBindingTestHelper.GetOperationBindingContext( var operationContext = ModelBindingTestHelper.GetOperationBindingContext(
request => UpdateRequest(request, data: null, name: null)); request => UpdateRequest(request, data: null, name: null));
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.Equal(ModelBindingResult.NoResult, modelBindingResult); Assert.Equal(ModelBindingResult.NoResult, modelBindingResult);

56
test/Microsoft.AspNet.Mvc.IntegrationTests/GenericModelBinderIntegrationTest.cs
View File

@ -37,10 +37,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.index=10"); request.QueryString = new QueryString("?parameter.index=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -75,10 +75,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?index=10"); request.QueryString = new QueryString("?index=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -114,10 +114,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -183,10 +183,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request => request.QueryString = new QueryString("?parameter.index=0"), request => request.QueryString = new QueryString("?parameter.index=0"),
options => options.ModelBinders.Add(new AddressBinder())); options => options.ModelBinders.Add(new AddressBinder()));
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -217,10 +217,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
var operationContext = ModelBindingTestHelper.GetOperationBindingContext( var operationContext = ModelBindingTestHelper.GetOperationBindingContext(
request => request.QueryString = new QueryString("?parameter.index=0")); request => request.QueryString = new QueryString("?parameter.index=0"));
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -252,10 +252,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter[0][0].Key=key0&parameter[0][0].Value=10"); request.QueryString = new QueryString("?parameter[0][0].Key=key0&parameter[0][0].Value=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -297,10 +297,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?[0][0].Key=key0&[0][0].Value=10"); request.QueryString = new QueryString("?[0][0].Key=key0&[0][0].Value=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -342,10 +342,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -377,10 +377,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter[0].Key=key0&parameter[0].Value=10"); request.QueryString = new QueryString("?parameter[0].Key=key0&parameter[0].Value=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -421,10 +421,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?[0].Key=key0&[0].Value=10"); request.QueryString = new QueryString("?[0].Key=key0&[0].Value=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -465,10 +465,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -501,10 +501,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
"?parameter[0].Key=key0&parameter[0].Value[0]=10&parameter[0].Value[1]=11"); "?parameter[0].Key=key0&parameter[0].Value[0]=10&parameter[0].Value[1]=11");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -549,10 +549,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?[0].Key=key0&[0].Value[0]=10&[0].Value[1]=11"); request.QueryString = new QueryString("?[0].Key=key0&[0].Value[0]=10&[0].Value[1]=11");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -597,10 +597,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);

16
test/Microsoft.AspNet.Mvc.IntegrationTests/HeaderModelBinderIntegrationTest.cs
View File

@ -43,10 +43,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
// Do not add any headers. // Do not add any headers.
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(); var operationContext = ModelBindingTestHelper.GetOperationBindingContext();
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -86,10 +86,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.Headers.Add("Header", new[] { "someValue" }); request.Headers.Add("Header", new[] { "someValue" });
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -128,10 +128,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
var operationContext = ModelBindingTestHelper.GetOperationBindingContext( var operationContext = ModelBindingTestHelper.GetOperationBindingContext(
request => request.Headers.Add("Header", new[] { "someValue" })); request => request.Headers.Add("Header", new[] { "someValue" }));
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -190,10 +190,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
// Do not add any headers. // Do not add any headers.
var httpContext = operationContext.HttpContext; var httpContext = operationContext.HttpContext;
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert

48
test/Microsoft.AspNet.Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs
View File

@ -30,10 +30,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.Key=key0&parameter.Value=10"); request.QueryString = new QueryString("?parameter.Key=key0&parameter.Value=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -68,10 +68,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
{ {
request.QueryString = new QueryString("?parameter.Value=10"); request.QueryString = new QueryString("?parameter.Value=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.False(modelBindingResult.IsModelSet); Assert.False(modelBindingResult.IsModelSet);
@ -116,10 +116,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
{ {
request.QueryString = new QueryString("?parameter.Value=10"); request.QueryString = new QueryString("?parameter.Value=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.False(modelBindingResult.IsModelSet); Assert.False(modelBindingResult.IsModelSet);
@ -153,10 +153,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
{ {
request.QueryString = new QueryString("?parameter.Key=10"); request.QueryString = new QueryString("?parameter.Key=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.False(modelBindingResult.IsModelSet); Assert.False(modelBindingResult.IsModelSet);
@ -201,10 +201,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
{ {
request.QueryString = new QueryString("?parameter.Key=10"); request.QueryString = new QueryString("?parameter.Key=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.False(modelBindingResult.IsModelSet); Assert.False(modelBindingResult.IsModelSet);
@ -244,10 +244,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?prefix.Key=key0&prefix.Value=10"); request.QueryString = new QueryString("?prefix.Key=key0&prefix.Value=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -284,10 +284,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?Key=key0&Value=10"); request.QueryString = new QueryString("?Key=key0&Value=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -324,10 +324,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -360,10 +360,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.Key=key0&parameter.Value.Id=10"); request.QueryString = new QueryString("?parameter.Key=key0&parameter.Value.Id=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -405,10 +405,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?prefix.Key=key0&prefix.Value.Id=10"); request.QueryString = new QueryString("?prefix.Key=key0&prefix.Value.Id=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -446,10 +446,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?Key=key0&Value.Id=10"); request.QueryString = new QueryString("?Key=key0&Value.Id=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -487,10 +487,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);

20
test/Microsoft.AspNet.Mvc.IntegrationTests/ModelPrefixSelectionIntegrationTest.cs
View File

@ -45,10 +45,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}); });
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -95,10 +95,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}); });
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -135,10 +135,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?Name="); request.QueryString = new QueryString("?Name=");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -185,10 +185,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}); });
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -232,10 +232,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}); });
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);

172
test/Microsoft.AspNet.Mvc.IntegrationTests/MutableObjectModelBinderIntegrationTest.cs
View File

@ -66,10 +66,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
SetJsonBodyContent(request, AddressBodyContent); SetJsonBodyContent(request, AddressBodyContent);
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -111,10 +111,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
SetJsonBodyContent(request, AddressBodyContent); SetJsonBodyContent(request, AddressBodyContent);
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -156,10 +156,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.ContentType = "application/json"; request.ContentType = "application/json";
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -201,10 +201,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
SetJsonBodyContent(request, AddressBodyContent); SetJsonBodyContent(request, AddressBodyContent);
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -242,10 +242,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
SetJsonBodyContent(request, AddressBodyContent); SetJsonBodyContent(request, AddressBodyContent);
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -290,10 +290,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
new QueryString("?parameter.Customer.Name=bill&parameter.Customer.Token=" + ByteArrayEncoded); new QueryString("?parameter.Customer.Name=bill&parameter.Customer.Token=" + ByteArrayEncoded);
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -333,10 +333,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?Customer.Name=bill&Customer.Token=" + ByteArrayEncoded); request.QueryString = new QueryString("?Customer.Name=bill&Customer.Token=" + ByteArrayEncoded);
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -376,10 +376,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.Customer.Name=bill"); request.QueryString = new QueryString("?parameter.Customer.Name=bill");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -430,10 +430,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
SetFormFileBodyContent(request, "Hello, World!", "parameter.Customer.Documents"); SetFormFileBodyContent(request, "Hello, World!", "parameter.Customer.Documents");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -474,10 +474,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
SetFormFileBodyContent(request, "Hello, World!", "Customer.Documents"); SetFormFileBodyContent(request, "Hello, World!", "Customer.Documents");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -519,10 +519,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
// Deliberately leaving out any form data. // Deliberately leaving out any form data.
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -565,10 +565,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
SetFormFileBodyContent(request, "Hello, World!", "parameter.Customer.Documents"); SetFormFileBodyContent(request, "Hello, World!", "parameter.Customer.Documents");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -606,10 +606,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
SetFormFileBodyContent(request, "Hello, World!", "parameter.Customer.Documents"); SetFormFileBodyContent(request, "Hello, World!", "parameter.Customer.Documents");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -647,10 +647,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
new QueryString("?parameter.Name=bill&parameter.ProductIds[0]=10&parameter.ProductIds[1]=11"); new QueryString("?parameter.Name=bill&parameter.ProductIds[0]=10&parameter.ProductIds[1]=11");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -693,10 +693,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?Name=bill&ProductIds[0]=10&ProductIds[1]=11"); request.QueryString = new QueryString("?Name=bill&ProductIds[0]=10&ProductIds[1]=11");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -739,10 +739,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.Name=bill"); request.QueryString = new QueryString("?parameter.Name=bill");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -777,10 +777,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -819,10 +819,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
new QueryString("?parameter.Name=bill&parameter.ProductIds[0]=10&parameter.ProductIds[1]=11"); new QueryString("?parameter.Name=bill&parameter.ProductIds[0]=10&parameter.ProductIds[1]=11");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -865,10 +865,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?Name=bill&ProductIds[0]=10&ProductIds[1]=11"); request.QueryString = new QueryString("?Name=bill&ProductIds[0]=10&ProductIds[1]=11");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -911,10 +911,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.Name=bill"); request.QueryString = new QueryString("?parameter.Name=bill");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -949,10 +949,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -991,10 +991,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
new QueryString("?parameter.Name=bill&parameter.ProductIds[0].Key=key0&parameter.ProductIds[0].Value=10"); new QueryString("?parameter.Name=bill&parameter.ProductIds[0].Key=key0&parameter.ProductIds[0].Value=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1037,10 +1037,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?Name=bill&ProductIds[0].Key=key0&ProductIds[0].Value=10"); request.QueryString = new QueryString("?Name=bill&ProductIds[0].Key=key0&ProductIds[0].Value=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1083,10 +1083,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.Name=bill"); request.QueryString = new QueryString("?parameter.Name=bill");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1121,10 +1121,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1163,10 +1163,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
new QueryString("?parameter.Name=bill&parameter.ProductId.Key=key0&parameter.ProductId.Value=10"); new QueryString("?parameter.Name=bill&parameter.ProductId.Key=key0&parameter.ProductId.Value=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1209,10 +1209,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?Name=bill&ProductId.Key=key0&ProductId.Value=10"); request.QueryString = new QueryString("?Name=bill&ProductId.Key=key0&ProductId.Value=10");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1255,10 +1255,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.Name=bill"); request.QueryString = new QueryString("?parameter.Name=bill");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1293,10 +1293,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1341,10 +1341,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
SetJsonBodyContent(request, AddressBodyContent); SetJsonBodyContent(request, AddressBodyContent);
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1389,10 +1389,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
// No Data // No Data
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(); var operationContext = ModelBindingTestHelper.GetOperationBindingContext();
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1436,10 +1436,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
// No Data // No Data
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(); var operationContext = ModelBindingTestHelper.GetOperationBindingContext();
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1488,10 +1488,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.Customer.Id=123"); request.QueryString = new QueryString("?parameter.Customer.Id=123");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1533,10 +1533,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?Customer.Id=123"); request.QueryString = new QueryString("?Customer.Id=123");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1582,10 +1582,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?customParameter.Customer.Id=123"); request.QueryString = new QueryString("?customParameter.Customer.Id=123");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1633,10 +1633,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1676,10 +1676,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1715,10 +1715,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?ProductName=abc"); request.QueryString = new QueryString("?ProductName=abc");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1758,10 +1758,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1801,10 +1801,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1840,10 +1840,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?OrderIds[0]=123"); request.QueryString = new QueryString("?OrderIds[0]=123");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1884,10 +1884,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.ProductId="); request.QueryString = new QueryString("?parameter.ProductId=");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1928,10 +1928,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.ProductId"); request.QueryString = new QueryString("?parameter.ProductId");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);

19
test/Microsoft.AspNet.Mvc.IntegrationTests/ServicesModelBinderIntegrationTest.cs
View File

@ -32,10 +32,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}; };
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(); var operationContext = ModelBindingTestHelper.GetOperationBindingContext();
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -69,10 +69,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}; };
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(); var operationContext = ModelBindingTestHelper.GetOperationBindingContext();
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
// ModelBindingResult // ModelBindingResult
@ -105,10 +105,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}; };
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(); var operationContext = ModelBindingTestHelper.GetOperationBindingContext();
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
// ModelBindingResult // ModelBindingResult
@ -141,10 +141,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}; };
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(); var operationContext = ModelBindingTestHelper.GetOperationBindingContext();
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
// ModelBindingResult // ModelBindingResult
@ -177,11 +177,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}; };
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(); var operationContext = ModelBindingTestHelper.GetOperationBindingContext();
var modelState = new ModelStateDictionary();
// Act & Assert // Act & Assert
var exception = await Assert.ThrowsAsync<InvalidOperationException>( var exception = await Assert.ThrowsAsync<InvalidOperationException>(
() => argumentBinder.BindModelAsync(parameter, modelState, operationContext)); () => argumentBinder.BindModelAsync(parameter, operationContext));
Assert.Contains(typeof(IActionResult).FullName, exception.Message); Assert.Contains(typeof(IActionResult).FullName, exception.Message);
} }
} }

40
test/Microsoft.AspNet.Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs
View File

@ -42,10 +42,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("CustomParameter.Address.Zip", "1"); request.QueryString = QueryString.Create("CustomParameter.Address.Zip", "1");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -86,10 +86,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("Address.Zip", "1"); request.QueryString = QueryString.Create("Address.Zip", "1");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -131,10 +131,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("Parameter1", "someValue"); request.QueryString = QueryString.Create("Parameter1", "someValue");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -175,10 +175,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?Parameter1=someValue&Parameter1=otherValue"); request.QueryString = new QueryString("?Parameter1=someValue&Parameter1=otherValue");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -219,10 +219,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("Parameter1", "abcd"); request.QueryString = QueryString.Create("Parameter1", "abcd");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -273,10 +273,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
{ {
request.QueryString = QueryString.Create("Parameter1", " "); request.QueryString = QueryString.Create("Parameter1", " ");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -326,10 +326,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
{ {
request.QueryString = QueryString.Create("Parameter1", string.Empty); request.QueryString = QueryString.Create("Parameter1", string.Empty);
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
// ModelBindingResult // ModelBindingResult
@ -369,10 +369,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
{ {
request.QueryString = QueryString.Create("Parameter1", string.Empty); request.QueryString = QueryString.Create("Parameter1", string.Empty);
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -407,10 +407,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
// No Data. // No Data.
var operationContext = ModelBindingTestHelper.GetOperationBindingContext(); var operationContext = ModelBindingTestHelper.GetOperationBindingContext();
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
@ -461,10 +461,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
{ {
request.Form = new FormCollection(personStore); request.Form = new FormCollection(personStore);
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
// ModelBindingResult // ModelBindingResult

92
test/Microsoft.AspNet.Mvc.IntegrationTests/TryUpdateModelIntegrationTest.cs
View File

@ -31,7 +31,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("Street", "SomeStreet"); request.QueryString = QueryString.Create("Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new Address var model = new Address
{ {
Street = "DefaultStreet", Street = "DefaultStreet",
@ -40,7 +40,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
var oldModel = model; var oldModel = model;
// Act // Act
var result = await TryUpdateModel(model, string.Empty, operationContext, modelState); var result = await TryUpdateModel(model, string.Empty, operationContext);
// Assert // Assert
Assert.True(result); Assert.True(result);
@ -71,11 +71,11 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("Street", "SomeStreet"); request.QueryString = QueryString.Create("Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new Address(); var model = new Address();
// Act // Act
var result = await TryUpdateModel(model, string.Empty, operationContext, modelState); var result = await TryUpdateModel(model, string.Empty, operationContext);
// Assert // Assert
Assert.True(result); Assert.True(result);
@ -121,7 +121,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}); });
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new List<Person1> var model = new List<Person1>
{ {
new Person1 new Person1
@ -138,7 +138,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}; };
// Act // Act
var result = await TryUpdateModel(model, string.Empty, operationContext, modelState); var result = await TryUpdateModel(model, string.Empty, operationContext);
// Assert // Assert
Assert.True(result); Assert.True(result);
@ -175,7 +175,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("Address.Street", "SomeStreet"); request.QueryString = QueryString.Create("Address.Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new Person1 var model = new Person1
{ {
Name = "Joe", Name = "Joe",
@ -188,7 +188,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
var oldModel = model; var oldModel = model;
// Act // Act
var result = await TryUpdateModel(model, string.Empty, operationContext, modelState); var result = await TryUpdateModel(model, string.Empty, operationContext);
// Assert // Assert
Assert.True(result); Assert.True(result);
@ -230,11 +230,11 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet"); request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new Person2(); var model = new Person2();
// Act // Act
var result = await TryUpdateModel(model, string.Empty, operationContext, modelState); var result = await TryUpdateModel(model, string.Empty, operationContext);
// Assert // Assert
Assert.True(result); Assert.True(result);
@ -271,7 +271,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet"); request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new Person2 var model = new Person2
{ {
Address = new List<Address>(), Address = new List<Address>(),
@ -279,7 +279,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
var collection = model.Address; var collection = model.Address;
// Act // Act
var result = await TryUpdateModel(model, string.Empty, operationContext, modelState); var result = await TryUpdateModel(model, string.Empty, operationContext);
// Assert // Assert
Assert.True(result); Assert.True(result);
@ -327,7 +327,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet"); request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new Person3 var model = new Person3
{ {
Address = Address =
@ -346,7 +346,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}; };
// Act // Act
var result = await TryUpdateModel(model, string.Empty, operationContext, modelState); var result = await TryUpdateModel(model, string.Empty, operationContext);
// Assert // Assert
Assert.True(result); Assert.True(result);
@ -382,11 +382,11 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet"); request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new Person6(); var model = new Person6();
// Act // Act
var result = await TryUpdateModel(model, string.Empty, operationContext, modelState); var result = await TryUpdateModel(model, string.Empty, operationContext);
// Assert // Assert
Assert.True(result); Assert.True(result);
@ -426,11 +426,11 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet"); request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new Person4(); var model = new Person4();
// Act // Act
var result = await TryUpdateModel(model, string.Empty, operationContext, modelState); var result = await TryUpdateModel(model, string.Empty, operationContext);
// Assert // Assert
Assert.True(result); Assert.True(result);
@ -467,7 +467,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet"); request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new Person4 var model = new Person4
{ {
Address = new Address[] Address = new Address[]
@ -482,7 +482,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
var collection = model.Address; var collection = model.Address;
// Act // Act
var result = await TryUpdateModel(model, string.Empty, operationContext, modelState); var result = await TryUpdateModel(model, string.Empty, operationContext);
// Assert // Assert
Assert.True(result); Assert.True(result);
@ -525,11 +525,11 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet"); request.QueryString = QueryString.Create("Address[0].Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new Person5(); var model = new Person5();
// Act // Act
var result = await TryUpdateModel(model, string.Empty, operationContext, modelState); var result = await TryUpdateModel(model, string.Empty, operationContext);
// Assert // Assert
Assert.True(result); Assert.True(result);
@ -555,7 +555,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("prefix.Street", "SomeStreet"); request.QueryString = QueryString.Create("prefix.Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new Address var model = new Address
{ {
Street = "DefaultStreet", Street = "DefaultStreet",
@ -564,7 +564,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
var oldModel = model; var oldModel = model;
// Act // Act
var result = await TryUpdateModel(model, "prefix", operationContext, modelState); var result = await TryUpdateModel(model, "prefix", operationContext);
// Assert // Assert
Assert.True(result); Assert.True(result);
@ -595,11 +595,11 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("prefix.Street", "SomeStreet"); request.QueryString = QueryString.Create("prefix.Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new Address(); var model = new Address();
// Act // Act
var result = await TryUpdateModel(model, "prefix", operationContext, modelState); var result = await TryUpdateModel(model, "prefix", operationContext);
// Assert // Assert
Assert.True(result); Assert.True(result);
@ -638,7 +638,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}); });
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new List<Person1> var model = new List<Person1>
{ {
new Person1 new Person1
@ -655,7 +655,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}; };
// Act // Act
var result = await TryUpdateModel(model, "prefix", operationContext, modelState); var result = await TryUpdateModel(model, "prefix", operationContext);
// Assert // Assert
Assert.True(result); Assert.True(result);
@ -692,7 +692,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("prefix.Address.Street", "SomeStreet"); request.QueryString = QueryString.Create("prefix.Address.Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new Person1 var model = new Person1
{ {
Name = "Joe", Name = "Joe",
@ -705,7 +705,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
var oldModel = model; var oldModel = model;
// Act // Act
var result = await TryUpdateModel(model, "prefix", operationContext, modelState); var result = await TryUpdateModel(model, "prefix", operationContext);
// Assert // Assert
Assert.True(result); Assert.True(result);
@ -742,11 +742,11 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet"); request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new Person2(); var model = new Person2();
// Act // Act
var result = await TryUpdateModel(model, "prefix", operationContext, modelState); var result = await TryUpdateModel(model, "prefix", operationContext);
// Assert // Assert
Assert.True(result); Assert.True(result);
@ -783,7 +783,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet"); request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new Person2 var model = new Person2
{ {
Address = new List<Address>(), Address = new List<Address>(),
@ -791,7 +791,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
var collection = model.Address; var collection = model.Address;
// Act // Act
var result = await TryUpdateModel(model, "prefix", operationContext, modelState); var result = await TryUpdateModel(model, "prefix", operationContext);
// Assert // Assert
Assert.True(result); Assert.True(result);
@ -829,7 +829,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet"); request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new Person3 var model = new Person3
{ {
Address = Address =
@ -848,7 +848,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}; };
// Act // Act
var result = await TryUpdateModel(model, "prefix", operationContext, modelState); var result = await TryUpdateModel(model, "prefix", operationContext);
// Assert // Assert
Assert.True(result); Assert.True(result);
@ -879,11 +879,11 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet"); request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new Person6(); var model = new Person6();
// Act // Act
var result = await TryUpdateModel(model, "prefix", operationContext, modelState); var result = await TryUpdateModel(model, "prefix", operationContext);
// Assert // Assert
Assert.True(result); Assert.True(result);
@ -918,11 +918,11 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet"); request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new Person4(); var model = new Person4();
// Act // Act
var result = await TryUpdateModel(model, "prefix", operationContext, modelState); var result = await TryUpdateModel(model, "prefix", operationContext);
// Assert // Assert
Assert.True(result); Assert.True(result);
@ -959,7 +959,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet"); request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new Person4 var model = new Person4
{ {
Address = new Address[] Address = new Address[]
@ -974,7 +974,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
var collection = model.Address; var collection = model.Address;
// Act // Act
var result = await TryUpdateModel(model, "prefix", operationContext, modelState); var result = await TryUpdateModel(model, "prefix", operationContext);
// Assert // Assert
Assert.True(result); Assert.True(result);
@ -1012,11 +1012,11 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet"); request.QueryString = QueryString.Create("prefix.Address[0].Street", "SomeStreet");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
var model = new Person5(); var model = new Person5();
// Act // Act
var result = await TryUpdateModel(model, "prefix", operationContext, modelState); var result = await TryUpdateModel(model, "prefix", operationContext);
// Assert // Assert
Assert.True(result); Assert.True(result);
@ -1098,15 +1098,13 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
private Task<bool> TryUpdateModel( private Task<bool> TryUpdateModel(
object model, object model,
string prefix, string prefix,
OperationBindingContext operationContext, OperationBindingContext operationContext)
ModelStateDictionary modelState)
{ {
return ModelBindingHelper.TryUpdateModelAsync( return ModelBindingHelper.TryUpdateModelAsync(
model, model,
model.GetType(), model.GetType(),
prefix, prefix,
operationContext.ActionContext, operationContext.ActionContext,
modelState,
operationContext.MetadataProvider, operationContext.MetadataProvider,
operationContext.ModelBinder, operationContext.ModelBinder,
operationContext.ValueProvider, operationContext.ValueProvider,

100
test/Microsoft.AspNet.Mvc.IntegrationTests/ValidationIntegrationTests.cs
View File

@ -37,10 +37,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.CustomerName=bill"); request.QueryString = new QueryString("?parameter.CustomerName=bill");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -74,10 +74,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -125,10 +125,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.Customer.Name=bill"); request.QueryString = new QueryString("?parameter.Customer.Name=bill");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -163,10 +163,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -216,10 +216,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.Customer.Name=bill"); request.QueryString = new QueryString("?parameter.Customer.Name=bill");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -255,10 +255,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.Customer.Age=17"); request.QueryString = new QueryString("?parameter.Customer.Age=17");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -308,10 +308,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?Items[0].ItemId=17"); request.QueryString = new QueryString("?Items[0].ItemId=17");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -347,10 +347,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -395,10 +395,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter[0].ProductId=17"); request.QueryString = new QueryString("?parameter[0].ProductId=17");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -433,10 +433,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter[0].Name=bill"); request.QueryString = new QueryString("?parameter[0].Name=bill");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -481,10 +481,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.Name=bill"); request.QueryString = new QueryString("?parameter.Name=bill");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -518,10 +518,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.Name=billybob"); request.QueryString = new QueryString("?parameter.Name=billybob");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -569,10 +569,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.Customer.Name=bill"); request.QueryString = new QueryString("?parameter.Customer.Name=bill");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -606,10 +606,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.Customer.Name=billybob"); request.QueryString = new QueryString("?parameter.Customer.Name=billybob");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -646,10 +646,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -704,10 +704,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.Customer.Name=bill"); request.QueryString = new QueryString("?parameter.Customer.Name=bill");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -741,10 +741,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.Customer.Name=billybob"); request.QueryString = new QueryString("?parameter.Customer.Name=billybob");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -811,10 +811,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.Products[0].Name=bill"); request.QueryString = new QueryString("?parameter.Products[0].Name=bill");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -848,10 +848,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter.Products[0].Name=billybob"); request.QueryString = new QueryString("?parameter.Products[0].Name=billybob");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -899,10 +899,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter[0].Name=bill"); request.QueryString = new QueryString("?parameter[0].Name=bill");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -936,10 +936,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?parameter[0].Name=billybob"); request.QueryString = new QueryString("?parameter[0].Name=billybob");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -976,10 +976,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?"); request.QueryString = new QueryString("?");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1016,10 +1016,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?Id=bill"); request.QueryString = new QueryString("?Id=bill");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1056,10 +1056,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
request.QueryString = new QueryString("?Zip=-123"); request.QueryString = new QueryString("?Zip=-123");
}); });
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
// Assert // Assert
Assert.True(modelBindingResult.IsModelSet); Assert.True(modelBindingResult.IsModelSet);
@ -1134,10 +1134,10 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests
}); });
var argumentBinder = ModelBindingTestHelper.GetArgumentBinder(testOptions); var argumentBinder = ModelBindingTestHelper.GetArgumentBinder(testOptions);
var modelState = new ModelStateDictionary(); var modelState = operationContext.ActionContext.ModelState;
// Act // Act
var modelBindingResult = await argumentBinder.BindModelAsync(parameter, modelState, operationContext); var modelBindingResult = await argumentBinder.BindModelAsync(parameter, operationContext);
Assert.Equal(4, modelState.Count); Assert.Equal(4, modelState.Count);
Assert.Equal(0, modelState.ErrorCount); Assert.Equal(0, modelState.ErrorCount);

24
test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs
View File

@ -445,7 +445,15 @@ namespace Microsoft.AspNet.Mvc
serviceCollection.AddSingleton<IUrlHelper>(urlHelper); serviceCollection.AddSingleton<IUrlHelper>(urlHelper);
var serviceProvider = serviceCollection.BuildServiceProvider(); var serviceProvider = serviceCollection.BuildServiceProvider();
return new ClientModelValidationContext(_metadata, _metadataProvider, serviceProvider); var actionContext = new ActionContext()
{
HttpContext = new DefaultHttpContext()
{
RequestServices = serviceProvider,
},
};
return new ClientModelValidationContext(actionContext, _metadata, _metadataProvider);
} }
private static ClientModelValidationContext GetValidationContextWithArea(string currentArea) private static ClientModelValidationContext GetValidationContextWithArea(string currentArea)
@ -475,7 +483,15 @@ namespace Microsoft.AspNet.Mvc
serviceCollection.AddSingleton<IUrlHelper>(urlHelper); serviceCollection.AddSingleton<IUrlHelper>(urlHelper);
serviceProvider = serviceCollection.BuildServiceProvider(); serviceProvider = serviceCollection.BuildServiceProvider();
return new ClientModelValidationContext(_metadata, _metadataProvider, serviceProvider); var actionContext = new ActionContext()
{
HttpContext = new DefaultHttpContext()
{
RequestServices = serviceProvider,
},
};
return new ClientModelValidationContext(actionContext, _metadata, _metadataProvider);
} }
private static ClientModelValidationContext GetValidationContextWithNoController() private static ClientModelValidationContext GetValidationContextWithNoController()
@ -494,9 +510,9 @@ namespace Microsoft.AspNet.Mvc
var contextAccessor = GetContextAccessor(serviceProvider, routeData); var contextAccessor = GetContextAccessor(serviceProvider, routeData);
var urlHelper = new UrlHelper(contextAccessor); var urlHelper = new UrlHelper(contextAccessor);
serviceCollection.AddSingleton<IUrlHelper>(urlHelper); serviceCollection.AddSingleton<IUrlHelper>(urlHelper);
serviceProvider = serviceCollection.BuildServiceProvider(); contextAccessor.ActionContext.HttpContext.RequestServices = serviceCollection.BuildServiceProvider();
return new ClientModelValidationContext(_metadata, _metadataProvider, serviceProvider); return new ClientModelValidationContext(contextAccessor.ActionContext, _metadata, _metadataProvider);
} }
private static IRouter GetRouteCollectionWithArea(IServiceProvider serviceProvider) private static IRouter GetRouteCollectionWithArea(IServiceProvider serviceProvider)