Merge pull request #1 from gokTyBalD/CHANGE_MainFillFunction

Changed fill API

Author: Roman K

ObjectFiller.Test/ObjectFillerTest.cs

@@ -16,7 +16,7 @@ public class ObjectFillerTest
         public void TestFillPerson()
         {
             Person p = new Person();
-            ObjectFiller<Person> objectFiller = new ObjectFiller<Person>(p);
+            ObjectFiller<Person> objectFiller = new ObjectFiller<Person>();
             objectFiller.Setup()
                 .RegisterInterface<IAddress, Address>()
                 .RandomizerForType(new MnemonicStringPlugin(10))
@@ -26,11 +26,7 @@ public void TestFillPerson()
                 .SetupFor<Address>()
                 .IgnoreProperties(a => a.City, a => a.Country);
 
-
-
-            Person pFilled = objectFiller.Fill();
-
-
+            Person pFilled = objectFiller.Fill(p);
         }
     }
 }

ObjectFiller/ObjectFiller.cs

@@ -1,22 +1,13 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 
 namespace ObjectFiller
 {
     public class ObjectFiller<T> where T : class
     {
-        private T _objectToFill;
-
-        public ObjectFiller(T objectToFill)
-            : this()
-        {
-            _objectToFill = objectToFill;
-        }
-
         public ObjectFiller()
         {
             SetupManager.Clear();
@@ -49,23 +40,21 @@ public T Fill(ObjectFillerSetup setup)
         /// </summary>
         public T Fill()
         {
-            try
-            {
-                if (_objectToFill == null)
-                {
-                    _objectToFill = (T)CreateInstanceOfType(typeof(T), SetupManager.GetFor<T>());
-                }
+            T objectToFill = (T)CreateInstanceOfType(typeof(T), SetupManager.GetFor<T>());
 
-                Fill(_objectToFill);
+            Fill(objectToFill);
 
+            return objectToFill;
+        }
 
-                return _objectToFill;
-            }
-            finally
-            {
-                _objectToFill = null;
-            }
+        /// <summary>
+        /// Fills your object instance. Call this after you finished your setup with the FluentAPI
+        /// </summary>
+        public T Fill(T instanceToFill)
+        {
+            FillInternal(instanceToFill);
 
+            return instanceToFill;
         }
 
 
@@ -106,7 +95,7 @@ private object CreateInstanceOfType(Type type, ObjectFillerSetup currentSetup)
         }
 
 
-        private void Fill(object objectToFill)
+        private void FillInternal(object objectToFill)
         {
             var currentSetup = SetupManager.GetFor(objectToFill.GetType());
 
@@ -179,7 +168,7 @@ private object GetFilledPoco(Type type, ObjectFillerSetup currentSetup)
         {
             object result = CreateInstanceOfType(type, currentSetup);
 
-            Fill(result);
+            FillInternal(result);
             return result;
         }
 
@@ -272,7 +261,7 @@ private object GetInterfaceInstance(Type interfaceType, ObjectFillerSetup setup)
                 MethodInfo genericMethod = method.MakeGenericMethod(new Type[] { interfaceType });
                 result = genericMethod.Invoke(setup.InterfaceMocker, null);
             }
-            Fill(result);
+            FillInternal(result);
             return result;
         }