Merge pull request #45 from csf-dev/43-mandatory-logging

Resolve #43 - Logging is no longer mandatory

Author: craigfowler

CSF.Extensions.WebDriver.Tests/Factories/WebDriverFactoryIntegrationTests.cs

@@ -50,7 +50,7 @@ IConfiguration GetConfiguration()
 
     public class FakeWebDriverFactory : ICreatesWebDriverFromOptions
     {
-        public WebDriverAndOptions GetWebDriver(WebDriverCreationOptions options, Action<DriverOptions> supplementaryConfiguration = null)
+        public WebDriverAndOptions GetWebDriver(WebDriverCreationOptions options, Action<DriverOptions>? supplementaryConfiguration = null)
         {
             return new(Mock.Of<IWebDriver>(), Mock.Of<DriverOptions>());
         }

CSF.Extensions.WebDriver.Tests/ServiceCollectionExtensionsTests.cs

@@ -0,0 +1,18 @@
+using CSF.Extensions.WebDriver.Factories;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace CSF.Extensions.WebDriver;
+
+[TestFixture,Parallelizable]
+public class ServiceCollectionExtensionsTests
+{
+    [Test,AutoMoqData]
+    public void AddWebDriverFactoryWithoutOptionsPatternShouldNotCrashWhenResolvingBecauseOfMissingLogging()
+    {
+        var services = new ServiceCollection();
+        services.AddWebDriverFactoryWithoutOptionsPattern();
+        var serviceProvider = services.BuildServiceProvider();
+
+        Assert.That(serviceProvider.GetRequiredService<ICreatesWebDriverFromOptions>, Throws.Nothing);
+    }
+}

CSF.Extensions.WebDriver/ServiceCollectionExtensions.cs

@@ -1,11 +1,14 @@
 using System;
+using System.Linq;
 using Castle.DynamicProxy;
 using CSF.Extensions.WebDriver.Factories;
 using CSF.Extensions.WebDriver.Identification;
 using CSF.Extensions.WebDriver.Proxies;
 using CSF.Extensions.WebDriver.Quirks;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 
 namespace CSF.Extensions.WebDriver
@@ -164,6 +167,8 @@ public static IServiceCollection AddWebDriverFactoryWithoutOptionsPattern(this I
             services.AddTransient<IdentificationAugmenter>();
             services.AddTransient<UnproxyingAugmenter>();
 
+            AddLoggingIfNotAlreadyAdded(services);
+
             return services;
         }
 
@@ -241,6 +246,17 @@ static Func<IServiceProvider, IConfigureOptions<WebDriverCreationOptionsCollecti
                 return ActivatorUtilities.CreateInstance<WebDriverCreationConfigureOptions>(services, configSection, configureOptions);
             };
         }
+
+        static IServiceCollection AddLoggingIfNotAlreadyAdded(IServiceCollection services)
+        {
+            if(services.Any(s => s.ServiceType == typeof(ILoggerFactory)))
+                return services;
+
+            services.AddTransient<ILoggerFactory, NullLoggerFactory>();
+            services.AddTransient(typeof(ILogger<>), typeof(NullLogger<>));
+
+            return services;
+        }
     }
 }