Copy constructor bug fixed

Author: Tynamix

ObjectFiller.Test/CopyConstructorTest.cs

@@ -0,0 +1,63 @@
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Tynamix.ObjectFiller;
+
+namespace ObjectFiller.Test
+{
+    [TestClass]
+    public class CopyConstructorTest
+    {
+
+        [TestMethod]
+        public void WhenClassWithCopyConstructorIsCreatedNoExceptionShallBeThrown()
+        {
+            var f = new Filler<ClassWithCopyConstructorAndNormalConstructor>();
+            var cc = f.Create();
+
+            Assert.IsNotNull(cc);
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(InvalidOperationException))]
+        public void WhenClassWithJustCopyConstructorIsCreatedAExceptionShallBeThrown()
+        {
+            var f = new Filler<ClassWithCopyConstructor>();
+            var cc = f.Create();
+
+        }
+    }
+
+    public class ClassWithCopyConstructor
+    {
+
+        public ClassWithCopyConstructor(ClassWithCopyConstructor constructor)
+        {
+            Count1 = constructor.Count1;
+            Count2 = constructor.Count2;
+        }
+
+        public int Count1 { get; set; }
+
+        public int Count2 { get; set; }
+    }
+
+
+    public class ClassWithCopyConstructorAndNormalConstructor
+    {
+        public ClassWithCopyConstructorAndNormalConstructor(int count1, int count2)
+        {
+            Count1 = count1;
+            Count2 = count2;
+        }
+
+        public ClassWithCopyConstructorAndNormalConstructor(ClassWithCopyConstructorAndNormalConstructor constructor)
+            : this(constructor.Count1, constructor.Count2)
+        {
+
+        }
+
+        public int Count1 { get; set; }
+
+        public int Count2 { get; set; }
+    }
+}

ObjectFiller.Test/ObjectFiller.Test.csproj

@@ -46,6 +46,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AddressFillingTest.cs" />
+    <Compile Include="CopyConstructorTest.cs" />
     <Compile Include="CountryNamesPlugin.cs" />
     <Compile Include="CityNamesPluginTest.cs" />
     <Compile Include="CreateInstanceTest.cs" />

ObjectFiller/Filler.cs

@@ -536,13 +536,13 @@ private object CreateInstanceOfType(Type type, FillerSetupItem currentSetupItem,
             if (type.GetConstructors().All(ctor => ctor.GetParameters().Length != 0))
             {
                 IEnumerable<ConstructorInfo> ctorInfos;
-                if ((ctorInfos = type.GetConstructors().Where(ctr => ctr.GetParameters().Length != 0)).Count() != 0)
+                if ((ctorInfos = type.GetConstructors().Where(ctr => ctr.GetParameters().Length != 0)).Any())
                 {
                     foreach (ConstructorInfo ctorInfo in ctorInfos.OrderBy(x => x.GetParameters().Length))
                     {
                         Type[] paramTypes = ctorInfo.GetParameters().Select(p => p.ParameterType).ToArray();
 
-                        if (paramTypes.All(t => TypeIsValidForObjectFiller(t, currentSetupItem)))
+                        if (paramTypes.All(ctorParamType => TypeIsValidForObjectFiller(ctorParamType, currentSetupItem) && ctorParamType != type))
                         {
                             foreach (Type paramType in paramTypes)
                             {

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.3.6.0")]
-[assembly: AssemblyFileVersion("1.4.6.0")]
+[assembly: AssemblyVersion("1.3.9.0")]
+[assembly: AssemblyFileVersion("1.3.9.0")]
 
 [assembly: InternalsVisibleTo("ObjectFiller.Test")]