* Removed obsoletes from IConfigManipulator. * Removed obsolete models builder extensions. * Removed the obsolete ContentDashboardSettings. * Removed the obsolete InstallMissingDatabase setting on GlobalSettings. * Removed obsolete NuCache settings. * Removed obsolete RuntimeMinificationSettings. * Removed obsolete health check constant. * Removed obsolete icon constant. * Removed obsolete telemetry constant. * Removed obsolete property and constructor on UmbracoBuilder. * Removed obsolete constructor on AuditNotificationsHandler. * Removed obsolete constructor on HTTP header health checks. * Removed obsolete constructor on MediaFileManager. * Removed obsolete GetDefaultFileContent on ViewHelper. * Remove obsoleted methods on embed providers. * Fix tests. * Removed obsolete constructors on BlockEditorDataConverter. * Removed obsolete SeedCacheDuration property on CacheSettings. * Removed obsolete PublishCulture on ContentRepositoryExtensions. * Removed obsolete MonitorLock. * Removed obsolete synchronous HasSavedValues from IDataTypeUsageService and IDataTypeUsageRepository. * Removed obsolete HasSavedPropertyValues from IPropertyTypeUsageService and IPropertyTypeUsageRepository. * Removed obsolete methods in ITrackedReferencesService and ITrackedReferencesRepository. * Removed obsolete DateValueEditor constructors. * Removed obsolete GetAutomaticRelationTypesAliases. * Removed obsolete constructor on TextOnlyValueEditor. * Removed obsolete constructors on RegexValidator and RequiredValidator. * Removed obsolete constructs on SliderValueConverter and TagsValueConverter. * Removed obsolete GetContentType methods from IPublishedCache. * Removed ContentFinderByIdPath. * Removed obsolete constructor on DefaultMediaUrlProvider. * Removed obsolete constructor on Domain. * Removed obsolete constructor on PublishedRequest. * Removed obsolete methods on CheckPermissions. * Removed obsolete GetUserId from IBackOfficeSecurity. * Removed obsolete methods on LegacyPasswordSecurity. * Removed obsolete constructors on AuditService. * Removed obsolete methods on IContentEditingService. * Remove obsolete constructors and methods on ContentService/IContentService. * Removed obsolete constructor in ContentTypeEditingService. * Removed obsolete constructor in MediaTypeEditingService. * Removed obsolete constructor in MemberTypeEditingService. * Removed obsolete constructor in ContentTypeService. * Removed obsolete constructors in ContentTypeServiceBase. * Removed obsolete constructors and methods in ContentVersionService. * Removed obsolete constructor in DataTypeUsageService. * Removed obsolete constructor in DomainService. * Removed obsolete constructor in FileService. * Removes obsolete AttemptMove from IContentService. * Removes obsolete SetPreventCleanup from IContentVersionService. * Removes obsolete GetReferences from IDataTypeService. * Removed obsolete SetConsentLevel from IMetricsConsentService. * Removed obsolete methods from IPackageDataInstallation. * Removed obsolete methods from IPackagingService. * Removed obsolete methods on ITwoFactorLoginService. Removed obsolete ITemporaryMediaService. * Removed obsolete constructor from MediaService, MemberTypeService and MediaTypeService. * More obsolete constructors. * Removed obsoleted overloads on IPropertyValidationService. * Fixed build for tests. * Removed obsolete constructor for PublicAccessService, UserService and RelationService. * Removed GetDefaultMemberType. * Removed obsolete user group functionality from IUserService. * Removed obsolete extension methods on IUserService. * Removed obsolete method from ITelemetryService. * Removed obsolete UdiParserServiceConnectors. * Removed obsolete method on ICookieManager. * Removed obsolete DynamicContext. * Removed obsolete XmlHelper. * Fixed failing integration tests. * Removed obsoletes in Umbraco.Cms.Api.Common * Removed obsoletes in Umbraco.Cms.Api.Delivery * Removed obsoletes in Umbraco.Cms.Api.Management * Removed obsoletes in Umbraco.Examine.Lucene * Removed obsoletes in Umbraco.Infrastructure * Fix failing delivery API contract integration test. * Made integration tests internal. * Removed obsoletes from web projects. * Fix build. * Removed Twitter OEmbed provider * Removed obsolete constructor on PublishedDataType. * Removed obsolete constructors on PublishedCacheBase. * Removed the obsolete PropertyEditorTagsExtensions. * Removed obsoletion properties on configuration response models (#18697) * Removed obsolete methods from server-side models. * Update client-side types and sdk. * Update client-side files. * Removed obsoletion of Utf8ToAsciiConverter.ToAsciiString overload. (#18694) * Removed obsolete method in UserService. (#18710) * Removed obsoleted group alias keys from being publicly available. (#18682) * Removed unneceessary ApiVersion attribute. * Clean-up obsoletions on MemberService (#18703) * Removed obsoleted method on MemberService, added future obsoletion to interface and updated all callers. * Removed obsoletion on member service method that's not obsolete on the interface.
258 lines
11 KiB
C#
258 lines
11 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.Routing;
|
|
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.Serialization;
|
|
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)]
|
|
internal sealed 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<Guid>(), true))
|
|
.ReturnsAsync(draftTestCacheNode);
|
|
|
|
_mockedNucacheRepository.Setup(r => r.GetContentSourceAsync(It.IsAny<Guid>(), false))
|
|
.ReturnsAsync(publishedTestCacheNode);
|
|
|
|
_mockedNucacheRepository.Setup(r => r.GetContentByContentTypeKey(It.IsAny<IReadOnlyCollection<Guid>>(), ContentCacheDataSerializerEntityType.Document)).Returns(
|
|
new List<ContentCacheNode>()
|
|
{
|
|
draftTestCacheNode,
|
|
});
|
|
|
|
_mockedNucacheRepository.Setup(r => r.DeleteContentItemAsync(It.IsAny<int>()));
|
|
|
|
var mockedPublishedStatusService = new Mock<IPublishStatusQueryService>();
|
|
mockedPublishedStatusService.Setup(x => x.IsDocumentPublishedInAnyCulture(It.IsAny<Guid>())).Returns(true);
|
|
|
|
_mockDocumentCacheService = new DocumentCacheService(
|
|
_mockedNucacheRepository.Object,
|
|
GetRequiredService<IIdKeyMap>(),
|
|
GetRequiredService<ICoreScopeProvider>(),
|
|
GetRequiredService<Microsoft.Extensions.Caching.Hybrid.HybridCache>(),
|
|
GetRequiredService<IPublishedContentFactory>(),
|
|
GetRequiredService<ICacheNodeFactory>(),
|
|
GetSeedProviders(mockedPublishedStatusService.Object),
|
|
new OptionsWrapper<CacheSettings>(new CacheSettings()),
|
|
GetRequiredService<IPublishedModelFactory>(),
|
|
GetRequiredService<IPreviewService>(),
|
|
mockedPublishedStatusService.Object,
|
|
GetRequiredService<IDocumentNavigationQueryService>());
|
|
|
|
_mockedCache = new DocumentCache(_mockDocumentCacheService,
|
|
GetRequiredService<IPublishedContentTypeCache>(),
|
|
GetRequiredService<IDocumentNavigationQueryService>(),
|
|
GetRequiredService<IDocumentUrlService>(),
|
|
new Lazy<IPublishedUrlProvider>(GetRequiredService<IPublishedUrlProvider>));
|
|
}
|
|
|
|
// 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(IPublishStatusQueryService publishStatusQueryService)
|
|
{
|
|
_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, publishStatusQueryService),
|
|
new DocumentBreadthFirstKeyProvider(GetRequiredService<IDocumentNavigationQueryService>(), mock.Object, publishStatusQueryService),
|
|
};
|
|
}
|
|
|
|
[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<Guid>(), 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);
|
|
_mockedNucacheRepository.Verify(x => x.GetContentSourceAsync(It.IsAny<Guid>(), It.IsAny<bool>()), Times.Exactly(1));
|
|
|
|
var textPage = await _mockedCache.GetByIdAsync(Textpage.Id);
|
|
AssertTextPage(textPage);
|
|
|
|
_mockedNucacheRepository.Verify(x => x.GetContentSourceAsync(It.IsAny<Guid>(), It.IsAny<bool>()), Times.Exactly(1));
|
|
}
|
|
|
|
[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);
|
|
_mockedNucacheRepository.Verify(x => x.GetContentSourceAsync(It.IsAny<Guid>(), It.IsAny<bool>()), Times.Exactly(1));
|
|
var textPage = await _mockedCache.GetByIdAsync(Textpage.Key);
|
|
AssertTextPage(textPage);
|
|
|
|
_mockedNucacheRepository.Verify(x => x.GetContentSourceAsync(It.IsAny<Guid>(), It.IsAny<bool>()), Times.Exactly(1));
|
|
}
|
|
|
|
[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<Guid>(), 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);
|
|
});
|
|
}
|
|
}
|