Skip to content

Commit 5d607cb

Browse files
huoshan12345huoshan12345
committed
fix a test case
1 parent 2caca2f commit 5d607cb

File tree

4 files changed

+22
-19
lines changed

4 files changed

+22
-19
lines changed

‎src/AspectCore.Core/Extensions/TypeExtensions.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ internal static class TypeExtensions
2424
{
2525
public static readonly Type PreserveBaseOverridesAttribute = Type.GetType("System.Runtime.CompilerServices.PreserveBaseOverridesAttribute", false);
2626

27-
public static bool IsPreserveBaseOverrides(this Type type)
28-
{
29-
return type == PreserveBaseOverridesAttribute;
30-
}
31-
3227
public static IReadOnlyList<CovariantReturnMethodInfo> GetCovariantReturnMethods(this Type type)
3328
{
3429
var result = new List<CovariantReturnMethodInfo>();

‎src/AspectCore.Core/Utils/ProxyGeneratorUtils.cs‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -497,9 +497,6 @@ private static MethodBuilder DefineMethod(MethodInfo method, string name, Method
497497
//inherit targetMethod's attribute
498498
foreach (var customAttributeData in method.CustomAttributes)
499499
{
500-
if (customAttributeData.AttributeType.IsPreserveBaseOverrides())
501-
continue;
502-
503500
methodBuilder.SetCustomAttribute(CustomAttributeBuilderUtils.DefineCustomAttribute(customAttributeData));
504501
}
505502

@@ -857,6 +854,13 @@ private static void DefineClassPropertyMethod(PropertyBuilder propertyBuilder, P
857854
{
858855
var method = MethodBuilderUtils.DefineClassMethod(property.GetMethod, implType, typeDesc);
859856
propertyBuilder.SetGetMethod(method);
857+
858+
if (property.GetMethod.IsPreserveBaseOverride(true))
859+
{
860+
// property.GetMethod is a covariant return type method, we need to define an override for it.
861+
// otherwise, the TypeDesc.Compile() will run forever.
862+
typeDesc.Builder.DefineMethodOverride(method, property.GetMethod);
863+
}
860864
}
861865
if (property.CanWrite)
862866
{
@@ -990,10 +994,10 @@ public static void DefineParameters(MethodInfo targetMethod, MethodBuilder metho
990994
}
991995
}
992996

993-
var returnParamter = targetMethod.ReturnParameter;
994-
var returnParameterBuilder = methodBuilder.DefineParameter(0, returnParamter.Attributes, returnParamter.Name);
997+
var returnParameter = targetMethod.ReturnParameter;
998+
var returnParameterBuilder = methodBuilder.DefineParameter(0, returnParameter.Attributes, returnParameter.Name);
995999
returnParameterBuilder.SetCustomAttribute(CustomAttributeBuilderUtils.DefineCustomAttribute(typeof(DynamicallyAttribute)));
996-
foreach (var attribute in returnParamter.CustomAttributes)
1000+
foreach (var attribute in returnParameter.CustomAttributes)
9971001
{
9981002
returnParameterBuilder.SetCustomAttribute(CustomAttributeBuilderUtils.DefineCustomAttribute(attribute));
9991003
}

‎src/AspectCore.Core/Utils/ReflectionUtils.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public static bool IsVisibleAndVirtual(this PropertyInfo property)
168168
throw new ArgumentNullException(nameof(property));
169169
}
170170
return (property.CanRead && property.GetMethod.IsVisibleAndVirtual()) ||
171-
(property.CanWrite && property.GetMethod.IsVisibleAndVirtual());
171+
(property.CanWrite && property.SetMethod.IsVisibleAndVirtual());
172172
}
173173

174174
public static bool IsVisibleAndVirtual(this MethodInfo method)

‎tests/AspectCore.Tests/DynamicProxy/CovariantReturnMethodTests.cs‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ public interface IService
2929
object Property { get; }
3030
object Method();
3131

32+
object ProxyProperty { [Interceptor] get; }
3233
[Interceptor]
3334
object ProxyMethod();
3435
}
@@ -38,6 +39,7 @@ public class Service : IService
3839
public virtual object Property { get; } = 1;
3940
public virtual object Method() => 1;
4041

42+
public virtual object ProxyProperty { [Interceptor] get; } = new();
4143
[Interceptor]
4244
public virtual object ProxyMethod() => new();
4345
}
@@ -47,38 +49,35 @@ public class CovariantReturnsService : Service
4749
public override string Property { get; } = nameof(CovariantReturnsService);
4850
public override string Method() => nameof(CovariantReturnsService);
4951

52+
public override string ProxyProperty { [Interceptor] get; } = nameof(CovariantReturnsService);
5053
[Interceptor]
5154
public override string ProxyMethod() => nameof(CovariantReturnsService);
5255
}
5356

5457
public class DerivedCovariantReturnsService : CovariantReturnsService
5558
{
59+
public override string ProxyProperty { [Interceptor] get; } = nameof(DerivedCovariantReturnsService);
5660
[Interceptor]
5761
public override string ProxyMethod() => nameof(DerivedCovariantReturnsService);
5862
}
5963

