Explicitly close ApplicationContexts and clean up warnings in tests

This commit also ensures that various test methods actually test
something now.
This commit is contained in:
Sam Brannen
2022-03-20 12:34:56 +01:00
parent 64b64d9ba0
commit 9a5891e6e6
110 changed files with 1579 additions and 1182 deletions

View File

@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:aop="http://www.springframework.org/schema/aop"
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:aop="http://www.springframework.org/schema/aop"
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
<aop:config>
<aop:aspect id="beforeAdviceBindingTests" ref="testAspect">
<aop:pointcut id="foo" expression="execution(* foo(..)) and args(x)"/>
<aop:before pointcut-ref="foo" method="doBefore(int)"/>
<aop:before pointcut-ref="foo" method="doBefore(java.lang.String)"/>
<aop:pointcut id="foo" expression="execution(* foo(..)) and args(x)" />
<aop:before pointcut-ref="foo" method="doBefore(int)" />
<aop:before pointcut-ref="foo" method="doBefore(java.lang.String)" />
</aop:aspect>
</aop:config>
<bean id="toBeAdvised" class="org.springframework.aop.aspectj.ToBeAdvised"/>
<bean id="toBeAdvised" class="org.springframework.aop.aspectj.SharedPointcutWithArgsMismatchTests.ToBeAdvised"/>
<bean id="testAspect" class="org.springframework.aop.aspectj.MyAspect"/>
</beans>
<bean id="testAspect" class="org.springframework.aop.aspectj.SharedPointcutWithArgsMismatchTests.MyAspect"/>
</beans>