* 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.
119 lines
6.0 KiB
C#
119 lines
6.0 KiB
C#
using NUnit.Framework;
|
|
using Umbraco.Cms.Core;
|
|
|
|
namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Services;
|
|
|
|
internal sealed partial class MediaNavigationServiceTests
|
|
{
|
|
[Test]
|
|
public async Task Structure_Updates_When_Moving_Media_To_Recycle_Bin()
|
|
{
|
|
// Arrange
|
|
Guid nodeToMoveToRecycleBin = Image3.Key;
|
|
Guid nodeInRecycleBin = SubSubAlbum1.Key;
|
|
await MediaEditingService.MoveToRecycleBinAsync(nodeInRecycleBin, Constants.Security.SuperUserKey);
|
|
MediaNavigationQueryService.TryGetSiblingsKeysInBin(nodeInRecycleBin, out IEnumerable<Guid> initialSiblingsKeys);
|
|
var beforeMoveRecycleBinSiblingsCount = initialSiblingsKeys.Count();
|
|
Assert.AreEqual(beforeMoveRecycleBinSiblingsCount, 0);
|
|
MediaNavigationQueryService.TryGetParentKey(nodeToMoveToRecycleBin, out Guid? originalParentKey);
|
|
MediaNavigationQueryService.TryGetDescendantsKeys(nodeToMoveToRecycleBin, out IEnumerable<Guid> initialDescendantsKeys);
|
|
var beforeMoveDescendants = initialDescendantsKeys.ToList();
|
|
MediaNavigationQueryService.TryGetChildrenKeys(originalParentKey.Value, out IEnumerable<Guid> initialParentChildrenKeys);
|
|
var beforeMoveParentSiblingsCount = initialParentChildrenKeys.Count();
|
|
|
|
// Act
|
|
await MediaEditingService.MoveToRecycleBinAsync(nodeToMoveToRecycleBin, Constants.Security.SuperUserKey);
|
|
|
|
// Assert
|
|
var nodeExists = MediaNavigationQueryService.TryGetParentKey(nodeToMoveToRecycleBin, out _); // Verify that the item is no longer in the document structure
|
|
var nodeExistsInRecycleBin = MediaNavigationQueryService.TryGetParentKeyInBin(nodeToMoveToRecycleBin, out Guid? updatedParentKeyInRecycleBin);
|
|
MediaNavigationQueryService.TryGetDescendantsKeysInBin(nodeToMoveToRecycleBin, out IEnumerable<Guid> afterMoveDescendantsKeys);
|
|
var afterMoveDescendants = afterMoveDescendantsKeys.ToList();
|
|
MediaNavigationQueryService.TryGetChildrenKeys(originalParentKey.Value, out IEnumerable<Guid> afterMoveParentChildrenKeys);
|
|
var afterMoveParentSiblingsCount = afterMoveParentChildrenKeys.Count();
|
|
MediaNavigationQueryService.TryGetSiblingsKeysInBin(nodeInRecycleBin, out IEnumerable<Guid> afterMoveRecycleBinSiblingsKeys);
|
|
var afterMoveRecycleBinSiblingsCount = afterMoveRecycleBinSiblingsKeys.Count();
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.IsFalse(nodeExists);
|
|
Assert.IsTrue(nodeExistsInRecycleBin);
|
|
Assert.AreNotEqual(originalParentKey, updatedParentKeyInRecycleBin);
|
|
Assert.IsNull(updatedParentKeyInRecycleBin); // Verify the node's parent is now located at the root of the recycle bin (null)
|
|
Assert.AreEqual(beforeMoveDescendants, afterMoveDescendants);
|
|
Assert.AreEqual(beforeMoveParentSiblingsCount - 1, afterMoveParentSiblingsCount);
|
|
Assert.AreEqual(beforeMoveRecycleBinSiblingsCount + 1, afterMoveRecycleBinSiblingsCount);
|
|
});
|
|
}
|
|
|
|
// TODO: Add more test cases
|
|
[Test]
|
|
public async Task Sort_Order_Of_Siblings_Updates_When_Moving_Media_To_Recycle_Bin_And_Adding_New_One()
|
|
{
|
|
// Arrange
|
|
Guid nodeToMoveToRecycleBin = SubAlbum2.Key;
|
|
Guid node = Image1.Key;
|
|
|
|
// Act
|
|
await MediaEditingService.MoveToRecycleBinAsync(nodeToMoveToRecycleBin, Constants.Security.SuperUserKey);
|
|
|
|
// Assert
|
|
MediaNavigationQueryService.TryGetSiblingsKeys(node, out IEnumerable<Guid> siblingsKeysAfterDeletion);
|
|
var siblingsKeysAfterDeletionList = siblingsKeysAfterDeletion.ToList();
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.AreEqual(1, siblingsKeysAfterDeletionList.Count);
|
|
Assert.AreEqual(SubAlbum1.Key, siblingsKeysAfterDeletionList[0]);
|
|
});
|
|
|
|
// Create a new sibling under the same parent
|
|
var key = Guid.NewGuid();
|
|
var createModel = CreateMediaCreateModel("Child Image", key, ImageMediaType.Key, Album.Key);
|
|
await MediaEditingService.CreateAsync(createModel, Constants.Security.SuperUserKey);
|
|
|
|
MediaNavigationQueryService.TryGetSiblingsKeys(node, out IEnumerable<Guid> siblingsKeysAfterCreation);
|
|
var siblingsKeysAfterCreationList = siblingsKeysAfterCreation.ToList();
|
|
|
|
// Verify sibling order after creating the new media
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.AreEqual(2, siblingsKeysAfterCreationList.Count);
|
|
Assert.AreEqual(SubAlbum1.Key, siblingsKeysAfterDeletionList[0]);
|
|
Assert.AreEqual(key, siblingsKeysAfterCreationList[1]);
|
|
});
|
|
}
|
|
|
|
[Test]
|
|
public async Task Sort_Order_Of_Chilldren_Is_Maintained_When_Moving_Media_To_Recycle_Bin()
|
|
{
|
|
// Arrange
|
|
Guid nodeToMoveToRecycleBin = SubAlbum1.Key;
|
|
|
|
// Create a new grandchild under Child1
|
|
var key = Guid.NewGuid();
|
|
var createModel = CreateMediaCreateModel("Image 5", key, ImageMediaType.Key, nodeToMoveToRecycleBin);
|
|
await MediaEditingService.CreateAsync(createModel, Constants.Security.SuperUserKey);
|
|
|
|
MediaNavigationQueryService.TryGetChildrenKeys(nodeToMoveToRecycleBin, out IEnumerable<Guid> childrenKeysBeforeDeletion);
|
|
var childrenKeysBeforeDeletionList = childrenKeysBeforeDeletion.ToList();
|
|
|
|
// Act
|
|
await MediaEditingService.MoveToRecycleBinAsync(nodeToMoveToRecycleBin, Constants.Security.SuperUserKey);
|
|
|
|
// Assert
|
|
MediaNavigationQueryService.TryGetChildrenKeysInBin(nodeToMoveToRecycleBin, out IEnumerable<Guid> childrenKeysAfterDeletion);
|
|
var childrenKeysAfterDeletionList = childrenKeysAfterDeletion.ToList();
|
|
|
|
// Verify children order in the bin
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.AreEqual(3, childrenKeysAfterDeletionList.Count);
|
|
Assert.AreEqual(Image2.Key, childrenKeysAfterDeletionList[0]);
|
|
Assert.AreEqual(Image3.Key, childrenKeysAfterDeletionList[1]);
|
|
Assert.AreEqual(key, childrenKeysAfterDeletionList[2]);
|
|
Assert.IsTrue(childrenKeysBeforeDeletionList.SequenceEqual(childrenKeysAfterDeletionList));
|
|
});
|
|
}
|
|
}
|