60-
public class DerivedCovariantReturnsService2 : DerivedCovariantReturnsService
61-
{
62-
public override string Property { get; } = nameof(CovariantReturnsService);
63-
}
64-
6564
[Fact]
6665
public void CreateClassProxy_CovariantReturnsService_Test()
6766
{
6867
var service = ProxyGenerator.CreateClassProxy<CovariantReturnsService>();
6968
Assert.Equal(nameof(CovariantReturnsService), service.Property);
7069
Assert.Equal(nameof(CovariantReturnsService), service.Method());
70+
Assert.Equal(nameof(CovariantReturnsService) + nameof(Interceptor), service.ProxyProperty);
7171
Assert.Equal(nameof(CovariantReturnsService) + nameof(Interceptor), service.ProxyMethod());
7272
}
7373

7474
[Fact]
7575
public void CreateClassProxy_DerivedCovariantReturnsService_Test()
7676
{
77-
return; // 会死锁, 待修. DefineClassPropertyMethod
78-
7977
var service = ProxyGenerator.CreateClassProxy<DerivedCovariantReturnsService>();
8078
Assert.Equal(nameof(CovariantReturnsService), service.Property);
8179
Assert.Equal(nameof(CovariantReturnsService), service.Method());
80+
Assert.Equal(nameof(DerivedCovariantReturnsService) + nameof(Interceptor), service.ProxyProperty);
8281
Assert.Equal(nameof(DerivedCovariantReturnsService) + nameof(Interceptor), service.ProxyMethod());
8382
}
8483

@@ -88,6 +87,7 @@ public void CreateClassProxy_Service_CovariantReturnsService_Test()
8887
var service = ProxyGenerator.CreateClassProxy<Service, CovariantReturnsService>();
8988
Assert.Equal(nameof(CovariantReturnsService), service.Property);
9089
Assert.Equal(nameof(CovariantReturnsService), service.Method());
90+
Assert.Equal(nameof(CovariantReturnsService) + nameof(Interceptor), service.ProxyProperty);
9191
Assert.Equal(nameof(CovariantReturnsService) + nameof(Interceptor), service.ProxyMethod());
9292
}
9393

@@ -97,6 +97,7 @@ public void CreateClassProxy_Service_DerivedCovariantReturnsService_Test()
9797
var service = ProxyGenerator.CreateClassProxy<Service, DerivedCovariantReturnsService>();
9898
Assert.Equal(nameof(CovariantReturnsService), service.Property);
9999
Assert.Equal(nameof(CovariantReturnsService), service.Method());
100+
Assert.Equal(nameof(DerivedCovariantReturnsService) + nameof(Interceptor), service.ProxyProperty);
100101
Assert.Equal(nameof(DerivedCovariantReturnsService) + nameof(Interceptor), service.ProxyMethod());
101102
}
102103

@@ -106,6 +107,7 @@ public void CreateClassProxy_CovariantReturnsService_DerivedCovariantReturnsServ
106107
var service = ProxyGenerator.CreateClassProxy<CovariantReturnsService, DerivedCovariantReturnsService>();
107108
Assert.Equal(nameof(CovariantReturnsService), service.Property);
108109
Assert.Equal(nameof(CovariantReturnsService), service.Method());
110+
Assert.Equal(nameof(DerivedCovariantReturnsService) + nameof(Interceptor), service.ProxyProperty);
109111
Assert.Equal(nameof(DerivedCovariantReturnsService) + nameof(Interceptor), service.ProxyMethod());
110112
}
111113

@@ -115,6 +117,7 @@ public void CreateInterfaceProxy_IService_CovariantReturnsService_Test()
115117
var service = ProxyGenerator.CreateInterfaceProxy<IService, CovariantReturnsService>();
116118
Assert.Equal(nameof(CovariantReturnsService), service.Property);
117119
Assert.Equal(nameof(CovariantReturnsService), service.Method());
120+
Assert.Equal(nameof(CovariantReturnsService) + nameof(Interceptor), service.ProxyProperty);
118121
Assert.Equal(nameof(CovariantReturnsService) + nameof(Interceptor), service.ProxyMethod());
119122
}
120123

@@ -124,6 +127,7 @@ public void CreateInterfaceProxy_IService_DerivedCovariantReturnsService_Test()
124127
var service = ProxyGenerator.CreateInterfaceProxy<IService, DerivedCovariantReturnsService>();
125128
Assert.Equal(nameof(CovariantReturnsService), service.Property);
126129
Assert.Equal(nameof(CovariantReturnsService), service.Method());
130+
Assert.Equal(nameof(DerivedCovariantReturnsService) + nameof(Interceptor), service.ProxyProperty);
127131
Assert.Equal(nameof(DerivedCovariantReturnsService) + nameof(Interceptor), service.ProxyMethod());
128132
}
129133
}

0 commit comments

Comments
 (0)