polishing .aop tests

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.

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;
 
 

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;
 
 
 /**

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;
 
 
 /**

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;
 
 /**

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}

org.springframework.aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml

@@ -6,7 +6,7 @@
 -->
 <beans>
 	
-	<bean id="nopInterceptor" class="test.interceptor.NopInterceptor"/>
+	<bean id="nopInterceptor" class="test.aop.NopInterceptor"/>
 
 	<bean id="exposeInvocation" class="org.springframework.beans.factory.config.FieldRetrievingFactoryBean">
 		<property name="targetClass">

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;
 
 /**

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

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;
 

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;
 
 /**

org.springframework.aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml

@@ -9,7 +9,7 @@
 		<property name="age"><value>666</value></property>
 	</bean>
 
-	<bean id="nopInterceptor" class="test.interceptor.SerializableNopInterceptor"/>
+	<bean id="nopInterceptor" class="test.aop.SerializableNopInterceptor"/>
 
 	<bean id="settersAdvisor" class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
 		<property name="advice"><ref local="nopInterceptor"/></property>

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;
 
 /**

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;
 
 

org.springframework.aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml

@@ -16,7 +16,7 @@
 		<property name="targetBeanName"><value>prototypeTest</value></property>
 	</bean>
 	
-	<bean id="debugInterceptor" class="test.interceptor.NopInterceptor" />
+	<bean id="debugInterceptor" class="test.aop.NopInterceptor" />
 	
 	<bean id="singleton" class="org.springframework.aop.framework.ProxyFactoryBean">
 		<property name="interceptorNames"><value>debugInterceptor,test</value></property>		

org.springframework.aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml

@@ -11,7 +11,7 @@
 		<property name="targetBeanName"><value>prototypeTest</value></property>
 	</bean>
 	
-	<bean id="debugInterceptor" class="test.interceptor.NopInterceptor" />
+	<bean id="debugInterceptor" class="test.aop.NopInterceptor" />
 	
 	<!--
 		We want to invoke the getStatsMixin method on our ThreadLocal invoker

org.springframework.aop/src/test/java/test/aop/DefaultLockable.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.mixin;
+package test.aop;
 
 /**
  * Simple implementation of Lockable interface for use in mixins.

org.springframework.aop/src/test/java/test/aop/Lockable.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.mixin;
+package test.aop;
 
 
 /**

org.springframework.aop/src/test/java/test/aop/MethodCounter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.advice;
+package test.aop;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;

org.springframework.aop/src/test/java/test/aop/NopInterceptor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.interceptor;
+package test.aop;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;

org.springframework.aop/src/test/java/test/aop/PerTargetAspect.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package test.aspect;
+package test.aop;
 
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;

org.springframework.aop/src/test/java/test/aop/PerThisAspect.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.aspect;
+package test.aop;
 
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;

org.springframework.aop/src/test/java/test/aop/SerializableNopInterceptor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.interceptor;
+package test.aop;
 
 import java.io.Serializable;
 

org.springframework.aop/src/test/java/test/aop/TwoAdviceAspect.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.aspect;
+package test.aop;
 
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;