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

Cleaned-up code in Umbraco.Web.UnitTests to match linting rules.

Browse Source
This commit is contained in:
Andy Butland
2020-12-20 08:36:11 +01:00
parent 7600ae9e05
commit 3be9610c72
236 changed files with 5804 additions and 5268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs
View File

@@ -1,3 +1,6 @@
// Copyright (c) Umbraco.
// See LICENSE for more details.
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
@@ -16,7 +19,6 @@ using Umbraco.Tests.Testing;
using Umbraco.Web;
using Umbraco.Web.PublishedCache;
using Umbraco.Web.Routing;
using Umbraco.Web.Security;
using Umbraco.Web.Website;
using Umbraco.Web.Website.Controllers;
using CoreConstants = Umbraco.Core.Constants;
@@ -30,16 +32,13 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Controllers
private IUmbracoContextAccessor _umbracoContextAccessor;
[SetUp]
public void SetUp()
{
_umbracoContextAccessor = new TestUmbracoContextAccessor();
}
public void SetUp() => _umbracoContextAccessor = new TestUmbracoContextAccessor();
[Test]
public void Can_Construct_And_Get_Result()
{
var hostingEnvironment = Mock.Of<IHostingEnvironment>();
var backofficeSecurityAccessor = Mock.Of<IBackOfficeSecurityAccessor>();
IHostingEnvironment hostingEnvironment = Mock.Of<IHostingEnvironment>();
IBackOfficeSecurityAccessor backofficeSecurityAccessor = Mock.Of<IBackOfficeSecurityAccessor>();
Mock.Get(backofficeSecurityAccessor).Setup(x => x.BackOfficeSecurity).Returns(Mock.Of<IBackOfficeSecurity>());
var globalSettings = new GlobalSettings();
@@ -55,14 +54,14 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Controllers
Mock.Of<IRequestAccessor>(),
backofficeSecurityAccessor);
var umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext();
var umbracoContext = umbracoContextReference.UmbracoContext;
UmbracoContextReference umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext();
IUmbracoContext umbracoContext = umbracoContextReference.UmbracoContext;
var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
var ctrl = new TestSurfaceController(umbracoContextAccessor, Mock.Of<IPublishedContentQuery>(), Mock.Of<IPublishedUrlProvider>());
var result = ctrl.Index();
IActionResult result = ctrl.Index();
Assert.IsNotNull(result);
}
@@ -71,8 +70,8 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Controllers
public void Umbraco_Context_Not_Null()
{
var globalSettings = new GlobalSettings();
var hostingEnvironment = Mock.Of<IHostingEnvironment>();
var backofficeSecurityAccessor = Mock.Of<IBackOfficeSecurityAccessor>();
IHostingEnvironment hostingEnvironment = Mock.Of<IHostingEnvironment>();
IBackOfficeSecurityAccessor backofficeSecurityAccessor = Mock.Of<IBackOfficeSecurityAccessor>();
Mock.Get(backofficeSecurityAccessor).Setup(x => x.BackOfficeSecurity).Returns(Mock.Of<IBackOfficeSecurity>());
var umbracoContextFactory = new UmbracoContextFactory(
_umbracoContextAccessor,
@@ -86,8 +85,8 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Controllers
Mock.Of<IRequestAccessor>(),
backofficeSecurityAccessor);
var umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext();
var umbCtx = umbracoContextReference.UmbracoContext;
UmbracoContextReference umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext();
IUmbracoContext umbCtx = umbracoContextReference.UmbracoContext;
var umbracoContextAccessor = new TestUmbracoContextAccessor(umbCtx);
@@ -103,10 +102,10 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Controllers
publishedSnapshot.Setup(x => x.Members).Returns(Mock.Of<IPublishedMemberCache>());
var content = new Mock<IPublishedContent>();
content.Setup(x => x.Id).Returns(2);
var backofficeSecurityAccessor = Mock.Of<IBackOfficeSecurityAccessor>();
IBackOfficeSecurityAccessor backofficeSecurityAccessor = Mock.Of<IBackOfficeSecurityAccessor>();
Mock.Get(backofficeSecurityAccessor).Setup(x => x.BackOfficeSecurity).Returns(Mock.Of<IBackOfficeSecurity>());
var publishedSnapshotService = new Mock<IPublishedSnapshotService>();
var hostingEnvironment = Mock.Of<IHostingEnvironment>();
IHostingEnvironment hostingEnvironment = Mock.Of<IHostingEnvironment>();
var globalSettings = new GlobalSettings();
var umbracoContextFactory = new UmbracoContextFactory(
@@ -121,12 +120,12 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Controllers
Mock.Of<IRequestAccessor>(),
backofficeSecurityAccessor);
var umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext();
var umbracoContext = umbracoContextReference.UmbracoContext;
UmbracoContextReference umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext();
IUmbracoContext umbracoContext = umbracoContextReference.UmbracoContext;
var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
var publishedContentQuery = Mock.Of<IPublishedContentQuery>(query => query.Content(2) == content.Object);
IPublishedContentQuery publishedContentQuery = Mock.Of<IPublishedContentQuery>(query => query.Content(2) == content.Object);
var ctrl = new TestSurfaceController(umbracoContextAccessor, publishedContentQuery, Mock.Of<IPublishedUrlProvider>());
var result = ctrl.GetContent(2) as PublishedContentResult;
@@ -136,13 +135,12 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Controllers
Assert.AreEqual(2, result.Content.Id);
}
[Test]
public void Mock_Current_Page()
{
var globalSettings = new GlobalSettings();
var hostingEnvironment = Mock.Of<IHostingEnvironment>();
var backofficeSecurityAccessor = Mock.Of<IBackOfficeSecurityAccessor>();
IHostingEnvironment hostingEnvironment = Mock.Of<IHostingEnvironment>();
IBackOfficeSecurityAccessor backofficeSecurityAccessor = Mock.Of<IBackOfficeSecurityAccessor>();
Mock.Get(backofficeSecurityAccessor).Setup(x => x.BackOfficeSecurity).Returns(Mock.Of<IBackOfficeSecurity>());
var umbracoContextFactory = new UmbracoContextFactory(
_umbracoContextAccessor,
@@ -156,17 +154,17 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Controllers
Mock.Of<IRequestAccessor>(),
backofficeSecurityAccessor);
var umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext();
var umbracoContext = umbracoContextReference.UmbracoContext;
UmbracoContextReference umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext();
IUmbracoContext umbracoContext = umbracoContextReference.UmbracoContext;
var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
var content = Mock.Of<IPublishedContent>(publishedContent => publishedContent.Id == 12345);
IPublishedContent content = Mock.Of<IPublishedContent>(publishedContent => publishedContent.Id == 12345);
var publishedRequestMock = new Mock<IPublishedRequest>();
publishedRequestMock.Setup(x => x.PublishedContent).Returns(content);
var routeDefinition = new RouteDefinition
var routeDefinition = new RouteDefinition
{
PublishedRequest = publishedRequestMock.Object
};
@@ -174,11 +172,13 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Controllers
var routeData = new RouteData();
routeData.DataTokens.Add(CoreConstants.Web.UmbracoRouteDefinitionDataToken, routeDefinition);
var ctrl = new TestSurfaceController(umbracoContextAccessor, Mock.Of<IPublishedContentQuery>(), Mock.Of<IPublishedUrlProvider>());
ctrl.ControllerContext = new ControllerContext()
var ctrl = new TestSurfaceController(umbracoContextAccessor, Mock.Of<IPublishedContentQuery>(), Mock.Of<IPublishedUrlProvider>())
{
HttpContext = Mock.Of<HttpContext>(),
RouteData = routeData
ControllerContext = new ControllerContext()
{
HttpContext = Mock.Of<HttpContext>(),
RouteData = routeData
}
};
var result = ctrl.GetContentFromCurrentPage() as PublishedContentResult;
@@ -186,33 +186,29 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Controllers
Assert.AreEqual(12345, result.Content.Id);
}
public class TestSurfaceController : SurfaceController
{
private readonly IPublishedContentQuery _publishedContentQuery;
public TestSurfaceController(IUmbracoContextAccessor umbracoContextAccessor, IPublishedContentQuery publishedContentQuery, IPublishedUrlProvider publishedUrlProvider)
: base(umbracoContextAccessor, null, ServiceContext.CreatePartial(), AppCaches.Disabled, null, publishedUrlProvider)
{
: base(umbracoContextAccessor, null, ServiceContext.CreatePartial(), AppCaches.Disabled, null, publishedUrlProvider) =>
_publishedContentQuery = publishedContentQuery;
}
public IActionResult Index()
{
public IActionResult Index() =>
// ReSharper disable once Mvc.ViewNotResolved
return View();
}
View();
public IActionResult GetContent(int id)
{
var content = _publishedContentQuery.Content(id);
IPublishedContent content = _publishedContentQuery.Content(id);
return new PublishedContentResult(content);
}
public IActionResult GetContentFromCurrentPage()
{
var content = CurrentPage;
IPublishedContent content = CurrentPage;
return new PublishedContentResult(content);
}
@@ -222,15 +218,9 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.Website.Controllers
{
public IPublishedContent Content { get; set; }
public PublishedContentResult(IPublishedContent content)
{
Content = content;
}
public PublishedContentResult(IPublishedContent content) => Content = content;
public Task ExecuteResultAsync(ActionContext context)
{
return Task.CompletedTask;
}
public Task ExecuteResultAsync(ActionContext context) => Task.CompletedTask;
}
}
}