draft

stakx · Jul 22, 2022 · 781de05 · 781de05
1 parent e758285
commit 781de05
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/src/Castle.Core.Tests/DynamicProxy.Tests/DefaultInterfaceMethodsTestCase.cs b/src/Castle.Core.Tests/DynamicProxy.Tests/DefaultInterfaceMethodsTestCase.cs
@@ -131,15 +131,15 @@ public void Default_implementation_called_when_method_not_proxied_in_class_proxy
 		}
 
 		[Test]
-		public void Default_implementation_called_when_method_not_proxied_in_class_proxy_with_target()
+		public void Target_implementation_called_when_method_not_proxied_in_class_proxy_with_target()
 		{
 			var options = new ProxyGenerationOptions { Hook = new ProxyNothingHook() };
-			var target = new InheritsDefaultInterfaceMethod();
+			var target = new ImplementsDefaultInterfaceMethod();
 			var proxy = (IHaveDefaultInterfaceMethod)generator.CreateClassProxyWithTarget(target, options);
 
 			var returnValue = proxy.Method();
 
-			Assert.AreEqual("default implementation", returnValue);
+			Assert.AreEqual("implementation", returnValue);
 		}
 
 		[Test]
@@ -154,27 +154,27 @@ public void Default_implementation_called_when_method_not_proxied_in_interface_p
 		}
 
 		[Test]
-		public void Default_implementation_called_when_method_not_proxied_in_interface_proxy_with_target()
+		public void Target_implementation_called_when_method_not_proxied_in_interface_proxy_with_target()
 		{
 			var options = new ProxyGenerationOptions { Hook = new ProxyNothingHook() };
-			var target = new InheritsDefaultInterfaceMethod();
+			var target = new ImplementsDefaultInterfaceMethod();
 			var proxy = generator.CreateInterfaceProxyWithTarget<IHaveDefaultInterfaceMethod>(target, options);
 
 			var returnValue = proxy.Method();
 
-			Assert.AreEqual("default implementation", returnValue);
+			Assert.AreEqual("implementation", returnValue);
 		}
 
 		[Test]
-		public void Default_implementation_called_when_method_not_proxied_in_interface_proxy_with_target_interface()
+		public void Target_implementation_called_when_method_not_proxied_in_interface_proxy_with_target_interface()
 		{
 			var options = new ProxyGenerationOptions { Hook = new ProxyNothingHook() };
-			var target = new InheritsDefaultInterfaceMethod();
+			var target = new ImplementsDefaultInterfaceMethod();
 			var proxy = generator.CreateInterfaceProxyWithTargetInterface<IHaveDefaultInterfaceMethod>(target, options);
 
 			var returnValue = proxy.Method();
 
-			Assert.AreEqual("default implementation", returnValue);
+			Assert.AreEqual("implementation", returnValue);
 		}
 
 		public interface IHaveDefaultInterfaceMethod
@@ -188,6 +188,14 @@ string Method()
 		public class InheritsDefaultInterfaceMethod : IHaveDefaultInterfaceMethod
 		{
 		}
+
+		public class ImplementsDefaultInterfaceMethod : InheritsDefaultInterfaceMethod
+		{
+			public string Method()
+			{
+				return "target implementation";
+			}
+		}
 	}
 }
 

diff --git a/src/Castle.Core/DynamicProxy/Contributors/ClassProxyTargetContributor.cs b/src/Castle.Core/DynamicProxy/Contributors/ClassProxyTargetContributor.cs
@@ -44,7 +44,7 @@ protected override IEnumerable<MembersCollector> GetCollectors()
 
 			foreach (var @interface in targetType.GetAllInterfaces())
 			{
-				yield return new InterfaceMembersWithDefaultImplementationCollector(@interface, targetType);
+				yield return new InterfaceMembersWithDefaultImplementationCollector(@interface, targetType, forProxyWithTarget: false);
 			}
 
 			foreach (var @interface in interfaces)

diff --git a/src/Castle.Core/DynamicProxy/Contributors/ClassProxyWithTargetTargetContributor.cs b/src/Castle.Core/DynamicProxy/Contributors/ClassProxyWithTargetTargetContributor.cs
@@ -43,7 +43,7 @@ protected override IEnumerable<MembersCollector> GetCollectors()
 
 			foreach (var @interface in targetType.GetAllInterfaces())
 			{
-				yield return new InterfaceMembersWithDefaultImplementationCollector(@interface, targetType);
+				yield return new InterfaceMembersWithDefaultImplementationCollector(@interface, targetType, forProxyWithTarget: true);
 			}
 
 			foreach (var @interface in interfaces)

diff --git a/...stle.Core/DynamicProxy/Contributors/InterfaceMembersWithDefaultImplementationCollector.cs b/...stle.Core/DynamicProxy/Contributors/InterfaceMembersWithDefaultImplementationCollector.cs
@@ -23,8 +23,9 @@ namespace Castle.DynamicProxy.Contributors
 	internal sealed class InterfaceMembersWithDefaultImplementationCollector : MembersCollector
 	{
 		private readonly InterfaceMapping map;
+		private readonly bool forProxyWithTarget;
 
-		public InterfaceMembersWithDefaultImplementationCollector(Type @interface, Type classToProxy)
+		public InterfaceMembersWithDefaultImplementationCollector(Type @interface, Type classToProxy, bool forProxyWithTarget)
 			: base(@interface)
 		{
 			Debug.Assert(@interface != null);
@@ -36,6 +37,7 @@ public InterfaceMembersWithDefaultImplementationCollector(Type @interface, Type
 			Debug.Assert(@interface.IsAssignableFrom(classToProxy));
 
 			map = classToProxy.GetInterfaceMap(@interface);
+			this.forProxyWithTarget = forProxyWithTarget;
 		}
 
 		protected override MetaMethod GetMethodToGenerate(MethodInfo method, IProxyGenerationHook hook, bool standalone)
@@ -53,7 +55,7 @@ protected override MetaMethod GetMethodToGenerate(MethodInfo method, IProxyGener
 			Debug.Assert(hasTarget);
 
 			var proxyable = AcceptMethod(method, onlyVirtuals: true, hook);
-			if (!proxyable)
+			if (!proxyable && !forProxyWithTarget)
 			{
 				return null;
 			}