From 78ae4d027b7f3b133cd281fc555e3aad44cc4bd1 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Thu, 10 Jun 2021 10:33:35 -0700
Subject: [PATCH] SHIBUI-1788

Refactored tests to handle the multiple beans found issue and removed
the @Primary annotation from the service class
---
 .../ui/service/CustomEntityAttributesDefinitionServiceImpl.java | 1 -
 .../shibboleth/admin/ui/configuration/TestConfiguration.groovy  | 2 +-
 .../admin/ui/repository/EntityDescriptorRepositoryTest.groovy   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/CustomEntityAttributesDefinitionServiceImpl.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/CustomEntityAttributesDefinitionServiceImpl.java
index dd1000736..33e660077 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/CustomEntityAttributesDefinitionServiceImpl.java
+++ b/backend/src/main/java/edu/internet2/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/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 4e6e78db8..775103ac0 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
@@ -59,7 +59,7 @@ class TestConfiguration {
     }
 
     @Bean
-    CustomEntityAttributesDefinitionServiceImpl ceadService() {
+    CustomEntityAttributesDefinitionServiceImpl customEntityAttributesDefinitionServiceImpl() {
         new CustomEntityAttributesDefinitionServiceImpl().with {
            it.entityManager = entityManager
            it.repository = repository
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorRepositoryTest.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorRepositoryTest.groovy
index 5fab1b0a2..282961b79 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorRepositoryTest.groovy
+++ b/backend/src/test/groovy/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