OrchardCMS · hishamco · Jan 3, 2024 · Jan 3, 2024 · Jan 10, 2024 · Jan 10, 2024
diff --git a/src/OrchardCore.Build/Dependencies.AspNetCore.props b/src/OrchardCore.Build/Dependencies.AspNetCore.props
@@ -48,6 +48,7 @@
   <!-- 'Microsoft.Extensions' packages that are not included in the ASP.NET Core shared framework -->
   <ItemGroup>
     <PackageManagement Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="$(MicrosoftExtensionsPackagesVersion)" />
+    <PackageManagement Include="Microsoft.Extensions.Diagnostics.Testing" Version="$(MicrosoftExtensionsPackagesVersion)" />
     <PackageManagement Include="Microsoft.Extensions.Http.Polly" Version="$(MicrosoftExtensionsPackagesVersion)" />
   </ItemGroup>
 

diff --git a/test/OrchardCore.Tests/Email/EmailTests.cs b/test/OrchardCore.Tests/Email/EmailTests.cs
@@ -268,9 +268,9 @@ private static ISmtpService CreateSmtpService(SmtpSettings settings)
             var options = new Mock<IOptions<SmtpSettings>>();
             options.Setup(o => o.Value).Returns(settings);
 
-            var logger = new Mock<ILogger<SmtpService>>();
+            var logger = new FakeLogger<SmtpService>();
             var localizer = new Mock<IStringLocalizer<SmtpService>>();
-            var smtp = new SmtpService(options.Object, logger.Object, localizer.Object);
+            var smtp = new SmtpService(options.Object, logger, localizer.Object);
 
             return smtp;
         }

diff --git a/test/OrchardCore.Tests/Extensions/ExtensionManagerTests.cs b/test/OrchardCore.Tests/Extensions/ExtensionManagerTests.cs
@@ -36,7 +36,7 @@ public ExtensionManagerTests()
                 new[] { new ExtensionPriorityStrategy() },
                 new TypeFeatureProvider(),
                 _moduleFeatureProvider,
-                new NullLogger<ExtensionManager>()
+                new FakeLogger<ExtensionManager>()
                 );
 
             _themeScopedExtensionManager = new ExtensionManager(
@@ -45,7 +45,7 @@ public ExtensionManagerTests()
                 new[] { new ExtensionPriorityStrategy() },
                 new TypeFeatureProvider(),
                 _themeFeatureProvider,
-                new NullLogger<ExtensionManager>()
+                new FakeLogger<ExtensionManager>()
                 );
 
             _moduleThemeScopedExtensionManager = new ExtensionManager(
@@ -54,7 +54,7 @@ public ExtensionManagerTests()
                 new[] { new ExtensionPriorityStrategy() },
                 new TypeFeatureProvider(),
                 _themeFeatureProvider,
-                new NullLogger<ExtensionManager>()
+                new FakeLogger<ExtensionManager>()
                 );
         }
 

diff --git a/test/OrchardCore.Tests/Localization/PortableObjectStringLocalizerTests.cs b/test/OrchardCore.Tests/Localization/PortableObjectStringLocalizerTests.cs
@@ -6,12 +6,12 @@ namespace OrchardCore.Tests.Localization
     public class PortableObjectStringLocalizerTests
     {
         private readonly Mock<ILocalizationManager> _localizationManager;
-        private readonly Mock<ILogger> _logger;
+        private readonly FakeLogger _logger;
 
         public PortableObjectStringLocalizerTests()
         {
             _localizationManager = new Mock<ILocalizationManager>();
-            _logger = new Mock<ILogger>();
+            _logger = new FakeLogger();
         }
 
         [Fact]
@@ -21,7 +21,7 @@ public void LocalizerReturnsTranslationsFromProvidedDictionary()
                 new CultureDictionaryRecord("ball", "míč", "míče", "míčů")
             });
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
+            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger);
             using (CultureScope.Create("cs"))
             {
 
@@ -38,7 +38,7 @@ public void LocalizerReturnsOriginalTextIfTranslationsDoesntExistInProvidedDicti
                 new CultureDictionaryRecord("ball", "míč", "míče", "míčů")
             });
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
+            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger);
             using (CultureScope.Create("cs"))
             {
                 var translation = localizer["car"];
@@ -52,7 +52,7 @@ public void LocalizerReturnsOriginalTextIfDictionaryIsEmpty()
         {
             SetupDictionary("cs", Array.Empty<CultureDictionaryRecord>());
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
+            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger);
             using (CultureScope.Create("cs"))
             {
                 var translation = localizer["car"];
@@ -72,7 +72,7 @@ public void LocalizerFallbacksToParentCultureIfTranslationDoesntExistInSpecificC
                 new CultureDictionaryRecord("car", "auto", "auta", "aut")
             });
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
+            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger);
             using (CultureScope.Create("cs-cz"))
             {
                 var translation = localizer["ball"];
@@ -92,7 +92,7 @@ public void LocalizerReturnsTranslationFromSpecificCultureIfItExists()
                 new CultureDictionaryRecord("ball", "balón", "balóny", "balónů")
             });
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
+            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger);
             using (CultureScope.Create("cs-CZ"))
             {
                 var translation = localizer["ball"];
@@ -109,7 +109,7 @@ public void LocalizerReturnsTranslationWithSpecificContext()
                 new CultureDictionaryRecord("ball", "small",  new [] { "míček", "míčky", "míčků" })
             });
 
