* 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
8.1 KiB
C#
162 lines
8.1 KiB
C#
using NUnit.Framework;
|
|
using Umbraco.Cms.Core;
|
|
|
|
namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Services;
|
|
|
|
internal sealed partial class MediaNavigationServiceTests
|
|
{
|
|
[Test]
|
|
[TestCase("62BCE72F-8C18-420E-BCAC-112B5ECC95FD", "139DC977-E50F-4382-9728-B278C4B7AC6A")] // Image 4 to Sub-album 1
|
|
[TestCase("E0B23D56-9A0E-4FC4-BD42-834B73B4C7AB", "1CD97C02-8534-4B72-AE9E-AE52EC94CF31")] // Sub-sub-album 1 to Album
|
|
public async Task Structure_Updates_When_Moving_Media(Guid nodeToMove, Guid targetParentKey)
|
|
{
|
|
// Arrange
|
|
MediaNavigationQueryService.TryGetParentKey(nodeToMove, out Guid? originalParentKey);
|
|
MediaNavigationQueryService.TryGetDescendantsKeys(nodeToMove, out IEnumerable<Guid> initialDescendantsKeys);
|
|
var beforeMoveDescendants = initialDescendantsKeys.ToList();
|
|
MediaNavigationQueryService.TryGetDescendantsKeys(originalParentKey.Value, out IEnumerable<Guid> beforeMoveInitialParentDescendantsKeys);
|
|
var beforeMoveInitialParentDescendants = beforeMoveInitialParentDescendantsKeys.ToList();
|
|
MediaNavigationQueryService.TryGetChildrenKeys(targetParentKey, out IEnumerable<Guid> beforeMoveTargetParentChildrenKeys);
|
|
var beforeMoveTargetParentChildren = beforeMoveTargetParentChildrenKeys.ToList();
|
|
|
|
// Act
|
|
var moveAttempt = await MediaEditingService.MoveAsync(nodeToMove, targetParentKey, Constants.Security.SuperUserKey);
|
|
|
|
// Verify the node's new parent is updated
|
|
MediaNavigationQueryService.TryGetParentKey(moveAttempt.Result!.Key, out Guid? updatedParentKey);
|
|
|
|
// Assert
|
|
MediaNavigationQueryService.TryGetDescendantsKeys(nodeToMove, out IEnumerable<Guid> afterMoveDescendantsKeys);
|
|
var afterMoveDescendants = afterMoveDescendantsKeys.ToList();
|
|
MediaNavigationQueryService.TryGetDescendantsKeys(originalParentKey.Value, out IEnumerable<Guid> afterMoveInitialParentDescendantsKeys);
|
|
var afterMoveInitialParentDescendants = afterMoveInitialParentDescendantsKeys.ToList();
|
|
MediaNavigationQueryService.TryGetChildrenKeys(targetParentKey, out IEnumerable<Guid> afterMoveTargetParentChildrenKeys);
|
|
var afterMoveTargetParentChildren = afterMoveTargetParentChildrenKeys.ToList();
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.IsNotNull(updatedParentKey);
|
|
Assert.AreNotEqual(originalParentKey, updatedParentKey);
|
|
Assert.AreEqual(targetParentKey, updatedParentKey);
|
|
|
|
// Verifies that the parent's children have been updated
|
|
Assert.AreEqual(beforeMoveInitialParentDescendants.Count - (afterMoveDescendants.Count + 1), afterMoveInitialParentDescendants.Count);
|
|
Assert.AreEqual(beforeMoveTargetParentChildren.Count + 1, afterMoveTargetParentChildren.Count);
|
|
|
|
// Verifies that the descendants are the same before and after the move
|
|
Assert.AreEqual(beforeMoveDescendants.Count, afterMoveDescendants.Count);
|
|
Assert.AreEqual(beforeMoveDescendants, afterMoveDescendants);
|
|
});
|
|
}
|
|
|
|
[Test]
|
|
public async Task Structure_Updates_When_Moving_Media_To_Root()
|
|
{
|
|
// Arrange
|
|
Guid nodeToMove = SubAlbum2.Key;
|
|
Guid? targetParentKey = Constants.System.RootKey;
|
|
MediaNavigationQueryService.TryGetParentKey(nodeToMove, out Guid? originalParentKey);
|
|
MediaNavigationQueryService.TryGetDescendantsKeys(nodeToMove, out IEnumerable<Guid> initialDescendantsKeys);
|
|
var beforeMoveDescendants = initialDescendantsKeys.ToList();
|
|
MediaNavigationQueryService.TryGetDescendantsKeys(originalParentKey.Value, out IEnumerable<Guid> beforeMoveInitialParentDescendantsKeys);
|
|
var beforeMoveInitialParentDescendants = beforeMoveInitialParentDescendantsKeys.ToList();
|
|
|
|
// The Root node is the only node at the root
|
|
MediaNavigationQueryService.TryGetSiblingsKeys(Album.Key, out IEnumerable<Guid> beforeMoveSiblingsKeys);
|
|
var beforeMoveRootSiblings = beforeMoveSiblingsKeys.ToList();
|
|
|
|
// Act
|
|
var moveAttempt = await MediaEditingService.MoveAsync(nodeToMove, targetParentKey, Constants.Security.SuperUserKey);
|
|
|
|
// Verify the node's new parent is updated
|
|
MediaNavigationQueryService.TryGetParentKey(moveAttempt.Result!.Key, out Guid? updatedParentKey);
|
|
|
|
// Assert
|
|
MediaNavigationQueryService.TryGetDescendantsKeys(nodeToMove, out IEnumerable<Guid> afterMoveDescendantsKeys);
|
|
var afterMoveDescendants = afterMoveDescendantsKeys.ToList();
|
|
MediaNavigationQueryService.TryGetDescendantsKeys((Guid)originalParentKey, out IEnumerable<Guid> afterMoveInitialParentDescendantsKeys);
|
|
var afterMoveInitialParentDescendants = afterMoveInitialParentDescendantsKeys.ToList();
|
|
MediaNavigationQueryService.TryGetSiblingsKeys(Album.Key, out IEnumerable<Guid> afterMoveSiblingsKeys);
|
|
var afterMoveRootSiblings = afterMoveSiblingsKeys.ToList();
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.IsNull(updatedParentKey);
|
|
Assert.AreNotEqual(originalParentKey, updatedParentKey);
|
|
Assert.AreEqual(targetParentKey, updatedParentKey);
|
|
|
|
// Verifies that the parent's children have been updated
|
|
Assert.AreEqual(beforeMoveInitialParentDescendants.Count - (afterMoveDescendants.Count + 1), afterMoveInitialParentDescendants.Count);
|
|
Assert.AreEqual(beforeMoveRootSiblings.Count + 1, afterMoveRootSiblings.Count);
|
|
|
|
// Verifies that the descendants are the same before and after the move
|
|
Assert.AreEqual(beforeMoveDescendants.Count, afterMoveDescendants.Count);
|
|
Assert.AreEqual(beforeMoveDescendants, afterMoveDescendants);
|
|
});
|
|
}
|
|
|
|
[Test]
|
|
[TestCase(null)] // Media root
|
|
[TestCase("1CD97C02-8534-4B72-AE9E-AE52EC94CF31")] // Album
|
|
[TestCase("DBCAFF2F-BFA4-4744-A948-C290C432D564")] // Sub-album 2
|
|
[TestCase("E0B23D56-9A0E-4FC4-BD42-834B73B4C7AB")] // Sub-sub-album 1
|
|
public async Task Moving_Media_Adds_It_Last(Guid? targetParentKey)
|
|
{
|
|
// Arrange
|
|
Guid nodeToMove = Image2.Key;
|
|
|
|
// Act
|
|
await MediaEditingService.MoveAsync(nodeToMove, targetParentKey, Constants.Security.SuperUserKey);
|
|
|
|
// Assert
|
|
if (targetParentKey is null)
|
|
{
|
|
MediaNavigationQueryService.TryGetRootKeys(out IEnumerable<Guid> rootKeys);
|
|
Assert.AreEqual(nodeToMove, rootKeys.Last());
|
|
}
|
|
else
|
|
{
|
|
MediaNavigationQueryService.TryGetChildrenKeys(targetParentKey.Value, out IEnumerable<Guid> childrenKeys);
|
|
Assert.AreEqual(nodeToMove, childrenKeys.Last());
|
|
}
|
|
}
|
|
|
|
// TODO: Add more test cases
|
|
[Test]
|
|
public async Task Sort_Order_Of_Siblings_Updates_When_Moving_Media_And_Adding_New_One()
|
|
{
|
|
// Arrange
|
|
Guid nodeToMove = SubAlbum2.Key;
|
|
Guid node = Image1.Key;
|
|
|
|
// Act
|
|
await MediaEditingService.MoveAsync(nodeToMove, null, Constants.Security.SuperUserKey);
|
|
|
|
// Assert
|
|
MediaNavigationQueryService.TryGetSiblingsKeys(node, out IEnumerable<Guid> siblingsKeysAfterMoving);
|
|
var siblingsKeysAfterMovingList = siblingsKeysAfterMoving.ToList();
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.AreEqual(1, siblingsKeysAfterMovingList.Count);
|
|
Assert.AreEqual(SubAlbum1.Key, siblingsKeysAfterMovingList[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, siblingsKeysAfterMovingList[0]);
|
|
Assert.AreEqual(key, siblingsKeysAfterCreationList[1]);
|
|
});
|
|
}
|
|
}
|