feature: splat init checks for pre registrations (#360)

README.md

@@ -100,8 +100,6 @@ There are 2 parts to the locator design:
 * **Locator.Current** The property to use to **retrieve** services. Locator.Current is a static variable that can be set on startup, to adapt Splat to other DI/IoC frameworks. We're currently working from v7 onward to make it easier to use your DI/IoC framework of choice. (see below)
 * **Locator.CurrentMutable** The property to use to **register** services
 
-**Note:** Currently these properties point to the same object and you can use CurrentMutable to also GetServices, but this is not the intention and the interfaces may be adjusted in future to lock this down (and make it more obvious what the use cases are).
-
 To get a service:
 
 ```cs
@@ -132,6 +130,10 @@ Locator.CurrentMutable.RegisterLazySingleton(() => new LazyToaster(), typeof(ITo
 ### Dependency Resolver Packages
 For each of the provided dependency resolver adapters, there is a specific package that allows the service locator to be implemented by another ioc container.
 
+Please note: If you are adjusting behaviours of Splat by working with your custom container directly. Please read the relevant projects documentation on
+REPLACING the registration. If the container supports appending\ multiple registrations you may get undesired behaviours, such as the wrong logger factory
+being used.
+
 | Container | NuGet | Read Me
 |---------|-------|-------|
 | [Splat.Autofac][SplatAutofacNuGet] | [![SplatAutofacBadge]][SplatAutofacNuGet] | [Setup Autofac][SplatAutofacReadme]

src/Splat.Autofac.Tests/DependencyResolverTests.cs

@@ -10,14 +10,15 @@
 using Autofac;
 using Shouldly;
 using Splat.Common.Test;
+using Splat.Tests.ServiceLocation;
 using Xunit;
 
 namespace Splat.Autofac.Tests
 {
     /// <summary>
     /// Tests to show the <see cref="AutofacDependencyResolver"/> works correctly.
     /// </summary>
-    public class DependencyResolverTests
+    public class DependencyResolverTests : BaseDependencyResolverTests<AutofacDependencyResolver>
     {
         /// <summary>
         /// Shoulds the resolve views.
@@ -93,45 +94,61 @@ public void AutofacDependencyResolver_Should_Resolve_Screen()
         /// Should throw an exception if service registration call back called.
         /// </summary>
         [Fact]
-        public void AutofacDependencyResolver_Should_Throw_If_UnregisterCurrent_Called()
+        public void AutofacDependencyResolver_Should_Throw_If_ServiceRegistionCallback_Called()
         {
             var container = new ContainerBuilder();
             container.UseAutofacDependencyResolver();
 
             var result = Record.Exception(() =>
-                Locator.CurrentMutable.UnregisterCurrent(typeof(IScreen)));
+                Locator.CurrentMutable.ServiceRegistrationCallback(typeof(IScreen), disposable => { }));
 
             result.ShouldBeOfType<NotImplementedException>();
         }
 
         /// <summary>
-        /// Should unregister all.
+        /// Check to ensure the correct logger is returned.
         /// </summary>
+        /// <remarks>
+        /// Introduced for Splat #331.
+        /// </remarks>
         [Fact]
-        public void AutofacDependencyResolver_Should_UnregisterAll_Called()
+        public void AutofacDependencyResolver_Should_ReturnRegisteredLogger()
         {
             var container = new ContainerBuilder();
             container.UseAutofacDependencyResolver();
 
-            var result = Record.Exception(() =>
-                Locator.CurrentMutable.UnregisterCurrent(typeof(IScreen)));
+            Locator.CurrentMutable.RegisterConstant(
+                new FuncLogManager(type => new WrappingFullLogger(new ConsoleLogger())),
+                typeof(ILogManager));
 
-            result.ShouldBeOfType<NotImplementedException>();
+            var d = Splat.Locator.Current.GetService<ILogManager>();
+            Assert.IsType<FuncLogManager>(d);
         }
 
         /// <summary>
-        /// Should throw an exception if service registration call back called.
+        /// Test that a pre-init logger isn't overriden.
         /// </summary>
+        /// <remarks>
+        /// Introduced for Splat #331.
+        /// </remarks>
         [Fact]
-        public void AutofacDependencyResolver_Should_Throw_If_ServiceRegistionCallback_Called()
+        public void AutofacDependencyResolver_PreInit_Should_ReturnRegisteredLogger()
         {
-            var container = new ContainerBuilder();
-            container.UseAutofacDependencyResolver();
+            var builder = new ContainerBuilder();
+            builder.Register(_ => new FuncLogManager(type => new WrappingFullLogger(new ConsoleLogger()))).As(typeof(ILogManager))
+                .AsImplementedInterfaces();
 
-            var result = Record.Exception(() =>
-                Locator.CurrentMutable.ServiceRegistrationCallback(typeof(IScreen), disposable => { }));
+            builder.UseAutofacDependencyResolver();
 
-            result.ShouldBeOfType<NotImplementedException>();
+            var d = Splat.Locator.Current.GetService<ILogManager>();
+            Assert.IsType<FuncLogManager>(d);
+        }
+
+        /// <inheritdoc />
+        protected override AutofacDependencyResolver GetDependencyResolver()
+        {
+            var container = new ContainerBuilder();
+            return new AutofacDependencyResolver(container.Build());
         }
     }
 }

src/Splat.Autofac.Tests/Splat.Autofac.Tests.csproj

@@ -15,6 +15,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Splat.Autofac\Splat.Autofac.csproj" />
     <ProjectReference Include="..\Splat.Common.Test\Splat.Common.Test.csproj" />
+    <ProjectReference Include="..\Splat.Tests\Splat.Tests.csproj" />
   </ItemGroup>
 
   <ItemGroup>