-            var localizer = new PortableObjectStringLocalizer("small", _localizationManager.Object, true, _logger.Object);
+            var localizer = new PortableObjectStringLocalizer("small", _localizationManager.Object, true, _logger);
             using (CultureScope.Create("cs"))
             {
                 var translation = localizer["ball"];
@@ -126,7 +126,7 @@ public void LocalizerReturnsTranslationWithoutContextIfTranslationWithContextDoe
                 new CultureDictionaryRecord("ball", "big", new [] { "míček", "míčky", "míčků" })
             });
 
-            var localizer = new PortableObjectStringLocalizer("small", _localizationManager.Object, true, _logger.Object);
+            var localizer = new PortableObjectStringLocalizer("small", _localizationManager.Object, true, _logger);
             using (CultureScope.Create("cs"))
             {
                 var translation = localizer["ball"];
@@ -142,7 +142,7 @@ public void LocalizerReturnsFormattedTranslation()
                 new CultureDictionaryRecord("The page (ID:{0}) was deleted.", "Stránka (ID:{0}) byla smazána.")
             });
 
-            var localizer = new PortableObjectStringLocalizer("small", _localizationManager.Object, true, _logger.Object);
+            var localizer = new PortableObjectStringLocalizer("small", _localizationManager.Object, true, _logger);
             using (CultureScope.Create("cs"))
             {
                 var translation = localizer["The page (ID:{0}) was deleted.", 1];
@@ -158,7 +158,7 @@ public void HtmlLocalizerDoesNotFormatTwiceIfFormattedTranslationContainsCurlyBr
                 new CultureDictionaryRecord("The page (ID:{0}) was deleted.", "Stránka (ID:{0}) byla smazána.")
             });
 
-            var localizer = new PortableObjectStringLocalizer("small", _localizationManager.Object, true, _logger.Object);
+            var localizer = new PortableObjectStringLocalizer("small", _localizationManager.Object, true, _logger);
             using (CultureScope.Create("cs"))
             {
                 var htmlLocalizer = new PortableObjectHtmlLocalizer(localizer);
@@ -190,7 +190,7 @@ public void LocalizerReturnsOriginalTextForPluralIfTranslationDoesntExist(string
                 new CultureDictionaryRecord("ball", "míč", "míče", "míčů"),
             });
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
+            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger);
             using (CultureScope.Create("cs"))
             {
                 var translation = localizer.Plural(count, "car", "cars");
@@ -212,7 +212,7 @@ public void LocalizerReturnsCorrectTranslationForPluralIfNoPluralFormsSpecified(
 
             SetupDictionary(culture, new[] { new CultureDictionaryRecord("ball", translations), }, rule);
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
+            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger);
             var translation = localizer.Plural(count, "ball", "{0} balls", count);
 
             Assert.Equal(expected, translation);
@@ -228,7 +228,7 @@ public void LocalizerReturnsTranslationInCorrectPluralForm(string expected, int
                 new CultureDictionaryRecord("ball", "míč", "{0} míče", "{0} míčů"),
             });
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
+            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger);
             using (CultureScope.Create("cs"))
             {
                 var translation = localizer.Plural(count, "ball", "{0} balls", count);
@@ -245,7 +245,7 @@ public void LocalizerReturnsOriginalValuesIfTranslationDoesntExistAndMultiplePlu
         {
             SetupDictionary("en", Array.Empty<CultureDictionaryRecord>());
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
+            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger);
             using (CultureScope.Create("en"))
             {
                 var translation = localizer.Plural(count, new[] { "míč", "{0} míče", "{0} míčů" }, count);
@@ -264,7 +264,7 @@ public void LocalizerReturnsCorrectPluralFormIfMultiplePluraflFormsAreSpecified(
                 new CultureDictionaryRecord("míč", "ball", "{0} balls")
             }, PluralizationRule.English);
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger.Object);
+            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, true, _logger);
             using (CultureScope.Create("en"))
             {
                 var translation = localizer.Plural(count, new[] { "míč", "{0} míče", "{0} míčů" }, count);
@@ -285,7 +285,7 @@ public void LocalizerFallBackToParentCultureIfFallBackToParentUICulturesIsTrue(b
 
             SetupDictionary("ar-YE", Array.Empty<CultureDictionaryRecord>(), PluralizationRule.Arabic);
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, fallBackToParentCulture, _logger.Object);
+            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, fallBackToParentCulture, _logger);
             using (CultureScope.Create("ar-YE"))
             {
                 var translation = localizer[resourceKey];
@@ -313,7 +313,7 @@ public void LocalizerReturnsGetAllStrings(bool includeParentCultures, string[] e
                 new CultureDictionaryRecord("Product", "منتج")
             }, PluralizationRule.Arabic);
 
