Fixes up the set lambda, the function pattern now underlies other methods

 - It's a lot cleaner to use the factory lambdas as just constant functions
   for the other Set method.

Author: Quantumplation

TestStack.Dossier.Tests/ProxyBuilderTests.cs

@@ -12,7 +12,7 @@ class ProxyBuilderTests
         [Fact]
         public void GivenClassToProxyWithNoProperties_WhenBuildingProxy_ReturnAClassWithNoReturnsValuesSet()
         {
-            var proxyBuilder = new ProxyBuilder<Customer>(new Dictionary<string, object>());
+            var proxyBuilder = new ProxyBuilder<Customer>(new Dictionary<string, Func<object>>());
 
             var proxy = proxyBuilder.Build();
 
@@ -24,33 +24,34 @@ public void GivenClassToProxyWithNoProperties_WhenBuildingProxy_ReturnAClassWith
         [Fact]
         public void GivenClassToProxyWithNoProperties_WhenBuildingProxy_ReturnAnNSubstituteProxyOfThatClass()
         {
-            var proxyBuilder = new ProxyBuilder<Customer>(new Dictionary<string, object>());
+            var proxyBuilder = new ProxyBuilder<Customer>(new Dictionary<string, Func<object>>());
 
             var proxy = proxyBuilder.Build();
 
             proxy.DidNotReceive().CustomerForHowManyYears(Arg.Any<DateTime>());
         }
 
         [Fact]
-        public void GivenClassToProxyWithSinglePropertyValue_WhenBuildingProxy_ReturnAClassWithReturnValueSet()
+        public void GivenClassToProxyWithSinglePropertyValue_WhenBuildingProxy_ReturnAClassWithReturnValueSetFromFunction()
         {
-            var proxyBuilder = new ProxyBuilder<Customer>(new Dictionary<string, object> {{"FirstName", "FirstName"}});
+            int nonce = new Random().Next(0, 100);
+            var proxyBuilder = new ProxyBuilder<Customer>(new Dictionary<string, Func<object>> {{"FirstName", () => "FirstName" + nonce}});
 
             var proxy = proxyBuilder.Build();
 
-            proxy.FirstName.ShouldBe("FirstName");
+            proxy.FirstName.ShouldBe("FirstName" + nonce);
             proxy.LastName.ShouldBe(string.Empty);
             proxy.YearJoined.ShouldBe(0);
         }
 
         [Fact]
         public void GivenClassToProxyWithMultiplePropertyValues_WhenBuildingProxy_ReturnAClassWithReturnValueSet()
         {
-            var proxyBuilder = new ProxyBuilder<Customer>(new Dictionary<string, object>
+            var proxyBuilder = new ProxyBuilder<Customer>(new Dictionary<string, Func<object>>
                 {
-                    { "FirstName", "FirstName" },
-                    { "LastName", "LastName" },
-                    { "YearJoined", 1 },
+                    { "FirstName", () => "FirstName" },
+                    { "LastName", () => "LastName" },
+                    { "YearJoined", () => 1 },
                 }
             );
 
@@ -64,10 +65,10 @@ public void GivenClassToProxyWithMultiplePropertyValues_WhenBuildingProxy_Return
         [Fact]
         public void GivenClassWithSomeVirtualProperties_WhenBuildingProxy_ThenOnlyVirtualMembersAreProxied()
         {
-            var proxyBuilder = new ProxyBuilder<Company>(new Dictionary<string, object>()
+            var proxyBuilder = new ProxyBuilder<Company>(new Dictionary<string, Func<object>>()
             {
-                {"Name", "Vandelay Industries"},
-                {"EmployeeCount", 100}
+                {"Name", () => "Vandelay Industries"},
+                {"EmployeeCount", () => 100}
             });
 
             var proxy = proxyBuilder.Build();

TestStack.Dossier/ProxyBuilder.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using NSubstitute;
@@ -11,13 +12,13 @@ namespace TestStack.Dossier
     /// <typeparam name="T">The type being proxied</typeparam>
     public class ProxyBuilder<T> where T : class
     {
-        private readonly Dictionary<string, object> _properties;
+        private readonly Dictionary<string, Func<object>> _properties;
 
         /// <summary>
         /// Create a proxy builder to proxy the given property values for the type {T}.
         /// </summary>
         /// <param name="properties"></param>
-        public ProxyBuilder(Dictionary<string, object> properties)
+        public ProxyBuilder(Dictionary<string, Func<object>> properties)
         {
             _properties = properties;
         }
@@ -33,7 +34,7 @@ public T Build()
             foreach (var property in properties.Where(property => _properties.ContainsKey(property.Name)))
             {
                 if (property.GetGetMethod().IsVirtual)
-                    property.GetValue(proxy, null).Returns(_properties[property.Name]);
+                    property.GetValue(proxy, null).Returns(_properties[property.Name]());
             }
 
             return proxy;

TestStack.Dossier/TestDataBuilder.cs

@@ -15,8 +15,7 @@ public abstract class TestDataBuilder<TObject, TBuilder>
         where TObject : class
         where TBuilder : TestDataBuilder<TObject, TBuilder>, new()
     {
-        private readonly Dictionary<string, object> _properties = new Dictionary<string, object>(StringComparer.InvariantCultureIgnoreCase);
-        private readonly Dictionary<string, Func<object>> _propFactories = new Dictionary<string, Func<object>>();
+        private readonly Dictionary<string, Func<object>> _properties = new Dictionary<string, Func<object>>();
         private ProxyBuilder<TObject> _proxyBuilder;
 
         /// <summary>
@@ -118,7 +117,7 @@ protected virtual void AlterProxy(TObject proxy) {}
         /// <returns>The builder so that other method calls can be chained</returns>
         public virtual TBuilder Set<TValue>(Expression<Func<TObject, TValue>> property, TValue value)
         {
-            _properties[Reflector.GetPropertyNameFor(property)] = value;
+            _properties[Reflector.GetPropertyNameFor(property)] = () => value;
             return this as TBuilder;
         }
 
@@ -130,7 +129,7 @@ public virtual TBuilder Set<TValue>(Expression<Func<TObject, TValue>> property,
         /// <param name="factory">A method which produces instances of {TValue} for the property.</param>
         public virtual TBuilder Set<TValue>(Expression<Func<TObject, TValue>> property, Func<TValue> factory)
         {
-            _propFactories[Reflector.GetPropertyNameFor(property)] = () => factory() as object;
+            _properties[Reflector.GetPropertyNameFor(property)] = () => factory() as object;
             return this as TBuilder;
         }
 
@@ -155,11 +154,8 @@ public TValue Get<TValue>(Expression<Func<TObject, TValue>> property)
         /// <returns></returns>
         public object Get(Type type, string propertyName)
         {
-            object value;
-            if (_properties.TryGetValue(propertyName, out value)) return value;
-
             Func<object> factory;
-            if (_propFactories.TryGetValue(propertyName, out factory)) return factory();
+            if (_properties.TryGetValue(propertyName, out factory)) return factory();
 
             return Any.Get(type, propertyName);
         } 
@@ -208,7 +204,7 @@ protected bool Has<TValue>(Expression<Func<TObject, TValue>> property)
         /// <returns>Whether or not there is a recorded value for the property</returns>
         protected bool Has(string propertyName)
         {
-            return _properties.ContainsKey(propertyName) || _propFactories.ContainsKey(propertyName);
+            return _properties.ContainsKey(propertyName);
         }
 
         /// <summary>