Bugfix Circular Reference on lists and dictionary

Author: gokTyBalD

ObjectFiller.Test/ObjectFillerRecursiveTests.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Tynamix.ObjectFiller;
 
@@ -43,6 +44,21 @@ private class TestDuplicate
             public TestEmptyNode Node2 { get; set; }
         }
 
+        public class Children
+        {
+            public Parent Parent { get; set; }
+        }
+
+        public class Parent
+        {
+            public List<Children> Childrens { get; set; }
+        }
+
+        public class ParentDictionary
+        {
+            public Dictionary<string, Children> Childrens { get; set; }
+        }
+
         // ReSharper restore ClassNeverInstantiated.Local
 
         [TestMethod]
@@ -155,5 +171,21 @@ public void RecursiveFill_SelfReferencing_Succeeds()
 
             Assert.IsNull(r.Self.Self);
         }
+
+        [TestMethod]
+        public void RecursiveFill_ParentList_Succeeds()
+        {
+            var filler = new Filler<Parent>();
+            var r = filler.Create();
+        }
+
+        [TestMethod]
+        public void RecursiveFill_ParentDictionary_Succeeds()
+        {
+            var filler = new Filler<ParentDictionary>();
+            var r = filler.Create();
+
+
+        }
     }
 }

ObjectFiller.Test/RangePluginTest.cs

@@ -19,7 +19,7 @@ public void TestRangeWithMaxValue()
 
             Assert.IsNotNull(sl);
             Assert.IsNotNull(sl.IntegerList);
-            Assert.IsTrue(sl.IntegerList.All(x => x <= 100));
+            Assert.IsTrue(sl.IntegerList.All(x => x < 100));
             Assert.IsFalse(sl.IntegerList.All(x => x == sl.IntegerList[0]));
         }
 

ObjectFiller/Filler.cs

@@ -242,20 +242,20 @@ private object GetFilledObject(Type type, FillerSetupItem currentSetupItem, Hash
 
             if (TypeIsDictionary(type))
             {
-                IDictionary dictionary = GetFilledDictionary(type, currentSetupItem);
+                IDictionary dictionary = GetFilledDictionary(type, currentSetupItem, typeTracker);
 
                 return dictionary;
             }
 
             if (TypeIsList(type))
             {
-                IList list = GetFilledList(type, currentSetupItem);
+                IList list = GetFilledList(type, currentSetupItem, typeTracker);
                 return list;
             }
 
             if (type.IsInterface)
             {
-                return GetInterfaceInstance(type, currentSetupItem);
+                return GetInterfaceInstance(type, currentSetupItem, typeTracker);
             }
 
             if (TypeIsPoco(type))
@@ -317,7 +317,7 @@ private object GetFilledPoco(Type type, FillerSetupItem currentSetupItem, HashSt
             return result;
         }
 
-        private IDictionary GetFilledDictionary(Type propertyType, FillerSetupItem currentSetupItem)
+        private IDictionary GetFilledDictionary(Type propertyType, FillerSetupItem currentSetupItem, HashStack<Type> typeTracker)
         {
             IDictionary dictionary = (IDictionary)Activator.CreateInstance(propertyType);
             Type keyType = propertyType.GetGenericArguments()[0];
@@ -327,7 +327,7 @@ private IDictionary GetFilledDictionary(Type propertyType, FillerSetupItem curre
                 currentSetupItem.DictionaryKeyMaxCount);
             for (int i = 0; i < maxDictionaryItems; i++)
             {
-                object keyObject = GetFilledObject(keyType, currentSetupItem);
+                object keyObject = GetFilledObject(keyType, currentSetupItem, typeTracker);
 
                 if (dictionary.Contains(keyObject))
                 {
@@ -336,7 +336,7 @@ private IDictionary GetFilledDictionary(Type propertyType, FillerSetupItem curre
                     throw new ArgumentException(message);
                 }
 
-                object valueObject = GetFilledObject(valueType, currentSetupItem);
+                object valueObject = GetFilledObject(valueType, currentSetupItem, typeTracker);
                 dictionary.Add(keyObject, valueObject);
             }
             return dictionary;
@@ -348,7 +348,7 @@ private static bool HasTypeARandomFunc(Type type, FillerSetupItem currentSetupIt
         }
 
 
-        private IList GetFilledList(Type propertyType, FillerSetupItem currentSetupItem)
+        private IList GetFilledList(Type propertyType, FillerSetupItem currentSetupItem, HashStack<Type> typeTracker)
         {
             Type genType = propertyType.GetGenericArguments()[0];
 
@@ -374,13 +374,13 @@ private IList GetFilledList(Type propertyType, FillerSetupItem currentSetupItem)
             int maxListItems = Random.Next(currentSetupItem.ListMinCount, currentSetupItem.ListMaxCount);
             for (int i = 0; i < maxListItems; i++)
             {
-                object listObject = GetFilledObject(genType, currentSetupItem);
+                object listObject = GetFilledObject(genType, currentSetupItem, typeTracker);
                 list.Add(listObject);
             }
             return list;
         }
 
-        private object GetInterfaceInstance(Type interfaceType, FillerSetupItem setupItem)
+        private object GetInterfaceInstance(Type interfaceType, FillerSetupItem setupItem, HashStack<Type> typeTracker)
         {
             object result;
             if (setupItem.TypeToRandomFunc.ContainsKey(interfaceType))
@@ -405,7 +405,7 @@ private object GetInterfaceInstance(Type interfaceType, FillerSetupItem setupIte
                 MethodInfo genericMethod = method.MakeGenericMethod(new[] { interfaceType });
                 result = genericMethod.Invoke(setupItem.InterfaceMocker, null);
             }
-            FillInternal(result);
+            FillInternal(result, typeTracker);
             return result;
         }
 

ObjectFiller/Properties/AssemblyInfo.cs

@@ -32,7 +32,7 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.8.0")]
-[assembly: AssemblyFileVersion("1.2.8.0")]
+[assembly: AssemblyVersion("1.2.9.0")]
+[assembly: AssemblyFileVersion("1.2.9.0")]
 
 [assembly: InternalsVisibleTo("ObjectFiller.Test")]