From 8a371c76697a596ff409cb63c6cadde6660e140c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@pivotal.io>
Date: Sun, 29 Dec 2019 19:15:23 +0100
Subject: [PATCH] Use Gradle test fixture support for spring-aop

See gh-23550
---
 .../build/testsources/TestSourcesPlugin.java  |  3 +-
 integration-tests/integration-tests.gradle    |  1 +
 ...visorAutoProxyCreatorIntegrationTests.java |  6 ++--
 ...toProxyCreatorIntegrationTests-context.xml |  2 +-
 spring-aop/spring-aop.gradle                  |  1 +
 .../aop/framework/ProxyFactoryTests.java      | 30 ++-----------------
 .../adapter/ThrowsAdviceInterceptorTests.java | 24 +--------------
 .../aop/support/AopUtilsTests.java            |  2 +-
 .../aop/support/ControlFlowPointcutTests.java |  2 +-
 ...elegatingIntroductionInterceptorTests.java |  2 +-
 .../support/NameMatchMethodPointcutTests.java |  4 +--
 ...MethodPointcutAdvisorIntegrationTests.java |  4 +--
 .../target/HotSwappableTargetSourceTests.java |  2 +-
 ...poseInvocationInterceptorTests-context.xml |  4 +--
 ...ointcutAdvisorIntegrationTests-context.xml |  2 +-
 .../PrototypeTargetSourceTests-context.xml    |  2 +-
 .../ThreadLocalTargetSourceTests-context.xml  |  2 +-
 .../advice/CountingAfterReturningAdvice.java  |  4 +--
 .../advice/CountingBeforeAdvice.java          |  4 +--
 .../testfixture}/advice/MethodCounter.java    |  4 +--
 .../testfixture}/advice/MyThrowsHandler.java  |  5 +++-
 .../advice/TimestampIntroductionAdvisor.java  |  4 +--
 .../interceptor/NopInterceptor.java           |  2 +-
 .../SerializableNopInterceptor.java           |  2 +-
 .../TimestampIntroductionInterceptor.java     |  2 +-
 spring-context/spring-context.gradle          |  1 +
 .../aop/config/AopNamespaceHandlerTests.java  |  2 +-
 .../aop/framework/AbstractAopProxyTests.java  | 14 ++++-----
 .../aop/framework/CglibProxyTests.java        |  4 +--
 .../aop/framework/ProxyFactoryBeanTests.java  |  8 ++---
 .../AdvisorAutoProxyCreatorTests.java         |  4 +--
 .../BeanNameAutoProxyCreatorTests.java        |  4 +--
 .../support/CustomNamespaceHandlerTests.java  |  2 +-
 .../jmx/export/MBeanExporterTests.java        |  2 +-
 .../AbstractMetadataAssemblerTests.java       |  2 +-
 ...pNamespaceHandlerAdviceTypeTests-error.xml |  4 +--
 .../AopNamespaceHandlerAdviceTypeTests-ok.xml |  4 +--
 ...AopNamespaceHandlerArgNamesTests-error.xml |  4 +--
 .../AopNamespaceHandlerArgNamesTests-ok.xml   |  4 +--
 ...ceHandlerProxyTargetClassTests-context.xml |  4 +--
 ...opNamespaceHandlerReturningTests-error.xml |  4 +--
 .../AopNamespaceHandlerReturningTests-ok.xml  |  4 +--
 .../AopNamespaceHandlerTests-context.xml      |  4 +--
 ...AopNamespaceHandlerThrowingTests-error.xml |  4 +--
 .../AopNamespaceHandlerThrowingTests-ok.xml   |  4 +--
 .../ProxyFactoryBeanTests-autowiring.xml      |  2 +-
 .../ProxyFactoryBeanTests-context.xml         |  2 +-
 ...xyFactoryBeanTests-double-targetsource.xml |  2 +-
 .../ProxyFactoryBeanTests-frozen.xml          |  2 +-
 ...roxyFactoryBeanTests-inner-bean-target.xml |  2 +-
 ...yFactoryBeanTests-notlast-targetsource.xml |  2 +-
 .../ProxyFactoryBeanTests-prototype.xml       |  2 +-
 .../ProxyFactoryBeanTests-serialization.xml   |  4 +--
 .../ProxyFactoryBeanTests-targetsource.xml    |  4 +--
 .../ProxyFactoryBeanTests-throws-advice.xml   |  6 ++--
 ...oProxyCreatorTests-common-interceptors.xml |  4 +--
 ...AdvisorAutoProxyCreatorTests-optimized.xml |  2 +-
 .../BeanNameAutoProxyCreatorTests-context.xml |  8 ++---
 .../CommonsPool2TargetSourceTests-context.xml |  4 +--
 59 files changed, 105 insertions(+), 144 deletions(-)
 rename spring-aop/src/{test/java/org/springframework/tests/aop => testFixtures/java/org/springframework/aop/testfixture}/advice/CountingAfterReturningAdvice.java (90%)
 rename spring-aop/src/{test/java/org/springframework/tests/aop => testFixtures/java/org/springframework/aop/testfixture}/advice/CountingBeforeAdvice.java (90%)
 rename spring-aop/src/{test/java/org/springframework/tests/aop => testFixtures/java/org/springframework/aop/testfixture}/advice/MethodCounter.java (94%)
 rename spring-aop/src/{test/java/org/springframework/tests/aop => testFixtures/java/org/springframework/aop/testfixture}/advice/MyThrowsHandler.java (95%)
 rename spring-aop/src/{test/java/org/springframework/tests/aop => testFixtures/java/org/springframework/aop/testfixture}/advice/TimestampIntroductionAdvisor.java (88%)
 rename spring-aop/src/{test/java/org/springframework/tests/aop => testFixtures/java/org/springframework/aop/testfixture}/interceptor/NopInterceptor.java (96%)
 rename spring-aop/src/{test/java/org/springframework/tests/aop => testFixtures/java/org/springframework/aop/testfixture}/interceptor/SerializableNopInterceptor.java (95%)
 rename spring-aop/src/{test/java/org/springframework/tests/aop => testFixtures/java/org/springframework/aop/testfixture}/interceptor/TimestampIntroductionInterceptor.java (95%)

