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

Refactor setting arrays to sets (#16058)

Browse Source 
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
This commit is contained in:
Ronald Barendse
2024-12-02 15:50:23 +01:00
committed by GitHub
parent 303758d1b2
commit 0d1cdd1bb4
23 changed files with 107 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/RequestHandlerSettingsTests.cs
View File

@@ -11,17 +11,18 @@ public class RequestHandlerSettingsTests
[Test]
public void Given_CharCollection_With_DefaultEnabled_MergesCollection()
{
var userCollection = new CharItem[]
var settings = new RequestHandlerSettings
{
new() { Char = "test", Replacement = "replace" },
new() { Char = "test2", Replacement = "replace2" },
UserDefinedCharCollection =
{
new() { Char = "test", Replacement = "replace" },
new() { Char = "test2", Replacement = "replace2" },
}
};
var settings = new RequestHandlerSettings { UserDefinedCharCollection = userCollection };
var actual = settings.GetCharReplacements().ToList();
var expectedCollection = RequestHandlerSettings.DefaultCharCollection.ToList();
expectedCollection.AddRange(userCollection);
expectedCollection.AddRange(settings.UserDefinedCharCollection);
Assert.AreEqual(expectedCollection.Count, actual.Count);
Assert.That(actual, Is.EquivalentTo(expectedCollection));
@@ -30,33 +31,32 @@ public class RequestHandlerSettingsTests
[Test]
public void Given_CharCollection_With_DefaultDisabled_ReturnsUserCollection()
{
var userCollection = new CharItem[]
{
new() { Char = "test", Replacement = "replace" },
new() { Char = "test2", Replacement = "replace2" },
};
var settings = new RequestHandlerSettings
{
UserDefinedCharCollection = userCollection,
UserDefinedCharCollection =
{
new() { Char = "test", Replacement = "replace" },
new() { Char = "test2", Replacement = "replace2" },
},
EnableDefaultCharReplacements = false,
};
var actual = settings.GetCharReplacements().ToList();
Assert.AreEqual(userCollection.Length, actual.Count);
Assert.That(actual, Is.EquivalentTo(userCollection));
Assert.AreEqual(settings.UserDefinedCharCollection.Count, actual.Count);
Assert.That(actual, Is.EquivalentTo(settings.UserDefinedCharCollection));
}
[Test]
public void Given_CharCollection_That_OverridesDefaultValues_ReturnsReplacements()
{
var userCollection = new CharItem[]
var settings = new RequestHandlerSettings
{
new() { Char = "%", Replacement = "percent" },
new() { Char = ".", Replacement = "dot" },
UserDefinedCharCollection =
{
new() { Char = "%", Replacement = "percent" },
new() { Char = ".", Replacement = "dot" },
}
};
var settings = new RequestHandlerSettings { UserDefinedCharCollection = userCollection };
var actual = settings.GetCharReplacements().ToList();
Assert.AreEqual(RequestHandlerSettings.DefaultCharCollection.Length, actual.Count);
@@ -70,14 +70,15 @@ public class RequestHandlerSettingsTests
[Test]
public void Given_CharCollection_That_OverridesDefaultValues_And_ContainsNew_ReturnsMergedWithReplacements()
{
var userCollection = new CharItem[]
var settings = new RequestHandlerSettings
{
new() { Char = "%", Replacement = "percent" },
new() { Char = ".", Replacement = "dot" },
new() { Char = "new", Replacement = "new" },
UserDefinedCharCollection =
{
new() { Char = "%", Replacement = "percent" },
new() { Char = ".", Replacement = "dot" },
new() { Char = "new", Replacement = "new" },
}
};
var settings = new RequestHandlerSettings { UserDefinedCharCollection = userCollection };
var actual = settings.GetCharReplacements().ToList();
// Add 1 to the length, because we're expecting to only add one new one

18
tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/ContentSettingsValidatorTests.cs
View File

@@ -41,16 +41,16 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validati
private static ContentSettings BuildContentSettings(string culture = "en-US", string autoFillImagePropertyAlias = "testAlias") =>
new ContentSettings
{
Error404Collection = new ContentErrorPage[]
{
new() { Culture = culture, ContentId = 1 },
},
Imaging = new ContentImagingSettings
Error404Collection =
{
AutoFillImageProperties = new ImagingAutoFillUploadField[]
{
new() { Alias = autoFillImagePropertyAlias, WidthFieldAlias = "w", HeightFieldAlias = "h", LengthFieldAlias = "l", ExtensionFieldAlias = "e" },
},
new() { Culture = culture, ContentId = 1 },
},
Imaging =
{
AutoFillImageProperties =
{
new() { Alias = autoFillImagePropertyAlias, WidthFieldAlias = "w", HeightFieldAlias = "h", LengthFieldAlias = "l", ExtensionFieldAlias = "e" },
},
},
};
}