From 81efa4d23c80056789667d2abaa1e6641659e10e Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Fri, 19 Dec 2008 02:59:46 +0000 Subject: [PATCH] refactoring .testsuite .aop.aspectj tests in preparation for migration to .context --- .../java/org/springframework/aop/aspectj/ProceedTests.java | 3 ++- .../aop/aspectj/{proceedTests_.xml => ProceedTests.xml} | 0 .../aop/aspectj/TargetPointcutSelectionTests.java | 3 ++- ...cutSelectionTests_.xml => TargetPointcutSelectionTests.xml} | 0 4 files changed, 4 insertions(+), 2 deletions(-) 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/ProceedTests.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/ProceedTests.java index 257c2e56f91..b92fc66d93f 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,8 @@ public final class ProceedTests { @Before public void setUp() { - ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("proceedTests_.xml", getClass()); + ClassPathXmlApplicationContext ctx = + new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".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/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.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java index 1f6ed1f71bb..c20e47a55af 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,8 @@ public final class TargetPointcutSelectionTests { @Before public void setUp() { - ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("targetPointcutSelectionTests_.xml", getClass()); + ClassPathXmlApplicationContext ctx = + new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".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/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