* 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>
239 lines
7.2 KiB
C#
239 lines
7.2 KiB
C#
using NUnit.Framework;
|
|
using Umbraco.Cms.Core;
|
|
using Umbraco.Cms.Core.Models;
|
|
using Umbraco.Cms.Core.Models.ContentEditing;
|
|
using Umbraco.Cms.Core.PublishedCache;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Cms.Core.Web;
|
|
using Umbraco.Cms.Tests.Common.Builders;
|
|
using Umbraco.Cms.Tests.Common.Builders.Extensions;
|
|
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 MediaHybridCacheTests : UmbracoIntegrationTest
|
|
{
|
|
private IPublishedMediaCache PublishedMediaHybridCache => GetRequiredService<IPublishedMediaCache>();
|
|
|
|
private IUmbracoContextFactory UmbracoContextFactory => GetRequiredService<IUmbracoContextFactory>();
|
|
|
|
private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
|
|
|
|
private IMediaEditingService MediaEditingService => GetRequiredService<IMediaEditingService>();
|
|
|
|
protected override void CustomTestSetup(IUmbracoBuilder builder) => builder.AddUmbracoHybridCache();
|
|
|
|
// TODO: make test with MediaWithCrops
|
|
|
|
[Test]
|
|
public async Task Can_Get_Media_By_Key()
|
|
{
|
|
// Arrange
|
|
var newMediaType = new MediaTypeBuilder()
|
|
.WithAlias("album")
|
|
.WithName("Album")
|
|
.Build();
|
|
|
|
newMediaType.AllowedAsRoot = true;
|
|
MediaTypeService.Save(newMediaType);
|
|
|
|
var createModel = new MediaCreateModel
|
|
{
|
|
ContentTypeKey = newMediaType.Key,
|
|
ParentKey = Constants.System.RootKey,
|
|
InvariantName = "Image",
|
|
};
|
|
|
|
var result = await MediaEditingService.CreateAsync(createModel, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(result.Success);
|
|
|
|
// Act
|
|
var media = await PublishedMediaHybridCache.GetByKeyAsync(result.Result.Content.Key);
|
|
|
|
// Assert
|
|
Assert.IsNotNull(media);
|
|
Assert.AreEqual("Image", media.Name);
|
|
Assert.AreEqual(newMediaType.Key, media.ContentType.Key);
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Media_By_Id()
|
|
{
|
|
// Arrange
|
|
var newMediaType = new MediaTypeBuilder()
|
|
.WithAlias("album")
|
|
.WithName("Album")
|
|
.Build();
|
|
|
|
newMediaType.AllowedAsRoot = true;
|
|
MediaTypeService.Save(newMediaType);
|
|
|
|
var createModel = new MediaCreateModel
|
|
{
|
|
ContentTypeKey = newMediaType.Key,
|
|
ParentKey = Constants.System.RootKey,
|
|
InvariantName = "Image",
|
|
};
|
|
|
|
var result = await MediaEditingService.CreateAsync(createModel, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(result.Success);
|
|
|
|
// Act
|
|
var media = await PublishedMediaHybridCache.GetByIdAsync(result.Result.Content.Id);
|
|
|
|
// Assert
|
|
Assert.IsNotNull(media);
|
|
Assert.AreEqual("Image", media.Name);
|
|
Assert.AreEqual(newMediaType.Key, media.ContentType.Key);
|
|
}
|
|
|
|
[Test]
|
|
public async Task Cannot_Get_Non_Existing_Media_By_Key()
|
|
{
|
|
// Act
|
|
var media = await PublishedMediaHybridCache.GetByKeyAsync(Guid.NewGuid());
|
|
|
|
// Assert
|
|
Assert.IsNull(media);
|
|
}
|
|
|
|
[Test]
|
|
public async Task Cannot_Get_Non_Existing_Media_By_Id()
|
|
{
|
|
// Act
|
|
var media = await PublishedMediaHybridCache.GetByIdAsync(124214);
|
|
|
|
// Assert
|
|
Assert.IsNull(media);
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Media_Property_By_Key()
|
|
{
|
|
// Arrange
|
|
var media = await CreateMedia();
|
|
|
|
// Act
|
|
var publishedMedia = await PublishedMediaHybridCache.GetByKeyAsync(media.Key);
|
|
|
|
UmbracoContextFactory.EnsureUmbracoContext();
|
|
|
|
// Assert
|
|
Assert.IsNotNull(media);
|
|
Assert.AreEqual("Image", media.Name);
|
|
Assert.AreEqual("NewTitle", publishedMedia.Value("title"));
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Media_Property_By_Id()
|
|
{
|
|
// Arrange
|
|
var media = await CreateMedia();
|
|
|
|
// Act
|
|
var publishedMedia = await PublishedMediaHybridCache.GetByKeyAsync(media.Key);
|
|
|
|
UmbracoContextFactory.EnsureUmbracoContext();
|
|
|
|
// Assert
|
|
Assert.IsNotNull(publishedMedia);
|
|
Assert.AreEqual("Image", publishedMedia.Name);
|
|
Assert.AreEqual("NewTitle", publishedMedia.Value("title"));
|
|
}
|
|
|
|
[Test]
|
|
public async Task Can_Get_Updated_Media()
|
|
{
|
|
// Arrange
|
|
var media = await CreateMedia();
|
|
await PublishedMediaHybridCache.GetByIdAsync(media.Id);
|
|
|
|
// Act
|
|
var updateModel = new MediaUpdateModel()
|
|
{
|
|
InvariantName = "Update name",
|
|
InvariantProperties = new List<PropertyValueModel>()
|
|
{
|
|
new()
|
|
{
|
|
Alias = "title",
|
|
Value = "Updated Title"
|
|
}
|
|
}
|
|
};
|
|
|
|
var updateAttempt = await MediaEditingService.UpdateAsync(media.Key, updateModel, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(updateAttempt.Success);
|
|
var publishedMedia = await PublishedMediaHybridCache.GetByIdAsync(media.Id);
|
|
UmbracoContextFactory.EnsureUmbracoContext();
|
|
|
|
// Assert
|
|
Assert.IsNotNull(publishedMedia);
|
|
Assert.AreEqual("Update name", publishedMedia.Name);
|
|
Assert.AreEqual("Updated Title", publishedMedia.Value("title"));
|
|
}
|
|
|
|
[Test]
|
|
public async Task Cannot_Get_Deleted_Media_By_Id()
|
|
{
|
|
// Arrange
|
|
var media = await CreateMedia();
|
|
var publishedMedia = await PublishedMediaHybridCache.GetByIdAsync(media.Id);
|
|
Assert.IsNotNull(publishedMedia);
|
|
|
|
await MediaEditingService.DeleteAsync(media.Key, Constants.Security.SuperUserKey);
|
|
|
|
// Act
|
|
var deletedMedia = await PublishedMediaHybridCache.GetByIdAsync(media.Id);
|
|
|
|
// Assert
|
|
Assert.IsNull(deletedMedia);
|
|
}
|
|
|
|
[Test]
|
|
public async Task Cannot_Get_Deleted_Media_By_Key()
|
|
{
|
|
// Arrange
|
|
var media = await CreateMedia();
|
|
var publishedMedia = await PublishedMediaHybridCache.GetByKeyAsync(media.Key);
|
|
Assert.IsNotNull(publishedMedia);
|
|
|
|
await MediaEditingService.DeleteAsync(media.Key, Constants.Security.SuperUserKey);
|
|
|
|
// Act
|
|
var deletedMedia = await PublishedMediaHybridCache.GetByKeyAsync(media.Key);
|
|
|
|
// Assert
|
|
Assert.IsNull(deletedMedia);
|
|
}
|
|
|
|
private async Task<IMedia> CreateMedia()
|
|
{
|
|
IMediaType mediaType = MediaTypeBuilder.CreateSimpleMediaType("test", "Test");
|
|
mediaType.AllowedAsRoot = true;
|
|
MediaTypeService.Save(mediaType);
|
|
|
|
var createModel = new MediaCreateModel
|
|
{
|
|
ContentTypeKey = mediaType.Key,
|
|
ParentKey = Constants.System.RootKey,
|
|
InvariantName = "Image",
|
|
InvariantProperties = new List<PropertyValueModel>()
|
|
{
|
|
new()
|
|
{
|
|
Alias = "title",
|
|
Value = "NewTitle"
|
|
}
|
|
}
|
|
};
|
|
|
|
var result = await MediaEditingService.CreateAsync(createModel, Constants.Security.SuperUserKey);
|
|
Assert.IsTrue(result.Success);
|
|
return result.Result.Content;
|
|
}
|
|
}
|