* 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>
240 lines
10 KiB
C#
240 lines
10 KiB
C#
// Copyright (c) Umbraco.
|
|
// See LICENSE for more details.
|
|
|
|
using System.Collections.Generic;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Umbraco.Cms.Core.Cache;
|
|
using Umbraco.Cms.Core.Models;
|
|
using Umbraco.Cms.Core.Models.PublishedContent;
|
|
using Umbraco.Cms.Core.PropertyEditors;
|
|
using Umbraco.Cms.Core.PublishedCache;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Cms.Infrastructure.Serialization;
|
|
using Umbraco.Extensions;
|
|
|
|
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Published;
|
|
|
|
[TestFixture]
|
|
public class PropertyCacheLevelTests
|
|
{
|
|
[TestCase(PropertyCacheLevel.None, 2)]
|
|
[TestCase(PropertyCacheLevel.Element, 1)]
|
|
[TestCase(PropertyCacheLevel.Elements, 1)]
|
|
[TestCase(PropertyCacheLevel.Snapshot, 1)]
|
|
public void CacheLevelTest(PropertyCacheLevel cacheLevel, int interConverts)
|
|
{
|
|
var converter = new CacheConverter1(cacheLevel);
|
|
|
|
var converters = new PropertyValueConverterCollection(() => new IPropertyValueConverter[] { converter });
|
|
|
|
var configurationEditorJsonSerializer = new SystemTextConfigurationEditorJsonSerializer();
|
|
var dataTypeServiceMock = new Mock<IDataTypeService>();
|
|
var dataType = new DataType(
|
|
new VoidEditor(Mock.Of<IDataValueEditorFactory>()), configurationEditorJsonSerializer)
|
|
{ Id = 1 };
|
|
dataTypeServiceMock.Setup(x => x.GetAll()).Returns(dataType.Yield);
|
|
|
|
var publishedContentTypeFactory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), converters, dataTypeServiceMock.Object);
|
|
|
|
IEnumerable<IPublishedPropertyType> CreatePropertyTypes(IPublishedContentType contentType)
|
|
{
|
|
yield return publishedContentTypeFactory.CreatePropertyType(contentType, "prop1", dataType.Id);
|
|
}
|
|
|
|
var setType1 = publishedContentTypeFactory.CreateContentType(Guid.NewGuid(), 1000, "set1", CreatePropertyTypes);
|
|
|
|
// PublishedElementPropertyBase.GetCacheLevels:
|
|
//
|
|
// if property level is > reference level, or both are None
|
|
// use None for property & new reference
|
|
// else
|
|
// use Content for property, & keep reference
|
|
//
|
|
// PublishedElement creates properties with reference being None
|
|
// if converter specifies None, keep using None
|
|
// anything else is not > None, use Content
|
|
//
|
|
// for standalone elements, it's only None or Content
|
|
var set1 = new PublishedElement(setType1, Guid.NewGuid(), new Dictionary<string, object> { { "prop1", "1234" } }, false);
|
|
|
|
Assert.AreEqual(1234, set1.Value(Mock.Of<IPublishedValueFallback>(), "prop1"));
|
|
Assert.AreEqual(1, converter.SourceConverts);
|
|
Assert.AreEqual(1, converter.InterConverts);
|
|
|
|
// source is always converted once and cached per content
|
|
// inter conversion depends on the specified cache level
|
|
Assert.AreEqual(1234, set1.Value(Mock.Of<IPublishedValueFallback>(), "prop1"));
|
|
Assert.AreEqual(1, converter.SourceConverts);
|
|
Assert.AreEqual(interConverts, converter.InterConverts);
|
|
}
|
|
|
|
// property is not cached, converted cached at Content, exept
|
|
// /None = not cached at all
|
|
[TestCase(PropertyCacheLevel.None, PropertyCacheLevel.None, 2, 0, 0)]
|
|
[TestCase(PropertyCacheLevel.None, PropertyCacheLevel.Element, 1, 0, 0)]
|
|
[TestCase(PropertyCacheLevel.None, PropertyCacheLevel.Elements, 1, 0, 0)]
|
|
|
|
// property is cached at element level, converted cached at
|
|
// /None = not at all
|
|
// /Element = in element
|
|
// /Snapshot = in snapshot
|
|
// /Elements = in elements
|
|
[TestCase(PropertyCacheLevel.Element, PropertyCacheLevel.None, 2, 0, 0)]
|
|
[TestCase(PropertyCacheLevel.Element, PropertyCacheLevel.Element, 1, 0, 0)]
|
|
[TestCase(PropertyCacheLevel.Element, PropertyCacheLevel.Elements, 1, 1, 1)]
|
|
|
|
// property is cached at elements level, converted cached at Element, exept
|
|
// /None = not cached at all
|
|
// /Snapshot = cached in snapshot
|
|
[TestCase(PropertyCacheLevel.Elements, PropertyCacheLevel.None, 2, 0, 0)]
|
|
[TestCase(PropertyCacheLevel.Elements, PropertyCacheLevel.Element, 1, 0, 0)]
|
|
[TestCase(PropertyCacheLevel.Elements, PropertyCacheLevel.Elements, 1, 0, 0)]
|
|
public void CachePublishedSnapshotTest(
|
|
PropertyCacheLevel referenceCacheLevel,
|
|
PropertyCacheLevel converterCacheLevel,
|
|
int interConverts,
|
|
int elementsCount1,
|
|
int elementsCount2)
|
|
{
|
|
var converter = new CacheConverter1(converterCacheLevel);
|
|
|
|
var converters = new PropertyValueConverterCollection(() => new IPropertyValueConverter[] { converter });
|
|
|
|
var dataTypeServiceMock = new Mock<IDataTypeService>();
|
|
var dataType = new DataType(
|
|
new VoidEditor(Mock.Of<IDataValueEditorFactory>()), new SystemTextConfigurationEditorJsonSerializer())
|
|
{ Id = 1 };
|
|
dataTypeServiceMock.Setup(x => x.GetAll()).Returns(dataType.Yield);
|
|
|
|
var publishedContentTypeFactory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), converters, dataTypeServiceMock.Object);
|
|
|
|
IEnumerable<IPublishedPropertyType> CreatePropertyTypes(IPublishedContentType contentType)
|
|
{
|
|
yield return publishedContentTypeFactory.CreatePropertyType(contentType, "prop1", 1);
|
|
}
|
|
|
|
var setType1 = publishedContentTypeFactory.CreateContentType(Guid.NewGuid(), 1000, "set1", CreatePropertyTypes);
|
|
|
|
var elementsCache = new FastDictionaryAppCache();
|
|
|
|
var cacheManager = new Mock<ICacheManager>();
|
|
cacheManager.Setup(x => x.ElementsCache).Returns(elementsCache);
|
|
|
|
// pretend we're creating this set as a value for a property
|
|
// referenceCacheLevel is the cache level for this fictious property
|
|
// converterCacheLevel is the cache level specified by the converter
|
|
var set1 = new PublishedElement(
|
|
setType1,
|
|
Guid.NewGuid(),
|
|
new Dictionary<string, object>
|
|
{
|
|
{ "prop1", "1234" },
|
|
},
|
|
false,
|
|
referenceCacheLevel,
|
|
cacheManager.Object);
|
|
|
|
Assert.AreEqual(1234, set1.Value(Mock.Of<IPublishedValueFallback>(), "prop1"));
|
|
Assert.AreEqual(1, converter.SourceConverts);
|
|
Assert.AreEqual(1, converter.InterConverts);
|
|
|
|
Assert.AreEqual(elementsCount1, elementsCache.Count);
|
|
Assert.AreEqual(1234, set1.Value(Mock.Of<IPublishedValueFallback>(), "prop1"));
|
|
Assert.AreEqual(1, converter.SourceConverts);
|
|
Assert.AreEqual(interConverts, converter.InterConverts);
|
|
|
|
Assert.AreEqual(elementsCount2, elementsCache.Count);
|
|
|
|
Assert.AreEqual(1234, set1.Value(Mock.Of<IPublishedValueFallback>(), "prop1"));
|
|
Assert.AreEqual(1, converter.SourceConverts);
|
|
|
|
Assert.AreEqual(elementsCount2, elementsCache.Count);
|
|
|
|
var oldElementsCache = elementsCache;
|
|
elementsCache.Clear();
|
|
|
|
Assert.AreEqual(1234, set1.Value(Mock.Of<IPublishedValueFallback>(), "prop1"));
|
|
Assert.AreEqual(1, converter.SourceConverts);
|
|
|
|
Assert.AreEqual(elementsCount2, elementsCache.Count);
|
|
Assert.AreEqual(elementsCount2, oldElementsCache.Count);
|
|
}
|
|
|
|
[Test]
|
|
public void CacheUnknownTest()
|
|
{
|
|
var converter = new CacheConverter1(PropertyCacheLevel.Unknown);
|
|
|
|
var converters = new PropertyValueConverterCollection(() => new IPropertyValueConverter[] { converter });
|
|
|
|
var dataTypeServiceMock = new Mock<IDataTypeService>();
|
|
var dataType = new DataType(
|
|
new VoidEditor(Mock.Of<IDataValueEditorFactory>()), new SystemTextConfigurationEditorJsonSerializer())
|
|
{ Id = 1 };
|
|
dataTypeServiceMock.Setup(x => x.GetAll()).Returns(dataType.Yield);
|
|
|
|
var publishedContentTypeFactory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), converters, dataTypeServiceMock.Object);
|
|
|
|
IEnumerable<IPublishedPropertyType> CreatePropertyTypes(IPublishedContentType contentType)
|
|
{
|
|
yield return publishedContentTypeFactory.CreatePropertyType(contentType, "prop1", 1);
|
|
}
|
|
|
|
var setType1 = publishedContentTypeFactory.CreateContentType(Guid.NewGuid(), 1000, "set1", CreatePropertyTypes);
|
|
|
|
Assert.Throws<Exception>(() =>
|
|
{
|
|
var unused = new PublishedElement(setType1, Guid.NewGuid(), new Dictionary<string, object> { { "prop1", "1234" } }, false);
|
|
});
|
|
}
|
|
|
|
private class CacheConverter1 : IPropertyValueConverter
|
|
{
|
|
private readonly PropertyCacheLevel _cacheLevel;
|
|
|
|
public CacheConverter1(PropertyCacheLevel cacheLevel) => _cacheLevel = cacheLevel;
|
|
|
|
public int SourceConverts { get; private set; }
|
|
|
|
public int InterConverts { get; private set; }
|
|
|
|
public bool? IsValue(object value, PropertyValueLevel level)
|
|
=> value != null && (!(value is string) || string.IsNullOrWhiteSpace((string)value) == false);
|
|
|
|
public bool IsConverter(IPublishedPropertyType propertyType)
|
|
=> propertyType.EditorAlias.InvariantEquals("Umbraco.Void");
|
|
|
|
public Type GetPropertyValueType(IPublishedPropertyType propertyType)
|
|
=> typeof(int);
|
|
|
|
public PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
|
|
=> _cacheLevel;
|
|
|
|
public object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object source, bool preview)
|
|
{
|
|
SourceConverts++;
|
|
return int.TryParse(source as string, out var i) ? i : 0;
|
|
}
|
|
|
|
public object ConvertIntermediateToObject(
|
|
IPublishedElement owner,
|
|
IPublishedPropertyType propertyType,
|
|
PropertyCacheLevel referenceCacheLevel,
|
|
object inter,
|
|
bool preview)
|
|
{
|
|
InterConverts++;
|
|
return (int)inter;
|
|
}
|
|
|
|
public object ConvertIntermediateToXPath(
|
|
IPublishedElement owner,
|
|
IPublishedPropertyType propertyType,
|
|
PropertyCacheLevel referenceCacheLevel,
|
|
object inter,
|
|
bool preview)
|
|
=> ((int)inter).ToString();
|
|
}
|
|
}
|