Merge pull request #16 from maxbruecken/fix-further-regressions-while-using-iterative-approach

lofcz · web-flow · commit cea23ec5e2a6 · 2025-10-02T20:44:42.000+02:00
Fix further regressions while using iterative approach
diff --git a/FastCloner.Tests/ArrayTests.cs b/FastCloner.Tests/ArrayTests.cs
@@ -3,8 +3,9 @@
 
 namespace FastCloner.Tests;
 
-[TestFixture]
-public class ArrayTests
+[TestFixture(Low)]
+[TestFixture(High)]
+public class ArrayTests(int maxRecursionDepth) : BaseTestFixture(maxRecursionDepth)
 {
     struct MyIntStruct
     {
diff --git a/FastCloner.Tests/BaseTestFixture.cs b/FastCloner.Tests/BaseTestFixture.cs
@@ -0,0 +1,32 @@
+namespace FastCloner.Tests;
+
+/// <summary>
+/// Base class for test fixtures that should run with multiple MaxRecursionDepth values.
+/// Inherit from this class and add [TestFixture(1)] and [TestFixture(1000)] to your test class.
+/// </summary>
+public abstract class BaseTestFixture
+{
+    public const int Low = 1;
+    public const int High = 1_000;
+    
+    protected int MaxRecursionDepth { get; private set; }
+
+    protected BaseTestFixture(int maxRecursionDepth)
+    {
+        MaxRecursionDepth = maxRecursionDepth;
+    }
+
+    [OneTimeSetUp]
+    public void BaseOneTimeSetUp()
+    {
+        FastCloner.MaxRecursionDepth = MaxRecursionDepth;
+    }
+
+    [OneTimeTearDown]
+    public void BaseOneTimeTearDown()
+    {
+        // Reset to default
+        FastCloner.MaxRecursionDepth = 1000;
+    }
+}
+
diff --git a/FastCloner.Tests/CircularTests.cs b/FastCloner.Tests/CircularTests.cs
@@ -1,7 +1,8 @@
 ﻿namespace FastCloner.Tests;
 
-[TestFixture]
-public class CircularTests
+[TestFixture(Low)]
+[TestFixture(High)]
+public class CircularTests(int maxRecursionDepth) : BaseTestFixture(maxRecursionDepth)
 {
     public class C1
     {
diff --git a/FastCloner.Tests/ConcurrentTests.cs b/FastCloner.Tests/ConcurrentTests.cs
@@ -3,8 +3,9 @@
 
 namespace FastCloner.Tests;
 
-[TestFixture]
-public class ConcurrentTests
+[TestFixture(Low)]
+[TestFixture(High)]
+public class ConcurrentTests(int maxRecursionDepth) : BaseTestFixture(maxRecursionDepth)
 {
     private class TestClass
     {
@@ -15,6 +16,9 @@ private class TestClass
     public void GenerateCloner_IsCalledOnlyOnce()
     {
         // Arrange
+        // clear cache between fixtures
+        FastClonerCache.ClearCache();
+        
         CountHolder generatorCallCount = new CountHolder();
         Type testType = typeof(TestClassForSingleCallTest);
 
diff --git a/FastCloner.Tests/CopyToObjectTests.cs b/FastCloner.Tests/CopyToObjectTests.cs
@@ -5,8 +5,9 @@
 
 namespace FastCloner.Tests;
 
-[TestFixture]
-public class CopyToObjectTests
+[TestFixture(Low)]
+[TestFixture(High)]
+public class CopyToObjectTests(int maxRecursionDepth) : BaseTestFixture(maxRecursionDepth)
 {
     [Test]
     public void InterfaceTest()
diff --git a/FastCloner.Tests/CtorTests.cs b/FastCloner.Tests/CtorTests.cs
@@ -2,8 +2,9 @@
 
 namespace FastCloner.Tests;
 
-[TestFixture]
-public class CtorTests
+[TestFixture(Low)]
+[TestFixture(High)]
+public class CtorTests(int maxRecursionDepth) : BaseTestFixture(maxRecursionDepth)
 {
     public class T1
     {
diff --git a/FastCloner.Tests/DbTests.cs b/FastCloner.Tests/DbTests.cs
@@ -13,8 +13,9 @@ namespace FastCloner.Tests;
 using NHibernate;
 using NHibernate.Proxy;
 
-[TestFixture]
-public class DbTests
+[TestFixture(Low)]
+[TestFixture(High)]
+public class DbTests(int maxRecursionDepth) : BaseTestFixture(maxRecursionDepth)
 {
     private ISessionFactory sessionFactory;
     private const string DbFile = "test.db";
diff --git a/FastCloner.Tests/GenericTests.cs b/FastCloner.Tests/GenericTests.cs
@@ -1,7 +1,8 @@
 ﻿namespace FastCloner.Tests;
 
-[TestFixture]
-public class GenericTests
+[TestFixture(Low)]
+[TestFixture(High)]
+public class GenericTests(int maxRecursionDepth) : BaseTestFixture(maxRecursionDepth)
 {
     [Test]
     public void Tuple_Should_Be_Cloned()
diff --git a/FastCloner.Tests/IgnoredTypesTests.cs b/FastCloner.Tests/IgnoredTypesTests.cs
@@ -3,8 +3,9 @@
 
 namespace FastCloner.Tests;
 
-[TestFixture, NonParallelizable]
-public class IgnoredTypesTests
+[TestFixture(Low)]
+[TestFixture(High)]
+public class IgnoredTypesTests(int maxRecursionDepth) : BaseTestFixture(maxRecursionDepth)
 {
     public class SimpleClass
     {
diff --git a/FastCloner.Tests/InheritanceTests.cs b/FastCloner.Tests/InheritanceTests.cs
@@ -2,8 +2,9 @@
 
 namespace FastCloner.Tests;
 
-[TestFixture]
-public class InheritanceTests
+[TestFixture(Low)]
+[TestFixture(High)]
+public class InheritanceTests(int maxRecursionDepth) : BaseTestFixture(maxRecursionDepth)
 {
     public class C1 : IDisposable
     {
diff --git a/FastCloner.Tests/ObjectTests.cs b/FastCloner.Tests/ObjectTests.cs
@@ -4,8 +4,9 @@
 
 namespace FastCloner.Tests;
 
-[TestFixture]
-public class ObjectTests
+[TestFixture(Low)]
+[TestFixture(High)]
+public class ObjectTests(int maxRecursionDepth) : BaseTestFixture(maxRecursionDepth)
 {
     [Test]
     public void SimpleObject_Should_Be_Cloned()
diff --git a/FastCloner.Tests/ShallowCloneTests.cs b/FastCloner.Tests/ShallowCloneTests.cs
@@ -2,8 +2,9 @@
 
 namespace FastCloner.Tests;
 
-[TestFixture]
-public class ShallowCloneTests
+[TestFixture(Low)]
+[TestFixture(High)]
+public class ShallowCloneTests(int maxRecursionDepth) : BaseTestFixture(maxRecursionDepth)
 {
     [Test]
     public void SimpleObject_Should_Be_Cloned()
diff --git a/FastCloner.Tests/SpecialCaseTests.cs b/FastCloner.Tests/SpecialCaseTests.cs
@@ -23,8 +23,9 @@
 
 namespace FastCloner.Tests;
 
-[TestFixture]
-public class SpecialCaseTests
+[TestFixture(Low)]
+[TestFixture(High)]
+public class SpecialCaseTests(int maxRecursionDepth) : BaseTestFixture(maxRecursionDepth)
 {
     [OneTimeSetUp]
     public void Setup()
@@ -3179,4 +3180,89 @@ private class SelfReferencedWithInitOnlyField
     
     	public ClassWithReadOnlyField WithReadOnlyField { get; set; }
     }
+    
+    [Test]
+    public void SelfReferenced_WithInitOnlyValueTypeField_Test()
+    {
+        SelfReferencedWithInitOnlyValueTypeField original = new SelfReferencedWithInitOnlyValueTypeField
+        {
+            WithReadOnlyValueTypeField = new ClassWithReadOnlyValueField()
+        };
+    
+        SelfReferencedWithInitOnlyValueTypeField clone = original.DeepClone();
+    	
+        Assert.That(clone, Is.Not.SameAs(original));
+        Assert.That(clone.WithReadOnlyValueTypeField, Is.Not.SameAs(original.WithReadOnlyValueTypeField));
+        Assert.That(clone.WithReadOnlyValueTypeField.ReadOnlyValue, Is.EqualTo(original.WithReadOnlyValueTypeField.ReadOnlyValue));
+    }
+    
+    private class SelfReferencedWithInitOnlyValueTypeField
+    {
+        public SelfReferencedWithInitOnlyValueTypeField? Predecessor { get; set; }
+        
+        public ClassWithReadOnlyValueField WithReadOnlyValueTypeField { get; set; }
+    }
+
+    private class ClassWithReadOnlyValueField
+    {
+        private readonly decimal readOnlyField = 1m;
+        public decimal ReadOnlyValue => readOnlyField;
+    }
+    
+    [Test]
+    public void SelfReferenced_WithWritableValueTypeField_Test()
+    {
+        SelfReferencedWithWritableValueTypeField original = new SelfReferencedWithWritableValueTypeField
+        {
+            WithWritableValueTypeField = new ClassWithWritableValueTypeField()
+        };
+    
+        SelfReferencedWithWritableValueTypeField clone = original.DeepClone();
+    	
+        Assert.That(clone, Is.Not.SameAs(original));
+        Assert.That(clone.WithWritableValueTypeField, Is.Not.SameAs(original.WithWritableValueTypeField));
+        Assert.That(clone.WithWritableValueTypeField.ReadOnlyValue, Is.EqualTo(original.WithWritableValueTypeField.ReadOnlyValue));
+    }
+    
+    private class SelfReferencedWithWritableValueTypeField
+    {
+        public SelfReferencedWithWritableValueTypeField? Predecessor { get; set; }
+        
+        public ClassWithWritableValueTypeField WithWritableValueTypeField { get; set; }
+    }
+
+    private class ClassWithWritableValueTypeField
+    {
+        private decimal readOnlyField = 1m;
+        public decimal ReadOnlyValue => readOnlyField;
+    }
+    
+    [Test]
+    public void SelfReferenced_WithMultipleReadOnlyProperties_Test()
+    {
+        SelfReferencedWithMultipleReadOnlyProperties original = new SelfReferencedWithMultipleReadOnlyProperties
+        {
+            WithMultipleReadOnlyProperties = new ClassWithMultipleReadOnlyProperties()
+        };
+    
+        SelfReferencedWithMultipleReadOnlyProperties clone = original.DeepClone();
+    	
+        Assert.That(clone, Is.Not.SameAs(original));
+        Assert.That(clone.WithMultipleReadOnlyProperties, Is.Not.SameAs(original.WithMultipleReadOnlyProperties));
+        Assert.That(clone.WithMultipleReadOnlyProperties.Name, Is.EqualTo(original.WithMultipleReadOnlyProperties.Name));
+        Assert.That(clone.WithMultipleReadOnlyProperties.Id, Is.EqualTo(original.WithMultipleReadOnlyProperties.Id));
+    }
+    
+    private class SelfReferencedWithMultipleReadOnlyProperties
+    {
+        public SelfReferencedWithMultipleReadOnlyProperties? Predecessor { get; set; }
+    
+        public ClassWithMultipleReadOnlyProperties WithMultipleReadOnlyProperties { get; set; }
+    }
+
+    private class ClassWithMultipleReadOnlyProperties
+    {
+        public int Id { get; } = 1;
+        public string Name { get; } = "Test";
+    }
 }
diff --git a/FastCloner.Tests/TypeTests.cs b/FastCloner.Tests/TypeTests.cs
@@ -8,8 +8,9 @@
 
 namespace FastCloner.Tests;
 
-[TestFixture]
-public class TypeTests
+[TestFixture(Low)]
+[TestFixture(High)]
+public class TypeTests(int maxRecursionDepth) : BaseTestFixture(maxRecursionDepth)
 {
     [Test]
     public void StandardTypes_Should_Be_Cloned()
diff --git a/FastCloner/Code/FastClonerCache.cs b/FastCloner/Code/FastClonerCache.cs
@@ -17,14 +17,14 @@ internal static bool IsTypeIgnored(Type type)
     private static readonly ClrCache<object> deepClassToCache = new ClrCache<object>();
     private static readonly ClrCache<object> shallowClassToCache = new ClrCache<object>();
     private static readonly ConcurrentLazyCache<object> typeConvertCache = new ConcurrentLazyCache<object>();
-    private static readonly ClrCache<object?> fieldCache = new ClrCache<object?>();
+    private static readonly GenericClrCache<Tuple<Type, string>, object?> fieldCache = new GenericClrCache<Tuple<Type, string>, object?>();
     private static readonly ClrCache<Dictionary<string, Type>> ignoredEventInfoCache = new ClrCache<Dictionary<string, Type>>();
     private static readonly ClrCache<List<MemberInfo>> allMembersCache = new ClrCache<List<MemberInfo>>();
     private static readonly GenericClrCache<MemberInfo, bool> memberIgnoreStatusCache = new GenericClrCache<MemberInfo, bool>();
     private static readonly ClrCache<bool> typeContainsIgnoredMembersCache = new ClrCache<bool>();
     private static readonly ClrCache<object> specialTypesCache = new ClrCache<object>();
 
-    public static object? GetOrAddField(Type type, Func<Type, object?> valueFactory) => fieldCache.GetOrAdd(type, valueFactory);
+    public static object? GetOrAddField(Type type, string name, Func<Type, object?> valueFactory) => fieldCache.GetOrAdd(new Tuple<Type, string>(type, name), k => valueFactory(k.Item1));
     public static object? GetOrAddClass(Type type, Func<Type, object?> valueFactory) => classCache.GetOrAdd(type, valueFactory);
     public static object? GetOrAddStructAsObject(Type type, Func<Type, object?> valueFactory) => structCache.GetOrAdd(type, valueFactory);
     public static object GetOrAddDeepClassTo(Type type, Func<Type, object> valueFactory) => deepClassToCache.GetOrAdd(type, valueFactory);
diff --git a/FastCloner/Code/FastClonerExprGenerator.cs b/FastCloner/Code/FastClonerExprGenerator.cs
@@ -112,7 +112,7 @@ private static LabelTarget CreateLoopLabel(ExpressionPosition position)
 
     internal static object? GenerateProcessMethod(Type realType, bool asObject) => GenerateProcessMethod(realType, asObject && realType.IsValueType(), new ExpressionPosition(0, 0));
     public static bool IsSetType(Type type) => type.GetInterfaces().Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(ISet<>));
-    private static bool IsDictionaryType(Type type) => typeof(IDictionary).IsAssignableFrom(type) || type.GetInterfaces().Any(i => i.IsGenericType && (i.GetGenericTypeDefinition() == typeof(IDictionary<,>) || i.GetGenericTypeDefinition() == typeof(IReadOnlyDictionary<,>)));
+    public static bool IsDictionaryType(Type type) => typeof(IDictionary).IsAssignableFrom(type) || type.GetInterfaces().Any(i => i.IsGenericType && (i.GetGenericTypeDefinition() == typeof(IDictionary<,>) || i.GetGenericTypeDefinition() == typeof(IReadOnlyDictionary<,>)));
 
     private readonly struct ConstructorInfoEx
     {
diff --git a/FastCloner/Code/FastClonerGenerator.cs b/FastCloner/Code/FastClonerGenerator.cs
diff --git a/FastCloner/Code/FieldAccessorGenerator.cs b/FastCloner/Code/FieldAccessorGenerator.cs

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@`
`3`	`3`
`4`	`4`	`namespace FastCloner.Tests;`
`5`	`5`
`6`		`-[TestFixture]`
`7`		`-public class ArrayTests`
	`6`	`+[TestFixture(Low)]`
	`7`	`+[TestFixture(High)]`
	`8`	`+public class ArrayTests(int maxRecursionDepth) : BaseTestFixture(maxRecursionDepth)`
`8`	`9`	`{`
`9`	`10`	`struct MyIntStruct`
`10`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`namespace FastCloner.Tests;`
`2`	`2`
`3`		`-[TestFixture]`
`4`		`-public class CircularTests`
	`3`	`+[TestFixture(Low)]`
	`4`	`+[TestFixture(High)]`
	`5`	`+public class CircularTests(int maxRecursionDepth) : BaseTestFixture(maxRecursionDepth)`
`5`	`6`	`{`
`6`	`7`	`public class C1`
`7`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace FastCloner.Tests;`
`4`	`4`
`5`		`-[TestFixture]`
`6`		`-public class CtorTests`
	`5`	`+[TestFixture(Low)]`
	`6`	`+[TestFixture(High)]`
	`7`	`+public class CtorTests(int maxRecursionDepth) : BaseTestFixture(maxRecursionDepth)`
`7`	`8`	`{`
`8`	`9`	`public class T1`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@`
`3`	`3`
`4`	`4`	`namespace FastCloner.Tests;`
`5`	`5`
`6`		`-[TestFixture, NonParallelizable]`
`7`		`-public class IgnoredTypesTests`
	`6`	`+[TestFixture(Low)]`
	`7`	`+[TestFixture(High)]`
	`8`	`+public class IgnoredTypesTests(int maxRecursionDepth) : BaseTestFixture(maxRecursionDepth)`
`8`	`9`	`{`
`9`	`10`	`public class SimpleClass`
`10`	`11`	`{`