SHIBUI-1788

Updated test configurations to fix autowired dependencies
TIER · Jun 8, 2021 · 2b4c374 · 2b4c374
1 parent d650f34
commit 2b4c374
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 6 deletions.
diff --git a/...ternet2/tier/shibboleth/admin/ui/service/CustomEntityAttributesDefinitionServiceImpl.java b/...ternet2/tier/shibboleth/admin/ui/service/CustomEntityAttributesDefinitionServiceImpl.java
@@ -5,6 +5,7 @@
 import javax.persistence.EntityManager;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 
 import edu.internet2.tier.shibboleth.admin.ui.domain.CustomEntityAttributeDefinition;
@@ -13,6 +14,7 @@
 import edu.internet2.tier.shibboleth.admin.ui.repository.CustomEntityAttributeFilterValueRepository;
 
 @Service
+@Primary
 public class CustomEntityAttributesDefinitionServiceImpl implements CustomEntityAttributesDefinitionService {
     @Autowired
     private CustomEntityAttributeDefinitionRepository repository;

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
@@ -2,11 +2,17 @@ package edu.internet2.tier.shibboleth.admin.ui.configuration
 
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.opensaml.OpenSamlChainingMetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects
+import edu.internet2.tier.shibboleth.admin.ui.repository.CustomEntityAttributeDefinitionRepository
+import edu.internet2.tier.shibboleth.admin.ui.repository.CustomEntityAttributeFilterValueRepository
 import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository
 import edu.internet2.tier.shibboleth.admin.ui.security.DefaultAuditorAware
+import edu.internet2.tier.shibboleth.admin.ui.service.CustomEntityAttributesDefinitionServiceImpl
 import edu.internet2.tier.shibboleth.admin.ui.service.IndexWriterService
 import net.shibboleth.ext.spring.resource.ResourceHelper
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException
+
+import javax.persistence.EntityManager
+
 import org.apache.lucene.document.Document
 import org.apache.lucene.document.Field
 import org.apache.lucene.document.StringField
@@ -35,11 +41,30 @@ class TestConfiguration {
     final MetadataResolverRepository metadataResolverRepository
     final Logger logger = LoggerFactory.getLogger(TestConfiguration.class);
 
+    @Autowired
+    private CustomEntityAttributeDefinitionRepository repository;
+
+    @Autowired
+    CustomEntityAttributeFilterValueRepository customEntityAttributeFilterValueRepository;
+
+    @Autowired
+    EntityManager entityManager
+
     TestConfiguration(final OpenSamlObjects openSamlObjects, final MetadataResolverRepository metadataResolverRepository) {
         this.openSamlObjects =openSamlObjects
         this.metadataResolverRepository = metadataResolverRepository
     }
 
+    @Bean
+    CustomEntityAttributesDefinitionServiceImpl ceadService() {
+        new CustomEntityAttributesDefinitionServiceImpl().with {
+           it.entityManager = entityManager
+           it.repository = repository
+           it.customEntityAttributeFilterValueRepository = customEntityAttributeFilterValueRepository
+           return it
+        }
+    }
+
     @Bean
     JavaMailSender javaMailSender() {
         return new JavaMailSenderImpl().with {

diff --git a/...src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptorTest.groovy b/...src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptorTest.groovy
@@ -33,7 +33,7 @@ import java.nio.file.Files
  * @author Bill Smith (wsmith@unicon.net)
  */
 @DataJpaTest
-@ContextConfiguration(classes=[CoreShibUiConfiguration, SearchConfiguration, InternationalizationConfiguration, MyConfig, PlaceholderResolverComponentsConfiguration])
+@ContextConfiguration(classes=[CoreShibUiConfiguration, SearchConfiguration, InternationalizationConfiguration, MyConfig, PlaceholderResolverComponentsConfiguration, edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration])
 @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"])
 @EntityScan("edu.internet2.tier.shibboleth.admin.ui")
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)

diff --git a/...y/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorRepositoryTest.groovy b/...y/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorRepositoryTest.groovy
@@ -8,6 +8,7 @@ import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects
 import edu.internet2.tier.shibboleth.admin.ui.security.repository.RoleRepository
 import edu.internet2.tier.shibboleth.admin.ui.security.repository.UserRepository
 import edu.internet2.tier.shibboleth.admin.ui.security.service.UserService
+import edu.internet2.tier.shibboleth.admin.ui.service.CustomEntityAttributesDefinitionServiceImpl
 import edu.internet2.tier.shibboleth.admin.ui.service.JPAEntityDescriptorServiceImpl
 import edu.internet2.tier.shibboleth.admin.ui.service.JPAEntityServiceImpl
 import org.apache.lucene.analysis.Analyzer
@@ -29,14 +30,20 @@ import javax.persistence.EntityManager
  * A highly unnecessary test so that I can check to make sure that persistence is correct for the model
  */
 @DataJpaTest
-@ContextConfiguration(classes=[CoreShibUiConfiguration, InternationalizationConfiguration, Config])
+@ContextConfiguration(classes=[CoreShibUiConfiguration, InternationalizationConfiguration, LocalConfig])
 @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"])
 @EntityScan("edu.internet2.tier.shibboleth.admin.ui")
 @DirtiesContext(methodMode = DirtiesContext.MethodMode.AFTER_METHOD)
 class EntityDescriptorRepositoryTest extends Specification {
     @Autowired
     EntityDescriptorRepository entityDescriptorRepository
 
+    @Autowired
+    private CustomEntityAttributeDefinitionRepository repository;
+
+    @Autowired
+    CustomEntityAttributeFilterValueRepository customEntityAttributeFilterValueRepository;
+
     @Autowired
     EntityManager entityManager
 
@@ -86,7 +93,7 @@ class EntityDescriptorRepositoryTest extends Specification {
     }
 
     @TestConfiguration
-    static class Config {
+    static class LocalConfig {
         @Bean
         MetadataResolver metadataResolver() {
             new OpenSamlChainingMetadataResolver().with {
@@ -100,5 +107,15 @@ class EntityDescriptorRepositoryTest extends Specification {
         Analyzer analyzer() {
             return new EnglishAnalyzer()
         }
+
+        @Bean
+        CustomEntityAttributesDefinitionServiceImpl ceadService() {
+            new CustomEntityAttributesDefinitionServiceImpl().with {
+               it.entityManager = entityManager
+               it.repository = repository
+               it.customEntityAttributeFilterValueRepository = customEntityAttributeFilterValueRepository
+               return it
+            }
+        }
     }
 }
diff --git a/...rnet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy b/...rnet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy
@@ -30,7 +30,7 @@ import spock.lang.Specification
 import static edu.internet2.tier.shibboleth.admin.ui.util.TestHelpers.*
 
 @DataJpaTest
-@ContextConfiguration(classes = [CoreShibUiConfiguration, SearchConfiguration, InternationalizationConfiguration, TestConfig])
+@ContextConfiguration(classes = [CoreShibUiConfiguration, SearchConfiguration, InternationalizationConfiguration, edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration ,LocalConfig])
 @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"])
 @EntityScan("edu.internet2.tier.shibboleth.admin.ui")
 class IncommonJPAMetadataResolverServiceImplTests extends Specification {
@@ -106,7 +106,7 @@ class IncommonJPAMetadataResolverServiceImplTests extends Specification {
 
     //TODO: check that this configuration is sufficient
     @TestConfiguration
-    static class TestConfig {
+    static class LocalConfig {
         @Autowired
         OpenSamlObjects openSamlObjects
 

diff --git a/...edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy b/...edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy
@@ -51,7 +51,7 @@ import spock.lang.Unroll
 import static edu.internet2.tier.shibboleth.admin.ui.util.TestHelpers.generatedXmlIsTheSameAsExpectedXml
 
 @DataJpaTest
-@ContextConfiguration(classes=[CoreShibUiConfiguration, MetadataResolverConverterConfiguration, SearchConfiguration, InternationalizationConfiguration, PlaceholderResolverComponentsConfiguration, Config])
+@ContextConfiguration(classes=[CoreShibUiConfiguration, MetadataResolverConverterConfiguration, SearchConfiguration, InternationalizationConfiguration, PlaceholderResolverComponentsConfiguration, edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration ,Config])
 @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"])
 @EntityScan("edu.internet2.tier.shibboleth.admin.ui")
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)