From 1b18a3a97cb8cc54e68b67c5fe94d61f4bb4322d Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Tue, 1 Jun 2021 12:54:51 -0700
Subject: [PATCH] SHIBUI-1783

correcting unit test configuration
---
 .../ui/configuration/TestConfiguration.groovy |  1 -
 .../repository/FilterRepositoryTests.groovy   | 20 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy
index a18a4a7b1..5e3c0ad1b 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy
+++ b/backend/src/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/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/FilterRepositoryTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/FilterRepositoryTests.groovy
index 473f7d3c9..48a042e5b 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/FilterRepositoryTests.groovy
+++ b/backend/src/test/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