SHIBUI-1783

correcting unit test configuration
TIER · Jun 1, 2021 · 1b18a3a · 1b18a3a
1 parent 837ce16
commit 1b18a3a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/...test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy b/...test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy
@@ -27,7 +27,6 @@ import org.springframework.mail.javamail.JavaMailSender
 import org.springframework.mail.javamail.JavaMailSenderImpl
 
 @Configuration
-@ComponentScan("edu.internet2.tier.shibboleth.admin.ui.service")
 class TestConfiguration {
     @Autowired
     IndexWriterService indexWriterService

diff --git a/...est/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/FilterRepositoryTests.groovy b/...est/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/FilterRepositoryTests.groovy
@@ -1,6 +1,16 @@
 package edu.internet2.tier.shibboleth.admin.ui.repository
 
+import javax.persistence.EntityManager
+
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.autoconfigure.domain.EntityScan
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
+import org.springframework.context.annotation.ComponentScan
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories
+import org.springframework.test.context.ContextConfiguration
+
 import com.fasterxml.jackson.databind.ObjectMapper
+
 import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration
 import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration
 import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration
@@ -10,21 +20,13 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.filters.CustomEntityAttribu
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilter
 import edu.internet2.tier.shibboleth.admin.ui.service.CustomEntityAttributesDefinitionService
 import edu.internet2.tier.shibboleth.admin.ui.util.TestObjectGenerator
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.autoconfigure.domain.EntityScan
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories
-import org.springframework.test.context.ContextConfiguration
 import spock.lang.Specification
 
-import javax.persistence.EntityManager
-
-import static edu.internet2.tier.shibboleth.admin.ui.util.TestObjectGenerator.*
-
 @DataJpaTest
 @ContextConfiguration(classes=[CoreShibUiConfiguration, SearchConfiguration, TestConfiguration, InternationalizationConfiguration])
 @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"])
 @EntityScan("edu.internet2.tier.shibboleth.admin.ui")
+@ComponentScan("edu.internet2.tier.shibboleth.admin.ui.service")
 class FilterRepositoryTests extends Specification {
 
     @Autowired