* Remove nucache reference from Web.Common * Get tests building-ish * Move ReservedFieldNamesService to the right project * Remove IPublishedSnapshotStatus * Added functionality to the INavigationQueryService to get root keys * Fixed issue with navigation * Remove IPublishedSnapshot from UmbracoContext * Begin removing usage of IPublishedSnapshot from PublishedContentExtensions * Fix PublishedContentExtensions.cs * Don't use snapshots in delivery media api * Use IPublishedMediaCache in QueryMediaApiController * Remove more usages of IPublishedSnapshotAccessor * Comment out tests * Remove more usages of PublishedSnapshotAccessor * Remove PublishedSnapshot from property * Fixed test build * Fix errors * Fix some tests * Delete NuCache 🎉 * Implement DatabaseCacheRebuilder * Remove usage of IPublishedSnapshotService * Remove IPublishedSnapshotService * Remove TestPublishedSnapshotAccessor and make tests build * Don't test Snapshot cachelevel It's no longer supported * Fix BlockEditorConverter Element != Element document type * Remember to set cachemanager * Fix RichTextParserTests * Implement TryGetLevel on INavigationQueryService * Fake level and obsolete it in PublishedContent * Remove ChildrenForAllCultures * Hack Path property on PublishedContent * Remove usages of IPublishedSnapshot in tests * More ConvertersTests * Add hybrid cache to integration tests We can actually do this now because we no longer save files on disk * Rename IPublishedSnapshotRebuilder to ICacheRebuilder * Comment out tests * V15: Replacing the usages of Parent (navigation data) from IPublishedContent (#17125) * Fix .Parent references in PublishedContentExtensions * Add missing methods to FriendlyPublishedContentExtensions (ones that you were able to call on the content directly as they now require extra params) * Fix references from the extension methods * Fix dependencies in tests * Replace IPublishedSnapshotAccessor with the content cache in tests * Resolving more .Parent references * Fix unit tests * Obsolete and use extension methods * Remove private method and use extension instead * Moving code around * Fix tests * Fix more references * Cleanup * Fix more usages * Resolve merge conflict * Fix tests * Cleanup * Fix more tests * Fixed unit tests * Cleanup * Replace last usages --------- Co-authored-by: Bjarke Berg <mail@bergmania.dk> * Remove usage of IPublishedSnapshotAccessor from IRequestItemProvider * Post merge fixup * Remo IPublishedSnapshot * Add HasAny to IDocumentUrlService * Fix TextBuilder * Fix modelsbuilder tests * Use explicit types * Implement GetByContentType * Support element types in PublishedContentTypeCache * Run enlistments before publishing notifications * Fix elements cache refreshing * Implement GetByUdi * Implement GetAtRoot * Implement GetByRoute * Reimplement GetRouteById * Fix blocks unit tests * Initialize domain cache on boot * Only return routes with domains on non default lanauges * V15: Replacing the usages of `Children` (navigation data) from `IPublishedContent` (#17159) * Update params in PublishedContentExtensions to the general interfaces for the published cache and navigation service, so that we can use the extension methods on both documents and media * Introduce GetParent() which uses the right services * Fix obsolete message on .Parent * Obsolete .Children * Fix usages of Children for ApiMediaQueryService * Fix usage in internal * Fix usages in views * Fix indentation * Fix issue with delete language * Update nuget pacakges * Clear elements cache when content is deleted instead of trying to update it * Reset publishedModelFactory * Fixed publishing --------- Co-authored-by: Bjarke Berg <mail@bergmania.dk> Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Co-authored-by: kjac <kja@umbraco.dk>
249 lines
9.7 KiB
C#
249 lines
9.7 KiB
C#
using Microsoft.Extensions.Options;
|
|
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.Core.Services.Navigation;
|
|
using Umbraco.Cms.Infrastructure.HybridCache;
|
|
using Umbraco.Cms.Infrastructure.HybridCache.Factories;
|
|
using Umbraco.Cms.Infrastructure.HybridCache.Persistence;
|
|
using Umbraco.Cms.Infrastructure.HybridCache.SeedKeyProviders.Document;
|
|
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)]
|
|
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>();
|
|
|
|
private CacheSettings _cacheSettings;
|
|
|
|
[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);
|
|
|
|
|
|
var draftTestCacheNode = new ContentCacheNode()
|
|
{
|
|
ContentTypeId = Textpage.ContentTypeId,
|
|
CreatorId = Textpage.CreatorId,
|
|
CreateDate = Textpage.CreateDate,
|
|
Id = Textpage.Id,
|
|
Key = Textpage.Key,
|
|
SortOrder = 0,
|
|
Data = contentData,
|
|
IsDraft = true,
|
|
};
|
|
|
|
var publishedTestCacheNode = new ContentCacheNode()
|
|
{
|
|
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.GetContentSourceAsync(It.IsAny<int>(), true))
|
|
.ReturnsAsync(draftTestCacheNode);
|
|
|
|
_mockedNucacheRepository.Setup(r => r.GetContentSourceAsync(It.IsAny<int>(), false))
|
|
.ReturnsAsync(publishedTestCacheNode);
|
|
|
|
_mockedNucacheRepository.Setup(r => r.GetContentSourceAsync(It.IsAny<Guid>(), true))
|
|
.ReturnsAsync(draftTestCacheNode);
|
|
|
|
_mockedNucacheRepository.Setup(r => r.GetContentSourceAsync(It.IsAny<Guid>(), false))
|
|
.ReturnsAsync(publishedTestCacheNode);
|
|
|
|
_mockedNucacheRepository.Setup(r => r.GetContentByContentTypeKey(It.IsAny<IReadOnlyCollection<Guid>>())).Returns(
|
|
new List<ContentCacheNode>()
|
|
{
|
|
draftTestCacheNode,
|
|
});
|
|
|
|
_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>(),
|
|
GetSeedProviders(),
|
|
Options.Create(new CacheSettings()),
|
|
GetRequiredService<IPublishedModelFactory>());
|
|
|
|
_mockedCache = new DocumentCache(_mockDocumentCacheService, GetRequiredService<IPublishedContentTypeCache>());
|
|
}
|
|
|
|
// We want to be able to alter the settings for the providers AFTER the test has started
|
|
// So we'll manually create them with a magic options mock.
|
|
private IEnumerable<IDocumentSeedKeyProvider> GetSeedProviders()
|
|
{
|
|
_cacheSettings = new CacheSettings();
|
|
_cacheSettings.DocumentBreadthFirstSeedCount = 0;
|
|
|
|
var mock = new Mock<IOptions<CacheSettings>>();
|
|
mock.Setup(m => m.Value).Returns(() => _cacheSettings);
|
|
|
|
return new List<IDocumentSeedKeyProvider>
|
|
{
|
|
new ContentTypeSeedKeyProvider(GetRequiredService<ICoreScopeProvider>(), GetRequiredService<IDatabaseCacheRepository>(), mock.Object),
|
|
new DocumentBreadthFirstKeyProvider(GetRequiredService<IDocumentNavigationQueryService>(), mock.Object),
|
|
};
|
|
}
|
|
|
|
[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<Guid>(), 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);
|
|
|
|
_cacheSettings.ContentTypeKeys = [ Textpage.ContentType.Key ];
|
|
await _mockDocumentCacheService.SeedAsync(CancellationToken.None);
|
|
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);
|
|
|
|
_cacheSettings.ContentTypeKeys = [ Textpage.ContentType.Key ];
|
|
await _mockDocumentCacheService.SeedAsync(CancellationToken.None);
|
|
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_Unpblished_By_Id()
|
|
{
|
|
|
|
await _mockDocumentCacheService.DeleteItemAsync(Textpage);
|
|
|
|
_cacheSettings.ContentTypeKeys = [ Textpage.ContentType.Key ];
|
|
await _mockDocumentCacheService.SeedAsync(CancellationToken.None);
|
|
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()
|
|
{
|
|
_cacheSettings.ContentTypeKeys = [ Textpage.ContentType.Key ];
|
|
await _mockDocumentCacheService.DeleteItemAsync(Textpage);
|
|
|
|
await _mockDocumentCacheService.SeedAsync(CancellationToken.None);
|
|
var textPage = await _mockedCache.GetByIdAsync(Textpage.Key, true);
|
|
AssertTextPage(textPage);
|
|
|
|
_mockedNucacheRepository.Verify(x => x.GetContentSourceAsync(It.IsAny<Guid>(), 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);
|
|
});
|
|
}
|
|
}
|