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

ValueListConfiguration should not use ValueListItem (#15796)

Browse Source 
* ValueListConfiguration should not use ValueListItem

* Fix test
This commit is contained in:
Kenn Jacobsen
2024-02-29 15:10:54 +01:00
committed by GitHub
parent b8577e3af2
commit 47d07bf2d8
4 changed files with 16 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/EnsureUniqueValuesValidatorTest.cs
View File

@@ -16,7 +16,7 @@ public class EnsureUniqueValuesValidatorTest
=> new SystemTextConfigurationEditorJsonSerializer();
[Test]
public void Expects_Array_Of_ValueListItems_Not_Single_String()
public void Expects_Array_Of_String_Not_Single_String()
{
var validator = new ValueListUniqueValueValidator(ConfigurationEditorJsonSerializer());
var result = validator.Validate(
@@ -27,7 +27,7 @@ public class EnsureUniqueValuesValidatorTest
}
[Test]
public void Expects_Array_Of_ValueListItems_Not_Array_Of_String()
public void Expects_Array_Of_String()
{
var validator = new ValueListUniqueValueValidator(ConfigurationEditorJsonSerializer());
var result =
@@ -35,7 +35,7 @@ public class EnsureUniqueValuesValidatorTest
new JsonArray("hello", "world"),
null,
null);
Assert.AreEqual(1, result.Count());
Assert.AreEqual(0, result.Count());
}
[Test]
@@ -44,9 +44,7 @@ public class EnsureUniqueValuesValidatorTest
var validator = new ValueListUniqueValueValidator(ConfigurationEditorJsonSerializer());
var result =
validator.Validate(
new JsonArray(
JsonNode.Parse("""{"value": "hello"}"""),
JsonNode.Parse("""{"value": "world"}""")),
new JsonArray("one", "two", "three"),
null,
null);
Assert.AreEqual(0, result.Count());
@@ -58,9 +56,7 @@ public class EnsureUniqueValuesValidatorTest
var validator = new ValueListUniqueValueValidator(ConfigurationEditorJsonSerializer());
var result =
validator.Validate(
new JsonArray(
JsonNode.Parse("""{"value": "hello"}"""),
JsonNode.Parse("""{"value": "hello"}""")),
new JsonArray("one", "one"),
null,
null);
Assert.AreEqual(1, result.Count());
@@ -72,11 +68,7 @@ public class EnsureUniqueValuesValidatorTest
var validator = new ValueListUniqueValueValidator(ConfigurationEditorJsonSerializer());
var result =
validator.Validate(
new JsonArray(
JsonNode.Parse("""{"value": "hello"}"""),
JsonNode.Parse("""{"value": "hello"}"""),
JsonNode.Parse("""{"value": "world"}"""),
JsonNode.Parse("""{"value": "world"}""")),
new JsonArray("one", "two", "three", "one", "two"),
null,
null);
Assert.AreEqual(2, result.Count());

28
tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/MultiValuePropertyEditorTests.cs
View File

@@ -1,7 +1,6 @@
// Copyright (c) Umbraco.
// See LICENSE for more details.
using System.Globalization;
using Moq;
using NUnit.Framework;
using Umbraco.Cms.Core;
@@ -42,12 +41,7 @@ public class MultiValuePropertyEditorTests
.FromConfigurationObject(
new ValueListConfiguration
{
Items = new List<ValueListConfiguration.ValueListItem>
{
new() { Value = "Value 1" },
new() { Value = "Value 2" },
new() { Value = "Value 3" },
},
Items = ["Value 1", "Value 2", "Value 3"]
},
serializer);
@@ -98,12 +92,7 @@ public class MultiValuePropertyEditorTests
.FromConfigurationObject(
new ValueListConfiguration
{
Items = new List<ValueListConfiguration.ValueListItem>
{
new() { Value = "Value 1" },
new() { Value = "Value 2" },
new() { Value = "Value 3" },
},
Items = ["Value 1", "Value 2", "Value 3"]
},
serializer);
@@ -152,12 +141,7 @@ public class MultiValuePropertyEditorTests
dataType.ConfigurationData = configurationEditor.FromConfigurationObject(
new ValueListConfiguration
{
Items = new List<ValueListConfiguration.ValueListItem>
{
new() { Value = "Item 1" },
new() { Value = "Item 2" },
new() { Value = "Item 3" },
},
Items = ["Item 1", "Item 2", "Item 3"]
},
serializer);
@@ -167,8 +151,8 @@ public class MultiValuePropertyEditorTests
Assert.NotNull(result);
Assert.AreEqual(3, result.Items.Count);
Assert.AreEqual("Item 1", result.Items[0].Value);
Assert.AreEqual("Item 2", result.Items[1].Value);
Assert.AreEqual("Item 3", result.Items[2].Value);
Assert.AreEqual("Item 1", result.Items[0]);
Assert.AreEqual("Item 2", result.Items[1]);
Assert.AreEqual("Item 3", result.Items[2]);
}
}