-            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, false, _logger.Object);
+            var localizer = new PortableObjectStringLocalizer(null, _localizationManager.Object, false, _logger);
             using (CultureScope.Create("ar-YE"))
             {
                 var translations = localizer.GetAllStrings(includeParentCultures).Select(l => l.Value).ToArray();
@@ -336,7 +336,7 @@ public void LocalizerWithContextShouldCallGetDictionaryOncePerCulture(string cul
             // Arrange
             SetupDictionary(culture, Array.Empty<CultureDictionaryRecord>());
 
-            var localizer = new PortableObjectStringLocalizer("context", _localizationManager.Object, true, _logger.Object);
+            var localizer = new PortableObjectStringLocalizer("context", _localizationManager.Object, true, _logger);
             CultureInfo.CurrentUICulture = new CultureInfo(culture);
 
             // Act

diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.Email/Workflows/EmailTaskTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.Email/Workflows/EmailTaskTests.cs
@@ -46,9 +46,9 @@ public async Task ExecuteTask_WhenToAndCcAndBccAreNotSet_ShouldFails()
         private static ISmtpService CreateSmtpService(SmtpSettings settings)
         {
             var options = new Mock<IOptions<SmtpSettings>>();
-            var logger = new Mock<ILogger<SmtpService>>();
+            var logger = new FakeLogger<SmtpService>();
             var localizer = new Mock<IStringLocalizer<SmtpService>>();
-            var smtp = new SmtpService(options.Object, logger.Object, localizer.Object);
+            var smtp = new SmtpService(options.Object, logger, localizer.Object);
 
             options.Setup(o => o.Value).Returns(settings);
 

diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.Media/AssetUrlShortcodeTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.Media/AssetUrlShortcodeTests.cs
@@ -33,7 +33,7 @@ public async Task ShouldProcess(string cdnBaseUrl, string text, string expected)
                 cdnBaseUrl,
                 Enumerable.Empty<IMediaEventHandler>(),
                 Enumerable.Empty<IMediaCreatingEventHandler>(),
-                Mock.Of<ILogger<DefaultMediaFileStore>>());
+                new FakeLogger<DefaultMediaFileStore>());
 
             var sanitizer = new HtmlSanitizerService(Options.Create(new HtmlSanitizerOptions()));
 

diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.Media/ImageShortcodeTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.Media/ImageShortcodeTests.cs
@@ -47,7 +47,7 @@ public async Task ShouldProcess(string cdnBaseUrl, string text, string expected)
                 cdnBaseUrl,
                 Enumerable.Empty<IMediaEventHandler>(),
                 Enumerable.Empty<IMediaCreatingEventHandler>(),
-                Mock.Of<ILogger<DefaultMediaFileStore>>());
+                new FakeLogger<DefaultMediaFileStore>());
 
             var fileVersionProvider = Mock.Of<IFileVersionProvider>();
 

diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.Tenants/ApiControllerTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.Tenants/ApiControllerTests.cs
@@ -174,7 +174,7 @@ private ApiController CreateController()
             Enumerable.Empty<DatabaseProvider>(),
             tenantValidator,
             Mock.Of<IStringLocalizer<ApiController>>(),
-            Mock.Of<ILogger<ApiController>>())
+            new FakeLogger<ApiController>())
         {
             ControllerContext = new ControllerContext { HttpContext = CreateHttpContext() }
         };

diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.Twitter/TwitterClientTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.Twitter/TwitterClientTests.cs
@@ -66,7 +66,7 @@ public async Task HttpRequestMessageShouldHaveCorrectSignedOAuthHeader()
                 );
 
             var mockTwitterClient = new Mock<TwitterClient>(
-                new HttpClient(_mockFakeHttpMessageHandler.Object), Mock.Of<ILogger<TwitterClient>>())
+                new HttpClient(_mockFakeHttpMessageHandler.Object), new FakeLogger<TwitterClient>())
             {
                 CallBase = true,
             };

