yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V10: fix build warnings in test projects (#12509)

Browse Source 
* 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:
Nikolaj Geisle
2022-06-21 08:09:38 +02:00
committed by GitHub
parent 29961d40a3
commit 7aeb400fce
599 changed files with 87303 additions and 86123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactoryTests.cs
View File

@@ -22,75 +22,75 @@ using Umbraco.Cms.Web.Website.Controllers;
using Umbraco.Cms.Web.Website.Routing;
using Umbraco.Extensions;
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Routing
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Routing;
[TestFixture]
public class UmbracoRouteValuesFactoryTests
{
[TestFixture]
public class UmbracoRouteValuesFactoryTests
private UmbracoRouteValuesFactory GetFactory(
out Mock<IPublishedRouter> publishedRouter,
out IOptions<UmbracoRenderingDefaultsOptions> renderingDefaults,
out IPublishedRequest request)
{
private UmbracoRouteValuesFactory GetFactory(
out Mock<IPublishedRouter> publishedRouter,
out IOptions<UmbracoRenderingDefaultsOptions> renderingDefaults,
out IPublishedRequest request)
var builder = new PublishedRequestBuilder(new Uri("https://example.com"), Mock.Of<IFileService>());
builder.SetPublishedContent(Mock.Of<IPublishedContent>());
var builtRequest = request = builder.Build();
publishedRouter = new Mock<IPublishedRouter>();
publishedRouter.Setup(x => x.UpdateRequestAsync(It.IsAny<IPublishedRequest>(), null))
.Returns((IPublishedRequest r, IPublishedContent c) => Task.FromResult(builtRequest))
.Verifiable();
renderingDefaults =
Mock.Of<IOptions<UmbracoRenderingDefaultsOptions>>(x =>
x.Value.DefaultControllerType == typeof(RenderController));
// add the default one
var actionDescriptors = new List<ActionDescriptor>
{
var builder = new PublishedRequestBuilder(new Uri("https://example.com"), Mock.Of<IFileService>());
builder.SetPublishedContent(Mock.Of<IPublishedContent>());
IPublishedRequest builtRequest = request = builder.Build();
publishedRouter = new Mock<IPublishedRouter>();
publishedRouter.Setup(x => x.UpdateRequestAsync(It.IsAny<IPublishedRequest>(), null))
.Returns((IPublishedRequest r, IPublishedContent c) => Task.FromResult(builtRequest))
.Verifiable();
renderingDefaults = Mock.Of<IOptions<UmbracoRenderingDefaultsOptions>>(x => x.Value.DefaultControllerType == typeof(RenderController));
// add the default one
var actionDescriptors = new List<ActionDescriptor>
new ControllerActionDescriptor
{
new ControllerActionDescriptor
{
ControllerName = ControllerExtensions.GetControllerName<RenderController>(),
ActionName = nameof(RenderController.Index),
ControllerTypeInfo = typeof(RenderController).GetTypeInfo()
}
};
var actionSelector = new Mock<IActionSelector>();
actionSelector.Setup(x => x.SelectCandidates(It.IsAny<RouteContext>())).Returns(actionDescriptors);
ControllerName = ControllerExtensions.GetControllerName<RenderController>(),
ActionName = nameof(RenderController.Index),
ControllerTypeInfo = typeof(RenderController).GetTypeInfo(),
},
};
var actionSelector = new Mock<IActionSelector>();
actionSelector.Setup(x => x.SelectCandidates(It.IsAny<RouteContext>())).Returns(actionDescriptors);
var factory = new UmbracoRouteValuesFactory(
renderingDefaults,
Mock.Of<IShortStringHelper>(),
new UmbracoFeatures(),
new ControllerActionSearcher(
new NullLogger<ControllerActionSearcher>(),
actionSelector.Object),
publishedRouter.Object);
var factory = new UmbracoRouteValuesFactory(
renderingDefaults,
Mock.Of<IShortStringHelper>(),
new UmbracoFeatures(),
new ControllerActionSearcher(
new NullLogger<ControllerActionSearcher>(),
actionSelector.Object),
publishedRouter.Object);
return factory;
}
return factory;
}
[Test]
public async Task Update_Request_To_Not_Found_When_No_Template()
{
UmbracoRouteValuesFactory factory = GetFactory(out Mock<IPublishedRouter> publishedRouter, out _, out IPublishedRequest request);
[Test]
public async Task Update_Request_To_Not_Found_When_No_Template()
{
var factory = GetFactory(out var publishedRouter, out _, out var request);
UmbracoRouteValues result = await factory.CreateAsync(new DefaultHttpContext(), request);
await factory.CreateAsync(new DefaultHttpContext(), request);
// The request has content, no template, no hijacked route and no disabled template features so UpdateRequestToNotFound will be called
publishedRouter.Verify(m => m.UpdateRequestAsync(It.IsAny<IPublishedRequest>(), null), Times.Once);
}
// The request has content, no template, no hijacked route and no disabled template features so UpdateRequestToNotFound will be called
publishedRouter.Verify(m => m.UpdateRequestAsync(It.IsAny<IPublishedRequest>(), null), Times.Once);
}
[Test]
public async Task Adds_Result_To_Route_Value_Dictionary()
{
UmbracoRouteValuesFactory factory = GetFactory(out _, out IOptions<UmbracoRenderingDefaultsOptions> renderingDefaults, out IPublishedRequest request);
[Test]
public async Task Adds_Result_To_Route_Value_Dictionary()
{
var factory = GetFactory(out _, out var renderingDefaults, out var request);
UmbracoRouteValues result = await factory.CreateAsync(new DefaultHttpContext(), request);
var result = await factory.CreateAsync(new DefaultHttpContext(), request);
Assert.IsNotNull(result);
Assert.AreEqual(renderingDefaults.Value.DefaultControllerType, result.ControllerType);
Assert.AreEqual(UmbracoRouteValues.DefaultActionName, result.ActionName);
Assert.IsNull(result.TemplateName);
}
Assert.IsNotNull(result);
Assert.AreEqual(renderingDefaults.Value.DefaultControllerType, result.ControllerType);
Assert.AreEqual(UmbracoRouteValues.DefaultActionName, result.ActionName);
Assert.IsNull(result.TemplateName);
}
}