diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
index 88bfdfb30b94..8b9675c8afe8 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -63,14 +63,16 @@
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
/**
- * Abstract tests for AspectJAdvisorFactory.
- * See subclasses for tests of concrete factories.
+ * Abstract tests for {@link AspectJAdvisorFactory} implementations.
+ *
+ *
See subclasses for tests of concrete factories.
*
* @author Rod Johnson
* @author Chris Beams
* @author Phillip Webb
+ * @author Sam Brannen
*/
-public abstract class AbstractAspectJAdvisorFactoryTests {
+abstract class AbstractAspectJAdvisorFactoryTests {
/**
* To be overridden by concrete test subclasses.
@@ -80,7 +82,7 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
@Test
- public void testRejectsPerCflowAspect() {
+ void rejectsPerCflowAspect() {
assertThatExceptionOfType(AopConfigException.class).isThrownBy(() ->
getFixture().getAdvisors(
new SingletonMetadataAwareAspectInstanceFactory(new PerCflowAspect(), "someBean")))
@@ -88,7 +90,7 @@ public void testRejectsPerCflowAspect() {
}
@Test
- public void testRejectsPerCflowBelowAspect() {
+ void rejectsPerCflowBelowAspect() {
assertThatExceptionOfType(AopConfigException.class).isThrownBy(() ->
getFixture().getAdvisors(
new SingletonMetadataAwareAspectInstanceFactory(new PerCflowBelowAspect(), "someBean")))
@@ -96,7 +98,7 @@ public void testRejectsPerCflowBelowAspect() {
}
@Test
- public void testPerTargetAspect() throws SecurityException, NoSuchMethodException {
+ void perTargetAspect() throws SecurityException, NoSuchMethodException {
TestBean target = new TestBean();
int realAge = 65;
target.setAge(realAge);
@@ -128,7 +130,7 @@ public void testPerTargetAspect() throws SecurityException, NoSuchMethodExceptio
}
@Test
- public void testMultiplePerTargetAspects() throws SecurityException, NoSuchMethodException {
+ void multiplePerTargetAspects() throws SecurityException, NoSuchMethodException {
TestBean target = new TestBean();
int realAge = 65;
target.setAge(realAge);
@@ -156,7 +158,7 @@ public void testMultiplePerTargetAspects() throws SecurityException, NoSuchMetho
}
@Test
- public void testMultiplePerTargetAspectsWithOrderAnnotation() throws SecurityException, NoSuchMethodException {
+ void multiplePerTargetAspectsWithOrderAnnotation() throws SecurityException, NoSuchMethodException {
TestBean target = new TestBean();
int realAge = 65;
target.setAge(realAge);
@@ -182,7 +184,7 @@ public void testMultiplePerTargetAspectsWithOrderAnnotation() throws SecurityExc
}
@Test
- public void testPerThisAspect() throws SecurityException, NoSuchMethodException {
+ void perThisAspect() throws SecurityException, NoSuchMethodException {
TestBean target = new TestBean();
int realAge = 65;
target.setAge(realAge);
@@ -218,7 +220,7 @@ public void testPerThisAspect() throws SecurityException, NoSuchMethodException
}
@Test
- public void testPerTypeWithinAspect() throws SecurityException, NoSuchMethodException {
+ void perTypeWithinAspect() throws SecurityException, NoSuchMethodException {
TestBean target = new TestBean();
int realAge = 65;
target.setAge(realAge);
@@ -259,22 +261,22 @@ public void testPerTypeWithinAspect() throws SecurityException, NoSuchMethodExce
}
@Test
- public void testNamedPointcutAspectWithFQN() {
- testNamedPointcuts(new NamedPointcutAspectWithFQN());
+ void namedPointcutAspectWithFQN() {
+ namedPointcuts(new NamedPointcutAspectWithFQN());
}
@Test
- public void testNamedPointcutAspectWithoutFQN() {
- testNamedPointcuts(new NamedPointcutAspectWithoutFQN());
+ void namedPointcutAspectWithoutFQN() {
+ namedPointcuts(new NamedPointcutAspectWithoutFQN());
}
@Test
- public void testNamedPointcutFromAspectLibrary() {
- testNamedPointcuts(new NamedPointcutAspectFromLibrary());
+ void namedPointcutFromAspectLibrary() {
+ namedPointcuts(new NamedPointcutAspectFromLibrary());
}
@Test
- public void testNamedPointcutFromAspectLibraryWithBinding() {
+ void namedPointcutFromAspectLibraryWithBinding() {
TestBean target = new TestBean();
ITestBean itb = (ITestBean) createProxy(target,
getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(
@@ -285,7 +287,7 @@ public void testNamedPointcutFromAspectLibraryWithBinding() {
assertThat(target.getAge()).isEqualTo(20);
}
- private void testNamedPointcuts(Object aspectInstance) {
+ private void namedPointcuts(Object aspectInstance) {
TestBean target = new TestBean();
int realAge = 65;
target.setAge(realAge);
@@ -297,7 +299,7 @@ private void testNamedPointcuts(Object aspectInstance) {
}
@Test
- public void testBindingWithSingleArg() {
+ void bindingWithSingleArg() {
TestBean target = new TestBean();
ITestBean itb = (ITestBean) createProxy(target,
getFixture().getAdvisors(
@@ -309,7 +311,7 @@ public void testBindingWithSingleArg() {
}
@Test
- public void testBindingWithMultipleArgsDifferentlyOrdered() {
+ void bindingWithMultipleArgsDifferentlyOrdered() {
ManyValuedArgs target = new ManyValuedArgs();
ManyValuedArgs mva = (ManyValuedArgs) createProxy(target,
getFixture().getAdvisors(
@@ -329,7 +331,7 @@ public void testBindingWithMultipleArgsDifferentlyOrdered() {
* In this case the introduction will be made.
*/
@Test
- public void testIntroductionOnTargetNotImplementingInterface() {
+ void introductionOnTargetNotImplementingInterface() {
NotLockable notLockableTarget = new NotLockable();
assertThat(notLockableTarget instanceof Lockable).isFalse();
NotLockable notLockable1 = (NotLockable) createProxy(notLockableTarget,
@@ -358,7 +360,7 @@ public void testIntroductionOnTargetNotImplementingInterface() {
}
@Test
- public void testIntroductionAdvisorExcludedFromTargetImplementingInterface() {
+ void introductionAdvisorExcludedFromTargetImplementingInterface() {
assertThat(AopUtils.findAdvisorsThatCanApply(
getFixture().getAdvisors(
new SingletonMetadataAwareAspectInstanceFactory(new MakeLockable(), "someBean")),
@@ -368,7 +370,7 @@ public void testIntroductionAdvisorExcludedFromTargetImplementingInterface() {
}
@Test
- public void testIntroductionOnTargetImplementingInterface() {
+ void introductionOnTargetImplementingInterface() {
CannotBeUnlocked target = new CannotBeUnlocked();
Lockable proxy = (Lockable) createProxy(target,
// Ensure that we exclude
@@ -388,7 +390,7 @@ public void testIntroductionOnTargetImplementingInterface() {
}
@Test
- public void testIntroductionOnTargetExcludedByTypePattern() {
+ void introductionOnTargetExcludedByTypePattern() {
LinkedList