Fix ApplicationManager to resolve #14 Sonal issues. Fix readme guide

Author: mialeska

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

@@ -13,26 +13,30 @@ public abstract class ApplicationManager<TManager, TApplication>
 
         public static bool IsStarted => AppContainer.IsValueCreated && AppContainer.Value.Driver.SessionId != null;
 
-        protected static TApplication GetApplication(Func<IServiceProvider, TApplication> startApplicationFunction, IServiceCollection serviceCollection = null)
+        protected static TApplication GetApplication(Func<IServiceProvider, TApplication> startApplicationFunction, Func<IServiceCollection> serviceCollectionProvider = null)
         {
             if (!IsStarted)
             {
                 AppContainer.Value = startApplicationFunction(
-                    GetServiceProvider(service => GetApplication(startApplicationFunction), serviceCollection));
+                    GetServiceProvider(service => GetApplication(startApplicationFunction, serviceCollectionProvider), serviceCollectionProvider));
             }
             return AppContainer.Value;
         }
 
-        protected static IServiceProvider GetServiceProvider(Func<IServiceProvider, TApplication> applicationSupplier, IServiceCollection serviceCollection = null)
+        protected static IServiceProvider GetServiceProvider(Func<IServiceProvider, TApplication> applicationSupplier, Func<IServiceCollection> serviceCollectionProvider = null)
         {
             if (!ServiceProviderContainer.IsValueCreated)
             {
-                var services = serviceCollection;
-                if (services == null)
+                IServiceCollection services;
+                if (serviceCollectionProvider == null)
                 {
                     services = new ServiceCollection();
                     new Startup().ConfigureServices(services, applicationSupplier);
                 }
+                else
+                {
+                    services = serviceCollectionProvider();
+                }
                 ServiceProviderContainer.Value = services.BuildServiceProvider();
             }
             return ServiceProviderContainer.Value;

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

@@ -36,15 +36,15 @@ public void Should_BePossibleTo_RegisterCustomServices_WithCustomSettingsFile()
 
         private class ApplicationManager : ApplicationManager<ApplicationManager, IApplication>
         {
-            public static IApplication Application => GetApplication(StartApplicationFunction, RegisterServices(StartApplicationFunction));
+            public static IApplication Application => GetApplication(StartApplicationFunction, () => RegisterServices(services => Application));
 
-            public static IServiceProvider ServiceProvider => GetServiceProvider(services => Application, RegisterServices(StartApplicationFunction));
+            public static IServiceProvider ServiceProvider => GetServiceProvider(services => Application, () => RegisterServices(services => Application));
 
             private static IServiceCollection RegisterServices(Func<IServiceProvider, IApplication> applicationSupplier)
             {
                 var services = new ServiceCollection();
                 var startup = new Startup();
-                var settingsFile = new JsonFile($"Resources.settings.{SpecialSettingsFile}.json", Assembly.GetCallingAssembly());
+                var settingsFile = new JsonFile($"Resources.settings.{SpecialSettingsFile}.json", Assembly.GetExecutingAssembly());
                 startup.ConfigureServices(services, applicationSupplier, settingsFile);
                 services.AddSingleton<ITimeoutConfiguration>(new CustomTimeoutConfiguration(settingsFile));
                 return services;

README.md

@@ -41,9 +41,9 @@ Or, if you need to register your own services / rewrite the implementation, you
 
         public class ApplicationManager : ApplicationManager<ApplicationManager, YourApplication>
         {
-            public static YourApplication Application => GetApplication(StartApplicationFunction, RegisterServices(StartApplicationFunction));
+            public static YourApplication Application => GetApplication(StartApplicationFunction, , () => RegisterServices(services => Application));
 
-            public static IServiceProvider ServiceProvider => GetServiceProvider(services => Application, RegisterServices(StartApplicationFunction));
+            public static IServiceProvider ServiceProvider => GetServiceProvider(services => Application, , () => RegisterServices(services => Application));
 
             private static IServiceCollection RegisterServices(Func<IServiceProvider, YourApplication> applicationSupplier)
             {