Fixed failing integration tests.

umbraco · Dec 21, 2024 · 1b86e7b · 1b86e7b
1 parent bf1e165
commit 1b86e7b
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 17 deletions.
diff --git a/tests/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs b/tests/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs
@@ -119,9 +119,9 @@ public DataTypeBuilder WithDatabaseType(ValueStorageType databaseType)
         return this;
     }
 
-    public DataTypeBuilder WithConfigurationData(Dictionary<string, object> configurationData)
+    public DataTypeBuilder AddOrUpdateConfigurationDataValue(string key, object value)
     {
-        _configurationData = configurationData;
+        _configurationData[key] = value;
         return this;
     }
 
@@ -143,9 +143,8 @@ public override DataType Build()
         var databaseType = _databaseType ?? ValueStorageType.Ntext;
         var sortOrder = _sortOrder ?? 0;
         var serializer = new SystemTextConfigurationEditorJsonSerializer();
-        var configurationData = _configurationData;
 
-        return new DataType(editor, serializer, parentId)
+        var dataType = new DataType(editor, serializer, parentId)
         {
             Id = id,
             Key = key,
@@ -158,8 +157,14 @@ public override DataType Build()
             Path = path,
             CreatorId = creatorId,
             DatabaseType = databaseType,
-            SortOrder = sortOrder,
-            ConfigurationData = configurationData,
+            SortOrder = sortOrder
         };
+
+        foreach (var item in _configurationData)
+        {
+            dataType.ConfigurationData[item.Key] = item.Value;
+        }
+
+        return dataType;
     }
 }
diff --git a/...Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueConverterTests.cs b/...Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueConverterTests.cs
@@ -66,17 +66,7 @@ public void CanConvertDatePickerPropertyEditor(string date, bool expected)
     [TestCase(null, true, true)]
     public void CanConvertYesNoPropertyEditor(object value, bool? initialStateConfigurationValue, bool expected)
     {
-        var dataTypeConfiguration = new Dictionary<string, object>();
-        if (initialStateConfigurationValue.HasValue)
-        {
-            dataTypeConfiguration.Add("default", initialStateConfigurationValue.Value);
-        }
-
-        var dataType = new DataTypeBuilder()
-            .WithConfigurationData(dataTypeConfiguration)
-            .Build();
-
-        var publishedDataType = new PublishedDataType(dataType.Id, dataType.EditorAlias, dataType.EditorUiAlias, new Lazy<object>(() => dataTypeConfiguration));
+        var publishedDataType = CreatePublishedDataType(initialStateConfigurationValue);
 
         var publishedPropertyTypeMock = new Mock<IPublishedPropertyType>();
         publishedPropertyTypeMock
@@ -90,6 +80,26 @@ public void CanConvertYesNoPropertyEditor(object value, bool? initialStateConfig
         Assert.AreEqual(expected, result);
     }
 
+    private static PublishedDataType CreatePublishedDataType(bool? initialStateConfigurationValue)
+    {
+        var dataTypeConfiguration = new Dictionary<string, object>();
+        if (initialStateConfigurationValue.HasValue)
+        {
+            dataTypeConfiguration.Add("default", initialStateConfigurationValue.Value);
+        }
+
+        var dataTypeBuilder = new DataTypeBuilder();
+
+        if (initialStateConfigurationValue.HasValue)
+        {
+            dataTypeBuilder = dataTypeBuilder.AddOrUpdateConfigurationDataValue("default", initialStateConfigurationValue.Value);
+        }
+
+        var dataType = dataTypeBuilder.Build();
+
+        return new PublishedDataType(dataType.Id, dataType.EditorAlias, dataType.EditorUiAlias, new Lazy<object>(() => dataTypeConfiguration));
+    }
+
     [TestCase("[\"apples\"]", new[] { "apples" })]
     [TestCase("[\"apples\",\"oranges\"]", new[] { "apples", "oranges" })]
     [TestCase("[\"apples\",\"oranges\",\"pears\"]", new[] { "apples", "oranges", "pears" })]