From 1b7bd7bcd9180871307de57219e60ad49c1eeef3 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Thu, 17 Sep 2020 15:31:32 +0200 Subject: [PATCH] Register ILogger<> --- src/Umbraco.Tests/IO/FileSystemsTests.cs | 8 ++++++++ src/Umbraco.Tests/Testing/UmbracoTestBase.cs | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Tests/IO/FileSystemsTests.cs b/src/Umbraco.Tests/IO/FileSystemsTests.cs index c1d3fbb331..6fde147f10 100644 --- a/src/Umbraco.Tests/IO/FileSystemsTests.cs +++ b/src/Umbraco.Tests/IO/FileSystemsTests.cs @@ -1,6 +1,8 @@ using System; using System.IO; using System.Text; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Abstractions; using Moq; using NUnit.Framework; using Umbraco.Core; @@ -16,6 +18,7 @@ using Umbraco.Tests.TestHelpers; using Umbraco.Core.Composing.CompositionExtensions; using Current = Umbraco.Web.Composing.Current; using FileSystems = Umbraco.Core.IO.FileSystems; +using ILogger = Umbraco.Core.Logging.ILogger; namespace Umbraco.Tests.IO { @@ -35,6 +38,10 @@ namespace Umbraco.Tests.IO composition.Register(_ => Mock.Of()); composition.Register(_ => Mock.Of()); composition.Register(_ => Mock.Of()); + + composition.Register(new NullLoggerFactory()); + composition.Register(typeof(Microsoft.Extensions.Logging.ILogger<>), typeof(Logger<>)); + composition.Register(_ => TestHelper.ShortStringHelper); composition.Register(_ => TestHelper.IOHelper); composition.RegisterUnique(); @@ -44,6 +51,7 @@ namespace Umbraco.Tests.IO composition.Configs.Add(() => SettingsForTests.DefaultGlobalSettings); composition.Configs.Add(SettingsForTests.GenerateMockContentSettings); + composition.ComposeFileSystems(); composition.Configs.Add(SettingsForTests.GenerateMockContentSettings); diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs index 89097a3cba..936262046e 100644 --- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs +++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs @@ -198,7 +198,8 @@ namespace Umbraco.Tests.Testing Composition = new Composition(register, typeLoader, proflogger, ComponentTests.MockRuntimeState(RuntimeLevel.Run), TestHelper.GetConfigs(), TestHelper.IOHelper, AppCaches.NoCache); - + Composition.Register(new NullLoggerFactory()); + Composition.Register(typeof(Microsoft.Extensions.Logging.ILogger<>), typeof(Logger<>)); Composition.RegisterUnique(IOHelper); Composition.RegisterUnique(UriUtility);