yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Performance improvement: Reusable data editors (#12921)

Browse Source 
* Introduce opt-in option for reusable data editors

* Verified RTE as reusable

* Make attribute property naming more explicit + update comments

* Test file upload and image cropper

* Add unit tests
This commit is contained in:
Kenn Jacobsen
2022-08-31 11:03:34 +02:00
committed by GitHub
parent 748fb7d1f7
commit 44122c6509
36 changed files with 213 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueEditorReuseTests.cs Normal file
View File

@@ -0,0 +1,132 @@
using System.Linq;
using Microsoft.Extensions.Logging;
using Moq;
using NUnit.Framework;
using Umbraco.Cms.Core.IO;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Serialization;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Strings;
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors;
[TestFixture]
public class DataValueEditorReuseTests
{
private Mock<IDataValueEditorFactory> _dataValueEditorFactoryMock;
private PropertyEditorCollection _propertyEditorCollection;
[SetUp]
public void SetUp()
{
_dataValueEditorFactoryMock = new Mock<IDataValueEditorFactory>();
_dataValueEditorFactoryMock
.Setup(m => m.Create<TextOnlyValueEditor>(It.IsAny<DataEditorAttribute>()))
.Returns(() => new TextOnlyValueEditor(
new DataEditorAttribute("a", "b", "c"),
Mock.Of<ILocalizedTextService>(),
Mock.Of<IShortStringHelper>(),
Mock.Of<IJsonSerializer>(),
Mock.Of<IIOHelper>()));
_propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<IDataEditor>));
_dataValueEditorFactoryMock
.Setup(m =>
m.Create<BlockEditorPropertyEditor.BlockEditorPropertyValueEditor>(It.IsAny<DataEditorAttribute>()))
.Returns(() => new BlockEditorPropertyEditor.BlockEditorPropertyValueEditor(
new DataEditorAttribute("a", "b", "c"),
_propertyEditorCollection,
Mock.Of<IDataTypeService>(),
Mock.Of<IContentTypeService>(),
Mock.Of<ILocalizedTextService>(),
Mock.Of<ILogger<BlockEditorPropertyEditor.BlockEditorPropertyValueEditor>>(),
Mock.Of<IShortStringHelper>(),
Mock.Of<IJsonSerializer>(),
Mock.Of<IIOHelper>(),
Mock.Of<IPropertyValidationService>()));
}
[Test]
public void GetValueEditor_Reusable_Value_Editor_Is_Reused_When_Created_Without_Configuration()
{
var textboxPropertyEditor = new TextboxPropertyEditor(
_dataValueEditorFactoryMock.Object,
Mock.Of<IIOHelper>(),
Mock.Of<IEditorConfigurationParser>());
// textbox is set to reuse its data value editor when created *without* configuration
var dataValueEditor1 = textboxPropertyEditor.GetValueEditor();
Assert.NotNull(dataValueEditor1);
var dataValueEditor2 = textboxPropertyEditor.GetValueEditor();
Assert.NotNull(dataValueEditor2);
Assert.AreSame(dataValueEditor1, dataValueEditor2);
_dataValueEditorFactoryMock.Verify(
m => m.Create<TextOnlyValueEditor>(It.IsAny<DataEditorAttribute>()),
Times.Once);
}
[Test]
public void GetValueEditor_Reusable_Value_Editor_Is_Not_Reused_When_Created_With_Configuration()
{
var textboxPropertyEditor = new TextboxPropertyEditor(
_dataValueEditorFactoryMock.Object,
Mock.Of<IIOHelper>(),
Mock.Of<IEditorConfigurationParser>());
// no matter what, a property editor should never reuse its data value editor when created *with* configuration
var dataValueEditor1 = textboxPropertyEditor.GetValueEditor("config");
Assert.NotNull(dataValueEditor1);
Assert.AreEqual("config", ((DataValueEditor)dataValueEditor1).Configuration);
var dataValueEditor2 = textboxPropertyEditor.GetValueEditor("config");
Assert.NotNull(dataValueEditor2);
Assert.AreEqual("config", ((DataValueEditor)dataValueEditor2).Configuration);
Assert.AreNotSame(dataValueEditor1, dataValueEditor2);
_dataValueEditorFactoryMock.Verify(
m => m.Create<TextOnlyValueEditor>(It.IsAny<DataEditorAttribute>()),
Times.Exactly(2));
}
[Test]
public void GetValueEditor_Not_Reusable_Value_Editor_Is_Not_Reused_When_Created_Without_Configuration()
{
var blockListPropertyEditor = new BlockListPropertyEditor(
_dataValueEditorFactoryMock.Object,
new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<IDataEditor>)),
Mock.Of<IIOHelper>(),
Mock.Of<IEditorConfigurationParser>());
// block list is *not* set to reuse its data value editor
var dataValueEditor1 = blockListPropertyEditor.GetValueEditor();
Assert.NotNull(dataValueEditor1);
var dataValueEditor2 = blockListPropertyEditor.GetValueEditor();
Assert.NotNull(dataValueEditor2);
Assert.AreNotSame(dataValueEditor1, dataValueEditor2);
_dataValueEditorFactoryMock.Verify(
m => m.Create<BlockEditorPropertyEditor.BlockEditorPropertyValueEditor>(It.IsAny<DataEditorAttribute>()),
Times.Exactly(2));
}
[Test]
public void GetValueEditor_Not_Reusable_Value_Editor_Is_Not_Reused_When_Created_With_Configuration()
{
var blockListPropertyEditor = new BlockListPropertyEditor(
_dataValueEditorFactoryMock.Object,
new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<IDataEditor>)),
Mock.Of<IIOHelper>(),
Mock.Of<IEditorConfigurationParser>());
// no matter what, a property editor should never reuse its data value editor when created *with* configuration
var dataValueEditor1 = blockListPropertyEditor.GetValueEditor("config");
Assert.NotNull(dataValueEditor1);
Assert.AreEqual("config", ((DataValueEditor)dataValueEditor1).Configuration);
var dataValueEditor2 = blockListPropertyEditor.GetValueEditor("config");
Assert.NotNull(dataValueEditor2);
Assert.AreEqual("config", ((DataValueEditor)dataValueEditor2).Configuration);
Assert.AreNotSame(dataValueEditor1, dataValueEditor2);
_dataValueEditorFactoryMock.Verify(
m => m.Create<BlockEditorPropertyEditor.BlockEditorPropertyValueEditor>(It.IsAny<DataEditorAttribute>()),
Times.Exactly(2));
}
}