From 4671fd71416065e1381ef2683c15bdb0895c5121 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Sat, 20 Dec 2008 23:34:49 +0000 Subject: [PATCH] polishing .aop tests --- .../annotation/AbstractAspectJAdvisorFactoryTests.java | 8 ++++---- .../aspectj/annotation/AspectJPointcutAdvisorTests.java | 2 +- .../aop/aspectj/annotation/AspectMetadataTests.java | 2 +- .../aop/aspectj/annotation/AspectProxyFactoryTests.java | 2 +- .../springframework/aop/framework/ProxyFactoryTests.java | 4 ++-- .../framework/adapter/ThrowsAdviceInterceptorTests.java | 2 +- .../ExposeInvocationInterceptorTests-context.xml | 2 +- .../org/springframework/aop/support/AopUtilsTests.java | 2 +- .../aop/support/ControlFlowPointcutTests.java | 2 +- .../support/DelegatingIntroductionInterceptorTests.java | 2 +- .../aop/support/NameMatchMethodPointcutTests.java | 4 ++-- ...egexpMethodPointcutAdvisorIntegrationTests-context.xml | 2 +- .../RegexpMethodPointcutAdvisorIntegrationTests.java | 4 ++-- .../aop/target/HotSwappableTargetSourceTests.java | 2 +- .../aop/target/PrototypeTargetSourceTests-context.xml | 2 +- .../aop/target/ThreadLocalTargetSourceTests-context.xml | 2 +- .../test/java/test/{mixin => aop}/DefaultLockable.java | 2 +- .../src/test/java/test/{mixin => aop}/Lockable.java | 2 +- .../src/test/java/test/{advice => aop}/MethodCounter.java | 2 +- .../java/test/{interceptor => aop}/NopInterceptor.java | 2 +- .../test/java/test/{aspect => aop}/PerTargetAspect.java | 2 +- .../src/test/java/test/{aspect => aop}/PerThisAspect.java | 2 +- .../{interceptor => aop}/SerializableNopInterceptor.java | 2 +- .../test/java/test/{aspect => aop}/TwoAdviceAspect.java | 2 +- 24 files changed, 30 insertions(+), 30 deletions(-) rename org.springframework.aop/src/test/java/test/{mixin => aop}/DefaultLockable.java (97%) rename org.springframework.aop/src/test/java/test/{mixin => aop}/Lockable.java (97%) rename org.springframework.aop/src/test/java/test/{advice => aop}/MethodCounter.java (98%) rename org.springframework.aop/src/test/java/test/{interceptor => aop}/NopInterceptor.java (98%) rename org.springframework.aop/src/test/java/test/{aspect => aop}/PerTargetAspect.java (96%) rename org.springframework.aop/src/test/java/test/{aspect => aop}/PerThisAspect.java (98%) rename org.springframework.aop/src/test/java/test/{interceptor => aop}/SerializableNopInterceptor.java (97%) rename org.springframework.aop/src/test/java/test/{aspect => aop}/TwoAdviceAspect.java (98%) diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java index 83e1653cd1..162ab6b9a5 100644 --- a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java +++ b/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java @@ -50,12 +50,12 @@ import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; import org.springframework.util.ObjectUtils; -import test.aspect.PerTargetAspect; -import test.aspect.TwoAdviceAspect; +import test.aop.DefaultLockable; +import test.aop.Lockable; +import test.aop.PerTargetAspect; +import test.aop.TwoAdviceAspect; import test.beans.ITestBean; import test.beans.TestBean; -import test.mixin.DefaultLockable; -import test.mixin.Lockable; /** * Abstract tests for AspectJAdvisorFactory. diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java index fb91a3d488..ead9f1f62c 100644 --- a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java +++ b/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java @@ -24,7 +24,7 @@ import org.springframework.aop.aspectj.AspectJExpressionPointcut; import org.springframework.aop.aspectj.AspectJExpressionPointcutTests; import org.springframework.aop.framework.AopConfigException; -import test.aspect.PerTargetAspect; +import test.aop.PerTargetAspect; import test.beans.TestBean; diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java index 07d97abf4c..f1c32fe992 100644 --- a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java +++ b/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.springframework.aop.Pointcut; import org.springframework.aop.aspectj.annotation.AbstractAspectJAdvisorFactoryTests.ExceptionAspect; -import test.aspect.PerTargetAspect; +import test.aop.PerTargetAspect; /** diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java index 74be402eab..58c5b3226e 100644 --- a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java +++ b/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java @@ -23,7 +23,7 @@ import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.junit.Test; -import test.aspect.PerThisAspect; +import test.aop.PerThisAspect; /** diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java index 1cb396cabb..dd4c9ef091 100644 --- a/org.springframework.aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java +++ b/org.springframework.aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java @@ -33,11 +33,11 @@ import org.springframework.aop.support.DefaultIntroductionAdvisor; import org.springframework.aop.support.DefaultPointcutAdvisor; import org.springframework.aop.support.DelegatingIntroductionInterceptor; -import test.advice.MethodCounter; +import test.aop.MethodCounter; +import test.aop.NopInterceptor; import test.beans.IOther; import test.beans.ITestBean; import test.beans.TestBean; -import test.interceptor.NopInterceptor; import test.util.TimeStamped; /** diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java index 943535713a..e8d99f91ea 100644 --- a/org.springframework.aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java +++ b/org.springframework.aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java @@ -35,7 +35,7 @@ import org.junit.Ignore; import org.junit.Test; import org.springframework.aop.ThrowsAdvice; -import test.advice.MethodCounter; +import test.aop.MethodCounter; /** * Unit tests for {@link ThrowsAdviceInterceptor} diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml b/org.springframework.aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml index a3ce25dd04..a4eef4491b 100644 --- a/org.springframework.aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml +++ b/org.springframework.aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml @@ -6,7 +6,7 @@ --> - + diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java index 23155444d5..c423579aa0 100644 --- a/org.springframework.aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java +++ b/org.springframework.aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java @@ -27,8 +27,8 @@ import org.springframework.aop.Pointcut; import org.springframework.aop.interceptor.ExposeInvocationInterceptor; import org.springframework.aop.target.EmptyTargetSource; +import test.aop.NopInterceptor; import test.beans.TestBean; -import test.interceptor.NopInterceptor; import test.util.SerializationTestUtils; /** diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java index a8645364a6..ed17db6618 100644 --- a/org.springframework.aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java +++ b/org.springframework.aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java @@ -22,9 +22,9 @@ import org.junit.Test; import org.springframework.aop.Pointcut; import org.springframework.aop.framework.ProxyFactory; +import test.aop.NopInterceptor; import test.beans.ITestBean; import test.beans.TestBean; -import test.interceptor.NopInterceptor; /** * @author Rod Johnson diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java index 4cb0036c47..c4b4cc5dec 100644 --- a/org.springframework.aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java +++ b/org.springframework.aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java @@ -27,13 +27,13 @@ import org.springframework.aop.IntroductionAdvisor; import org.springframework.aop.IntroductionInterceptor; import org.springframework.aop.framework.ProxyFactory; +import test.aop.SerializableNopInterceptor; import test.beans.INestedTestBean; import test.beans.ITestBean; import test.beans.NestedTestBean; import test.beans.Person; import test.beans.SerializablePerson; import test.beans.TestBean; -import test.interceptor.SerializableNopInterceptor; import test.util.SerializationTestUtils; import test.util.TimeStamped; diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java index b69cfbca10..1d6a353156 100644 --- a/org.springframework.aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java +++ b/org.springframework.aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java @@ -23,10 +23,10 @@ import org.junit.Test; import org.springframework.aop.framework.Advised; import org.springframework.aop.framework.ProxyFactory; +import test.aop.NopInterceptor; +import test.aop.SerializableNopInterceptor; import test.beans.Person; import test.beans.SerializablePerson; -import test.interceptor.NopInterceptor; -import test.interceptor.SerializableNopInterceptor; import test.util.SerializationTestUtils; /** diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml b/org.springframework.aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml index 343232a0e9..1e3ae07f26 100644 --- a/org.springframework.aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml +++ b/org.springframework.aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml @@ -9,7 +9,7 @@ 666 - + diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java index 73cbe44023..3b90868cad 100644 --- a/org.springframework.aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java +++ b/org.springframework.aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java @@ -24,11 +24,11 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.xml.XmlBeanFactory; import org.springframework.core.io.ClassPathResource; +import test.aop.NopInterceptor; +import test.aop.SerializableNopInterceptor; import test.beans.ITestBean; import test.beans.Person; import test.beans.TestBean; -import test.interceptor.NopInterceptor; -import test.interceptor.SerializableNopInterceptor; import test.util.SerializationTestUtils; /** diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java index 196acfdd0e..59cecf140d 100644 --- a/org.springframework.aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java +++ b/org.springframework.aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java @@ -27,10 +27,10 @@ import org.springframework.aop.support.DefaultPointcutAdvisor; import org.springframework.beans.factory.xml.XmlBeanFactory; import org.springframework.core.io.ClassPathResource; +import test.aop.SerializableNopInterceptor; import test.beans.Person; import test.beans.SerializablePerson; import test.beans.SideEffectBean; -import test.interceptor.SerializableNopInterceptor; import test.util.SerializationTestUtils; diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml b/org.springframework.aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml index 84703ecdc7..b271b1f556 100644 --- a/org.springframework.aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml +++ b/org.springframework.aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml @@ -16,7 +16,7 @@ prototypeTest - + debugInterceptor,test diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml b/org.springframework.aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml index 24ccf83677..f4c41190ff 100644 --- a/org.springframework.aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml +++ b/org.springframework.aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml @@ -11,7 +11,7 @@ prototypeTest - +