#36 make it possible to override Startup (#38)

* #36 make it possible to override Startup

* put TestStartup to ThreadLocal

Author: knysh

Aquality.Selenium.Core/src/Aquality.Selenium.Core/Applications/Startup.cs

@@ -25,7 +25,7 @@ public class Startup
         /// <param name="applicationProvider">function that provides an instance of <see cref="IApplication"/></param>
         /// <param name="settings">File with settings for configuration of dependencies.
         /// Pass the result of <see cref="GetSettings"/> if you need to get settings from the embedded resource of your project.</param>
-        public void ConfigureServices(IServiceCollection services, Func<IServiceProvider, IApplication> applicationProvider, ISettingsFile settings = null)
+        public virtual IServiceCollection ConfigureServices(IServiceCollection services, Func<IServiceProvider, IApplication> applicationProvider, ISettingsFile settings = null)
         {
             settingsFile = settings ?? GetSettings();
             services.AddScoped(applicationProvider);
@@ -42,6 +42,7 @@ public void ConfigureServices(IServiceCollection services, Func<IServiceProvider
             services.AddTransient<ConditionalWait>();
             services.AddTransient<IElementFinder, ElementFinder>();
             services.AddTransient<IElementFactory, ElementFactory>();
+            return services;
         }
 
         /// <summary>

Aquality.Selenium.Core/tests/Aquality.Selenium.Core.Tests/Applications/ApplicationManagerTests.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Reflection;
+using System.Threading;
 using Aquality.Selenium.Core.Applications;
 using Aquality.Selenium.Core.Configurations;
 using Aquality.Selenium.Core.Utilities;
@@ -13,53 +14,95 @@ public class ApplicationManagerTests
         private const string SpecialSettingsFile = "special";
         private const string SpecialLanguageValue = "special";
         private static readonly TimeSpan SpecialTimeoutValue = TimeSpan.FromDays(1);
+        private const string SpecialLogger = "SpecialLogger";
 
         [Test]
         public void Should_BePossibleTo_RegisterCustomServices()
         {
-            Assert.IsInstanceOf<CustomTimeoutConfiguration>(ApplicationManager.ServiceProvider.GetService<ITimeoutConfiguration>());
+            Assert.IsInstanceOf<TestTimeoutConfiguration>(TestApplicationManager.ServiceProvider.GetService<ITimeoutConfiguration>());
         }
 
         [Test]
         public void Should_BePossibleTo_GetCustomValues()
         {
-            var timeoutConfiguration = ApplicationManager.ServiceProvider.GetService<ITimeoutConfiguration>() as CustomTimeoutConfiguration;
+            var timeoutConfiguration = TestApplicationManager.ServiceProvider.GetService<ITimeoutConfiguration>() as TestTimeoutConfiguration;
             Assert.AreEqual(SpecialTimeoutValue,  timeoutConfiguration.CustomTimeout);
         }
 
+        [Test]
+        public void Should_BePossibleTo_GetCustomLoggerValues()
+        {
+            TestApplicationManager.SetStartup(new CustomStartup());
+            var timeoutConfiguration = TestApplicationManager.ServiceProvider.GetService<ILoggerConfiguration>() as CustomLoggerConfiguration;
+            Assert.AreEqual(SpecialLogger, timeoutConfiguration.CustomLogger);
+        }
+
         [Test]
         public void Should_BePossibleTo_RegisterCustomServices_WithCustomSettingsFile()
         {
-            Assert.AreEqual(SpecialLanguageValue, ApplicationManager.ServiceProvider.GetService<ILoggerConfiguration>().Language);
+            Assert.AreEqual(SpecialLanguageValue, TestApplicationManager.ServiceProvider.GetService<ILoggerConfiguration>().Language);
         }
 
-        private class ApplicationManager : ApplicationManager<IApplication>
+        private class TestApplicationManager : ApplicationManager<IApplication>
         {
-            public static IApplication Application => GetApplication(StartApplicationFunction, () => RegisterServices(services => Application));
+            private static ThreadLocal<TestStartup> startup = new ThreadLocal<TestStartup>();
 
-            public static IServiceProvider ServiceProvider => GetServiceProvider(services => Application, () => RegisterServices(services => Application));
+            private static IApplication Application => GetApplication(StartApplicationFunction, () => startup.Value.ConfigureServices(new ServiceCollection(), services => Application));
 
-            private static IServiceCollection RegisterServices(Func<IServiceProvider, IApplication> applicationSupplier)
+            public static IServiceProvider ServiceProvider => GetServiceProvider(services => Application,
+                () => startup.Value.ConfigureServices(new ServiceCollection(), services => Application));
+
+            public static void SetStartup(Startup startup)
+            {
+                if (startup != null)
+                {
+                    TestApplicationManager.startup.Value = (TestStartup)startup;
+                }
+            }
+
+            private static Func<IServiceProvider, IApplication> StartApplicationFunction => (services) => throw new NotImplementedException();
+        }
+
+        private class TestStartup : Startup
+        {
+            public override IServiceCollection ConfigureServices(IServiceCollection services, Func<IServiceProvider, IApplication> applicationProvider, ISettingsFile settings = null)
             {
-                var services = new ServiceCollection();
-                var startup = new Startup();
                 var settingsFile = new JsonSettingsFile($"Resources.settings.{SpecialSettingsFile}.json", Assembly.GetExecutingAssembly());
-                startup.ConfigureServices(services, applicationSupplier, settingsFile);
-                services.AddSingleton<ITimeoutConfiguration>(new CustomTimeoutConfiguration(settingsFile));
+                base.ConfigureServices(services, applicationProvider, settingsFile);
+                services.AddSingleton<ITimeoutConfiguration>(new TestTimeoutConfiguration(settingsFile));
                 return services;
             }
+        }
 
-            private static Func<IServiceProvider, IApplication> StartApplicationFunction => (services) => throw new NotImplementedException();
+        private class CustomStartup : TestStartup
+        {
+            public override IServiceCollection ConfigureServices(IServiceCollection services, Func<IServiceProvider, IApplication> applicationProvider, ISettingsFile settings = null)
+            {
+                var settingsFile = new JsonSettingsFile($"Resources.settings.{SpecialSettingsFile}.json", Assembly.GetExecutingAssembly());
+                base.ConfigureServices(services, applicationProvider, settingsFile);
+                services.AddSingleton<ILoggerConfiguration>(new CustomLoggerConfiguration(settingsFile));
+                return services;
+            }
         }
 
-        private class CustomTimeoutConfiguration : TimeoutConfiguration
+        private class TestTimeoutConfiguration : TimeoutConfiguration
         {
-            public CustomTimeoutConfiguration(ISettingsFile settingsFile) : base(settingsFile)
+            public TestTimeoutConfiguration(ISettingsFile settingsFile) : base(settingsFile)
             {
                 CustomTimeout = SpecialTimeoutValue;
             }
 
             public TimeSpan CustomTimeout { get; }
         }
+
+        private class CustomLoggerConfiguration : LoggerConfiguration
+        {
+            public CustomLoggerConfiguration(ISettingsFile settingsFile) : base(settingsFile)
+            {
+                CustomLogger = SpecialLogger;
+            }
+
+            public string CustomLogger { get; }
+        }
     }
 }