Merge pull request #40 from twsouthwick/container-builder

Add container configuration method

Author: robdmoore

AutofacContrib.NSubstitute.Tests/ExampleFixture.cs

@@ -219,5 +219,20 @@ public void Example_provide_service_with_out_param()
 
             Assert.AreSame(result, c.Value);
         }
+
+        [Test]
+        public void CustomContainerBuilder()
+        {
+            var container = Substitute.For<IContainer>();
+
+            using var mock = AutoSubstitute.Configure()
+                .ConfigureOptions(options =>
+                {
+                    options.BuildContainerFactory = _ => container;
+                })
+                .Build();
+
+            Assert.AreSame(container, mock.Container);
+        }
     }
 }

AutofacContrib.NSubstitute/AutoSubstituteBuilder.cs

@@ -9,18 +9,23 @@ namespace AutofacContrib.NSubstitute
 {
     public class AutoSubstituteBuilder
     {
-        private readonly Dictionary<Type, object> _substituteForRegistrations = new Dictionary<Type, object>();
-        private readonly List<IProvidedValue> _providedValues;
+        private readonly Dictionary<Type, object> _substituteForRegistrations;
+        private readonly List<Action<IComponentContext>> _afterBuildActions;
         private readonly ContainerBuilder _builder;
         private readonly AutoSubstituteOptions _options;
 
         public AutoSubstituteBuilder()
         {
+            _substituteForRegistrations = new Dictionary<Type, object>();
+            _afterBuildActions = new List<Action<IComponentContext>>();
             _builder = new ContainerBuilder();
-            _providedValues = new List<IProvidedValue>();
             _options = new AutoSubstituteOptions();
         }
 
+        /// <summary>
+        /// Builds an <see cref="AutoSubstitute"/> from the current builder.
+        /// </summary>
+        /// <returns>A new <see cref="AutoSubstitute"/> instance.</returns>
         public AutoSubstitute Build()
             => new AutoSubstitute(InternalBuild());
 
@@ -38,11 +43,11 @@ internal IContainer InternalBuild()
             });
             _builder.RegisterSource(new NSubstituteRegistrationHandler(_options));
 
-            var container = _builder.Build();
+            var container = _options.BuildContainerFactory(_builder);
 
-            foreach (var provided in _providedValues)
+            foreach (var action in _afterBuildActions)
             {
-                provided.SetContainer(container);
+                action(container);
             }
 
             return container;
@@ -269,27 +274,22 @@ private SubstituteForBuilder<TService> CreateSubstituteForBuilder<TService>(Func
             return builder;
         }
 
-        internal IProvidedValue<TService> CreateProvidedValue<TService>(Func<IContainer, TService> factory)
+        internal IProvidedValue<TService> CreateProvidedValue<TService>(Func<IComponentContext, TService> factory)
         {
             var value = new ProvidedValue<TService>(factory);
 
-            _providedValues.Add(value);
+            _afterBuildActions.Add(c => value.SetComponentContext(c));
 
             return value;
         }
 
-        private interface IProvidedValue
-        {
-            void SetContainer(IContainer container);
-        }
-
-        private class ProvidedValue<T> : IProvidedValue<T>, IProvidedValue
+        private class ProvidedValue<T> : IProvidedValue<T>
         {
-            private readonly Func<IContainer, T> _factory;
+            private readonly Func<IComponentContext, T> _factory;
 
-            private IContainer _container;
+            private IComponentContext _componentContext;
 
-            public ProvidedValue(Func<IContainer, T> factory)
+            public ProvidedValue(Func<IComponentContext, T> factory)
             {
                 _factory = factory;
             }
@@ -298,16 +298,16 @@ public T Value
             {
                 get
                 {
-                    if (_container is null)
+                    if (_componentContext is null)
                     {
                         throw new InvalidOperationException("Build must be called before using a provided value.");
                     }
 
-                    return _factory(_container);
+                    return _factory(_componentContext);
                 }
             }
 
-            public void SetContainer(IContainer container) => _container = container;
+            public void SetComponentContext(IComponentContext c) => _componentContext = c;
         }
     }
 }

AutofacContrib.NSubstitute/AutoSubstituteOptions.cs

@@ -1,11 +1,14 @@
-using Autofac.Builder;
+using Autofac;
+using Autofac.Builder;
 using System;
 using System.Collections.Generic;
 
 namespace AutofacContrib.NSubstitute
 {
     public class AutoSubstituteOptions
     {
+        private readonly static Func<ContainerBuilder, IContainer> _defaultContainerBuilder = b => b.Build();
+
         internal bool AutoInjectProperties { get; set; }
 
         /// <summary>
@@ -27,5 +30,10 @@ public class AutoSubstituteOptions
         /// Gets or sets a flag indicating whether mocks should be excluded for provided values. This will automatically add values given to Provide methods to <see cref="TypesToSkipForMocking"/>.
         /// </summary>
         public bool AutomaticallySkipMocksForProvidedValues { get; set; }
+
+        /// <summary>
+        /// Gets or sets a factory to create an <see cref="IContainer"/> given a <see cref="ContainerBuilder"/>. This defaults to simply calling <see cref="ContainerBuilder.Build()"/>.
+        /// </summary>
+        public Func<ContainerBuilder, IContainer> BuildContainerFactory { get; set; } = _defaultContainerBuilder;
     }
 }