Consolidate AspectJ test fixtures

Author: sbrannen

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java

@@ -40,17 +40,17 @@
 import org.aspectj.lang.reflect.MethodSignature;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import test.aop.DefaultLockable;
-import test.aop.Lockable;
-import test.aop.PerTargetAspect;
-import test.aop.TwoAdviceAspect;
 
 import org.springframework.aop.Advisor;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.framework.AopConfigException;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
 import org.springframework.aop.support.AopUtils;
+import org.springframework.aop.testfixture.aspectj.PerTargetAspect;
+import org.springframework.aop.testfixture.aspectj.TwoAdviceAspect;
+import org.springframework.aop.testfixture.mixin.DefaultLockable;
+import org.springframework.aop.testfixture.mixin.Lockable;
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.core.OrderComparator;
@@ -459,10 +459,10 @@ void twoAdvicesOnOneAspect() {
 		assertThat(advisors).as("Two advice methods found").hasSize(2);
 		ITestBean itb = createProxy(target, ITestBean.class, advisors);
 		itb.setName("");
-		assertThat(itb.getAge()).isEqualTo(0);
+		assertThat(itb.age()).isEqualTo(0);
 		int newAge = 32;
 		itb.setAge(newAge);
-		assertThat(itb.getAge()).isEqualTo(1);
+		assertThat(itb.age()).isEqualTo(1);
 	}
 
 	@Test

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -17,13 +17,13 @@
 package org.springframework.aop.aspectj.annotation;
 
 import org.junit.jupiter.api.Test;
-import test.aop.PerTargetAspect;
 
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.aspectj.AspectJExpressionPointcut;
 import org.springframework.aop.aspectj.AspectJExpressionPointcutTests;
 import org.springframework.aop.aspectj.annotation.AbstractAspectJAdvisorFactoryTests.ExceptionThrowingAspect;
 import org.springframework.aop.framework.AopConfigException;
+import org.springframework.aop.testfixture.aspectj.PerTargetAspect;
 import org.springframework.beans.testfixture.beans.TestBean;
 
 import static org.assertj.core.api.Assertions.assertThat;

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -18,11 +18,11 @@
 
 import org.aspectj.lang.reflect.PerClauseKind;
 import org.junit.jupiter.api.Test;
-import test.aop.PerTargetAspect;
 
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.aspectj.AspectJExpressionPointcut;
 import org.springframework.aop.aspectj.annotation.AbstractAspectJAdvisorFactoryTests.ExceptionThrowingAspect;
+import org.springframework.aop.testfixture.aspectj.PerTargetAspect;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -24,8 +24,8 @@
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.junit.jupiter.api.Test;
-import test.aop.PerThisAspect;
 
+import org.springframework.aop.testfixture.aspectj.PerThisAspect;
 import org.springframework.core.testfixture.io.SerializationTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;

spring-aop/src/test/java/test/aop/PerThisAspect.java

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

spring-aop/src/test/java/test/aop/TwoAdviceAspect.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2023 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 test.aop;
+package org.springframework.aop.testfixture.aspectj;
 
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;

spring-context/src/test/java/test/aspect/CommonPointcuts.java renamed to spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/aspectj/CommonPointcuts.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package test.aspect;
+package org.springframework.aop.testfixture.aspectj;
 
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 
-@Aspect("perthis(test.aspect.CommonPointcuts.getAgeExecution())")
+@Aspect("perthis(org.springframework.aop.testfixture.aspectj.CommonPointcuts.getAgeExecution())")
 public class PerThisAspect {
 
 	private int invocations = 0;
@@ -29,7 +29,7 @@ public int getInvocations() {
 		return this.invocations;
 	}
 
-	@Around("test.aspect.CommonPointcuts.getAgeExecution()")
+	@Around("org.springframework.aop.testfixture.aspectj.CommonPointcuts.getAgeExecution()")
 	public int changeAge(ProceedingJoinPoint pjp) {
 		return this.invocations++;
 	}

spring-aop/src/test/java/test/aop/PerTargetAspect.java renamed to spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/aspectj/PerTargetAspect.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2023 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 test.aspect;
+package org.springframework.aop.testfixture.aspectj;
 
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;

spring-context/src/test/java/test/aspect/PerThisAspect.java renamed to spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/aspectj/PerThisAspect.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2023 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 test.aop;
+package org.springframework.aop.testfixture.mixin;
 
 /**
  * Simple implementation of Lockable interface for use in mixins.

spring-context/src/test/java/test/aspect/TwoAdviceAspect.java renamed to spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/aspectj/TwoAdviceAspect.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2023 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 test.mixin;
+package org.springframework.aop.testfixture.mixin;
 
 import org.aopalliance.intercept.MethodInvocation;
 

spring-aop/src/test/java/test/aop/DefaultLockable.java renamed to spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/mixin/DefaultLockable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2023 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 test.mixin;
+package org.springframework.aop.testfixture.mixin;
 
 import org.springframework.aop.support.DefaultIntroductionAdvisor;
 

spring-context/src/test/java/test/mixin/LockMixin.java renamed to spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/mixin/LockMixin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2023 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,14 +14,12 @@
  * limitations under the License.
  */
 
-package test.aop;
-
+package org.springframework.aop.testfixture.mixin;
 
 /**
- * Simple interface to use for mixins
+ * Simple interface to use for mixins.
  *
  * @author Rod Johnson
- *
  */
 public interface Lockable {
 

spring-context/src/test/java/test/mixin/LockMixinAdvisor.java renamed to spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/mixin/LockMixinAdvisor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2023 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,12 +14,12 @@
  * limitations under the License.
  */
 
-package test.mixin;
-
+package org.springframework.aop.testfixture.mixin;
 
 @SuppressWarnings("serial")
 public class LockedException extends RuntimeException {
 
 	public LockedException() {
 	}
+
 }

spring-aop/src/test/java/test/aop/Lockable.java renamed to spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/mixin/Lockable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -19,9 +19,9 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import test.mixin.Lockable;
 
 import org.springframework.aop.support.AopUtils;
+import org.springframework.aop.testfixture.mixin.Lockable;
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 

spring-context/src/test/java/test/mixin/LockedException.java renamed to spring-aop/src/testFixtures/java/org/springframework/aop/testfixture/mixin/LockedException.java

@@ -46,6 +46,7 @@
 import org.springframework.aop.support.AbstractPointcutAdvisor;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.support.StaticMethodMatcherPointcutAdvisor;
+import org.springframework.aop.testfixture.aspectj.PerTargetAspect;
 import org.springframework.beans.PropertyValue;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.config.MethodInvokingFactoryBean;
@@ -62,7 +63,6 @@
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.DecoratingProxy;
 import org.springframework.core.NestedRuntimeException;
-import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.lang.Nullable;
 
@@ -354,33 +354,6 @@ private String qName(String fileSuffix) {
 
 }
 
-@Aspect("pertarget(execution(* *.getSpouse()))")
-class PerTargetAspect implements Ordered {
-
-	public int count;
-
-	private int order = Ordered.LOWEST_PRECEDENCE;
-
-	@Around("execution(int *.getAge())")
-	public int returnCountAsAge() {
-		return count++;
-	}
-
-	@Before("execution(void *.set*(int))")
-	public void countSetter() {
-		++count;
-	}
-
-	@Override
-	public int getOrder() {
-		return this.order;
-	}
-
-	public void setOrder(int order) {
-		this.order = order;
-	}
-}
-
 @Aspect
 class AdviceUsingThisJoinPoint {