[java-shib-shared] branch main updated: More test cleanup.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-shib-shared.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-shared.git;a=commit;h=1821011ffeae83bd1ec8944ba56d41313249cef5

The following commit(s) were added to refs/heads/main by this push:
     new 1821011f More test cleanup.
1821011f is described below

commit 1821011ffeae83bd1ec8944ba56d41313249cef5
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jun 14 13:06:07 2023 -0400

    More test cleanup.
---
 .../resource/FileBackedHTTPResourceTest.java       | 34 ++++------------------
 .../shibboleth/shared/spring/resource/Idp1326.java | 30 +++++++------------
 .../shibboleth/shared/spring/resource/idp1326.xml  |  2 +-
 3 files changed, 17 insertions(+), 49 deletions(-)

diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResourceTest.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResourceTest.java
index a9ad1160..61df4f04 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResourceTest.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResourceTest.java
@@ -20,15 +20,12 @@ package net.shibboleth.shared.spring.httpclient.resource;
 import java.io.File;
 import java.io.IOException;
 
+import net.shibboleth.shared.collection.CollectionSupport;
 import net.shibboleth.shared.httpclient.HttpClientBuilder;
-import net.shibboleth.shared.spring.context.FilesystemGenericApplicationContext;
-import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
+import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
 
 import org.apache.hc.client5.http.classic.HttpClient;
 import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
-import org.springframework.core.env.MutablePropertySources;
-import org.springframework.core.env.StandardEnvironment;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.mock.env.MockPropertySource;
@@ -90,30 +87,11 @@ public class FileBackedHTTPResourceTest {
         mockEnvVars.setProperty("file.name", existsFile);
         mockEnvVars.setProperty("the.url", existsURL);
 
-        final GenericApplicationContext context = new FilesystemGenericApplicationContext();
-        context.setDisplayName("ApplicationContext");
-
-        final MutablePropertySources propertySources = context.getEnvironment().getPropertySources();
-        propertySources.replace(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME, mockEnvVars);
-
-        final PropertySourcesPlaceholderConfigurer placeholderConfig = new PropertySourcesPlaceholderConfigurer();
-        placeholderConfig.setPlaceholderPrefix("%{");
-        placeholderConfig.setPlaceholderSuffix("}");
-        placeholderConfig.setPropertySources(propertySources);
-
-        context.addBeanFactoryPostProcessor(placeholderConfig);
-
-        final SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader =
-                new SchemaTypeAwareXMLBeanDefinitionReader(context);
-
-        beanDefinitionReader.loadBeanDefinitions(location);
-
-        beanDefinitionReader.setValidating(true);
-
-        context.refresh();
-
-        return context;
+        final ApplicationContextBuilder builder = new ApplicationContextBuilder();
+        builder.setUnresolvedServiceConfigurations(CollectionSupport.singletonList(location));
+        builder.setPropertySources(CollectionSupport.singletonList(mockEnvVars));
 
+        return builder.build();
     }
 
     @Test public void testParsingNew() throws IOException {
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/Idp1326.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/Idp1326.java
index baaa2b4e..82854dd0 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/Idp1326.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/Idp1326.java
@@ -22,9 +22,6 @@ import java.nio.file.Path;
 import java.util.Collection;
 
 import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
-import org.springframework.core.env.MutablePropertySources;
-import org.springframework.core.env.StandardEnvironment;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.mock.env.MockPropertySource;
@@ -32,8 +29,8 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import net.shibboleth.shared.spring.context.FilesystemGenericApplicationContext;
-import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
+import net.shibboleth.shared.collection.CollectionSupport;
+import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
 
 @SuppressWarnings("javadoc")
 public class Idp1326{
@@ -74,28 +71,21 @@ public class Idp1326{
     
     private void testPropFile(String idpHome) {
         
-        GenericApplicationContext context = new FilesystemGenericApplicationContext();
+        final ApplicationContextBuilder builder = new ApplicationContextBuilder();
         
-        final MutablePropertySources propertySources = context.getEnvironment().getPropertySources();
         final MockPropertySource mockEnvVars = new MockPropertySource();
         mockEnvVars.setProperty("idp.home", idpHome);
+        builder.setPropertySources(CollectionSupport.singletonList(mockEnvVars));
+        builder.setServiceConfiguration(resource);
         
-        propertySources.replace(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME, mockEnvVars);
+        final GenericApplicationContext context = builder.build();
         
-        final PropertySourcesPlaceholderConfigurer placeholderConfig = new PropertySourcesPlaceholderConfigurer();
-        placeholderConfig.setPlaceholderPrefix("%{");
-        placeholderConfig.setPlaceholderSuffix("}");
-        placeholderConfig.setPropertySources(propertySources);
-        
-        context.addBeanFactoryPostProcessor(placeholderConfig);
-
-        final SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader = new SchemaTypeAwareXMLBeanDefinitionReader(context);
-        beanDefinitionReader.loadBeanDefinitions(resource);
-        
-        context.refresh();
         final Collection<String> beans = context.getBeansOfType(String.class).values();
         Assert.assertEquals(beans.size(), 1);
 
         Assert.assertEquals(beans.iterator().next(), idpHome);
+        
+        context.close();
     }
-}
+
+}
\ No newline at end of file
diff --git a/shib-spring/src/test/resources/net/shibboleth/shared/spring/resource/idp1326.xml b/shib-spring/src/test/resources/net/shibboleth/shared/spring/resource/idp1326.xml
index 85fff45e..6331b356 100644
--- a/shib-spring/src/test/resources/net/shibboleth/shared/spring/resource/idp1326.xml
+++ b/shib-spring/src/test/resources/net/shibboleth/shared/spring/resource/idp1326.xml
@@ -5,7 +5,7 @@
        xmlns:c="http://www.springframework.org/schema/c"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <import resource="conditional:${idp.home}/idp1326-import.xml" />
+    <import resource="conditional:%{idp.home}/idp1326-import.xml" />
 
 
 </beans>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.