* Update to dotnet 9 and update nuget packages * Update umbraco code version * Update Directory.Build.props Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> * Include preview version in pipeline * update template projects * update global json with specific version * Update version.json to v15 * Rename TrimStart and TrimEnd to string specific * Rename to Exact * Update global.json Co-authored-by: Ronald Barendse <ronald@barend.se> * Remove includePreviewVersion * Rename to trim exact * Add new Hybridcache project * Add tests * Start implementing PublishedContent.cs * Implement repository for content * Refactor to use async everywhere * Add cache refresher * make public as needed for serialization * Use content type cache to get content type out * Refactor to use ContentCacheNode model, that goes in the memory cache * Remove content node kit as its not needed * Implement tests for ensuring caching * Implement better asserts * Implement published property * Refactor to use mapping * Rename to document tests * Update to test properties * Create more tests * Refactor mock tests into own file * Update property test * Fix published version of content * Change default cache level to elements * Refactor to always have draft * Refactor to not use PublishedModelFactory * Added tests * Added and updated tests * Fixed tests * Don't return empty object with id * More tests * Added key * Another key * Refactor CacheService to be responsible for using the hybrid cache * Use notification handler to remove deleted content from cache * Add more tests for missing functions * Implement missing methods * Remove HasContent as it pertains to routing * Fik up test * formatting * refactor variable names * Implement variant tests * Map all the published content properties * Get item out of cache first, to assert updated * Implement member cache * Add member test * Implement media cache * Implement property tests for media tests * Refactor tests to use extension method * Add more media tests * Refactor properties to no longer have element caching * Don't use property cache level * Start implementing seeding * Only seed when main * Add Immutable for performance * Implement permanent seeding of content * Implement cache settings * Implement tests for seeding * Update package version * start refactoring nurepo * Refactor so draft & published nodes are cached individually * Refactor RefreshContent to take node instead of IContent * Refactor media to also use cache nodes * Remove member from repo as it isn't cached * Refactor media to not include preview, as media has no draft * create new benchmark project * POC Integration benchmarks with custom api controllers * Start implementing content picker tests * Implement domain cache * Rework content cache to implement interface * Start implementing elements cache * Implement published snapshot service * Publish snapshot tests * Use snapshot for elements cache * Create test proving we don't clear cache when updating content picker * Clear entire elements cache * Remove properties from element cache, when content gets updated. * Rename methods to async * Refactor to use old cache interfaces instead of new ones * Remove snapshot, as it is no longer needed * Fix tests building * Refactor domaincache to not have snapshots * Delete benchmarks * Delete benchmarks * Add HybridCacheProject to Umbraco * Add comment to route value transformer * Implement is draft * remove snapshot from property * V15 updated the hybrid caching integration tests to use ContentEditingService (#16947) * Added builder extension withParentKey * Created builder with ContentEditingService * Added usage of the ContentEditingService to SETUP * Started using ContentEditingService builder in tests * Updated builder extensions * Fixed builder * Clean up * Clean up, not done * Added Ids * Remove entries from cache on delete * Fix up seeding logic * Don't register hybrid cache twice * Change seeded entry options * Update hybrid cache package * Fix up published property to work with delivery api again * Fix dependency injection to work with tests * Fix naming * Dont make caches nullable * Make content node sealed * Remove path and other unused from content node * Remove hacky 2 phase ctor * Refactor to actually set content templates * Remove umbraco context * Remove "HasBy" methods * rename property data * Delete obsolete legacy stuff * Add todo for making expiration configurable * Add todo in UmbracoContext * Add clarifying comment in content factory * Remove xml stuff from published property * Fix according to review * Make content type cache injectible * Make content type cache injectible * Rename to database cache repository * Rename to document cache * Add TODO * Refactor to async * Rename to async * Make everything async * Remove duplicate line from json schema * Move Hybrid cache project * Remove leftover file * Refactor to use keys * Refactor published content to no longer have content data, as it is on the node itself * Refactor to member to use proper content node ctor * Move tests to own folder * Add immutable objects to property and content data for performance * Make property data public * Fix member caching to be singleton * Obsolete GetContentType * Remove todo * Fix naming * Fix lots of exposed errors due to scope test * Add final scope tests * Rename to document cache service * Rename test files * Create new doc type tests * Add ignore to tests * Start implementing refresh for content type save * Clear contenttype cache when contenttype is updated * Fix test Teh contenttype is not upated unless the property is dirty * Use init for ContentSourceDto * Fix get by key in PublishedContentTypeCache * Remove ContentType from PublishedContentTypeCache when contenttype is deleted * Update to preview 7 * Fix versions * Increase timeout for sqlite integration tests * Undo timeout increase * Try and undo init change to ContentSourceDto * That wasn't it chief * Try and make DomainAndUrlsTests non NonParallelizable * Update versions * Only run cache tests on linux for now --------- Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Co-authored-by: Ronald Barendse <ronald@barend.se> Co-authored-by: Andreas Zerbst <andr317c@live.dk> Co-authored-by: Sven Geusens <sge@umbraco.dk> Co-authored-by: Andreas Zerbst <73799582+andr317c@users.noreply.github.com> Co-authored-by: nikolajlauridsen <nikolajlauridsen@protonmail.ch>
206 lines
8.1 KiB
C#
206 lines
8.1 KiB
C#
using Moq;
|
|
using NUnit.Framework;
|
|
using Umbraco.Cms.Core;
|
|
using Umbraco.Cms.Core.Models;
|
|
using Umbraco.Cms.Core.Models.ContentPublishing;
|
|
using Umbraco.Cms.Core.Models.PublishedContent;
|
|
using Umbraco.Cms.Core.PublishedCache;
|
|
using Umbraco.Cms.Core.Scoping;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Cms.Infrastructure.HybridCache;
|
|
using Umbraco.Cms.Infrastructure.HybridCache.Factories;
|
|
using Umbraco.Cms.Infrastructure.HybridCache.Persistence;
|
|
using Umbraco.Cms.Infrastructure.HybridCache.Services;
|
|
using Umbraco.Cms.Tests.Common.Testing;
|
|
using Umbraco.Cms.Tests.Integration.Testing;
|
|
|
|
namespace Umbraco.Cms.Tests.Integration.Umbraco.PublishedCache.HybridCache;
|
|
|
|
[TestFixture]
|
|
[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
|
|
[Platform("Linux", Reason = "This uses too much memory when running both caches, should be removed when nuchache is removed")]
|
|
public class DocumentHybridCacheMockTests : UmbracoIntegrationTestWithContent
|
|
{
|
|
private IPublishedContentCache _mockedCache;
|
|
private Mock<IDatabaseCacheRepository> _mockedNucacheRepository;
|
|
private IDocumentCacheService _mockDocumentCacheService;
|
|
|
|
protected override void CustomTestSetup(IUmbracoBuilder builder) => builder.AddUmbracoHybridCache();
|
|
|
|
private IContentPublishingService ContentPublishingService => GetRequiredService<IContentPublishingService>();
|
|
|
|
[SetUp]
|
|
public void SetUp()
|
|
{
|
|
_mockedNucacheRepository = new Mock<IDatabaseCacheRepository>();
|
|
|
|
var contentData = new ContentData(
|
|
Textpage.Name,
|
|
null,
|
|
1,
|
|
Textpage.UpdateDate,
|
|
Textpage.CreatorId,
|
|
-1,
|
|
false,
|
|
new Dictionary<string, PropertyData[]>(),
|
|
null);
|
|
_mockedNucacheRepository.Setup(r => r.GetContentSourceAsync(It.IsAny<int>(), It.IsAny<bool>())).ReturnsAsync(
|
|
new ContentCacheNode()
|
|
{
|
|
ContentTypeId = Textpage.ContentTypeId,
|
|
CreatorId = Textpage.CreatorId,
|
|
CreateDate = Textpage.CreateDate,
|
|
Id = Textpage.Id,
|
|
Key = Textpage.Key,
|
|
SortOrder = 0,
|
|
Data = contentData,
|
|
IsDraft = true,
|
|
});
|
|
|
|
_mockedNucacheRepository.Setup(r => r.GetContentByContentTypeKey(It.IsAny<IReadOnlyCollection<Guid>>())).Returns(
|
|
new List<ContentCacheNode>()
|
|
{
|
|
new()
|
|
{
|
|
ContentTypeId = Textpage.ContentTypeId,
|
|
CreatorId = Textpage.CreatorId,
|
|
CreateDate = Textpage.CreateDate,
|
|
Id = Textpage.Id,
|
|
Key = Textpage.Key,
|
|
SortOrder = 0,
|
|
Data = contentData,
|
|
IsDraft = false,
|
|
},
|
|
});
|
|
|
|
_mockedNucacheRepository.Setup(r => r.DeleteContentItemAsync(It.IsAny<int>()));
|
|
|
|
_mockDocumentCacheService = new DocumentCacheService(
|
|
_mockedNucacheRepository.Object,
|
|
GetRequiredService<IIdKeyMap>(),
|
|
GetRequiredService<ICoreScopeProvider>(),
|
|
GetRequiredService<Microsoft.Extensions.Caching.Hybrid.HybridCache>(),
|
|
GetRequiredService<IPublishedContentFactory>(),
|
|
GetRequiredService<ICacheNodeFactory>());
|
|
|
|
_mockedCache = new DocumentCache(_mockDocumentCacheService, GetRequiredService<IPublishedContentTypeCache>());
|
|
}
|
|
|
|
[Test]
|
|
public async Task Content_Is_Cached_By_Key()
|
|
{
|
|
var hybridCache = GetRequiredService<Microsoft.Extensions.Caching.Hybrid.HybridCache>();
|
|
await hybridCache.RemoveAsync($"{Textpage.Key}+draft");
|
|
var textPage = await _mockedCache.GetByIdAsync(Textpage.Key, true);
|
|
var textPage2 = await _mockedCache.GetByIdAsync(Textpage.Key, true);
|
|
AssertTextPage(textPage);
|
|
AssertTextPage(textPage2);
|
|
_mockedNucacheRepository.Verify(x => x.GetContentSourceAsync(It.IsAny<int>(), It.IsAny<bool>()), Times.Exactly(1));
|
|
}
|
|
|
|
[Test]
|
|
public async Task Content_Is_Cached_By_Id()
|
|
{
|
|
var hybridCache = GetRequiredService<Microsoft.Extensions.Caching.Hybrid.HybridCache>();
|
|
await hybridCache.RemoveAsync($"{Textpage.Key}+draft");
|
|
var textPage = await _mockedCache.GetByIdAsync(Textpage.Id, true);
|
|
var textPage2 = await _mockedCache.GetByIdAsync(Textpage.Id, true);
|
|
AssertTextPage(textPage);
|
|
AssertTextPage(textPage2);
|
|
_mockedNucacheRepository.Verify(x => x.GetContentSourceAsync(It.IsAny<int>(), It.IsAny<bool>()), Times.Exactly(1));
|
|
}
|
|
|
|
[Test]
|
|
public async Task Content_Is_Seeded_By_Id()
|
|
{
|
|
var schedule = new CultureAndScheduleModel
|
|
{
|
|
CulturesToPublishImmediately = new HashSet<string> { "*" }, Schedules = new ContentScheduleCollection(),
|
|
};
|
|
|
|
var publishResult = await ContentPublishingService.PublishAsync(Textpage.Key, schedule, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(publishResult.Success);
|
|
Textpage.Published = true;
|
|
await _mockDocumentCacheService.DeleteItemAsync(Textpage.Id);
|
|
|
|
await _mockDocumentCacheService.SeedAsync(new [] {Textpage.ContentType.Key});
|
|
var textPage = await _mockedCache.GetByIdAsync(Textpage.Id);
|
|
AssertTextPage(textPage);
|
|
|
|
_mockedNucacheRepository.Verify(x => x.GetContentSourceAsync(It.IsAny<int>(), It.IsAny<bool>()), Times.Exactly(0));
|
|
}
|
|
|
|
[Test]
|
|
public async Task Content_Is_Seeded_By_Key()
|
|
{
|
|
var schedule = new CultureAndScheduleModel
|
|
{
|
|
CulturesToPublishImmediately = new HashSet<string> { "*" }, Schedules = new ContentScheduleCollection(),
|
|
};
|
|
|
|
var publishResult = await ContentPublishingService.PublishAsync(Textpage.Key, schedule, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(publishResult.Success);
|
|
Textpage.Published = true;
|
|
await _mockDocumentCacheService.DeleteItemAsync(Textpage.Id);
|
|
|
|
await _mockDocumentCacheService.SeedAsync(new [] {Textpage.ContentType.Key});
|
|
var textPage = await _mockedCache.GetByIdAsync(Textpage.Key);
|
|
AssertTextPage(textPage);
|
|
|
|
_mockedNucacheRepository.Verify(x => x.GetContentSourceAsync(It.IsAny<int>(), It.IsAny<bool>()), Times.Exactly(0));
|
|
}
|
|
|
|
[Test]
|
|
public async Task Content_Is_Not_Seeded_If_Unpublished_By_Id()
|
|
{
|
|
|
|
await _mockDocumentCacheService.DeleteItemAsync(Textpage.Id);
|
|
|
|
await _mockDocumentCacheService.SeedAsync(new [] {Textpage.ContentType.Key});
|
|
var textPage = await _mockedCache.GetByIdAsync(Textpage.Id, true);
|
|
AssertTextPage(textPage);
|
|
|
|
_mockedNucacheRepository.Verify(x => x.GetContentSourceAsync(It.IsAny<int>(), It.IsAny<bool>()), Times.Exactly(1));
|
|
}
|
|
|
|
[Test]
|
|
public async Task Content_Is_Not_Seeded_If_Unpublished_By_Key()
|
|
{
|
|
await _mockDocumentCacheService.DeleteItemAsync(Textpage.Id);
|
|
|
|
await _mockDocumentCacheService.SeedAsync(new [] {Textpage.ContentType.Key});
|
|
var textPage = await _mockedCache.GetByIdAsync(Textpage.Key, true);
|
|
AssertTextPage(textPage);
|
|
|
|
_mockedNucacheRepository.Verify(x => x.GetContentSourceAsync(It.IsAny<int>(), It.IsAny<bool>()), Times.Exactly(1));
|
|
}
|
|
|
|
private void AssertTextPage(IPublishedContent textPage)
|
|
{
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.IsNotNull(textPage);
|
|
Assert.AreEqual(Textpage.Name, textPage.Name);
|
|
Assert.AreEqual(Textpage.Published, textPage.IsPublished());
|
|
});
|
|
AssertProperties(Textpage.Properties, textPage.Properties);
|
|
}
|
|
|
|
private void AssertProperties(IPropertyCollection propertyCollection, IEnumerable<IPublishedProperty> publishedProperties)
|
|
{
|
|
foreach (var prop in propertyCollection)
|
|
{
|
|
AssertProperty(prop, publishedProperties.First(x => x.Alias == prop.Alias));
|
|
}
|
|
}
|
|
|
|
private void AssertProperty(IProperty property, IPublishedProperty publishedProperty)
|
|
{
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.AreEqual(property.Alias, publishedProperty.Alias);
|
|
Assert.AreEqual(property.PropertyType.Alias, publishedProperty.PropertyType.Alias);
|
|
});
|
|
}
|
|
}
|