[utilities COMMIT] in /spring-extensions/trunk/src/test: java/net/shibboleth/ext/spring/resource/FileBackedHTTPResour...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Aug 11 09:25:07 2015
New Revision: 811

URL: http://svn.shibboleth.net/view/utilities?rev=811&view=rev
Log:
JSE-15 Add test for old style bean creation

https://issues.shibboleth.net/jira/browse/JSE-15

Prior to implementing a new constructor to take a File as input, add a litmus test for currently documented configuration.

Added:
    spring-extensions/trunk/src/test/resources/data/oldStyle.xml
Modified:
    spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResourceTest.java

Modified: spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResourceTest.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResourceTest.java?rev=811&r1=810&r2=811&view=diff
==============================================================================
--- spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResourceTest.java	(original)
+++ spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResourceTest.java	Tue Aug 11 09:25:07 2015
@@ -20,12 +20,20 @@
 import java.io.File;
 import java.io.IOException;
 
+import net.shibboleth.ext.spring.context.FilesystemGenericApplicationContext;
+import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
 import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
 
 import org.apache.http.client.HttpClient;
+import org.springframework.context.ApplicationContext;
+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.FileSystemResource;
 import org.springframework.core.io.Resource;
+import org.springframework.mock.env.MockPropertySource;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -69,4 +77,48 @@
         // With that done compare via the backup
         Assert.assertTrue(ResourceTestHelper.compare(new FileBackedHTTPResource(client, nonExistsURL, new FileSystemResource(existsFile)), new ClassPathResource("data/document.xml")));
     }
+    
+    public GenericApplicationContext getContext(String location) {
+        
+        MockPropertySource mockEnvVars = new MockPropertySource();
+        mockEnvVars.setProperty("file.name", existsFile);
+        mockEnvVars.setProperty("the.url", existsURL);
+
+        GenericApplicationContext context = new FilesystemGenericApplicationContext() ;
+        context.setDisplayName("ApplicationContext");
+
+        MutablePropertySources propertySources = context.getEnvironment().getPropertySources();
+        propertySources.replace(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME, mockEnvVars);
+
+        PropertySourcesPlaceholderConfigurer placeholderConfig = new PropertySourcesPlaceholderConfigurer();
+        placeholderConfig.setPlaceholderPrefix("%{");
+        placeholderConfig.setPlaceholderSuffix("}");
+        placeholderConfig.setPropertySources(propertySources);
+
+        context.addBeanFactoryPostProcessor(placeholderConfig);
+        
+        SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader =
+                new SchemaTypeAwareXMLBeanDefinitionReader(context);
+
+        beanDefinitionReader.loadBeanDefinitions(location);
+
+        beanDefinitionReader.setValidating(true);
+
+        context.refresh();
+
+        
+        return context;
+       
+    }
+    
+    @Test public void testParsing() throws IOException {
+        
+      final ApplicationContext context = getContext("data/oldStyle.xml");
+        
+        Assert.assertTrue(ResourceTestHelper.compare(context.getBean("namedString", FileBackedHTTPResource.class), new ClassPathResource("data/document.xml")));
+        Assert.assertTrue(ResourceTestHelper.compare(context.getBean("namedFileString", FileBackedHTTPResource.class), new ClassPathResource("data/document.xml")));
+        Assert.assertTrue(ResourceTestHelper.compare(context.getBean("namedURL", FileBackedHTTPResource.class), new ClassPathResource("data/document.xml")));
+        Assert.assertTrue(ResourceTestHelper.compare(context.getBean("numberedString", FileBackedHTTPResource.class), new ClassPathResource("data/document.xml")));
+        Assert.assertTrue(ResourceTestHelper.compare(context.getBean("numberedURL", FileBackedHTTPResource.class), new ClassPathResource("data/document.xml")));
+    }
 }