yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
49e1aec71ce18f167f936fc89829d5b28e4f657a
Umbraco-CMS/tests/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs

134 lines
6.8 KiB
C#
Raw Normal View History

Published members cleanup (#10159) * Getting new netcore PublicAccessChecker in place * Adds full test coverage for PublicAccessChecker * remove PublicAccessComposer * adjust namespaces, ensure RoleManager works, separate public access controller, reduce content controller * Implements the required methods on IMemberManager, removes old migrated code * Updates routing to be able to re-route, Fixes middleware ordering ensuring endpoints are last, refactors pipeline options, adds public access middleware, ensures public access follows all hops * adds note * adds note * Cleans up ext methods, ensures that members identity is added on both front-end and back ends. updates how UmbracoApplicationBuilder works in that it explicitly starts endpoints at the time of calling. * Changes name to IUmbracoEndpointBuilder * adds note * Fixing tests, fixing error describers so there's 2x one for back office, one for members, fixes TryConvertTo, fixes login redirect * fixing build * Updates user manager to correctly validate password hashing and injects the IBackOfficeUserPasswordChecker * Merges PR * Fixes up build and notes * Implements security stamp and email confirmed for members, cleans up a bunch of repo/service level member groups stuff, shares user store code between members and users and fixes the user identity object so we arent' tracking both groups and roles. * Security stamp for members is now working * Fixes keepalive, fixes PublicAccessMiddleware to not throw, updates startup code to be more clear and removes magic that registers middleware. * adds note * removes unused filter, fixes build * fixes WebPath and tests * Looks up entities in one query * remove usings * Fix test, remove stylesheet * Set status code before we write to response to avoid error * Ensures that users and members are validated when logging in. Shares more code between users and members. * merge changes * oops * Reducing and removing published member cache * Fixes RepositoryCacheKeys to ensure the keys are normalized * oops didn't mean to commit this * Fix casing issues with caching, stop boxing value types for all cache operations, stop re-creating string keys in DefaultRepositoryCachePolicy * oops didn't mean to comit this * bah, far out this keeps getting recommitted. sorry * cannot inject IPublishedMemberCache and cannot have IPublishedMember * splits out files, fixes build * fix tests * removes membership provider classes * removes membership provider classes * updates the identity map definition * reverts commented out lines * reverts commented out lines Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-04-22 21:21:43 +10:00
using System.Linq;
Renormalize
2018-06-29 19:52:40 +02:00
using System.Xml;
NetCore: MSDI refactor remove IFactory & IRegister (#9308) * Replace IFactory with IServiceProvider * Replace IRegister with IServiceCollection * Fix Rte.cshtml so the view can service locate. * Replace Composing Lifetime with MSDI ServiceLifetime * Remove ServiceProvider AddMultipleUnique extension * Remove Umbraco.Web.Composing.Current.Reset and any calls * Remove LightInject from net framework projects * Brought back a helper for setting MediaFileSystem underlying IFileSystem
2020-10-30 11:16:17 +00:00
using Microsoft.Extensions.DependencyInjection;
Renormalize
2018-06-29 19:52:40 +02:00
using Moq;
using NUnit.Framework;
Rename Umbraco.Core namespace to Umbraco.Cms.Core
2021-02-09 10:22:42 +01:00
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.PublishedCache;
using Umbraco.Cms.Core.Security;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Web;
Align namespaces in Umbraco.Tests.Common
2021-02-10 14:45:44 +01:00
using Umbraco.Cms.Tests.Common;
using Umbraco.Cms.Tests.Common.Testing;
Moves the Xml published cache to the tests project since that is the only place it is used, removes the xml data integrity check since it's not needed, removes the xml published cache benchmark since it's not needed. Now we don't include the old xml published cache at all in the shipped product.
2019-01-30 17:50:13 +11:00
using Umbraco.Tests.LegacyXmlPublishedCache;
Renormalize
2018-06-29 19:52:40 +02:00
using Umbraco.Tests.TestHelpers;
using Umbraco.Web;
namespace Umbraco.Tests.Cache.PublishedCache
{
[TestFixture]
[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)]
public class PublishContentCacheTests : BaseWebTest
{
private FakeHttpContextFactory _httpContextFactory;
Introduced interface on UmbracoContext
2020-02-09 18:53:37 +01:00
private IUmbracoContext _umbracoContext;
Renormalize
2018-06-29 19:52:40 +02:00
private IPublishedContentCache _cache;
private XmlDocument _xml;
private string GetXml()
{
return @"<?xml version=""1.0"" encoding=""utf-8""?><!DOCTYPE root[
<!ELEMENT Home ANY>
<!ATTLIST Home id ID #REQUIRED>
]>
<root id=""-1"">
<Home id=""1046"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""1045"" sortOrder=""2"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""home"" writerName=""admin"" creatorName=""admin"" path=""-1,1046"" isDoc=""""><content><![CDATA[]]></content>
<Home id=""1173"" parentID=""1046"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""1045"" sortOrder=""1"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""sub1"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173"" isDoc=""""><content><![CDATA[]]></content>
<Home id=""1174"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""1045"" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""sub2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1174"" isDoc=""""><content><![CDATA[]]></content>
</Home>
<Home id=""1176"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""1045"" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""sub-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1176"" isDoc=""""><content><![CDATA[]]></content>
</Home>
</Home>
<Home id=""1175"" parentID=""1046"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""1045"" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""sub-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1175"" isDoc=""""><content><![CDATA[]]></content>
</Home>
<Home id=""1177"" parentID=""1046"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""1045"" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub'Apostrophe"" urlName=""sub'apostrophe"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1177"" isDoc=""""><content><![CDATA[]]></content>
</Home>
</Home>
<Home id=""1172"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""1045"" sortOrder=""3"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""test"" writerName=""admin"" creatorName=""admin"" path=""-1,1172"" isDoc="""" />
</root>";
}
Refactor configuration for DI
2019-01-07 10:43:28 +01:00
protected override void Initialize()
Renormalize
2018-06-29 19:52:40 +02:00
{
Refactor configuration for DI
2019-01-07 10:43:28 +01:00
base.Initialize();
Renormalize
2018-06-29 19:52:40 +02:00
_httpContextFactory = new FakeHttpContextFactory("~/Home");
Removed configuration model builders.
2020-09-21 21:06:24 +02:00
var globalSettings = new GlobalSettings();
NetCore: MSDI refactor phase 2 (#9280) * Moved adapters from Infra -> Core * Allow Composition to accept a service collection instead of an IRegister * Composition no longer takes IRegister as constructor arg all tests passing * Composition no longer implements IRegister * Lose _uniques in Composition * lose Composition OnCreatingFactory actions * Clean up UmbracoCoreServiceCollectionExtensions & Composition Less IFactory * LightInject gone where TFW == netstandard2.0 || TFW == netcoreapp3.1 * Resolve dead code issues * Rename IFactory methods to match IServiceProvider so they can be trivially swapped later. * Rename IFactory methods to match IServiceProvider so they can be trivially swapped later (continued) Thought the counts were low, it's mostly extension method usage
2020-10-27 10:53:01 +00:00
var umbracoContextAccessor = Factory.GetRequiredService<IUmbracoContextAccessor>();
Renormalize
2018-06-29 19:52:40 +02:00
_xml = new XmlDocument();
_xml.LoadXml(GetXml());
Introduced a IHostingEnvironment and one implemtation for AspNetHostingEnvironment
2019-11-20 13:38:41 +01:00
var xmlStore = new XmlStore(() => _xml, null, null, null, HostingEnvironment);
More renaming of caches
2019-01-18 08:29:16 +01:00
var appCache = new DictionaryAppCache();
Mock IMediaService and IUserService
2020-01-31 13:57:23 +00:00
var domainCache = new DomainCache(Mock.Of<IDomainService>(), DefaultCultureAccessor);
Moves the Xml published cache to the tests project since that is the only place it is used, removes the xml data integrity check since it's not needed, removes the xml published cache benchmark since it's not needed. Now we don't include the old xml published cache at all in the shipped product.
2019-01-30 17:50:13 +11:00
var publishedShapshot = new PublishedSnapshot(
AB3677 - Removed lot of stuff from Current (Core) and uses Current (Web) instead
2019-12-19 10:43:00 +01:00
new PublishedContentCache(xmlStore, domainCache, appCache, globalSettings, ContentTypesCache, null, VariationContextAccessor, null),
NetCore: MSDI refactor phase 2 (#9280) * Moved adapters from Infra -> Core * Allow Composition to accept a service collection instead of an IRegister * Composition no longer takes IRegister as constructor arg all tests passing * Composition no longer implements IRegister * Lose _uniques in Composition * lose Composition OnCreatingFactory actions * Clean up UmbracoCoreServiceCollectionExtensions & Composition Less IFactory * LightInject gone where TFW == netstandard2.0 || TFW == netcoreapp3.1 * Resolve dead code issues * Rename IFactory methods to match IServiceProvider so they can be trivially swapped later. * Rename IFactory methods to match IServiceProvider so they can be trivially swapped later (continued) Thought the counts were low, it's mostly extension method usage
2020-10-27 10:53:01 +00:00
new PublishedMediaCache(xmlStore, Mock.Of<IMediaService>(), Mock.Of<IUserService>(), appCache, ContentTypesCache, Factory.GetRequiredService<IEntityXmlSerializer>(), umbracoContextAccessor, VariationContextAccessor),
Published members cleanup (#10159) * Getting new netcore PublicAccessChecker in place * Adds full test coverage for PublicAccessChecker * remove PublicAccessComposer * adjust namespaces, ensure RoleManager works, separate public access controller, reduce content controller * Implements the required methods on IMemberManager, removes old migrated code * Updates routing to be able to re-route, Fixes middleware ordering ensuring endpoints are last, refactors pipeline options, adds public access middleware, ensures public access follows all hops * adds note * adds note * Cleans up ext methods, ensures that members identity is added on both front-end and back ends. updates how UmbracoApplicationBuilder works in that it explicitly starts endpoints at the time of calling. * Changes name to IUmbracoEndpointBuilder * adds note * Fixing tests, fixing error describers so there's 2x one for back office, one for members, fixes TryConvertTo, fixes login redirect * fixing build * Updates user manager to correctly validate password hashing and injects the IBackOfficeUserPasswordChecker * Merges PR * Fixes up build and notes * Implements security stamp and email confirmed for members, cleans up a bunch of repo/service level member groups stuff, shares user store code between members and users and fixes the user identity object so we arent' tracking both groups and roles. * Security stamp for members is now working * Fixes keepalive, fixes PublicAccessMiddleware to not throw, updates startup code to be more clear and removes magic that registers middleware. * adds note * removes unused filter, fixes build * fixes WebPath and tests * Looks up entities in one query * remove usings * Fix test, remove stylesheet * Set status code before we write to response to avoid error * Ensures that users and members are validated when logging in. Shares more code between users and members. * merge changes * oops * Reducing and removing published member cache * Fixes RepositoryCacheKeys to ensure the keys are normalized * oops didn't mean to commit this * Fix casing issues with caching, stop boxing value types for all cache operations, stop re-creating string keys in DefaultRepositoryCachePolicy * oops didn't mean to comit this * bah, far out this keeps getting recommitted. sorry * cannot inject IPublishedMemberCache and cannot have IPublishedMember * splits out files, fixes build * fix tests * removes membership provider classes * removes membership provider classes * updates the identity map definition * reverts commented out lines * reverts commented out lines Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-04-22 21:21:43 +10:00
new PublishedMemberCache(ContentTypesCache, VariationContextAccessor),
Renormalize
2018-06-29 19:52:40 +02:00
domainCache);
var publishedSnapshotService = new Mock<IPublishedSnapshotService>();
publishedSnapshotService.Setup(x => x.CreatePublishedSnapshot(It.IsAny<string>())).Returns(publishedShapshot);
Move files
2020-02-13 12:29:08 +01:00
var httpContext = _httpContextFactory.HttpContext;
Refactor UmbracoContext to inject IHttpAccessor instead of HttpContext
2020-02-13 13:57:39 +01:00
var httpContextAccessor = TestHelper.GetHttpContextAccessor(httpContext);
Renormalize
2018-06-29 19:52:40 +02:00
_umbracoContext = new UmbracoContext(
Refactor UmbracoContext to inject IHttpAccessor instead of HttpContext
2020-02-13 13:57:39 +01:00
httpContextAccessor,
Renormalize
2018-06-29 19:52:40 +02:00
publishedSnapshotService.Object,
Migrates remaining backofficecontroller but still a bunch of work to do , streamlines Backoffice to BackOffice (but is that what we want?)
2020-10-21 16:51:00 +11:00
Mock.Of<IBackOfficeSecurity>(),
Gets inbound routing working, reduces the amount of non injected dependencies, reduces the amount of DomainHelper instances
2018-04-24 13:07:18 +10:00
globalSettings,
Huge IIOHelper cleanup, removes some overlap with IHostingEnvironment, much less usages of IIOHelper and instead just use what is already available on IHostingEnvironment
2020-04-03 11:03:06 +11:00
HostingEnvironment,
Let IOHelper use IHostingEnvironment
2019-12-04 14:03:39 +01:00
new TestVariationContextAccessor(),
Move more files and fixed circular dependency
2020-02-19 09:26:51 +01:00
UriUtility,
new AspNetCookieManager(httpContextAccessor));
Renormalize
2018-06-29 19:52:40 +02:00
UmbracoContext: don't use obsolete properties
2019-04-22 18:14:03 +02:00
_cache = _umbracoContext.Content;
Renormalize
2018-06-29 19:52:40 +02:00
}
[Test]
public void Has_Content()
{
Assert.IsTrue(_cache.HasContent());
}
[Test]
public void Get_Root_Docs()
{
var result = _cache.GetAtRoot();
Assert.AreEqual(2, result.Count());
Assert.AreEqual(1046, result.ElementAt(0).Id);
Assert.AreEqual(1172, result.ElementAt(1).Id);
}
[TestCase("/", 1046)]
[TestCase("/home", 1046)]
[TestCase("/Home", 1046)] //test different cases
[TestCase("/home/sub1", 1173)]
[TestCase("/Home/sub1", 1173)]
[TestCase("/home/Sub1", 1173)] //test different cases
[TestCase("/home/Sub'Apostrophe", 1177)]
public void Get_Node_By_Route(string route, int nodeId)
{
var result = _cache.GetByRoute(route, false);
Assert.IsNotNull(result);
Assert.AreEqual(nodeId, result.Id);
}
[TestCase("/", 1046)]
[TestCase("/sub1", 1173)]
[TestCase("/Sub1", 1173)]
public void Get_Node_By_Route_Hiding_Top_Level_Nodes(string route, int nodeId)
{
var result = _cache.GetByRoute(route, true);
Assert.IsNotNull(result);
Assert.AreEqual(nodeId, result.Id);
}
}
}
Reference in New Issue Copy Permalink