Merge pull request #86 from Tynamix/FEATURE_83_Explicit_Setup

#83 implemented

Author: Tynamix

Tynamix.ObjectFiller.Test/SetupTests.cs

@@ -1,5 +1,5 @@
 using System;
-    using Xunit;
+using Xunit;
 
 namespace ObjectFiller.Test
 {
@@ -11,6 +11,8 @@ public class SetupTests
         public class Parent
         {
             public Child Child { get; set; }
+
+            public int? SomeId { get; set; }
         }
 
         public class Child
@@ -20,14 +22,46 @@ public class Child
             public string StringValue { get; set; }
         }
 
+        [Fact]
+        public void ExplicitSetupShallJustFillPropertiesWhichAreSetUpEvenInSubtypes()
+        {
+            Filler<Parent> filler = new Filler<Parent>();
+            filler.Setup(true)
+                .SetupFor<Child>().OnProperty(x => x.IntValue).Use(new IntRange(1, 20));
+
+            var parent = filler.Create();
+
+            Assert.NotNull(parent);
+            Assert.NotNull(parent.Child);
+            Assert.Null(parent.SomeId);
+            Assert.InRange(parent.Child.IntValue, 1, 20);
+            Assert.Null(parent.Child.StringValue);
+        }
+
+        [Fact]
+        public void ExplicitSetupShallJustFillPropertiesWhichAreSetUpAndNoInstanceShallCreateForSubTypesIfNotSetup()
+        {
+            Filler<Parent> filler = new Filler<Parent>();
+            filler.Setup(true)
+               .OnProperty(x => x.SomeId).Use(new IntRange(1, 20));
+
+            var parent = filler.Create();
+
+            Assert.NotNull(parent);
+            Assert.Null(parent.Child);
+            Assert.NotNull(parent.SomeId);
+        }
+
+
+
         [Fact]
         public void RandomizerCreatesObjectsBasedOnPreviouseSetups()
         {
             int givenValue = Randomizer<int>.Create();
 
             var childFiller = new Filler<Child>();
             var childSetup = childFiller.Setup().OnProperty(x => x.IntValue).Use(givenValue).Result;
-            
+
             var child = Randomizer<Child>.Create(childSetup);
             Assert.Equal(givenValue, child.IntValue);
         }

Tynamix.ObjectFiller/Filler.cs

@@ -34,6 +34,11 @@ public class Filler<T>
         /// </summary>
         private readonly SetupManager setupManager;
 
+        /// <summary>
+        /// True when the filler will just fill properties which are set up explicit
+        /// </summary>
+        private bool justConfiguredProperties;
+
         #endregion
 
         #region Constructors and Destructors
@@ -117,7 +122,17 @@ public T Fill(T instanceToFill)
         /// <returns>Fluent API setup</returns>
         public FluentFillerApi<T> Setup()
         {
-            return this.Setup(null);
+            return this.Setup(false);
+        }
+
+        /// <summary>
+        /// Call this to start the setup for the <see cref="Filler{T}"/>
+        /// </summary>
+        /// <param name="explicitSetup">True if just properties shall get filled which configured in filler setup.</param>
+        /// <returns>Fluent API setup</returns>
+        public FluentFillerApi<T> Setup(bool explicitSetup)
+        {
+            return this.Setup(null, explicitSetup);
         }
 
         /// <summary>
@@ -131,12 +146,29 @@ public FluentFillerApi<T> Setup()
         /// Fluent API Setup
         /// </returns>
         public FluentFillerApi<T> Setup(FillerSetup fillerSetupToUse)
+        {
+            return this.Setup(fillerSetupToUse, false);
+        }
+
+        /// <summary>
+        /// Call this to start the setup for the <see cref="Filler{T}"/> and use a setup which you created
+        /// before with the <see cref="IFluentApi{TTargetObject,TTargetType}"/>
+        /// </summary>
+        /// <param name="fillerSetupToUse">
+        /// FillerSetup to use
+        /// </param>
+        /// <param name="explicitSetup">True if just properties shall get filled which configured in filler setup.</param>
+        /// <returns>
+        /// Fluent API Setup
+        /// </returns>
+        public FluentFillerApi<T> Setup(FillerSetup fillerSetupToUse, bool explicitSetup)
         {
             if (fillerSetupToUse != null)
             {
                 this.setupManager.FillerSetup = fillerSetupToUse;
             }
 
+            this.justConfiguredProperties = explicitSetup;
             return new FluentFillerApi<T>(this.setupManager);
         }
 
@@ -648,6 +680,12 @@ private void FillInternal(object objectToFill, HashStack<Type> typeTracker = nul
                     continue;
                 }
 
+                if (this.justConfiguredProperties
+                    && !this.setupManager.FillerSetup.TypeToFillerSetup.ContainsKey(property.PropertyType))
+                {
+                    continue;
+                }
+
                 object filledObject = this.CreateAndFillObject(property.PropertyType, currentSetup, typeTracker);
 
                 this.SetPropertyValue(property, objectToFill, filledObject);

Tynamix.ObjectFiller/Randomizer.cs

@@ -144,7 +144,10 @@ internal static Func<T> CreateFactoryMethod(FillerSetup setup)
 
                     if (setup != null)
                     {
-                        var setupMethod = objectFiller.GetType().GetMethods().Single(x => x.Name == "Setup" && x.GetParameters().Any());
+                        var setupMethod = objectFiller.GetType().GetMethods()
+                                                      .Where(x => x.Name == "Setup" && x.GetParameters().Length == 1)
+                                                      .Single(x => x.GetParameters().First().ParameterType == typeof(FillerSetup));
+
                         setupMethod.Invoke(objectFiller, new[] { setup });
                     }