From bf1cf549b1f6d410d830945157ef2f4294f77783 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 26 Jan 2022 12:15:10 +0100
Subject: [PATCH] Delete unused XML config in AOP namespace tests

See gh-22246
---
 .../aop/config/AopNamespaceHandlerEventTests.java           | 4 ++--
 .../aop/config/AopNamespaceHandlerEventTests-context.xml    | 6 ------
 ...mespaceHandlerPointcutErrorTests-pointcutDuplication.xml | 4 ----
 ...opNamespaceHandlerPointcutErrorTests-pointcutMissing.xml | 4 ----
 4 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
index d4c774424d0..5c5dd5689fc 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -153,7 +153,7 @@ public class AopNamespaceHandlerEventTests {
 	public void testAspectEvent() {
 		this.reader.loadBeanDefinitions(CONTEXT);
 		ComponentDefinition[] componentDefinitions = this.eventListener.getComponentDefinitions();
-		assertThat(componentDefinitions.length).as("Incorrect number of events fired").isEqualTo(5);
+		assertThat(componentDefinitions.length).as("Incorrect number of events fired").isEqualTo(2);
 
 		boolean condition = componentDefinitions[0] instanceof CompositeComponentDefinition;
 		assertThat(condition).as("No holder with nested components").isTrue();
diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
index 6acd17a8567..1c2ba7c237b 100644
--- a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
+++ b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
@@ -16,12 +16,6 @@
 		</aop:aspect>
 	</aop:config>
 
-	<bean id="getNameCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
-
-	<bean id="getAgeCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
-
-	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
-
 	<bean id="countingAdvice" class="org.springframework.aop.config.CountingAspectJAdvice"/>
 
 </beans>
diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
index 7c8f47124e6..75ca4e9d364 100644
--- a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
+++ b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
@@ -12,10 +12,6 @@
 		</aop:aspect>
 	</aop:config>
 
-	<bean id="getAgeCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
-
-	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
-
 	<bean id="countingAdvice" class="org.springframework.aop.config.CountingAspectJAdvice"/>
 
 </beans>
diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
index 847f864eb11..0524b1071c6 100644
--- a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
+++ b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
@@ -12,10 +12,6 @@
 		</aop:aspect>
 	</aop:config>
 
-	<bean id="getAgeCounter" class="org.springframework.aop.testfixture.advice.CountingBeforeAdvice"/>
-
-	<bean id="testBean" class="org.springframework.beans.testfixture.beans.TestBean"/>
-
 	<bean id="countingAdvice" class="org.springframework.aop.config.CountingAspectJAdvice"/>
 
 </beans>