SHIBUI-1788

Refactored tests to handle the multiple beans found issue and removed the @Primary annotation from the service class
TIER · Jun 10, 2021 · 78ae4d0 · 78ae4d0
1 parent 803b0d7
commit 78ae4d0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/...ternet2/tier/shibboleth/admin/ui/service/CustomEntityAttributesDefinitionServiceImpl.java b/...ternet2/tier/shibboleth/admin/ui/service/CustomEntityAttributesDefinitionServiceImpl.java
@@ -16,7 +16,6 @@
 import edu.internet2.tier.shibboleth.admin.ui.repository.CustomEntityAttributeFilterValueRepository;
 
 @Service
-@Primary
 public class CustomEntityAttributesDefinitionServiceImpl implements CustomEntityAttributesDefinitionService {
     @Autowired
     CustomEntityAttributeFilterValueRepository customEntityAttributeFilterValueRepository;

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
@@ -59,7 +59,7 @@ class TestConfiguration {
     }
 
     @Bean
-    CustomEntityAttributesDefinitionServiceImpl ceadService() {
+    CustomEntityAttributesDefinitionServiceImpl customEntityAttributesDefinitionServiceImpl() {
         new CustomEntityAttributesDefinitionServiceImpl().with {
            it.entityManager = entityManager
            it.repository = repository

diff --git a/...y/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorRepositoryTest.groovy b/...y/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorRepositoryTest.groovy
@@ -109,7 +109,7 @@ class EntityDescriptorRepositoryTest extends Specification {
         }
 
         @Bean
-        CustomEntityAttributesDefinitionServiceImpl ceadService() {
+        CustomEntityAttributesDefinitionServiceImpl customEntityAttributesDefinitionServiceImpl() {
             new CustomEntityAttributesDefinitionServiceImpl().with {
                it.entityManager = entityManager
                it.repository = repository