Merge pull request #12 from servicetitan/fix-constraints

Fix constraints

Author: hypercodeplace

LazyProxy.Tests/LazyProxyBuilderTests.cs

@@ -9,11 +9,13 @@ public class LazyProxyBuilderTests
     {
         public interface IBaseArgument { }
 
-        public abstract class BaseArgument : IBaseArgument { }
+        public interface IOtherBaseArgument { }
+
+        public abstract class BaseArgument : IBaseArgument, IOtherBaseArgument { }
 
         public abstract class BaseArgument2 { }
 
-        public struct TestArgument : IBaseArgument { }
+        public struct TestArgument : IBaseArgument, IOtherBaseArgument { }
 
         // ReSharper disable once MemberCanBePrivate.Global
         public class TestArgument2 : BaseArgument { }
@@ -44,6 +46,10 @@ public interface ITestService : IParentTestService
             string MethodWithDefaultValue(string arg = "arg");
             string MethodWithOutValue(out string arg);
             string MethodWithRefValue(ref TestArgument arg);
+
+            void GenericMethod<T>()
+                where T : IBaseArgument, IOtherBaseArgument { }
+
             string GenericMethod<T1, T2, T3>(string arg)
                 where T1 : class, IBaseArgument, new()
                 where T2 : struct
@@ -52,7 +58,7 @@ string GenericMethod<T1, T2, T3>(string arg)
 
         // ReSharper disable once MemberCanBePrivate.Global
         public interface IGenericTestService<T, in TIn, out TOut>
-            where T : class, IBaseArgument, new()
+            where T : class, IBaseArgument, IOtherBaseArgument, new()
             where TIn : struct
             where TOut : BaseArgument2, IBaseArgument
         {
@@ -76,7 +82,7 @@ public void ProxyMustImplementInterface()
         public void ExceptionMustBeThrownForBuildingProxyByClass()
         {
             Assert.Throws<NotSupportedException>(
-                () => LazyProxyBuilder.GetType<AbstractTestService>());
+                LazyProxyBuilder.GetType<AbstractTestService>);
         }
 
         [Fact]
@@ -402,10 +408,16 @@ public void GenericInterfaceWithDifferentTypeParametersMustBeCreatedWithoutExcep
                 LazyProxyBuilder.GetType(typeof(IGenericTestService<,,>));
                 LazyProxyBuilder.GetType<IGenericTestService<TestArgument2, TestArgument, TestArgument4>>();
                 LazyProxyBuilder.GetType<IGenericTestService<TestArgument3, TestArgument, TestArgument4>>();
-
             });
 
             Assert.Null(exception);
         }
+
+        [Fact]
+        public void GenericMethodWithMultipleInterfaceConstraintsMustBeProxied()
+        {
+            var proxy = LazyProxyBuilder.CreateInstance(Mock.Of<ITestService>);
+            proxy.GenericMethod<TestArgument>();
+        }
     }
-}
+}

LazyProxy/LazyProxyBuilder.cs

@@ -312,18 +312,29 @@ private static void AddGenericParameters(
                 definedGenericParameter.SetGenericParameterAttributes(genericParameterAttributes);
 
                 var genericParameterConstraints = genericParameter.GetGenericParameterConstraints();
+                if (!genericParameterConstraints.Any())
+                {
+                    return;
+                }
+
+                var interfaceConstraints = new List<Type>(genericParameterConstraints.Length);
 
                 foreach (var constraint in genericParameterConstraints)
                 {
                     if (constraint.IsInterface)
                     {
-                        definedGenericParameter.SetInterfaceConstraints(constraint);
+                        interfaceConstraints.Add(constraint);
                     }
                     else
                     {
                         definedGenericParameter.SetBaseTypeConstraint(constraint);
                     }
                 }
+
+                if (interfaceConstraints.Any())
+                {
+                    definedGenericParameter.SetInterfaceConstraints(interfaceConstraints.ToArray());
+                }
             }
         }
     }