cleaned up AOP usage

src/test/java/org/springframework/samples/petclinic/aspects/UsageLogAspectTests.java

@@ -1,56 +0,0 @@
-package org.springframework.samples.petclinic.aspects;
-
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-
-import java.util.List;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.samples.petclinic.repository.OwnerRepository;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-/**
- * <p>
- * Tests for the DAO variant based on the shared EntityManager approach. Uses
- * TopLink Essentials (the reference implementation) for testing.
- * </p>
- * <p>
- * Specifically tests usage of an <code>orm.xml</code> file, loaded by the
- * persistence provider through the Spring-provided persistence unit root URL.
- * </p>
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
-@RunWith(SpringJUnit4ClassRunner.class)
-@ActiveProfiles({"jpa","plain-jpa"})
-public class UsageLogAspectTests {
-
-	@Autowired
-	private UsageLogAspect usageLogAspect;
-	
-	@Autowired
-	private OwnerRepository ownerRepository;
-
-
-	@Test
-	public void testUsageLogAspectIsInvoked() {
-		String lastName1 = "Franklin";
-		String lastName2 = "Davis";
-		String lastName3 = "foo";
-
-		assertFalse(this.ownerRepository.findByLastName(lastName1).isEmpty());
-		assertFalse(this.ownerRepository.findByLastName(lastName2).isEmpty());
-
-		List<String> namesRequested = this.usageLogAspect.getNamesRequested();
-		assertTrue(namesRequested.contains(lastName1));
-		assertTrue(namesRequested.contains(lastName2));
-		assertFalse(namesRequested.contains(lastName3));
-	}
-
-}

src/test/java/org/springframework/samples/petclinic/jdbc/JdbcOwnerRepositoryImplTests.java

@@ -16,7 +16,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Thomas Risberg
  * @author Michael Isvy 
  */
-@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
+@ContextConfiguration(locations={"classpath:spring/dao-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("jdbc")
 public class JdbcOwnerRepositoryImplTests extends AbstractOwnerRepositoryTests {

src/test/java/org/springframework/samples/petclinic/jdbc/JdbcPetRepositoryImplTests.java

@@ -16,7 +16,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Thomas Risberg
  * @author Michael Isvy 
  */
-@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
+@ContextConfiguration(locations={"classpath:spring/dao-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("jdbc")
 public class JdbcPetRepositoryImplTests extends AbstractPetRepositoryTests {

src/test/java/org/springframework/samples/petclinic/jdbc/JdbcVetRepositoryImplTests.java

@@ -16,7 +16,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Thomas Risberg
  * @author Michael Isvy 
  */
-@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
+@ContextConfiguration(locations={"classpath:spring/dao-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("jdbc")
 public class JdbcVetRepositoryImplTests extends AbstractVetRepositoryTests {

src/test/java/org/springframework/samples/petclinic/jdbc/JdbcVisitRepositoryImplTests.java

@@ -16,7 +16,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Thomas Risberg
  * @author Michael Isvy 
  */
-@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
+@ContextConfiguration(locations={"classpath:spring/dao-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("jdbc")
 public class JdbcVisitRepositoryImplTests extends AbstractVisitRepositoryTests {

src/test/java/org/springframework/samples/petclinic/jpa/JpaOwnerRepositoryImplTests.java

@@ -26,7 +26,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Michael Isvy
  */
 
-@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
+@ContextConfiguration(locations={"classpath:spring/dao-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("jpa")
 public class JpaOwnerRepositoryImplTests extends AbstractOwnerRepositoryTests {

src/test/java/org/springframework/samples/petclinic/jpa/JpaPetRepositoryImplTests.java

@@ -16,7 +16,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Thomas Risberg
  * @author Michael Isvy 
  */
-@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
+@ContextConfiguration(locations={"classpath:spring/dao-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("jpa")
 public class JpaPetRepositoryImplTests extends AbstractPetRepositoryTests {

src/test/java/org/springframework/samples/petclinic/jpa/JpaVetRepositoryImplTests.java

@@ -16,7 +16,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Thomas Risberg
  * @author Michael Isvy 
  */
-@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
+@ContextConfiguration(locations={"classpath:spring/dao-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("jpa")
 public class JpaVetRepositoryImplTests extends AbstractVetRepositoryTests {

src/test/java/org/springframework/samples/petclinic/jpa/JpaVisitRepositoryImplTests.java

@@ -16,7 +16,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Thomas Risberg
  * @author Michael Isvy 
  */
-@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
+@ContextConfiguration(locations={"classpath:spring/dao-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("jpa")
 public class JpaVisitRepositoryImplTests extends AbstractVisitRepositoryTests {

src/test/java/org/springframework/samples/petclinic/springdatajpa/JpaOwnerRepositoryImplTests.java

@@ -26,7 +26,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Michael Isvy
  */
 
-@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
+@ContextConfiguration(locations={"classpath:spring/dao-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("spring-data-jpa")
 public class JpaOwnerRepositoryImplTests extends AbstractOwnerRepositoryTests {

src/test/java/org/springframework/samples/petclinic/springdatajpa/JpaPetRepositoryImplTests.java

@@ -16,7 +16,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Thomas Risberg
  * @author Michael Isvy 
  */
-@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
+@ContextConfiguration(locations={"classpath:spring/dao-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("spring-data-jpa")
 public class JpaPetRepositoryImplTests extends AbstractPetRepositoryTests {

src/test/java/org/springframework/samples/petclinic/springdatajpa/JpaVetRepositoryImplTests.java

@@ -16,7 +16,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Thomas Risberg
  * @author Michael Isvy 
  */
-@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
+@ContextConfiguration(locations={"classpath:spring/dao-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("spring-data-jpa")
 public class JpaVetRepositoryImplTests extends AbstractVetRepositoryTests {

src/test/java/org/springframework/samples/petclinic/springdatajpa/JpaVisitRepositoryImplTests.java

@@ -16,7 +16,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Thomas Risberg
  * @author Michael Isvy 
  */
-@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
+@ContextConfiguration(locations={"classpath:spring/dao-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("spring-data-jpa")
 public class JpaVisitRepositoryImplTests extends AbstractVisitRepositoryTests {

src/test/java/org/springframework/samples/petclinic/springdatajpa/SpringDataOwnerRepositoryTests.java

@@ -11,7 +11,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Michael Isvy
  */
 
-@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
+@ContextConfiguration(locations={"classpath:spring/dao-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("spring-data-jpa")
 public class SpringDataOwnerRepositoryTests extends AbstractOwnerRepositoryTests {