diff --git a/buildSrc/src/main/java/org/springframework/build/testsources/TestSourcesPlugin.java b/buildSrc/src/main/java/org/springframework/build/testsources/TestSourcesPlugin.java
index c2ced0a4e90a..130a5cac22e3 100644
--- a/buildSrc/src/main/java/org/springframework/build/testsources/TestSourcesPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/build/testsources/TestSourcesPlugin.java
@@ -62,7 +62,8 @@ public class TestSourcesPlugin implements Plugin<Project> {
 	private static final List<String> excludedProjects = Arrays.asList(
 			"integration-tests",
 			"kotlin-coroutines",
-			// "spring-aop",
+			"spring-aop",
+			"spring-aspects",
 			"spring-beans",
 			"spring-context",
 			"spring-context-indexer",
diff --git a/integration-tests/integration-tests.gradle b/integration-tests/integration-tests.gradle
index add7b601218b..5e18462c1e84 100644
--- a/integration-tests/integration-tests.gradle
+++ b/integration-tests/integration-tests.gradle
@@ -7,6 +7,7 @@ dependencies {
 	testCompile(project(":spring-beans"))
 	testCompile(project(":spring-context"))
 	testCompile(project(":spring-core"))
+	testCompile(testFixtures(project(":spring-aop")))
 	testCompile(testFixtures(project(":spring-beans")))
 	testCompile(testFixtures(project(":spring-core")))
 	testCompile(testFixtures(project(":spring-tx")))
diff --git a/integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java b/integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
index ed77a4519385..cf067e01415c 100644
--- a/integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
+++ b/integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
@@ -26,14 +26,14 @@
 
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.support.StaticMethodMatcherPointcutAdvisor;
+import org.springframework.aop.testfixture.advice.CountingBeforeAdvice;
+import org.springframework.aop.testfixture.advice.MethodCounter;
+import org.springframework.aop.testfixture.interceptor.NopInterceptor;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.lang.Nullable;
-import org.springframework.tests.aop.advice.CountingBeforeAdvice;
-import org.springframework.tests.aop.advice.MethodCounter;
-import org.springframework.tests.aop.interceptor.NopInterceptor;
 import org.springframework.transaction.NoTransactionException;
 import org.springframework.transaction.interceptor.TransactionInterceptor;
 import org.springframework.transaction.testfixture.CallCountingTransactionManager;
diff --git a/integration-tests/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml b/integration-tests/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml
index 504b77040094..90ea7dc1f663 100644
--- a/integration-tests/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml
+++ b/integration-tests/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml
@@ -85,7 +85,7 @@
 		<property name="pattern"><value>org.springframework.beans.testfixture.beans.ITestBean.getName</value></property>
 	</bean>
 
-	<bean id="countingAdvice" class="org.springframework.tests.aop.advice.CountingAfterReturningAdvice"/>
+	<bean id="countingAdvice" class="org.springframework.aop.testfixture.advice.CountingAfterReturningAdvice"/>
 
 	<bean id="test" class="org.springframework.beans.testfixture.beans.TestBean">
 		<property name="age"><value>4</value></property>
diff --git a/spring-aop/spring-aop.gradle b/spring-aop/spring-aop.gradle
index 64c8fc6ef607..73bb378f39a7 100644
--- a/spring-aop/spring-aop.gradle
+++ b/spring-aop/spring-aop.gradle
@@ -8,4 +8,5 @@ dependencies {
 	optional("com.jamonapi:jamon")
 	testCompile(testFixtures(project(":spring-beans")))
 	testCompile(testFixtures(project(":spring-core")))
+	testFixturesImplementation(testFixtures(project(":spring-core")))
 }
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
index 033824508e26..2ae1d635116d 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
@@ -33,15 +33,15 @@
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.support.DefaultIntroductionAdvisor;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
-import org.springframework.aop.support.DelegatingIntroductionInterceptor;
+import org.springframework.aop.testfixture.advice.CountingBeforeAdvice;
+import org.springframework.aop.testfixture.interceptor.NopInterceptor;
+import org.springframework.aop.testfixture.interceptor.TimestampIntroductionInterceptor;
 import org.springframework.beans.testfixture.beans.IOther;
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 import org.springframework.core.annotation.Order;
 import org.springframework.core.testfixture.TimeStamped;
-import org.springframework.tests.aop.advice.CountingBeforeAdvice;
-import org.springframework.tests.aop.interceptor.NopInterceptor;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -371,30 +371,6 @@ public void testInterceptorWithoutJoinpoint() {
 	}
 
 
-	@SuppressWarnings("serial")
-	private static class TimestampIntroductionInterceptor extends DelegatingIntroductionInterceptor
-			implements TimeStamped {
-
-		private long ts;
-
-		public TimestampIntroductionInterceptor() {
-		}
-
-		public TimestampIntroductionInterceptor(long ts) {
-			this.ts = ts;
-		}
-
-		public void setTime(long ts) {
-			this.ts = ts;
-		}
-
-		@Override
-		public long getTimeStamp() {
-			return ts;
-		}
-	}
-
-
 	@Order(2)
 	public static class A implements Runnable {
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java
index a836bcc00314..2c1060274e74 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java
@@ -17,16 +17,13 @@
 package org.springframework.aop.framework.adapter;
 
 import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.lang.reflect.Method;
 import java.rmi.ConnectException;
 import java.rmi.RemoteException;
 
 import org.aopalliance.intercept.MethodInvocation;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.aop.ThrowsAdvice;
-import org.springframework.tests.aop.advice.MethodCounter;
+import org.springframework.aop.testfixture.advice.MyThrowsHandler;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -128,23 +125,4 @@ public void afterThrowing(RemoteException ex) throws Throwable {
 		assertThat(th.getCalls("remoteException")).isEqualTo(1);
 	}
 
-
-	@SuppressWarnings("serial")
-	static class MyThrowsHandler extends MethodCounter implements ThrowsAdvice {
-
-		// Full method signature
-		public void afterThrowing(Method m, Object[] args, Object target, IOException ex) {
-			count("ioException");
-		}
-
-		public void afterThrowing(RemoteException ex) throws Throwable {
-			count("remoteException");
-		}
-
-		/** Not valid, wrong number of arguments */
-		public void afterThrowing(Method m, Exception ex) throws Throwable {
-			throw new UnsupportedOperationException("Shouldn't be called");
-		}
-	}
-
 }
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
index eeeedd8efb96..dc5437e6cd67 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
@@ -25,10 +25,10 @@
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
 import org.springframework.aop.target.EmptyTargetSource;
+import org.springframework.aop.testfixture.interceptor.NopInterceptor;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.core.testfixture.io.SerializationTestUtils;
 import org.springframework.lang.Nullable;
-import org.springframework.tests.aop.interceptor.NopInterceptor;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java
index 69251aaebc43..f86c6e7ca9f1 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java
@@ -20,9 +20,9 @@
 
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.aop.testfixture.interceptor.NopInterceptor;
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.beans.testfixture.beans.TestBean;
-import org.springframework.tests.aop.interceptor.NopInterceptor;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
index b0330ff68214..4325e582704f 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
@@ -24,6 +24,7 @@
 import org.springframework.aop.IntroductionAdvisor;
 import org.springframework.aop.IntroductionInterceptor;
 import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.aop.testfixture.interceptor.SerializableNopInterceptor;
 import org.springframework.beans.testfixture.beans.INestedTestBean;
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.beans.testfixture.beans.NestedTestBean;
@@ -32,7 +33,6 @@
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.core.testfixture.TimeStamped;
 import org.springframework.core.testfixture.io.SerializationTestUtils;
-import org.springframework.tests.aop.interceptor.SerializableNopInterceptor;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java
index e344536e21ac..98f7ca29a97e 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java
@@ -21,11 +21,11 @@
 
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.aop.testfixture.interceptor.NopInterceptor;
+import org.springframework.aop.testfixture.interceptor.SerializableNopInterceptor;
 import org.springframework.beans.testfixture.beans.Person;
 import org.springframework.beans.testfixture.beans.SerializablePerson;
 import org.springframework.core.testfixture.io.SerializationTestUtils;
-import org.springframework.tests.aop.interceptor.NopInterceptor;
-import org.springframework.tests.aop.interceptor.SerializableNopInterceptor;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java b/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
index 00021faeb8ff..de3886ef85ee 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
@@ -19,6 +19,8 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.framework.Advised;
+import org.springframework.aop.testfixture.interceptor.NopInterceptor;
+import org.springframework.aop.testfixture.interceptor.SerializableNopInterceptor;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.beans.testfixture.beans.ITestBean;
@@ -26,8 +28,6 @@
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.core.io.Resource;
 import org.springframework.core.testfixture.io.SerializationTestUtils;
-import org.springframework.tests.aop.interceptor.NopInterceptor;
-import org.springframework.tests.aop.interceptor.SerializableNopInterceptor;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.core.testfixture.io.ResourceTestUtils.qualifiedResource;
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
index ca10d0f1b93d..a3354a5587f7 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
@@ -23,13 +23,13 @@
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
+import org.springframework.aop.testfixture.interceptor.SerializableNopInterceptor;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.beans.testfixture.beans.Person;
 import org.springframework.beans.testfixture.beans.SerializablePerson;
 import org.springframework.beans.testfixture.beans.SideEffectBean;
 import org.springframework.core.testfixture.io.SerializationTestUtils;
-import org.springframework.tests.aop.interceptor.SerializableNopInterceptor;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
diff --git a/spring-aop/src/test/resources/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml
index 1bfd0c2814b7..a5bf0f37d9c1 100644
--- a/spring-aop/src/test/resources/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml
+++ b/spring-aop/src/test/resources/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml
@@ -6,7 +6,7 @@
 -->
 <beans>
 
-	<bean id="nopInterceptor" class="org.springframework.tests.aop.interceptor.NopInterceptor"/>
+	<bean id="nopInterceptor" class="org.springframework.aop.testfixture.interceptor.NopInterceptor"/>
 
 	<bean id="exposeInvocation" class="org.springframework.beans.factory.config.FieldRetrievingFactoryBean">
 		<property name="targetClass">
@@ -15,7 +15,7 @@
 		<property name="targetField"><value>INSTANCE</value></property>
 	</bean>
 
-	<bean id="countingBeforeAdvice" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="countingBeforeAdvice" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
 	<bean id="proxy" class="org.springframework.aop.framework.ProxyFactoryBean">
 		<property name="target">
diff --git a/spring-aop/src/test/resources/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml
index b4e8fec10d26..967e42b6868a 100644
--- a/spring-aop/src/test/resources/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml
+++ b/spring-aop/src/test/resources/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml
@@ -9,7 +9,7 @@
 		<property name="age"><value>666</value></property>
 	</bean>
 
-	<bean id="nopInterceptor" class="org.springframework.tests.aop.interceptor.SerializableNopInterceptor"/>
+	<bean id="nopInterceptor" class="org.springframework.aop.testfixture.interceptor.SerializableNopInterceptor"/>
 
 	<bean id="settersAdvisor" class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
 		<property name="advice"><ref bean="nopInterceptor"/></property>
diff --git a/spring-aop/src/test/resources/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml
index 9689ba92e8fc..53513ecf1df6 100644
--- a/spring-aop/src/test/resources/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml
+++ b/spring-aop/src/test/resources/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml
@@ -16,7 +16,7 @@
 		<property name="targetBeanName"><value>prototypeTest</value></property>
 	</bean>
 
-	<bean id="debugInterceptor" class="org.springframework.tests.aop.interceptor.NopInterceptor" />
+	<bean id="debugInterceptor" class="org.springframework.aop.testfixture.interceptor.NopInterceptor" />
 
 	<bean id="singleton" class="org.springframework.aop.framework.ProxyFactoryBean">
 		<property name="interceptorNames"><value>debugInterceptor,test</value></property>
diff --git a/spring-aop/src/test/resources/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml
index 40f77d3f9799..778c8c1d7f0e 100644
--- a/spring-aop/src/test/resources/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml
+++ b/spring-aop/src/test/resources/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml
@@ -11,7 +11,7 @@
 		<property name="targetBeanName"><value>prototypeTest</value></property>
 	</bean>
 
-	<bean id="debugInterceptor" class="org.springframework.tests.aop.interceptor.NopInterceptor" />
+	<bean id="debugInterceptor" class="org.springframework.aop.testfixture.interceptor.NopInterceptor" />
 
 	<!--
 		We want to invoke the getStatsMixin method on our ThreadLocal invoker
diff --git a/spring-aop/src/test/java/org/springframework/tests/aop/advice/CountingAfterReturningAdvice.java b/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/CountingAfterReturningAdvice.java
similarity index 90%
rename from spring-aop/src/test/java/org/springframework/tests/aop/advice/CountingAfterReturningAdvice.java
rename to spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/CountingAfterReturningAdvice.java
index 2b10ce6408ee..8cfab3ca0127 100644
--- a/spring-aop/src/test/java/org/springframework/tests/aop/advice/CountingAfterReturningAdvice.java
+++ b/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/CountingAfterReturningAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.tests.aop.advice;
+package org.springframework.aop.testfixture.advice;
 
 import java.lang.reflect.Method;
 
diff --git a/spring-aop/src/test/java/org/springframework/tests/aop/advice/CountingBeforeAdvice.java b/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/CountingBeforeAdvice.java
similarity index 90%
rename from spring-aop/src/test/java/org/springframework/tests/aop/advice/CountingBeforeAdvice.java
rename to spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/CountingBeforeAdvice.java
index 8ccb4cc78387..bf931f6bdfaa 100644
--- a/spring-aop/src/test/java/org/springframework/tests/aop/advice/CountingBeforeAdvice.java
+++ b/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/CountingBeforeAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.tests.aop.advice;
+package org.springframework.aop.testfixture.advice;
 
 import java.lang.reflect.Method;
 
diff --git a/spring-aop/src/test/java/org/springframework/tests/aop/advice/MethodCounter.java b/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/MethodCounter.java
similarity index 94%
rename from spring-aop/src/test/java/org/springframework/tests/aop/advice/MethodCounter.java
rename to spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/MethodCounter.java
index 9527bdcd4d64..6a703fe23a76 100644
--- a/spring-aop/src/test/java/org/springframework/tests/aop/advice/MethodCounter.java
+++ b/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/MethodCounter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.tests.aop.advice;
+package org.springframework.aop.testfixture.advice;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
diff --git a/spring-aop/src/test/java/org/springframework/tests/aop/advice/MyThrowsHandler.java b/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/MyThrowsHandler.java
similarity index 95%
rename from spring-aop/src/test/java/org/springframework/tests/aop/advice/MyThrowsHandler.java
rename to spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/MyThrowsHandler.java
index 5eec90e61634..606101af9c62 100644
--- a/spring-aop/src/test/java/org/springframework/tests/aop/advice/MyThrowsHandler.java
+++ b/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/MyThrowsHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.tests.aop.advice;
+package org.springframework.aop.testfixture.advice;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -24,10 +24,12 @@
 
 @SuppressWarnings("serial")
 public class MyThrowsHandler extends MethodCounter implements ThrowsAdvice {
+
 	// Full method signature
 	public void afterThrowing(Method m, Object[] args, Object target, IOException ex) {
 		count("ioException");
 	}
+
 	public void afterThrowing(RemoteException ex) throws Throwable {
 		count("remoteException");
 	}
@@ -36,4 +38,5 @@ public void afterThrowing(RemoteException ex) throws Throwable {
 	public void afterThrowing(Method m, Exception ex) throws Throwable {
 		throw new UnsupportedOperationException("Shouldn't be called");
 	}
+
 }
diff --git a/spring-aop/src/test/java/org/springframework/tests/aop/advice/TimestampIntroductionAdvisor.java b/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/TimestampIntroductionAdvisor.java
similarity index 88%
rename from spring-aop/src/test/java/org/springframework/tests/aop/advice/TimestampIntroductionAdvisor.java
rename to spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/TimestampIntroductionAdvisor.java
index 8e2d4b8cc23b..5321e5d38110 100644
--- a/spring-aop/src/test/java/org/springframework/tests/aop/advice/TimestampIntroductionAdvisor.java
+++ b/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/advice/TimestampIntroductionAdvisor.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.tests.aop.advice;
+package org.springframework.aop.testfixture.advice;
 
 import org.springframework.aop.support.DefaultIntroductionAdvisor;
 import org.springframework.aop.support.DelegatingIntroductionInterceptor;
-import org.springframework.tests.aop.interceptor.TimestampIntroductionInterceptor;
+import org.springframework.aop.testfixture.interceptor.TimestampIntroductionInterceptor;
 
 /**
  * @author Rod Johnson
diff --git a/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/NopInterceptor.java b/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/interceptor/NopInterceptor.java
similarity index 96%
rename from spring-aop/src/test/java/org/springframework/tests/aop/interceptor/NopInterceptor.java
rename to spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/interceptor/NopInterceptor.java
index 5c1855cbd4b6..dd4432467620 100644
--- a/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/NopInterceptor.java
+++ b/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/interceptor/NopInterceptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.tests.aop.interceptor;
+package org.springframework.aop.testfixture.interceptor;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
diff --git a/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/SerializableNopInterceptor.java b/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/interceptor/SerializableNopInterceptor.java
similarity index 95%
rename from spring-aop/src/test/java/org/springframework/tests/aop/interceptor/SerializableNopInterceptor.java
rename to spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/interceptor/SerializableNopInterceptor.java
index 7813c87f9f6d..25d9546c53a0 100644
--- a/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/SerializableNopInterceptor.java
+++ b/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/interceptor/SerializableNopInterceptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.tests.aop.interceptor;
+package org.springframework.aop.testfixture.interceptor;
 
 import java.io.Serializable;
 
diff --git a/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/TimestampIntroductionInterceptor.java b/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/interceptor/TimestampIntroductionInterceptor.java
similarity index 95%
rename from spring-aop/src/test/java/org/springframework/tests/aop/interceptor/TimestampIntroductionInterceptor.java
rename to spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/interceptor/TimestampIntroductionInterceptor.java
index dc04a9fba9db..24761350132a 100644
--- a/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/TimestampIntroductionInterceptor.java
+++ b/spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/interceptor/TimestampIntroductionInterceptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.tests.aop.interceptor;
+package org.springframework.aop.testfixture.interceptor;
 
 import org.springframework.aop.support.DelegatingIntroductionInterceptor;
 import org.springframework.core.testfixture.TimeStamped;
diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle
index 77ab633b3e47..4d37abe0786c 100644
--- a/spring-context/spring-context.gradle
+++ b/spring-context/spring-context.gradle
@@ -26,6 +26,7 @@ dependencies {
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.reactivestreams:reactive-streams")
+	testCompile(testFixtures(project(":spring-aop")))
 	testCompile(testFixtures(project(":spring-beans")))
 	testCompile(testFixtures(project(":spring-core")))
 	testCompile("io.projectreactor:reactor-core")
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java
index 4e71cd317714..b3bf1ed04850 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java
@@ -23,11 +23,11 @@
 import org.springframework.aop.Advisor;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;
+import org.springframework.aop.testfixture.advice.CountingBeforeAdvice;
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.tests.aop.advice.CountingBeforeAdvice;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
index c1bcc57b52da..e27dbfcacb91 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
@@ -57,6 +57,13 @@
 import org.springframework.aop.support.StaticMethodMatcherPointcutAdvisor;
 import org.springframework.aop.target.HotSwappableTargetSource;
 import org.springframework.aop.target.SingletonTargetSource;
+import org.springframework.aop.testfixture.advice.CountingAfterReturningAdvice;
+import org.springframework.aop.testfixture.advice.CountingBeforeAdvice;
+import org.springframework.aop.testfixture.advice.MethodCounter;
+import org.springframework.aop.testfixture.advice.MyThrowsHandler;
+import org.springframework.aop.testfixture.interceptor.NopInterceptor;
+import org.springframework.aop.testfixture.interceptor.SerializableNopInterceptor;
+import org.springframework.aop.testfixture.interceptor.TimestampIntroductionInterceptor;
 import org.springframework.beans.testfixture.beans.IOther;
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.beans.testfixture.beans.Person;
@@ -67,13 +74,6 @@
 import org.springframework.core.testfixture.TimeStamped;
 import org.springframework.core.testfixture.io.SerializationTestUtils;
 import org.springframework.lang.Nullable;
-import org.springframework.tests.aop.advice.CountingAfterReturningAdvice;
-import org.springframework.tests.aop.advice.CountingBeforeAdvice;
-import org.springframework.tests.aop.advice.MethodCounter;
-import org.springframework.tests.aop.advice.MyThrowsHandler;
-import org.springframework.tests.aop.interceptor.NopInterceptor;
-import org.springframework.tests.aop.interceptor.SerializableNopInterceptor;
-import org.springframework.tests.aop.interceptor.TimestampIntroductionInterceptor;
 import org.springframework.util.StopWatch;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java
index 60b0e73c419e..02a956479cdb 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java
@@ -28,13 +28,13 @@
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
+import org.springframework.aop.testfixture.advice.CountingBeforeAdvice;
+import org.springframework.aop.testfixture.interceptor.NopInterceptor;
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextException;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.tests.aop.advice.CountingBeforeAdvice;
-import org.springframework.tests.aop.interceptor.NopInterceptor;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
index af7507470a16..0be9f673575e 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
@@ -38,6 +38,10 @@
 import org.springframework.aop.support.DefaultIntroductionAdvisor;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.aop.support.DynamicMethodMatcherPointcut;
+import org.springframework.aop.testfixture.advice.CountingBeforeAdvice;
+import org.springframework.aop.testfixture.advice.MyThrowsHandler;
+import org.springframework.aop.testfixture.interceptor.NopInterceptor;
+import org.springframework.aop.testfixture.interceptor.TimestampIntroductionInterceptor;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.FactoryBean;
@@ -55,10 +59,6 @@
 import org.springframework.core.testfixture.TimeStamped;
 import org.springframework.core.testfixture.io.SerializationTestUtils;
 import org.springframework.lang.Nullable;
-import org.springframework.tests.aop.advice.CountingBeforeAdvice;
-import org.springframework.tests.aop.advice.MyThrowsHandler;
-import org.springframework.tests.aop.interceptor.NopInterceptor;
-import org.springframework.tests.aop.interceptor.TimestampIntroductionInterceptor;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
index db7fb5fb25ed..8a111ebd4525 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
@@ -30,12 +30,12 @@
 import org.springframework.aop.target.LazyInitTargetSource;
 import org.springframework.aop.target.PrototypeTargetSource;
 import org.springframework.aop.target.ThreadLocalTargetSource;
+import org.springframework.aop.testfixture.advice.CountingBeforeAdvice;
+import org.springframework.aop.testfixture.interceptor.NopInterceptor;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.testfixture.beans.CountingTestBean;
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.tests.aop.advice.CountingBeforeAdvice;
-import org.springframework.tests.aop.interceptor.NopInterceptor;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java
index 5167ba3f089b..ce3123e71bf1 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java
@@ -23,14 +23,14 @@
 
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;
+import org.springframework.aop.testfixture.advice.CountingBeforeAdvice;
+import org.springframework.aop.testfixture.interceptor.NopInterceptor;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.core.testfixture.TimeStamped;
-import org.springframework.tests.aop.advice.CountingBeforeAdvice;
-import org.springframework.tests.aop.interceptor.NopInterceptor;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
index e623102553c1..b3306e23010f 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
@@ -34,6 +34,7 @@
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.interceptor.DebugInterceptor;
 import org.springframework.aop.support.AopUtils;
+import org.springframework.aop.testfixture.interceptor.NopInterceptor;
 import org.springframework.beans.BeanInstantiationException;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.factory.BeanCreationException;
@@ -57,7 +58,6 @@
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
-import org.springframework.tests.aop.interceptor.NopInterceptor;
 
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
index e172dfd61d6b..1cf666cbb61d 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
@@ -38,6 +38,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.aop.testfixture.interceptor.NopInterceptor;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -54,7 +55,6 @@
 import org.springframework.jmx.export.naming.SelfNaming;
 import org.springframework.jmx.support.ObjectNameManager;
 import org.springframework.jmx.support.RegistrationPolicy;
-import org.springframework.tests.aop.interceptor.NopInterceptor;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
index 9c979c3e99fc..f851ae7fb638 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
@@ -29,12 +29,12 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.aop.testfixture.interceptor.NopInterceptor;
 import org.springframework.jmx.IJmxTestBean;
 import org.springframework.jmx.JmxTestBean;
 import org.springframework.jmx.export.MBeanExporter;
 import org.springframework.jmx.export.metadata.JmxAttributeSource;
 import org.springframework.jmx.support.ObjectNameManager;
-import org.springframework.tests.aop.interceptor.NopInterceptor;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-error.xml b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-error.xml
index a400f7118088..681b8f23efbd 100644
--- a/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-error.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-error.xml
@@ -15,9 +15,9 @@
 
 	</aop:config>
 
-	<bean id="getNameCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getNameCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
-	<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getAgeCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
 	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
 
diff --git a/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml
index 4a290477bb9d..6acd17a85671 100644
--- a/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml
@@ -16,9 +16,9 @@
 		</aop:aspect>
 	</aop:config>
 
-	<bean id="getNameCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getNameCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
-	<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getAgeCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
 	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
 
diff --git a/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-error.xml b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-error.xml
index d91aeeb0fe5f..1b7300325305 100644
--- a/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-error.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-error.xml
@@ -12,9 +12,9 @@
 		</aop:aspect>
 	</aop:config>
 
-	<bean id="getNameCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getNameCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
-	<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getAgeCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
 	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
 
diff --git a/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml
index fd3825157fc3..d07c160d637a 100644
--- a/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml
@@ -12,9 +12,9 @@
 		</aop:aspect>
 	</aop:config>
 
-	<bean id="getNameCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getNameCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
-	<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getAgeCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
 	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
 
diff --git a/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests-context.xml
index e64f25a3fc23..bbb0ca22358d 100644
--- a/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests-context.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests-context.xml
@@ -19,9 +19,9 @@
 
 	</aop:config>
 
-	<bean id="getNameCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getNameCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
-	<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getAgeCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
 	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
 
diff --git a/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerReturningTests-error.xml b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerReturningTests-error.xml
index 7fdfd981e510..185736d0c3d3 100644
--- a/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerReturningTests-error.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerReturningTests-error.xml
@@ -11,9 +11,9 @@
 		</aop:aspect>
 	</aop:config>
 
-	<bean id="getNameCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getNameCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
-	<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getAgeCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
 	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
 
diff --git a/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerReturningTests-ok.xml b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerReturningTests-ok.xml
index d50e3d862b06..23b6d4742e58 100644
--- a/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerReturningTests-ok.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerReturningTests-ok.xml
@@ -11,9 +11,9 @@
 		</aop:aspect>
 	</aop:config>
 
-	<bean id="getNameCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getNameCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
-	<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getAgeCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
 	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
 
diff --git a/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerTests-context.xml
index 3929abd30765..ef136143ff16 100644
--- a/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerTests-context.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerTests-context.xml
@@ -19,9 +19,9 @@
 
 	</aop:config>
 
-	<bean id="getNameCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getNameCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
-	<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getAgeCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
 	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
 
diff --git a/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-error.xml b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-error.xml
index 3a940b46a481..1aef0e6da7f8 100644
--- a/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-error.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-error.xml
@@ -11,9 +11,9 @@
 		</aop:aspect>
 	</aop:config>
 
-	<bean id="getNameCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getNameCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
-	<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getAgeCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
 	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
 
diff --git a/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-ok.xml b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-ok.xml
index a203d7811630..4abf24dda6ad 100644
--- a/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-ok.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-ok.xml
@@ -11,9 +11,9 @@
 		</aop:aspect>
 	</aop:config>
 
-	<bean id="getNameCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getNameCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
-	<bean id="getAgeCounter" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="getAgeCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
 	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
 
diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-autowiring.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-autowiring.xml
index 190687da043d..2d399732f996 100644
--- a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-autowiring.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-autowiring.xml
@@ -3,7 +3,7 @@
 
 <beans>
 
-	<bean id="debugInterceptor" class="org.springframework.tests.aop.interceptor.NopInterceptor"/>
+	<bean id="debugInterceptor" class="org.springframework.aop.testfixture.interceptor.NopInterceptor"/>
 
 	<bean id="testBean"  class="org.springframework.aop.framework.ProxyFactoryBean">
 		<!-- Target is autowired, so can check type of parent without a guard -->
diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml
index b7eaa18ef82c..a8a77341e528 100644
--- a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml
@@ -9,7 +9,7 @@
 		<property name="age"><value>666</value></property>
 	</bean>
 
-	<bean id="debugInterceptor" class="org.springframework.tests.aop.interceptor.NopInterceptor"/>
+	<bean id="debugInterceptor" class="org.springframework.aop.testfixture.interceptor.NopInterceptor"/>
 
 	<bean id="test1" class="org.springframework.aop.framework.ProxyFactoryBean">
 		<property name="interfaces"><value>org.springframework.beans.testfixture.beans.ITestBean</value></property>
diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml
index 3fb58b993c86..4738c1abc5ce 100644
--- a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml
@@ -27,7 +27,7 @@
 	</bean>
 
 	<bean id="countingBeforeAdvice"
-		class="org.springframework.tests.aop.advice.CountingBeforeAdvice"
+		class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"
 	/>
 
 	<bean id="doubleTarget"
diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml
index a8883db6820e..a40e264b441b 100644
--- a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml
@@ -10,7 +10,7 @@
 	</bean>
 
 
-	<bean id="debugInterceptor" class="org.springframework.tests.aop.interceptor.NopInterceptor">
+	<bean id="debugInterceptor" class="org.springframework.aop.testfixture.interceptor.NopInterceptor">
 	</bean>
 
 	<bean id="frozen"
diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-inner-bean-target.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-inner-bean-target.xml
index 9d73fe7899d6..b8e6f5e5a092 100644
--- a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-inner-bean-target.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-inner-bean-target.xml
@@ -9,7 +9,7 @@
 
 <beans>
 
-	<bean id="nopInterceptor" class="org.springframework.tests.aop.interceptor.NopInterceptor">
+	<bean id="nopInterceptor" class="org.springframework.aop.testfixture.interceptor.NopInterceptor">
 	</bean>
 
 	<bean id="testBean"
diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml
index 88a2d4cc718b..fe55a5e3bfb6 100644
--- a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml
@@ -14,7 +14,7 @@
 	</bean>
 
 	<bean id="countingBeforeAdvice"
-		class="org.springframework.tests.aop.advice.CountingBeforeAdvice"
+		class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"
 	/>
 
 	<!--
diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml
index f66cd13a4770..aecb904e5570 100644
--- a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml
@@ -15,7 +15,7 @@
 		<property name="count"><value>10</value></property>
 	</bean>
 
-	<bean id="debugInterceptor" class="org.springframework.tests.aop.interceptor.NopInterceptor"/>
+	<bean id="debugInterceptor" class="org.springframework.aop.testfixture.interceptor.NopInterceptor"/>
 
 	<bean id="singleton" class="org.springframework.aop.framework.ProxyFactoryBean">
 		<property name="interceptorNames"><value>debugInterceptor,test</value></property>
diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-serialization.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-serialization.xml
index b8416580d691..1d0b6ffb469a 100644
--- a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-serialization.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-serialization.xml
@@ -6,9 +6,9 @@
 -->
 <beans>
 
-	<bean id="nopInterceptor" class="org.springframework.tests.aop.interceptor.NopInterceptor"/>
+	<bean id="nopInterceptor" class="org.springframework.aop.testfixture.interceptor.NopInterceptor"/>
 
-	<bean id="serializableNopInterceptor" class="org.springframework.tests.aop.interceptor.SerializableNopInterceptor"/>
+	<bean id="serializableNopInterceptor" class="org.springframework.aop.testfixture.interceptor.SerializableNopInterceptor"/>
 
 	<bean id="serializableSingleton" class="org.springframework.aop.framework.ProxyFactoryBean">
 		<property name="interceptorNames"><value>serializableNopInterceptor</value></property>
diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml
index 46fb7b112d34..0bc1a3eb4877 100644
--- a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml
@@ -13,11 +13,11 @@
 		<property name="name"><value>Adam</value></property>
 	</bean>
 
-	<bean id="nopInterceptor" class="org.springframework.tests.aop.interceptor.NopInterceptor">
+	<bean id="nopInterceptor" class="org.springframework.aop.testfixture.interceptor.NopInterceptor">
 	</bean>
 
 	<bean id="countingBeforeAdvice"
-		class="org.springframework.tests.aop.advice.CountingBeforeAdvice"
+		class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"
 	/>
 
 	<!--
diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-throws-advice.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-throws-advice.xml
index 581e650d68f0..8bc633ae6045 100644
--- a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-throws-advice.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-throws-advice.xml
@@ -11,11 +11,11 @@
 	<!-- Simple target -->
 	<bean id="target" class="org.springframework.aop.framework.Echo"/>
 
-	<bean id="nopInterceptor" class="org.springframework.tests.aop.interceptor.NopInterceptor"/>
+	<bean id="nopInterceptor" class="org.springframework.aop.testfixture.interceptor.NopInterceptor"/>
 
-	<bean id="countingBeforeAdvice" class="org.springframework.tests.aop.advice.CountingBeforeAdvice" />
+	<bean id="countingBeforeAdvice" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice" />
 
-	<bean id="throwsAdvice" class="org.springframework.tests.aop.advice.MyThrowsHandler"/>
+	<bean id="throwsAdvice" class="org.springframework.aop.testfixture.advice.MyThrowsHandler"/>
 
 	<bean id="throwsAdvised" class="org.springframework.aop.framework.ProxyFactoryBean">
 			<property name="interceptorNames">
diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml b/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml
index b5db44fbac4c..7819d2c86dbc 100644
--- a/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml
@@ -17,7 +17,7 @@
 		</property>
 	</bean>
 
-	<bean id="nopInterceptor" class="org.springframework.tests.aop.interceptor.NopInterceptor"/>
+	<bean id="nopInterceptor" class="org.springframework.aop.testfixture.interceptor.NopInterceptor"/>
 
 	<bean id="pointcutAdvisor" class="org.springframework.aop.support.DefaultPointcutAdvisor">
 		<property name="pointcut">
@@ -26,7 +26,7 @@
 			</bean>
 		</property>
 		<property name="advice">
-			<bean class="org.springframework.tests.aop.interceptor.NopInterceptor"/>
+			<bean class="org.springframework.aop.testfixture.interceptor.NopInterceptor"/>
 		</property>
 	</bean>
 
diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-optimized.xml b/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-optimized.xml
index 20adb97333cc..a3da2c1bb2ba 100644
--- a/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-optimized.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-optimized.xml
@@ -7,7 +7,7 @@
 		<property name="name" value="Optimized"/>
 	</bean>
 
-	<bean id="countingAdvice" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="countingAdvice" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
 	<bean id="advisor" class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
 		<property name="advice" ref="countingAdvice"/>
diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml
index 3a228ff01db5..95f25cdedb96 100644
--- a/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml
@@ -59,7 +59,7 @@
 	  </property>
 	</bean>
 
-	<bean id="timestampIntroduction" class="org.springframework.tests.aop.advice.TimestampIntroductionAdvisor"/>
+	<bean id="timestampIntroduction" class="org.springframework.aop.testfixture.advice.TimestampIntroductionAdvisor"/>
 
 	<!--
 		Stateful mixin. Note that singleton property is false.
@@ -67,11 +67,11 @@
 	<bean id="lockableAdvisor" class="test.mixin.LockMixinAdvisor"
 			scope="prototype"/>
 
-	<bean id="countingBeforeAdvice" class="org.springframework.tests.aop.advice.CountingBeforeAdvice"/>
+	<bean id="countingBeforeAdvice" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
 
-	<bean id="nopInterceptor" class="org.springframework.tests.aop.interceptor.NopInterceptor"/>
+	<bean id="nopInterceptor" class="org.springframework.aop.testfixture.interceptor.NopInterceptor"/>
 
-	<bean id="introductionNopInterceptor" class="org.springframework.tests.aop.interceptor.NopInterceptor"/>
+	<bean id="introductionNopInterceptor" class="org.springframework.aop.testfixture.interceptor.NopInterceptor"/>
 
 	<bean id="introductionUsingJdk" class="org.springframework.beans.testfixture.beans.TestBean">
 		<property name="name"><value>introductionUsingJdk</value></property>
diff --git a/spring-context/src/test/resources/org/springframework/aop/target/CommonsPool2TargetSourceTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/target/CommonsPool2TargetSourceTests-context.xml
index f83897a3f0ba..23a92df2d178 100644
--- a/spring-context/src/test/resources/org/springframework/aop/target/CommonsPool2TargetSourceTests-context.xml
+++ b/spring-context/src/test/resources/org/springframework/aop/target/CommonsPool2TargetSourceTests-context.xml
@@ -17,7 +17,7 @@
 		<property name="targetMethod"><value>getPoolingConfigMixin</value></property>
 	</bean>
 
-	<bean id="nop" class="org.springframework.tests.aop.interceptor.NopInterceptor"/>
+	<bean id="nop" class="org.springframework.aop.testfixture.interceptor.NopInterceptor"/>
 
 	<!--
 		This will create a bean for each thread ("apartment")
@@ -40,7 +40,7 @@
 	</bean>
 
 	<!-- Serialization tests using serializable target and advice -->
-	<bean id="serializableNop" class="org.springframework.tests.aop.interceptor.SerializableNopInterceptor" />
+	<bean id="serializableNop" class="org.springframework.aop.testfixture.interceptor.SerializableNopInterceptor" />
 
 	<bean id="prototypePerson" class="org.springframework.beans.testfixture.beans.SerializablePerson" scope="prototype"/>