Use Gradle test fixture support for spring-aop

See gh-23550
spring-projects · Jan 2, 2020 · 8a371c7 · 8a371c7
1 parent 5581f3b
commit 8a371c7
Show file tree

Hide file tree

Showing 59 changed files with 105 additions and 144 deletions.
diff --git 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
@@ -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/.../org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java b/.../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/...ringframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml b/...ringframework/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
@@ -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
@@ -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/...src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java b/...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
@@ -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
@@ -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/...src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java b/...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
@@ -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/...est/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java b/...est/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
@@ -19,15 +19,15 @@
 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;
 import org.springframework.beans.testfixture.beans.Person;
 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
@@ -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/...esources/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml b/...esources/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/...s/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml b/...s/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/.../src/test/resources/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml b/.../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/...rc/test/resources/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml b/...rc/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/.../advice/CountingAfterReturningAdvice.java → .../advice/CountingAfterReturningAdvice.java b/.../advice/CountingAfterReturningAdvice.java → .../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/...ests/aop/advice/CountingBeforeAdvice.java → ...tfixture/advice/CountingBeforeAdvice.java b/...ests/aop/advice/CountingBeforeAdvice.java → ...tfixture/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/...ework/tests/aop/advice/MethodCounter.java → ...aop/testfixture/advice/MethodCounter.java b/...ework/tests/aop/advice/MethodCounter.java → ...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/...ork/tests/aop/advice/MyThrowsHandler.java → ...p/testfixture/advice/MyThrowsHandler.java b/...ork/tests/aop/advice/MyThrowsHandler.java → ...p/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/.../advice/TimestampIntroductionAdvisor.java → .../advice/TimestampIntroductionAdvisor.java b/.../advice/TimestampIntroductionAdvisor.java → .../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/...tests/aop/interceptor/NopInterceptor.java → ...stfixture/interceptor/NopInterceptor.java b/...tests/aop/interceptor/NopInterceptor.java → ...stfixture/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/...terceptor/SerializableNopInterceptor.java → ...terceptor/SerializableNopInterceptor.java b/...terceptor/SerializableNopInterceptor.java → ...terceptor/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/...tor/TimestampIntroductionInterceptor.java → ...tor/TimestampIntroductionInterceptor.java b/...tor/TimestampIntroductionInterceptor.java → ...tor/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
@@ -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")