From 1c4893d3c8d0504f8a9dd43cd7970bc0effffe27 Mon Sep 17 00:00:00 2001
From: Nikolaj <nel@umbraco.dk>
Date: Tue, 24 Aug 2021 11:02:51 +0200
Subject: [PATCH] Fix Tests

---
 .../Services/ContentServiceTests.cs                      | 9 +++++++--
 .../Services/PropertyValidationServiceTests.cs           | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
index 60441a013d..75b2e62bf9 100644
--- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
@@ -9,6 +9,7 @@ using System.Threading;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
@@ -72,13 +73,17 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
 
         private IJsonSerializer Serializer => GetRequiredService<IJsonSerializer>();
 
+        private IValueEditorCache ValueEditorCache => GetRequiredService<IValueEditorCache>();
+
         [SetUp]
         public void Setup() => ContentRepositoryBase.ThrowOnWarning = true;
 
         protected override void CustomTestSetup(IUmbracoBuilder builder) => builder
             .AddNotificationHandler<ContentPublishingNotification, ContentNotificationHandler>()
             .AddNotificationHandler<ContentCopyingNotification, ContentNotificationHandler>()
-            .AddNotificationHandler<ContentCopiedNotification, ContentNotificationHandler>();
+            .AddNotificationHandler<ContentCopiedNotification, ContentNotificationHandler>()
+            .AddNotificationHandler<DataTypeSavedNotification, ValueEditorCacheRefresher>()
+            .AddNotificationHandler<DataTypeDeletedNotification, ValueEditorCacheRefresher>();
 
         [TearDown]
         public void Teardown() => ContentRepositoryBase.ThrowOnWarning = false;
@@ -1162,7 +1167,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
             Assert.IsFalse(content.HasIdentity);
 
             // content cannot publish values because they are invalid
-            var propertyValidationService = new PropertyValidationService(PropertyEditorCollection, DataTypeService, TextService);
+            var propertyValidationService = new PropertyValidationService(PropertyEditorCollection, DataTypeService, TextService, ValueEditorCache);
             bool isValid = propertyValidationService.IsPropertyDataValid(content, out IProperty[] invalidProperties, CultureImpact.Invariant);
             Assert.IsFalse(isValid);
             Assert.IsNotEmpty(invalidProperties);
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/PropertyValidationServiceTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/PropertyValidationServiceTests.cs
index bfbe6258cc..942ba8cf4a 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/PropertyValidationServiceTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/PropertyValidationServiceTests.cs
@@ -5,6 +5,7 @@ using System.Threading;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models;
@@ -45,7 +46,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Services
 
             var propEditors = new PropertyEditorCollection(new DataEditorCollection(() => new[] { dataEditor }));
 
-            validationService = new PropertyValidationService(propEditors, dataTypeService.Object, Mock.Of<ILocalizedTextService>());
+            validationService = new PropertyValidationService(propEditors, dataTypeService.Object, Mock.Of<ILocalizedTextService>(), new ValueEditorCache());
         }
 
         [Test]