From 7616a00e411225e9f6e6bba6329c77aec00e8502 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Fri, 19 Dec 2008 03:45:30 +0000
Subject: [PATCH] moving .aop.aspectj.* unit tests from .testsuite -> .context

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@479 50f2f4bb-b051-0410-bef5-90022cba6387
---
 .../aop/aspectj/AfterAdviceBindingTests.java  |  0
 .../aop/aspectj/AfterAdviceBindingTests.xml   |  0
 .../AfterReturningAdviceBindingTests.java     |  0
 .../AfterReturningAdviceBindingTests.xml      |  0
 .../AfterThrowingAdviceBindingTests.java      |  0
 .../AfterThrowingAdviceBindingTests.xml       |  0
 .../aop/aspectj/AroundAdviceBindingTests.java |  0
 .../aop/aspectj/AroundAdviceBindingTests.xml  |  0
 .../aspectj/AroundAdviceCircularTests.java    |  0
 .../aop/aspectj/AroundAdviceCircularTests.xml |  0
 .../AspectAndAdvicePrecedenceTests.java       |  0
 .../AspectAndAdvicePrecedenceTests.xml        |  0
 ...AspectJExpressionPointcutAdvisorTests.java |  0
 .../AspectJExpressionPointcutAdvisorTests.xml |  0
 .../BeanNamePointcutAtAspectTests.java        |  0
 .../aspectj/BeanNamePointcutAtAspectTests.xml |  0
 .../aop/aspectj/BeanNamePointcutTests.java    |  0
 .../aop/aspectj/BeanNamePointcutTests.xml     |  0
 .../aop/aspectj/BeforeAdviceBindingTests.java |  0
 .../aop/aspectj/BeforeAdviceBindingTests.xml  |  0
 .../DeclarationOrderIndependenceTests.java    |  0
 .../DeclarationOrderIndependenceTests.xml     |  0
 .../DeclareParentsDelegateRefTests.java       |  0
 .../DeclareParentsDelegateRefTests.xml        |  0
 .../aop/aspectj/DeclareParentsTests.java      |  3 +-
 .../aop/aspectj/DeclareParentsTests.xml       |  4 +-
 ...licitJPArgumentMatchingAtAspectJTests.java |  0
 ...plicitJPArgumentMatchingAtAspectJTests.xml |  0
 .../ImplicitJPArgumentMatchingTests.java      |  0
 .../ImplicitJPArgumentMatchingTests.xml       |  0
 .../OverloadedAdviceTests-ambiguous.xml       |  0
 .../aop/aspectj/OverloadedAdviceTests.java    |  0
 .../aop/aspectj/OverloadedAdviceTests.xml     |  0
 .../aop/aspectj/ProceedTests.java             |  2 +-
 .../aop/aspectj/ProceedTests.xml              |  0
 .../PropertyDependentAspectTests-after.xml    |  0
 ...tyDependentAspectTests-atAspectJ-after.xml |  0
 ...yDependentAspectTests-atAspectJ-before.xml |  0
 .../PropertyDependentAspectTests-before.xml   |  0
 .../aspectj/PropertyDependentAspectTests.java |  0
 .../SharedPointcutWithArgsMismatchTests.java  |  0
 .../SharedPointcutWithArgsMismatchTests.xml   |  0
 .../SubtypeSensitiveMatchingTests.java        |  0
 .../aspectj/SubtypeSensitiveMatchingTests.xml |  0
 .../aspectj/TargetPointcutSelectionTests.java |  0
 .../aspectj/TargetPointcutSelectionTests.xml  |  0
 ...tSelectionOnlyPointcutsAtAspectJTests.java |  0
 ...etSelectionOnlyPointcutsAtAspectJTests.xml |  0
 ...sAndTargetSelectionOnlyPointcutsTests.java |  0
 ...isAndTargetSelectionOnlyPointcutsTests.xml |  0
 .../aop/aspectj/_TestTypes.java               |  0
 .../test/java/test/mixin/DefaultLockable.java | 40 +++++++++++++++++++
 .../src/test/java/test/mixin/Lockable.java    | 32 +++++++++++++++
 53 files changed, 77 insertions(+), 4 deletions(-)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java (98%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml (86%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/ProceedTests.java (99%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/ProceedTests.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/aop/aspectj/_TestTypes.java (100%)
 create mode 100644 org.springframework.context/src/test/java/test/mixin/DefaultLockable.java
 create mode 100644 org.springframework.context/src/test/java/test/mixin/Lockable.java

diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
similarity index 98%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
index 856a70bb879..d4b9926cd4d 100644
--- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
+++ b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
@@ -21,13 +21,14 @@ import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.aop.framework.Advised;
-import org.springframework.aop.framework.Lockable;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.ITestBean;
 import org.springframework.beans.TestBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
+import test.mixin.Lockable;
+
 /**
  * @author Rod Johnson
  * @author Chris Beams
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml
similarity index 86%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml
index f8b682c84f7..d8b4887fe66 100644
--- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml
+++ b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml
@@ -9,8 +9,8 @@
 		<aop:aspect id="beforeAdviceBindingTests" ref="introduction">
 			<aop:declare-parents
 					types-matching="org.springframework.beans..*"
-			    implement-interface="org.springframework.aop.framework.Lockable"
-					default-impl="org.springframework.aop.framework.DefaultLockable"
+			    implement-interface="test.mixin.Lockable"
+					default-impl="test.mixin.DefaultLockable"
 			/>
 			<aop:before
 					method="checkNotLocked"
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ProceedTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java
similarity index 99%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ProceedTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java
index b92fc66d93f..14a52c18d1c 100644
--- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ProceedTests.java
+++ b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2002-2007 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ProceedTests.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/ProceedTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ProceedTests.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/ProceedTests.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/_TestTypes.java b/org.springframework.context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/_TestTypes.java
rename to org.springframework.context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java
diff --git a/org.springframework.context/src/test/java/test/mixin/DefaultLockable.java b/org.springframework.context/src/test/java/test/mixin/DefaultLockable.java
new file mode 100644
index 00000000000..981f0ac28d7
--- /dev/null
+++ b/org.springframework.context/src/test/java/test/mixin/DefaultLockable.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2002-2007 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.
+ */
+
+package test.mixin;
+
+/**
+ * Simple implementation of Lockable interface for use in mixins.
+ * 
+ * @author Rod Johnson
+ */
+public class DefaultLockable implements Lockable {
+
+	private boolean locked;
+
+	public void lock() {
+		this.locked = true;
+	}
+
+	public void unlock() {
+		this.locked = false;
+	}
+
+	public boolean locked() {
+		return this.locked;
+	}
+
+}
\ No newline at end of file
diff --git a/org.springframework.context/src/test/java/test/mixin/Lockable.java b/org.springframework.context/src/test/java/test/mixin/Lockable.java
new file mode 100644
index 00000000000..243e0038bbb
--- /dev/null
+++ b/org.springframework.context/src/test/java/test/mixin/Lockable.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2002-2007 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.
+ */
+
+package test.mixin;
+
+/**
+ * Simple interface to use for mixins
+ * 
+ * @author Rod Johnson
+ *
+ */
+public interface Lockable {
+	
+	void lock();
+	
+	void unlock();
+	
+	boolean locked();
+}
\ No newline at end of file