Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed SPRNET-1171

Browse Source
This commit is contained in:
eeichinger
2009-02-23 13:47:24 +00:00
parent fe3bc0b39b
commit fe944c740c
5 changed files with 135 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/InheritanceAopProxyTypeBuilder.cs
View File

@@ -201,7 +201,7 @@ namespace Spring.Aop.Framework.DynamicProxy
MemberInfo[] matchingMethods = targetType.FindMembers(
MemberTypes.Method,
BindingFlags.Instance | BindingFlags.Public,
BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic,
new MemberFilter(new CriteriaMemberFilter().FilterMemberByCriteria),
searchCriteria);

8
src/Spring/Spring.Core/Proxy/AbstractProxyTypeBuilder.cs
View File

@@ -851,8 +851,7 @@ namespace Spring.Proxy
IDictionary methodMap = new Hashtable();
IList finalMethods = new ArrayList();
BindingFlags bindingFlags = BindingFlags.Public | BindingFlags.Instance;
BindingFlags bindingFlags = BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic;
if (declaredMembersOnly)
{
bindingFlags |= BindingFlags.DeclaredOnly;
@@ -862,7 +861,10 @@ namespace Spring.Proxy
MethodInfo[] methods = type.GetMethods(bindingFlags);
foreach (MethodInfo method in methods)
{
if (method.IsVirtual && !method.IsFinal)
MethodAttributes memberAccess = method.Attributes & MethodAttributes.MemberAccessMask;
if (method.IsVirtual && !method.IsFinal && !method.Name.Equals("Finalize")
&& (memberAccess == MethodAttributes.Public || memberAccess == MethodAttributes.Family || memberAccess == MethodAttributes.FamORAssem))
{
MethodBuilder methodBuilder = proxyMethodBuilder.BuildProxyMethod(method, null);
ApplyMethodAttributes(methodBuilder, method);

2
src/Spring/Spring.Core/Util/Properties.cs
View File

@@ -128,7 +128,7 @@ namespace Spring.Util
while ((line = textReader.ReadLine()) != null)
{
line = RemoveLeadingWhitespace(line);
if (line != null && Comments.IndexOf(line[0]) == -1)
if (line != null && line.Length>0 && Comments.IndexOf(line[0]) == -1)
{
if (!isContinuation)
{

63
test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DecoratorAopProxyTests.cs
View File

@@ -120,6 +120,54 @@ namespace Spring.Aop.Framework.DynamicProxy
Assert.AreEqual(3, ni.Count);
}
[Test]
public void InterceptProtectedVirtualMethod()
{
DoesNotImplementInterfaceTestObject target = new DoesNotImplementInterfaceTestObject();
target.Name = "Bruno";
mockTargetSource.SetTarget(target);
NopInterceptor ni = new NopInterceptor();
AdvisedSupport advised = new AdvisedSupport();
advised.TargetSource = mockTargetSource;
advised.AddAdvice(ni);
DoesNotImplementInterfaceTestObject proxy = CreateProxy(advised) as DoesNotImplementInterfaceTestObject;
Assert.IsNotNull(proxy);
// GetName() calls underlying protected "GetNameInternal()" which calls get_Name
Assert.AreEqual(target.Name, proxy.GetName(), "Incorrect name");
target.Name = "Bruno Baia";
Assert.AreEqual("Bruno Baia", proxy.GetName(), "Incorrect name");
Assert.AreEqual(2, ni.Count);
}
[Test]
public void InterceptInheritedVirtualMethods()
{
DoesNotImplementInterfaceTestObject target = new DerivedDoesNotImplementInterfaceTestObject();
target.Name = "Bruno";
mockTargetSource.SetTarget(target);
NopInterceptor ni = new NopInterceptor();
AdvisedSupport advised = new AdvisedSupport();
advised.TargetSource = mockTargetSource;
advised.AddAdvice(ni);
DoesNotImplementInterfaceTestObject proxy = CreateProxy(advised) as DoesNotImplementInterfaceTestObject;
Assert.IsNotNull(proxy);
// GetName() calls underlying protected "GetNameInternal()" which calls get_Name
Assert.AreEqual(target.Name, proxy.GetName(), "Incorrect name");
proxy.Name = "Bruno Baia";
Assert.AreEqual("Bruno Baia", proxy.Name, "Incorrect name");
Assert.AreEqual(3, ni.Count);
}
[Test]
public void CannotInterceptFinalMethodThatDoesNotBelongToAnInterface()
{
@@ -343,8 +391,23 @@ namespace Spring.Aop.Framework.DynamicProxy
get { return _location; }
set { _location = value; }
}
// protected virtual method
protected virtual string GetNameInternal()
{
return this.Name;
}
// public final method calling protected
public string GetName()
{
return GetNameInternal();
}
}
public class DerivedDoesNotImplementInterfaceTestObject : DoesNotImplementInterfaceTestObject
{}
#endregion
}
}

79
test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/InheritanceAopProxyTests.cs
View File

@@ -175,6 +175,24 @@ namespace Spring.Aop.Framework.DynamicProxy
Assert.AreEqual(3, ni.Count);
}
[Test]
public void DoesNotInterceptInternalMethod()
{
NopInterceptor ni = new NopInterceptor();
AdvisedSupport advised = new AdvisedSupport();
advised.Target = new InheritanceTestObject();
advised.AddAdvice(ni);
object proxy = CreateProxy(advised);
//DynamicProxyManager.SaveAssembly();
Assert.IsTrue(proxy is InheritanceTestObject);
InheritanceTestObject proxiedClass = proxy as InheritanceTestObject;
proxiedClass.InternalToDo();
Assert.AreEqual(0, ni.Count);
}
[Test]
public void InterceptVirtualMethodThatBelongsToAnInterface()
{
@@ -241,23 +259,43 @@ namespace Spring.Aop.Framework.DynamicProxy
Assert.AreEqual(2, proxiedClass.Value);
}
//[Test]
//public void InterceptProtectedMethod()
//{
// NopInterceptor ni = new NopInterceptor();
[Test]
public void InterceptProtectedMethod()
{
NopInterceptor ni = new NopInterceptor();
// AdvisedSupport advised = new AdvisedSupport();
// advised.Target = new InheritanceTestObject();
// advised.AddAdvice(ni);
AdvisedSupport advised = new AdvisedSupport();
advised.Target = new InheritanceTestObject();
advised.AddAdvice(ni);
// object proxy = CreateProxy(advised);
// //DynamicProxyManager.SaveAssembly();
object proxy = CreateProxy(advised);
//DynamicProxyManager.SaveAssembly();
// Assert.IsTrue(proxy is InheritanceTestObject);
// InheritanceTestObject proxiedClass = proxy as InheritanceTestObject;
// proxiedClass.Todo();
// Assert.AreEqual(1, ni.Count);
//}
Assert.IsTrue(proxy is InheritanceTestObject);
InheritanceTestObject proxiedClass = proxy as InheritanceTestObject;
proxiedClass.Todo();
Assert.AreEqual(1, ni.Count);
}
[Test]
public void InterceptInheritedMethods()
{
NopInterceptor ni = new NopInterceptor();
AdvisedSupport advised = new AdvisedSupport();
advised.Target = new InheritanceTestObject();
advised.AddAdvice(ni);
object proxy = CreateProxy(advised);
//DynamicProxyManager.SaveAssembly();
Assert.IsTrue(proxy is InheritanceTestObject);
InheritanceTestObject proxiedClass = proxy as InheritanceTestObject;
proxiedClass.Todo();
proxiedClass.Name = "Erich";
Assert.AreEqual("Erich", proxiedClass.Name);
Assert.AreEqual(3, ni.Count);
}
}
#region Helper Classes
@@ -336,7 +374,20 @@ namespace Spring.Aop.Framework.DynamicProxy
{
}
internal virtual void InternalToDo()
{
}
internal protected virtual void InternalProtectedToDo()
{
}
}
public class DerivedInheritanceTestObject : InheritanceTestObject
{}
#endregion
}