Date: Mon, 17 Dec 2018 16:41:44 +0000
Subject: [PATCH 4/4] Remove redundant component scan filter
The @DataJpaTests creates all the repositories. There's no need
for a filter (and there aren't any matching @Service beans anyway).
---
.gitignore | 2 ++
.../petclinic/service/ClinicServiceTests.java | 36 +++++++++++--------
2 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/.gitignore b/.gitignore
index 8cdbd1ff4..559982f3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@ target/*
.settings/*
.classpath
.project
+.factorypath
+.attach_pid*
.idea
*.iml
/target
diff --git a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java b/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java
index 9f12151d9..b5626fae5 100644
--- a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java
@@ -16,16 +16,14 @@
package org.springframework.samples.petclinic.service;
-import static org.assertj.core.api.Assertions.assertThat;
-
import java.time.LocalDate;
import java.util.Collection;
import org.junit.Test;
import org.junit.runner.RunWith;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.context.annotation.ComponentScan;
import org.springframework.samples.petclinic.owner.Owner;
import org.springframework.samples.petclinic.owner.OwnerRepository;
import org.springframework.samples.petclinic.owner.Pet;
@@ -35,22 +33,32 @@ import org.springframework.samples.petclinic.vet.Vet;
import org.springframework.samples.petclinic.vet.VetRepository;
import org.springframework.samples.petclinic.visit.Visit;
import org.springframework.samples.petclinic.visit.VisitRepository;
-import org.springframework.stereotype.Service;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.transaction.annotation.Transactional;
+import static org.assertj.core.api.Assertions.assertThat;
+
/**
* Integration test of the Service and the Repository layer.
*
- * ClinicServiceSpringDataJpaTests subclasses benefit from the following services provided by the Spring
- * TestContext Framework:
- Spring IoC container caching which spares us unnecessary set up
- * time between test execution.
- Dependency Injection of test fixture instances, meaning that
- * we don't need to perform application context lookups. See the use of {@link Autowired @Autowired} on the
{@link
- * ClinicServiceTests#clinicService clinicService} instance variable, which uses autowiring by
- * type. - Transaction management, meaning each test method is executed in its own transaction,
- * which is automatically rolled back by default. Thus, even if tests insert or otherwise change database state, there
- * is no need for a teardown or cleanup script.
- An {@link org.springframework.context.ApplicationContext
- * ApplicationContext} is also inherited and can be used for explicit bean lookup if necessary.
+ * ClinicServiceSpringDataJpaTests subclasses benefit from the following services provided
+ * by the Spring TestContext Framework:
+ *
+ *
+ * - Spring IoC container caching which spares us unnecessary set up
+ * time between test execution.
+ * - Dependency Injection of test fixture instances, meaning that we
+ * don't need to perform application context lookups. See the use of
+ * {@link Autowired @Autowired} on the
{@link
+ * ClinicServiceTests#clinicService clinicService} instance variable, which uses
+ * autowiring by type.
+ * - Transaction management, meaning each test method is executed in
+ * its own transaction, which is automatically rolled back by default. Thus, even if tests
+ * insert or otherwise change database state, there is no need for a teardown or cleanup
+ * script.
+ *
- An {@link org.springframework.context.ApplicationContext ApplicationContext} is
+ * also inherited and can be used for explicit bean lookup if necessary.
+ *
*
* @author Ken Krebs
* @author Rod Johnson
@@ -61,7 +69,7 @@ import org.springframework.transaction.annotation.Transactional;
*/
@RunWith(SpringRunner.class)
-@DataJpaTest(includeFilters = @ComponentScan.Filter(Service.class))
+@DataJpaTest
public class ClinicServiceTests {
@Autowired