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

resolved SPRNET-924

Browse Source 
fixed bug in AttributeTypeFilter wrt attribute lookup
This commit is contained in:
eeichinger
2008-11-04 16:27:42 +00:00
parent 0b3d2bbd67
commit c79c47f4ea
14 changed files with 1365 additions and 729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AttributeAutoProxyCreatorTests.cs Normal file
View File

@@ -0,0 +1,150 @@
#region License
/*
* Copyright <20> 2002-2008 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#endregion
#region Imports
using System;
using NUnit.Framework;
using Spring.Objects;
using Spring.Stereotype;
#endregion
namespace Spring.Aop.Framework.AutoProxy
{
/// <summary>
///
/// </summary>
/// <author>Erich Eichinger</author>
[TestFixture]
public class AttributeAutoProxyCreatorTests
{
public interface IEmptyInterface
{}
[AttributeUsage( AttributeTargets.Class|AttributeTargets.Method, Inherited=false )]
private class ApcTestAttribute : Attribute {}
private class ApcTestObject: IEmptyInterface {}
[ApcTest]
private class AttributedApcTestObject : ApcTestObject
{}
private class DerivedAttributedApcTestObject : AttributedApcTestObject
{
[ApcTest]
public void SomeMethod() {}
}
[Test]
[ExpectedException( typeof( ArgumentNullException ) )]
public void ThrowsOnMissingAttributeTypeList()
{
AttributeAutoProxyCreator apc = new AttributeAutoProxyCreator();
apc.PostProcessAfterInitialization( new ApcTestObject(), "testObject" );
}
[Test]
[ExpectedException( typeof( ArgumentNullException ) )]
public void ThrowsOnAssigningNullAttributeList()
{
AttributeAutoProxyCreator apc = new AttributeAutoProxyCreator();
apc.AttributeTypes = null;
}
[Test]
public void AllowsEmptyAttributeList()
{
AttributeAutoProxyCreator apc = new AttributeAutoProxyCreator();
apc.AttributeTypes = new Type[0];
apc.PostProcessAfterInitialization( new ApcTestObject(), "testObject" );
}
[Test]
public void DefaultsToNotCheckInherited()
{
AttributeAutoProxyCreator apc = new AttributeAutoProxyCreator();
Assert.IsFalse(apc.CheckInherited);
}
[Test]
public void CreatesProxyOnAttributeMatch()
{
AttributeAutoProxyCreator apc = new AttributeAutoProxyCreator();
apc.AttributeTypes = new Type[] { typeof(ApcTestAttribute) };
object result = apc.PostProcessAfterInitialization( new AttributedApcTestObject(), "testObject" );
Assert.IsTrue( AopUtils.IsAopProxy( result ) );
}
[Test]
public void CreatesProxyOnInheritedAttributeMatchWhenCheckInherited()
{
AttributeAutoProxyCreator apc = new AttributeAutoProxyCreator();
apc.AttributeTypes = new Type[] { typeof(ApcTestAttribute) };
apc.CheckInherited = true;
object result = apc.PostProcessAfterInitialization( new DerivedAttributedApcTestObject(), "testObject" );
Assert.IsTrue( AopUtils.IsAopProxy( result ) );
}
[Test]
public void DoesNotCreateProxyOnInheritedAttributeMatchWhenNotCheckInherited()
{
AttributeAutoProxyCreator apc = new AttributeAutoProxyCreator();
apc.AttributeTypes = new Type[] { typeof(ApcTestAttribute) };
apc.CheckInherited = false;
object result = apc.PostProcessAfterInitialization( new DerivedAttributedApcTestObject(), "testObject" );
Assert.IsFalse( AopUtils.IsAopProxy( result ) );
}
[Test]
public void DoesNotCreateProxyIfNoAttributeMatch()
{
AttributeAutoProxyCreator apc = new AttributeAutoProxyCreator();
apc.AttributeTypes = new Type[] { typeof(ApcTestAttribute) };
object result = apc.PostProcessAfterInitialization( new TestObject(), "testObject" );
Assert.IsFalse( AopUtils.IsAopProxy( result ) );
}
[Test]
public void DoesNotCheckMethodLevelAttributes()
{
AttributeAutoProxyCreator apc = new AttributeAutoProxyCreator();
apc.AttributeTypes = new Type[] { typeof(ApcTestAttribute) };
apc.CheckInherited = false; // (!)
// does not check method level attributes!
object result = apc.PostProcessAfterInitialization( new DerivedAttributedApcTestObject(), "testObject" );
Assert.IsFalse( AopUtils.IsAopProxy( result ) );
}
[Test]
public void DoesNotCreateProxyIfEmptyAtributeList()
{
AttributeAutoProxyCreator apc = new AttributeAutoProxyCreator();
apc.AttributeTypes = new Type[0];
object result = apc.PostProcessAfterInitialization( new ApcTestObject(), "testObject" );
Assert.IsFalse( AopUtils.IsAopProxy( result ) );
}
}
}

38
test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/PointcutFilteringAutoProxyCreatorTests.cs
View File

@@ -36,58 +36,30 @@ namespace Spring.Aop.Framework.AutoProxy
[TestFixture]
public class PointcutFilteringAutoProxyCreatorTests
{
[Test]
public void CreatesProxyOnlyIfPointcutAndObjectNameMatch()
{
// is match
PointcutFilteringAutoProxyCreator apc = new PointcutFilteringAutoProxyCreator();
apc.ObjectNames = new string[] { "test*" } ;;
apc.Pointcut = new SdkRegularExpressionMethodPointcut(".*\\.GetHashCode");
object result = apc.PostProcessAfterInitialization( new TestObject(), "testObject" );
Assert.IsTrue(AopUtils.IsAopProxy(result));
apc = new PointcutFilteringAutoProxyCreator();
apc.ObjectNames = new string[] { "test*" } ;;
apc.Pointcut = new SdkRegularExpressionMethodPointcut(".*\\.GetHashCODE");
result = apc.PostProcessAfterInitialization( new TestObject(), "testObject" );
Assert.IsFalse(AopUtils.IsAopProxy(result));
apc = new PointcutFilteringAutoProxyCreator();
apc.ObjectNames = new string[] { "tesT*" } ;;
apc.Pointcut = new SdkRegularExpressionMethodPointcut(".*\\.GetHashCode");
result = apc.PostProcessAfterInitialization( new TestObject(), "testObject" );
Assert.IsFalse(AopUtils.IsAopProxy(result));
}
[Test]
public void CreatesProxyOnPointcutMatch()
{
PointcutFilteringAutoProxyCreator apc = new PointcutFilteringAutoProxyCreator();
apc.ObjectNames = null;
apc.Pointcut = new SdkRegularExpressionMethodPointcut(".*\\.GetHashCode");
object result = apc.PostProcessAfterInitialization( new TestObject(), "testObject" );
Assert.IsTrue(AopUtils.IsAopProxy(result));
}
[Test]
public void CreatesProxyOnNameMatch()
public void DoesNotCreateProxyIfNoPointcutMatch()
{
PointcutFilteringAutoProxyCreator apc = new PointcutFilteringAutoProxyCreator();
apc.ObjectNames = new string[] { "test*" } ;
apc.Pointcut = null;
apc.Pointcut = new SdkRegularExpressionMethodPointcut(".*\\.DOEsNOTExist");
object result = apc.PostProcessAfterInitialization( new TestObject(), "testObject" );
Assert.IsTrue(AopUtils.IsAopProxy(result));
Assert.IsFalse(AopUtils.IsAopProxy(result));
}
[Test]
[ExpectedException(typeof(ArgumentException))]
[ExpectedException(typeof(ArgumentNullException))]
public void ThrowsArgumentExceptionIfNoCriteriaSpecified()
{
PointcutFilteringAutoProxyCreator apc = new PointcutFilteringAutoProxyCreator();
apc.ObjectNames = new string[] {} ;
apc.Pointcut = null;
object result = apc.PostProcessAfterInitialization( new TestObject(), "testObject" );
Assert.IsTrue(AopUtils.IsAopProxy(result));
apc.PostProcessAfterInitialization( new TestObject(), "testObject" );
}
}
}

98
test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/TypeNameAutoProxyCreatorTests.cs Normal file
View File

@@ -0,0 +1,98 @@
#region License
/*
* Copyright <20> 2002-2008 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#endregion
#region Imports
using System;
using NUnit.Framework;
using Spring.Objects;
#endregion
namespace Spring.Aop.Framework.AutoProxy
{
/// <summary>
///
/// </summary>
/// <author>Erich Eichinger</author>
[TestFixture]
public class TypeNameAutoProxyCreatorTests
{
private class MyLocalTestObject: TestObject
{}
[Test]
[ExpectedException( typeof( ArgumentNullException ) )]
public void ThrowsOnMissingTypeNames()
{
TypeNameAutoProxyCreator apc = new TypeNameAutoProxyCreator();
apc.PostProcessAfterInitialization( new TestObject(), "testObject" );
}
[Test]
[ExpectedException( typeof( ArgumentNullException ) )]
public void ThrowsOnAssigningNullTypeNames()
{
TypeNameAutoProxyCreator apc = new TypeNameAutoProxyCreator();
apc.TypeNames = null;
}
[Test]
public void AllowsEmptyTypeNameList()
{
TypeNameAutoProxyCreator apc = new TypeNameAutoProxyCreator();
apc.TypeNames = new string[] {};
apc.PostProcessAfterInitialization( new TestObject(), "testObject" );
}
[Test]
public void CreatesProxyOnTypeNameMatch()
{
TypeNameAutoProxyCreator apc = new TypeNameAutoProxyCreator();
apc.TypeNames = new string[] { "Spring.Objects.Test*", "*MyLocal*" };
object result = apc.PostProcessAfterInitialization( new TestObject(), "testObject" );
Assert.IsTrue( AopUtils.IsAopProxy( result ) );
result = apc.PostProcessAfterInitialization( new MyLocalTestObject(), "myLocalTestObject" );
Assert.IsTrue( AopUtils.IsAopProxy( result ) );
}
[Test]
public void DoesNotCreateProxyIfNoTypeNameMatch()
{
TypeNameAutoProxyCreator apc = new TypeNameAutoProxyCreator();
apc.TypeNames = new string[] { "Foo*" };
object result = apc.PostProcessAfterInitialization( new TestObject(), "testObject" );
Assert.IsFalse( AopUtils.IsAopProxy( result ) );
}
[Test]
public void DoesNotCreateProxyIfEmptyTypeNameList()
{
TypeNameAutoProxyCreator apc = new TypeNameAutoProxyCreator();
apc.TypeNames = new string[] {};
object result = apc.PostProcessAfterInitialization( new TestObject(), "testObject" );
Assert.IsFalse( AopUtils.IsAopProxy( result ) );
}
}
}

2
test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2008.csproj
View File

@@ -125,6 +125,7 @@
</Compile>
<Compile Include="Aop\Framework\AutoProxy\AdvisorAutoProxyCreatorCircularReferencesTests.cs" />
<Compile Include="Aop\Framework\AutoProxy\AdvisorAutoProxyCreatorTests.cs" />
<Compile Include="Aop\Framework\AutoProxy\AttributeAutoProxyCreatorTests.cs" />
<Compile Include="Aop\Framework\AutoProxy\LogicalThreadContextAdvice.cs" />
<Compile Include="Aop\Framework\AutoProxy\NoSetterProperties.cs" />
<Compile Include="Aop\Framework\AutoProxy\ObjectNameAutoProxyCreatorTests.cs" />
@@ -132,6 +133,7 @@
<Compile Include="Aop\Framework\AbstractMethodInvocationTests.cs" />
<Compile Include="Aop\Framework\AutoProxy\CreatesTestObject.cs" />
<Compile Include="Aop\Framework\AutoProxy\PointcutFilteringAutoProxyCreatorTests.cs" />
<Compile Include="Aop\Framework\AutoProxy\TypeNameAutoProxyCreatorTests.cs" />
<Compile Include="Aop\Framework\DynamicMethodInvocationTests.cs" />
<Compile Include="Aop\Framework\CountingAfterReturningAdvice.cs" />
<Compile Include="Aop\Framework\CountingBeforeAdvice.cs">