V10: fix build warnings in test projects (#12509)
* Run code cleanup * Dotnet format benchmarks project * Fix up Test.Common * Run dotnet format + manual cleanup * Run code cleanup for unit tests * Run dotnet format * Fix up errors * Manual cleanup of Unit test project * Update tests/Umbraco.Tests.Benchmarks/HexStringBenchmarks.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update tests/Umbraco.Tests.Integration/Testing/TestDbMeta.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update tests/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Update tests/Umbraco.Tests.Integration/Umbraco.Core/Events/EventAggregatorTests.cs Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> * Fix according to review * Fix after merge * Fix errors Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk> Co-authored-by: Mole <nikolajlauridsen@protonmail.ch> Co-authored-by: Zeegaan <nge@umbraco.dk>
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
// Copyright (c) Umbraco.
|
||||
// See LICENSE for more details.
|
||||
|
||||
using System;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.Mvc.Abstractions;
|
||||
@@ -11,84 +10,83 @@ using Microsoft.Extensions.Primitives;
|
||||
using NUnit.Framework;
|
||||
using Umbraco.Cms.Web.Common.ModelBinders;
|
||||
|
||||
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.ModelBinders
|
||||
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.ModelBinders;
|
||||
|
||||
[TestFixture]
|
||||
public class HttpQueryStringModelBinderTests
|
||||
{
|
||||
[TestFixture]
|
||||
public class HttpQueryStringModelBinderTests
|
||||
[Test]
|
||||
public void Binds_Query_To_FormCollection()
|
||||
{
|
||||
[Test]
|
||||
public void Binds_Query_To_FormCollection()
|
||||
// Arrange
|
||||
var bindingContext = CreateBindingContext("?foo=bar&baz=buzz");
|
||||
var binder = new HttpQueryStringModelBinder();
|
||||
|
||||
// Act
|
||||
binder.BindModelAsync(bindingContext);
|
||||
|
||||
// Assert
|
||||
Assert.True(bindingContext.Result.IsModelSet);
|
||||
|
||||
var typedModel = bindingContext.Result.Model as FormCollection;
|
||||
Assert.IsNotNull(typedModel);
|
||||
Assert.AreEqual(typedModel["foo"], "bar");
|
||||
Assert.AreEqual(typedModel["baz"], "buzz");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Sets_Culture_Form_Value_From_Query_If_Provided()
|
||||
{
|
||||
// Arrange
|
||||
var bindingContext = CreateBindingContext("?foo=bar&baz=buzz&culture=en-gb");
|
||||
var binder = new HttpQueryStringModelBinder();
|
||||
|
||||
// Act
|
||||
binder.BindModelAsync(bindingContext);
|
||||
|
||||
// Assert
|
||||
Assert.True(bindingContext.Result.IsModelSet);
|
||||
|
||||
var typedModel = bindingContext.Result.Model as FormCollection;
|
||||
Assert.IsNotNull(typedModel);
|
||||
Assert.AreEqual(typedModel["culture"], "en-gb");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Sets_Culture_Form_Value_From_Header_If_Not_Provided_In_Query()
|
||||
{
|
||||
// Arrange
|
||||
var bindingContext = CreateBindingContext("?foo=bar&baz=buzz");
|
||||
var binder = new HttpQueryStringModelBinder();
|
||||
|
||||
// Act
|
||||
binder.BindModelAsync(bindingContext);
|
||||
|
||||
// Assert
|
||||
Assert.True(bindingContext.Result.IsModelSet);
|
||||
|
||||
var typedModel = bindingContext.Result.Model as FormCollection;
|
||||
Assert.IsNotNull(typedModel);
|
||||
Assert.AreEqual(typedModel["culture"], "en-gb");
|
||||
}
|
||||
|
||||
private ModelBindingContext CreateBindingContext(string querystring)
|
||||
{
|
||||
var httpContext = new DefaultHttpContext();
|
||||
httpContext.Request.QueryString = new QueryString(querystring);
|
||||
httpContext.Request.Headers.Add("X-UMB-CULTURE", new StringValues("en-gb"));
|
||||
var routeData = new RouteData();
|
||||
var actionContext = new ActionContext(httpContext, routeData, new ActionDescriptor());
|
||||
var metadataProvider = new EmptyModelMetadataProvider();
|
||||
var routeValueDictionary = new RouteValueDictionary();
|
||||
var valueProvider = new RouteValueProvider(BindingSource.Path, routeValueDictionary);
|
||||
var modelType = typeof(FormCollection);
|
||||
return new DefaultModelBindingContext
|
||||
{
|
||||
// Arrange
|
||||
ModelBindingContext bindingContext = CreateBindingContext("?foo=bar&baz=buzz");
|
||||
var binder = new HttpQueryStringModelBinder();
|
||||
|
||||
// Act
|
||||
binder.BindModelAsync(bindingContext);
|
||||
|
||||
// Assert
|
||||
Assert.True(bindingContext.Result.IsModelSet);
|
||||
|
||||
var typedModel = bindingContext.Result.Model as FormCollection;
|
||||
Assert.IsNotNull(typedModel);
|
||||
Assert.AreEqual(typedModel["foo"], "bar");
|
||||
Assert.AreEqual(typedModel["baz"], "buzz");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Sets_Culture_Form_Value_From_Query_If_Provided()
|
||||
{
|
||||
// Arrange
|
||||
ModelBindingContext bindingContext = CreateBindingContext("?foo=bar&baz=buzz&culture=en-gb");
|
||||
var binder = new HttpQueryStringModelBinder();
|
||||
|
||||
// Act
|
||||
binder.BindModelAsync(bindingContext);
|
||||
|
||||
// Assert
|
||||
Assert.True(bindingContext.Result.IsModelSet);
|
||||
|
||||
var typedModel = bindingContext.Result.Model as FormCollection;
|
||||
Assert.IsNotNull(typedModel);
|
||||
Assert.AreEqual(typedModel["culture"], "en-gb");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Sets_Culture_Form_Value_From_Header_If_Not_Provided_In_Query()
|
||||
{
|
||||
// Arrange
|
||||
ModelBindingContext bindingContext = CreateBindingContext("?foo=bar&baz=buzz");
|
||||
var binder = new HttpQueryStringModelBinder();
|
||||
|
||||
// Act
|
||||
binder.BindModelAsync(bindingContext);
|
||||
|
||||
// Assert
|
||||
Assert.True(bindingContext.Result.IsModelSet);
|
||||
|
||||
var typedModel = bindingContext.Result.Model as FormCollection;
|
||||
Assert.IsNotNull(typedModel);
|
||||
Assert.AreEqual(typedModel["culture"], "en-gb");
|
||||
}
|
||||
|
||||
private ModelBindingContext CreateBindingContext(string querystring)
|
||||
{
|
||||
var httpContext = new DefaultHttpContext();
|
||||
httpContext.Request.QueryString = new QueryString(querystring);
|
||||
httpContext.Request.Headers.Add("X-UMB-CULTURE", new StringValues("en-gb"));
|
||||
var routeData = new RouteData();
|
||||
var actionContext = new ActionContext(httpContext, routeData, new ActionDescriptor());
|
||||
var metadataProvider = new EmptyModelMetadataProvider();
|
||||
var routeValueDictionary = new RouteValueDictionary();
|
||||
var valueProvider = new RouteValueProvider(BindingSource.Path, routeValueDictionary);
|
||||
Type modelType = typeof(FormCollection);
|
||||
return new DefaultModelBindingContext
|
||||
{
|
||||
ActionContext = actionContext,
|
||||
ModelMetadata = metadataProvider.GetMetadataForType(modelType),
|
||||
ModelName = modelType.Name,
|
||||
ValueProvider = valueProvider,
|
||||
};
|
||||
}
|
||||
ActionContext = actionContext,
|
||||
ModelMetadata = metadataProvider.GetMetadataForType(modelType),
|
||||
ModelName = modelType.Name,
|
||||
ValueProvider = valueProvider,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user