From 8b1e69cfd2bcf25f40dae1afc7bd7e8f76252983 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Fri, 19 Dec 2008 02:57:21 +0000 Subject: [PATCH] refactoring .testsuite .aop.aspectj tests in preparation for migration to .context git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@476 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../aop/aspectj/AfterAdviceBindingTests.java | 3 ++- ...-advice-tests.xml => AfterAdviceBindingTests.xml} | 0 .../aspectj/AfterReturningAdviceBindingTests.java | 8 ++------ ...ests.xml => AfterReturningAdviceBindingTests.xml} | 0 .../aop/aspectj/AfterThrowingAdviceBindingTests.java | 3 ++- ...tests.xml => AfterThrowingAdviceBindingTests.xml} | 0 .../aop/aspectj/AroundAdviceBindingTests.java | 6 +----- ...advice-tests.xml => AroundAdviceBindingTests.xml} | 0 .../aop/aspectj/AroundAdviceCircularTests.java | 4 ---- ...cular-tests.xml => AroundAdviceCircularTests.xml} | 0 .../aop/aspectj/AspectAndAdvicePrecedenceTests.java | 3 ++- ...-tests.xml => AspectAndAdvicePrecedenceTests.xml} | 0 .../AspectJExpressionPointcutAdvisorTests.java | 3 ++- ...xml => AspectJExpressionPointcutAdvisorTests.xml} | 0 .../aop/aspectj/BeanNamePointcutAtAspectTests.java | 3 ++- ...t-tests.xml => BeanNamePointcutAtAspectTests.xml} | 0 .../aop/aspectj/BeanNamePointcutTests.java | 2 +- ...-pointcut-tests.xml => BeanNamePointcutTests.xml} | 0 .../aop/aspectj/BeforeAdviceBindingTests.java | 3 ++- ...advice-tests.xml => BeforeAdviceBindingTests.xml} | 0 .../aspectj/DeclarationOrderIndependenceTests.java | 3 ++- ...ect.xml => DeclarationOrderIndependenceTests.xml} | 0 .../aop/aspectj/DeclareParentsDelegateRefTests.java | 3 ++- ...-tests.xml => DeclareParentsDelegateRefTests.xml} | 0 .../aop/aspectj/DeclareParentsTests.java | 6 +----- ...are-parents-tests.xml => DeclareParentsTests.xml} | 0 .../ImplicitJPArgumentMatchingAtAspectJTests.java | 2 +- ... => ImplicitJPArgumentMatchingAtAspectJTests.xml} | 0 .../aop/aspectj/ImplicitJPArgumentMatchingTests.java | 2 +- ...tests.xml => ImplicitJPArgumentMatchingTests.xml} | 0 ...tests.xml => OverloadedAdviceTests-ambiguous.xml} | 0 .../aop/aspectj/OverloadedAdviceTests.java | 4 ++-- ...ed-advice-tests.xml => OverloadedAdviceTests.xml} | 0 .../springframework/aop/aspectj/ProceedTests.java | 2 +- ...st.xml => PropertyDependentAspectTests-after.xml} | 0 ...PropertyDependentAspectTests-atAspectJ-after.xml} | 0 ...ropertyDependentAspectTests-atAspectJ-before.xml} | 0 ...t.xml => PropertyDependentAspectTests-before.xml} | 0 .../aop/aspectj/PropertyDependentAspectTests.java | 12 ++++++------ .../aspectj/SharedPointcutWithArgsMismatchTests.java | 3 ++- ...h.xml => SharedPointcutWithArgsMismatchTests.xml} | 0 .../aop/aspectj/SubtypeSensitiveMatchingTests.java | 3 ++- ...atching.xml => SubtypeSensitiveMatchingTests.xml} | 0 .../aop/aspectj/TargetPointcutSelectionTests.java | 2 +- ...ndTargetSelectionOnlyPointcutsAtAspectJTests.java | 3 ++- ...ndTargetSelectionOnlyPointcutsAtAspectJTests.xml} | 0 .../ThisAndTargetSelectionOnlyPointcutsTests.java | 3 ++- ... => ThisAndTargetSelectionOnlyPointcutsTests.xml} | 0 .../aspectj/{proceedTests.xml => proceedTests_.xml} | 0 ...onTests.xml => targetPointcutSelectionTests_.xml} | 0 50 files changed, 41 insertions(+), 45 deletions(-) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{after-advice-tests.xml => AfterAdviceBindingTests.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{afterReturning-advice-tests.xml => AfterReturningAdviceBindingTests.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{afterThrowing-advice-tests.xml => AfterThrowingAdviceBindingTests.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{around-advice-tests.xml => AroundAdviceBindingTests.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{around-advice-circular-tests.xml => AroundAdviceCircularTests.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{advice-precedence-tests.xml => AspectAndAdvicePrecedenceTests.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{aspectj.xml => AspectJExpressionPointcutAdvisorTests.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{bean-name-pointcut-atAspect-tests.xml => BeanNamePointcutAtAspectTests.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{bean-name-pointcut-tests.xml => BeanNamePointcutTests.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{before-advice-tests.xml => BeforeAdviceBindingTests.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{topsy-turvy-aspect.xml => DeclarationOrderIndependenceTests.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{declare-parents-delegate-ref-tests.xml => DeclareParentsDelegateRefTests.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{declare-parents-tests.xml => DeclareParentsTests.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{implicit-jp-argument-matching-atAspectJ-tests.xml => ImplicitJPArgumentMatchingAtAspectJTests.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{implicit-jp-argument-matching-tests.xml => ImplicitJPArgumentMatchingTests.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{ambiguous-advice-tests.xml => OverloadedAdviceTests-ambiguous.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{overloaded-advice-tests.xml => OverloadedAdviceTests.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{property-dependent-aspect-property-after-aspect-test.xml => PropertyDependentAspectTests-after.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{property-dependent-atAspectJ-aspect-property-after-aspect-test.xml => PropertyDependentAspectTests-atAspectJ-after.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{property-dependent-atAspectJ-aspect-property-before-aspect-test.xml => PropertyDependentAspectTests-atAspectJ-before.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{property-dependent-aspect-property-before-aspect-test.xml => PropertyDependentAspectTests-before.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{args-mismatch.xml => SharedPointcutWithArgsMismatchTests.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{subtype-sensitive-matching.xml => SubtypeSensitiveMatchingTests.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{this-and-target-selectionOnly-pointcuts-atAspectJ-tests.xml => ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{this-and-target-selectionOnly-pointcuts-tests.xml => ThisAndTargetSelectionOnlyPointcutsTests.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{proceedTests.xml => proceedTests_.xml} (100%) rename org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/{targetPointcutSelectionTests.xml => targetPointcutSelectionTests_.xml} (100%) diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java index efad82cd6a3..36a60c2c682 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java @@ -45,7 +45,8 @@ public final class AfterAdviceBindingTests { @Before public void setUp() throws Exception { - ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("after-advice-tests.xml", getClass()); + ClassPathXmlApplicationContext ctx = + new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); AdviceBindingTestAspect afterAdviceAspect = (AdviceBindingTestAspect) ctx.getBean("testAspect"); testBeanProxy = (ITestBean) ctx.getBean("testBean"); diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/after-advice-tests.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/after-advice-tests.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java index 92c670580a8..a89b37711b5 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java @@ -26,7 +26,6 @@ import org.springframework.aop.framework.Advised; import org.springframework.aop.support.AopUtils; import org.springframework.beans.ITestBean; import org.springframework.beans.TestBean; -import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; /** @@ -52,13 +51,10 @@ public final class AfterReturningAdviceBindingTests { this.afterAdviceAspect = anAspect; } - protected String getConfigPath() { - return "afterReturning-advice-tests.xml"; - } - @Before public void setUp() throws Exception { - ApplicationContext ctx = new ClassPathXmlApplicationContext(getConfigPath(), getClass()); + ClassPathXmlApplicationContext ctx = + new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); afterAdviceAspect = (AfterReturningAdviceBindingTestAspect) ctx.getBean("testAspect"); diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/afterReturning-advice-tests.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/afterReturning-advice-tests.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java index 8973add224d..5798fa688dc 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java @@ -41,7 +41,8 @@ public final class AfterThrowingAdviceBindingTests { @Before public void setUp() { - ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("afterThrowing-advice-tests.xml", getClass()); + ClassPathXmlApplicationContext ctx = + new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); testBean = (ITestBean) ctx.getBean("testBean"); afterThrowingAdviceAspect = (AfterThrowingAdviceBindingTestAspect) ctx.getBean("testAspect"); diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/afterThrowing-advice-tests.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/afterThrowing-advice-tests.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java index 7512d2a9f63..04d0a666b01 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java @@ -46,13 +46,9 @@ public class AroundAdviceBindingTests { protected ApplicationContext ctx; - protected String getConfigPath() { - return "around-advice-tests.xml"; - } - @Before public void onSetUp() throws Exception { - ctx = new ClassPathXmlApplicationContext(getConfigPath(), getClass()); + ctx = new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); AroundAdviceBindingTestAspect aroundAdviceAspect = ((AroundAdviceBindingTestAspect) ctx.getBean("testAspect")); diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/around-advice-tests.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/around-advice-tests.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.java index ff558864fc9..9a22d6adde5 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.java @@ -27,10 +27,6 @@ import org.springframework.aop.support.AopUtils; */ public final class AroundAdviceCircularTests extends AroundAdviceBindingTests { - protected String getConfigPath() { - return "around-advice-circular-tests.xml"; - } - @Test public void testBothBeansAreProxies() { Object tb = ctx.getBean("testBean"); diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/around-advice-circular-tests.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/around-advice-circular-tests.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java index 068b2fa7e86..1cff726a581 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java @@ -48,7 +48,8 @@ public final class AspectAndAdvicePrecedenceTests { @Before public void setUp() { - ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("advice-precedence-tests.xml", getClass()); + ClassPathXmlApplicationContext ctx = + new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); highPrecedenceAspect = (PrecedenceTestAspect) ctx.getBean("highPrecedenceAspect"); lowPrecedenceAspect = (PrecedenceTestAspect) ctx.getBean("lowPrecedenceAspect"); highPrecedenceSpringAdvice = (SimpleSpringBeforeAdvice) ctx.getBean("highPrecedenceSpringAdvice"); diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/advice-precedence-tests.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/advice-precedence-tests.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java index 984131569d9..dbe4e3e51a0 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java @@ -38,7 +38,8 @@ public final class AspectJExpressionPointcutAdvisorTests { @Before public void setUp() { - ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("aspectj.xml", getClass()); + ClassPathXmlApplicationContext ctx = + new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); testBean = (ITestBean) ctx.getBean("testBean"); interceptor = (CallCountingInterceptor) ctx.getBean("interceptor"); } diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/aspectj.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/aspectj.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java index 31a709f47d2..c2f76603b16 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java @@ -47,7 +47,8 @@ public final class BeanNamePointcutAtAspectTests { @org.junit.Before public void setUp() { - ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("bean-name-pointcut-atAspect-tests.xml", getClass()); + ClassPathXmlApplicationContext ctx = + new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); counterAspect = (CounterAspect) ctx.getBean("counterAspect"); testBean1 = (ITestBean) ctx.getBean("testBean1"); testBean2 = (ITestBean) ctx.getBean("testBean2"); diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/bean-name-pointcut-atAspect-tests.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/bean-name-pointcut-atAspect-tests.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java index 76273948a9c..8d43600ab90 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java @@ -54,7 +54,7 @@ public final class BeanNamePointcutTests { @Before public void setUp() { - ctx = new ClassPathXmlApplicationContext("bean-name-pointcut-tests.xml", getClass()); + ctx = new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); testBean1 = (ITestBean) ctx.getBean("testBean1"); testBean2 = (ITestBean) ctx.getBean("testBean2"); testBeanContainingNestedBean = (ITestBean) ctx.getBean("testBeanContainingNestedBean"); diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/bean-name-pointcut-tests.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/bean-name-pointcut-tests.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java index d976422be9b..5a7e713cbe0 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java @@ -50,7 +50,8 @@ public final class BeforeAdviceBindingTests { @Before public void setUp() throws Exception { - ApplicationContext ctx = new ClassPathXmlApplicationContext(getConfigPath(), getClass()); + ClassPathXmlApplicationContext ctx = + new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); testBeanProxy = (ITestBean) ctx.getBean("testBean"); assertTrue(AopUtils.isAopProxy(testBeanProxy)); diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/before-advice-tests.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/before-advice-tests.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java index 37a3de4617c..b37f8fba371 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java @@ -39,7 +39,8 @@ public final class DeclarationOrderIndependenceTests { @Before public void setUp() { - ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("topsy-turvy-aspect.xml", getClass()); + ClassPathXmlApplicationContext ctx = + new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); aspect = (TopsyTurvyAspect) ctx.getBean("topsyTurvyAspect"); target = (TopsyTurvyTarget) ctx.getBean("topsyTurvyTarget"); } diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/topsy-turvy-aspect.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/topsy-turvy-aspect.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java index 7f3e8333823..599fa63ee99 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java @@ -35,7 +35,8 @@ public class DeclareParentsDelegateRefTests { @Before public void setUp() { - ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("declare-parents-delegate-ref-tests.xml", getClass()); + ClassPathXmlApplicationContext ctx = + new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); noMethodsBean = (NoMethodsBean) ctx.getBean("noMethodsBean"); counter = (Counter) ctx.getBean("counter"); counter.reset(); diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/declare-parents-delegate-ref-tests.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/declare-parents-delegate-ref-tests.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java index 98ed62d2ad5..856a70bb879 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java @@ -40,13 +40,9 @@ public final class DeclareParentsTests { private ApplicationContext ctx; - protected String getConfigPath() { - return "declare-parents-tests.xml"; - } - @Before public void setUp() throws Exception { - ctx = new ClassPathXmlApplicationContext(getConfigPath(), getClass()); + ctx = new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); testBeanProxy = (ITestBean) ctx.getBean("testBean"); assertTrue(AopUtils.isAopProxy(testBeanProxy)); diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/declare-parents-tests.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/declare-parents-tests.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java index f58dd722ebd..ca987a04a4c 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java @@ -34,7 +34,7 @@ public final class ImplicitJPArgumentMatchingAtAspectJTests { @Test public void testAspect() { // nothing to really test; it is enough if we don't get error while creating app context - new ClassPathXmlApplicationContext("implicit-jp-argument-matching-atAspectJ-tests.xml", getClass()); + new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); } @Aspect diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/implicit-jp-argument-matching-atAspectJ-tests.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/implicit-jp-argument-matching-atAspectJ-tests.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java index 8e8ab3f93f1..8cd94420ee7 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java @@ -31,7 +31,7 @@ public final class ImplicitJPArgumentMatchingTests { @Test public void testAspect() { // nothing to really test; it is enough if we don't get error while creating app context - new ClassPathXmlApplicationContext("implicit-jp-argument-matching-tests.xml", getClass()); + new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); } static class CounterAspect { diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/implicit-jp-argument-matching-tests.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/implicit-jp-argument-matching-tests.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ambiguous-advice-tests.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ambiguous-advice-tests.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java index 1bf43303972..9eac5f45d4b 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java @@ -33,7 +33,7 @@ public final class OverloadedAdviceTests { @Test public void testExceptionOnConfigParsingWithMismatchedAdviceMethod() { try { - new ClassPathXmlApplicationContext("overloaded-advice-tests.xml", getClass()); + new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); } catch (BeanCreationException ex) { Throwable cause = ex.getRootCause(); @@ -46,7 +46,7 @@ public final class OverloadedAdviceTests { @Test public void testExceptionOnConfigParsingWithAmbiguousAdviceMethod() { try { - new ClassPathXmlApplicationContext("ambiguous-advice-tests.xml", getClass()); + new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-ambiguous.xml", getClass()); } catch (BeanCreationException ex) { Throwable cause = ex.getRootCause(); diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/overloaded-advice-tests.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/overloaded-advice-tests.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ProceedTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ProceedTests.java index f95d6f75d11..257c2e56f91 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ProceedTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ProceedTests.java @@ -43,7 +43,7 @@ public final class ProceedTests { @Before public void setUp() { - ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("proceedTests.xml", getClass()); + ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("proceedTests_.xml", getClass()); testBean = (SimpleBean) ctx.getBean("testBean"); firstTestAspect = (ProceedTestingAspect) ctx.getBean("firstTestAspect"); secondTestAspect = (ProceedTestingAspect) ctx.getBean("secondTestAspect"); diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/property-dependent-aspect-property-after-aspect-test.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/property-dependent-aspect-property-after-aspect-test.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/property-dependent-atAspectJ-aspect-property-after-aspect-test.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/property-dependent-atAspectJ-aspect-property-after-aspect-test.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/property-dependent-atAspectJ-aspect-property-before-aspect-test.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/property-dependent-atAspectJ-aspect-property-before-aspect-test.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/property-dependent-aspect-property-before-aspect-test.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/property-dependent-aspect-property-before-aspect-test.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java index eb47909deca..39cc9b3486c 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java @@ -39,26 +39,26 @@ public final class PropertyDependentAspectTests { @Test public void testPropertyDependentAspectWithPropertyDeclaredBeforeAdvice() throws Exception { - checkXmlAspect("org/springframework/aop/aspectj/property-dependent-aspect-property-before-aspect-test.xml"); + checkXmlAspect(getClass().getSimpleName() + "-before.xml"); } @Test public void testPropertyDependentAspectWithPropertyDeclaredAfterAdvice() throws Exception { - checkXmlAspect("org/springframework/aop/aspectj/property-dependent-aspect-property-after-aspect-test.xml"); + checkXmlAspect(getClass().getSimpleName() + "-after.xml"); } @Test public void testPropertyDependentAtAspectJAspectWithPropertyDeclaredBeforeAdvice() throws Exception { - checkAtAspectJAspect("org/springframework/aop/aspectj/property-dependent-atAspectJ-aspect-property-before-aspect-test.xml"); + checkAtAspectJAspect(getClass().getSimpleName() + "-atAspectJ-before.xml"); } @Test public void testPropertyDependentAtAspectJAspectWithPropertyDeclaredAfterAdvice() throws Exception { - checkAtAspectJAspect("org/springframework/aop/aspectj/property-dependent-atAspectJ-aspect-property-after-aspect-test.xml"); + checkAtAspectJAspect(getClass().getSimpleName() + "-atAspectJ-after.xml"); } private void checkXmlAspect(String appContextFile) { - ApplicationContext context = new ClassPathXmlApplicationContext(appContextFile); + ApplicationContext context = new ClassPathXmlApplicationContext(appContextFile, getClass()); ICounter counter = (ICounter) context.getBean("counter"); assertTrue("Proxy didn't get created", counter instanceof Advised); @@ -69,7 +69,7 @@ public final class PropertyDependentAspectTests { } private void checkAtAspectJAspect(String appContextFile) { - ApplicationContext context = new ClassPathXmlApplicationContext(appContextFile); + ApplicationContext context = new ClassPathXmlApplicationContext(appContextFile, getClass()); ICounter counter = (ICounter) context.getBean("counter"); assertTrue("Proxy didn't get created", counter instanceof Advised); diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java index 77f26b83326..53700685629 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java @@ -33,7 +33,8 @@ public final class SharedPointcutWithArgsMismatchTests { @Before public void setUp() { - ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("args-mismatch.xml", getClass()); + ClassPathXmlApplicationContext ctx = + new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); toBeAdvised = (ToBeAdvised) ctx.getBean("toBeAdvised"); } diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/args-mismatch.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/args-mismatch.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java index 45a310dbac2..d587ab8ccf5 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java @@ -40,7 +40,8 @@ public final class SubtypeSensitiveMatchingTests { @Before public void setUp() { - ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("subtype-sensitive-matching.xml", getClass()); + ClassPathXmlApplicationContext ctx = + new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); nonSerializableBean = (NonSerializableFoo) ctx.getBean("testClassA"); serializableBean = (SerializableFoo) ctx.getBean("testClassB"); bar = (Bar) ctx.getBean("testClassC"); diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/subtype-sensitive-matching.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/subtype-sensitive-matching.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java index af6b711bd27..1f6ed1f71bb 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java @@ -42,7 +42,7 @@ public final class TargetPointcutSelectionTests { @Before public void setUp() { - ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("targetPointcutSelectionTests.xml", getClass()); + ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("targetPointcutSelectionTests_.xml", getClass()); testImpl1 = (TestInterface) ctx.getBean("testImpl1"); testImpl2 = (TestInterface) ctx.getBean("testImpl2"); testAspectForTestImpl1 = (TestAspect) ctx.getBean("testAspectForTestImpl1"); diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java index 90cc66e5c45..8008dbccfd1 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java @@ -39,7 +39,8 @@ public final class ThisAndTargetSelectionOnlyPointcutsAtAspectJTests { @org.junit.Before public void setUp() { - ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("this-and-target-selectionOnly-pointcuts-atAspectJ-tests.xml", getClass()); + ClassPathXmlApplicationContext ctx = + new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); testBean = (TestInterface) ctx.getBean("testBean"); testAnnotatedClassBean = (TestInterface) ctx.getBean("testAnnotatedClassBean"); testAnnotatedMethodBean = (TestInterface) ctx.getBean("testAnnotatedMethodBean"); diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/this-and-target-selectionOnly-pointcuts-atAspectJ-tests.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/this-and-target-selectionOnly-pointcuts-atAspectJ-tests.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java index b0a3b12ce1d..398046ddb2f 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java @@ -40,7 +40,8 @@ public final class ThisAndTargetSelectionOnlyPointcutsTests { @Before public void setUp() { - ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("this-and-target-selectionOnly-pointcuts-tests.xml", getClass()); + ClassPathXmlApplicationContext ctx = + new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); testBean = (TestInterface) ctx.getBean("testBean"); diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/this-and-target-selectionOnly-pointcuts-tests.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/this-and-target-selectionOnly-pointcuts-tests.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/proceedTests.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/proceedTests_.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/proceedTests.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/proceedTests_.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/targetPointcutSelectionTests.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/targetPointcutSelectionTests_.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/targetPointcutSelectionTests.xml rename to org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/targetPointcutSelectionTests_.xml