* 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.
162 lines
7.2 KiB
C#
162 lines
7.2 KiB
C#
using NUnit.Framework;
|
|
using Umbraco.Cms.Core;
|
|
using Umbraco.Cms.Core.Cache;
|
|
using Umbraco.Cms.Core.Models;
|
|
using Umbraco.Cms.Core.Models.ContentEditing;
|
|
using Umbraco.Cms.Core.Models.ContentPublishing;
|
|
using Umbraco.Cms.Core.Models.PublishedContent;
|
|
using Umbraco.Cms.Core.Notifications;
|
|
using Umbraco.Cms.Core.PublishedCache;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Cms.Core.Services.ContentTypeEditing;
|
|
using Umbraco.Cms.Core.Services.OperationStatus;
|
|
using Umbraco.Cms.Core.Sync;
|
|
using Umbraco.Cms.Tests.Common.Builders;
|
|
using Umbraco.Cms.Tests.Common.Testing;
|
|
using Umbraco.Cms.Tests.Integration.Testing;
|
|
using Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
|
|
|
|
namespace Umbraco.Cms.Tests.Integration.Umbraco.PublishedCache.HybridCache;
|
|
|
|
[TestFixture]
|
|
[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
|
|
internal sealed class DocumentHybridCachePropertyTest : UmbracoIntegrationTest
|
|
{
|
|
protected override void CustomTestSetup(IUmbracoBuilder builder)
|
|
{
|
|
builder.AddNotificationHandler<ContentTreeChangeNotification, ContentTreeChangeDistributedCacheNotificationHandler>();
|
|
builder.Services.AddUnique<IServerMessenger, ContentEventsTests.LocalServerMessenger>();
|
|
}
|
|
|
|
private ICacheManager CacheManager => GetRequiredService<ICacheManager>();
|
|
|
|
private ITemplateService TemplateService => GetRequiredService<ITemplateService>();
|
|
|
|
private IContentEditingService ContentEditingService => GetRequiredService<IContentEditingService>();
|
|
|
|
private IContentTypeEditingService ContentTypeEditingService => GetRequiredService<IContentTypeEditingService>();
|
|
|
|
private IContentPublishingService ContentPublishingService => GetRequiredService<IContentPublishingService>();
|
|
|
|
[Test]
|
|
public async Task Can_Get_Value_From_ContentPicker()
|
|
{
|
|
// Arrange
|
|
var template = TemplateBuilder.CreateTextPageTemplate();
|
|
await TemplateService.CreateAsync(template, Constants.Security.SuperUserKey);
|
|
var textPage = await CreateTextPageDocument(template.Key);
|
|
var contentPickerDocument = await CreateContentPickerDocument(template.Key, textPage.Key);
|
|
|
|
// Act
|
|
var contentPickerPage = await CacheManager.Content.GetByIdAsync(contentPickerDocument.Id);
|
|
|
|
// Assert
|
|
IPublishedContent contentPickerValue = (IPublishedContent)contentPickerPage.Value("contentPicker");
|
|
Assert.AreEqual(textPage.Key, contentPickerValue.Key);
|
|
Assert.AreEqual(textPage.Id, contentPickerValue.Id);
|
|
Assert.AreEqual(textPage.Name, contentPickerValue.Name);
|
|
Assert.AreEqual("The title value", contentPickerValue.Properties.First(x => x.Alias == "title").GetValue());
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Value_From_Updated_ContentPicker()
|
|
{
|
|
// Arrange
|
|
var template = TemplateBuilder.CreateTextPageTemplate();
|
|
await TemplateService.CreateAsync(template, Constants.Security.SuperUserKey);
|
|
var textPage = await CreateTextPageDocument(template.Key);
|
|
var contentPickerDocument = await CreateContentPickerDocument(template.Key, textPage.Key);
|
|
|
|
// Get for caching
|
|
var notUpdatedContent = await CacheManager.Content.GetByIdAsync(contentPickerDocument.Id);
|
|
|
|
IPublishedContent contentPickerValue = (IPublishedContent)notUpdatedContent.Value("contentPicker");
|
|
Assert.AreEqual("The title value", contentPickerValue.Properties.First(x => x.Alias == "title").GetValue());
|
|
|
|
// Update content
|
|
var updateModel = new ContentUpdateModel
|
|
{
|
|
InvariantName = "Root Create",
|
|
InvariantProperties = new[]
|
|
{
|
|
new PropertyValueModel { Alias = "title", Value = "Updated title" },
|
|
new PropertyValueModel { Alias = "bodyText", Value = "The body text" }
|
|
},
|
|
};
|
|
|
|
var updateResult = await ContentEditingService.UpdateAsync(textPage.Key, updateModel, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(updateResult.Success);
|
|
|
|
var publishResult = await ContentPublishingService.PublishAsync(
|
|
updateResult.Result.Content!.Key,
|
|
new CultureAndScheduleModel()
|
|
{
|
|
CulturesToPublishImmediately = new HashSet<string> { "*" },
|
|
Schedules = new ContentScheduleCollection(),
|
|
},
|
|
Constants.Security.SuperUserKey);
|
|
|
|
Assert.IsTrue(publishResult);
|
|
|
|
// Act
|
|
var contentPickerPage = await CacheManager.Content.GetByIdAsync(contentPickerDocument.Id);
|
|
|
|
// Assert
|
|
IPublishedContent updatedPickerValue = (IPublishedContent)contentPickerPage.Value("contentPicker");
|
|
Assert.AreEqual(textPage.Key, updatedPickerValue.Key);
|
|
Assert.AreEqual(textPage.Id, updatedPickerValue.Id);
|
|
Assert.AreEqual(textPage.Name, updatedPickerValue.Name);
|
|
Assert.AreEqual("Updated title", updatedPickerValue.Properties.First(x => x.Alias == "title").GetValue());
|
|
}
|
|
|
|
private async Task<IContent> CreateContentPickerDocument(Guid templateKey, Guid textPageKey)
|
|
{
|
|
var pickerContentType = ContentTypeEditingBuilder.CreateContentTypeWithContentPicker(templateKey: templateKey);
|
|
await ContentTypeEditingService.CreateAsync(pickerContentType, Constants.Security.SuperUserKey);
|
|
|
|
var createOtherModel = ContentEditingBuilder.CreateContentWithOneInvariantProperty(pickerContentType.Key.Value,
|
|
"Test Create", "contentPicker", textPageKey);
|
|
var result = await ContentEditingService.CreateAsync(createOtherModel, Constants.Security.SuperUserKey);
|
|
|
|
Assert.IsTrue(result.Success);
|
|
Assert.AreEqual(ContentEditingOperationStatus.Success, result.Status);
|
|
|
|
var publishResult = await ContentPublishingService.PublishAsync(
|
|
result.Result.Content!.Key,
|
|
new CultureAndScheduleModel()
|
|
{
|
|
CulturesToPublishImmediately = new HashSet<string> { "*" },
|
|
Schedules = new ContentScheduleCollection(),
|
|
},
|
|
Constants.Security.SuperUserKey);
|
|
|
|
Assert.IsTrue(publishResult.Success);
|
|
return result.Result.Content;
|
|
}
|
|
|
|
private async Task<IContent> CreateTextPageDocument(Guid templateKey)
|
|
{
|
|
var textContentType = ContentTypeEditingBuilder.CreateTextPageContentType(defaultTemplateKey: templateKey);
|
|
await ContentTypeEditingService.CreateAsync(textContentType, Constants.Security.SuperUserKey);
|
|
|
|
var contentCreateModel = ContentEditingBuilder.CreateContentWithTwoInvariantProperties(
|
|
textContentType.Key.Value, "Root Create", "title", "The title value", "bodyText", "The body text",
|
|
Constants.System.RootKey);
|
|
|
|
var createResult = await ContentEditingService.CreateAsync(contentCreateModel, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(createResult.Success);
|
|
|
|
var publishResult = await ContentPublishingService.PublishAsync(
|
|
createResult.Result.Content!.Key,
|
|
new CultureAndScheduleModel()
|
|
{
|
|
CulturesToPublishImmediately = new HashSet<string> { "*" },
|
|
Schedules = new ContentScheduleCollection(),
|
|
},
|
|
Constants.Security.SuperUserKey);
|
|
|
|
Assert.IsTrue(publishResult.Success);
|
|
return createResult.Result.Content;
|
|
}
|
|
}
|