diff --git a/test/OrchardCore.Tests/OrchardCore.Tests.csproj b/test/OrchardCore.Tests/OrchardCore.Tests.csproj
@@ -61,6 +61,7 @@
   <ItemGroup>
     <PackageReference Include="AngleSharp" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="System.Linq.Async" />
     <PackageReference Include="Moq" />

diff --git a/test/OrchardCore.Tests/OrchardCore.Users/RegistrationControllerTests.cs b/test/OrchardCore.Tests/OrchardCore.Users/RegistrationControllerTests.cs
@@ -166,7 +166,7 @@ private static RegistrationController SetupRegistrationController(RegistrationSe
                 Mock.Of<IAuthorizationService>(),
                 mockSiteService,
                 Mock.Of<INotifier>(),
-                Mock.Of<ILogger<RegistrationController>>(),
+                new FakeLogger<RegistrationController>(),
                 Mock.Of<IHtmlLocalizer<RegistrationController>>(),
                 mockStringLocalizer.Object)
             {

diff --git a/test/OrchardCore.Tests/Recipes/RecipeExecutorTests.cs b/test/OrchardCore.Tests/Recipes/RecipeExecutorTests.cs
@@ -29,12 +29,12 @@ public async Task ShouldTrimValidScriptExpression(string recipeName, string expe
                     .Returns(GetScopeAsync);
 
                 var recipeEventHandlers = new List<IRecipeEventHandler> { new RecipeEventHandler() };
-                var loggerMock = new Mock<ILogger<RecipeExecutor>>();
+                var logger = new FakeLogger<RecipeExecutor>();
                 var recipeExecutor = new RecipeExecutor(
                     shellHostMock.Object,
                     scope.ShellContext.Settings,
                     recipeEventHandlers,
-                    loggerMock.Object);
+                    logger);
 
                 // Act
                 var executionId = Guid.NewGuid().ToString("n");

diff --git a/test/OrchardCore.Tests/Usings.cs b/test/OrchardCore.Tests/Usings.cs
@@ -46,6 +46,7 @@
 global using Microsoft.Extensions.Localization;
 global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.Logging.Abstractions;
+global using Microsoft.Extensions.Logging.Testing;
 global using Microsoft.Extensions.Options;
 global using Microsoft.Extensions.Primitives;
 global using Moq;

diff --git a/test/OrchardCore.Tests/Workflows/WorkflowManagerTests.cs b/test/OrchardCore.Tests/Workflows/WorkflowManagerTests.cs
@@ -83,7 +83,7 @@ private static IWorkflowScriptEvaluator CreateWorkflowScriptEvaluator(IServicePr
             return new JavaScriptWorkflowScriptEvaluator(
                 scriptingManager,
                 workflowContextHandlers.Resolve(),
-                new Mock<ILogger<JavaScriptWorkflowScriptEvaluator>>().Object
+                new FakeLogger<JavaScriptWorkflowScriptEvaluator>()
             );
         }
 
@@ -100,9 +100,9 @@ WorkflowType workflowType
             var workflowIdGenerator = new Mock<IWorkflowIdGenerator>();
             workflowIdGenerator.Setup(x => x.GenerateUniqueId(It.IsAny<Workflow>())).Returns(IdGenerator.GenerateId());
             var distributedLock = new Mock<IDistributedLock>();
-            var workflowManagerLogger = new Mock<ILogger<WorkflowManager>>();
-            var workflowContextLogger = new Mock<ILogger<WorkflowExecutionContext>>();
-            var missingActivityLogger = new Mock<ILogger<MissingActivity>>();
+            var workflowManagerLogger = new FakeLogger<WorkflowManager>();
+            var workflowContextLogger = new FakeLogger<WorkflowExecutionContext>();
+            var missingActivityLogger = new FakeLogger<MissingActivity>();
             var missingActivityLocalizer = new Mock<IStringLocalizer<MissingActivity>>();
             var clock = new Mock<IClock>();
             var workflowFaultHandler = new Mock<IWorkflowFaultHandler>();
@@ -114,8 +114,8 @@ WorkflowType workflowType
                 workflowValueSerializers,
                 workflowFaultHandler.Object,
                 distributedLock.Object,
-                workflowManagerLogger.Object,
-                missingActivityLogger.Object,
+                workflowManagerLogger,
+                missingActivityLogger,
                 missingActivityLocalizer.Object,
                 clock.Object
                 );