[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/re...

[noreply at shibboleth.net]

Author: rdw
Date: Thu Jul 23 12:30:38 2015
New Revision: 7650

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7650&view=rev
Log:
IDP-771 Test for property replacement in ComputedIDConnector

https://issues.shibboleth.net/jira/browse/IDP-771

test is suppressed until I do the fix.  Code this time

Modified:
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java?rev=7650&r1=7649&r2=7650&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java	Thu Jul 23 12:30:38 2015
@@ -74,7 +74,7 @@
         loadFile(fileName, context, false);
     }
 
-    private <Type> Type getBean(String fileName, Class<Type> claz, GenericApplicationContext context,
+    protected <Type> Type getBean(String fileName, Class<Type> claz, GenericApplicationContext context,
             boolean supressValid) {
 
         ConversionServiceFactoryBean service = new ConversionServiceFactoryBean();
@@ -152,6 +152,8 @@
     protected <Type extends DataConnector> Type getDataConnector(String fileName, Class<Type> claz) {
         return getDataConnector(fileName, claz, false);
     }
+    
+    
 
     private <Type extends DataConnector> Type
             getDataConnector(String fileName, Class<Type> claz, boolean supressValid) {

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java?rev=7650&r1=7649&r2=7650&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java	Thu Jul 23 12:30:38 2015
@@ -17,10 +17,15 @@
 
 package net.shibboleth.idp.attribute.resolver.spring.dc;
 
+import java.util.Collections;
+
 import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
 import net.shibboleth.idp.saml.attribute.resolver.impl.ComputedIDDataConnector;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 
+import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.MapPropertySource;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -40,7 +45,8 @@
         connector.initialize();
     }
 
-    @Test(enabled=false) public void withoutSalt()  {
+    @Test(enabled=false) public void withoutSalt()  { 
+        // Needs schema change
         ComputedIDDataConnector connector = getDataConnector("computedNoSalt.xml", ComputedIDDataConnector.class);
         
         Assert.assertEquals(connector.getId(), "computedNoSalt");
@@ -56,4 +62,18 @@
         }
     }
 
+    @Test(enabled=false) public void propertySalt()  {
+        GenericApplicationContext context = new GenericApplicationContext();
+        final String salt = "0123456789ABCDEF";
+        context.setDisplayName("ApplicationContext");
+        final  ConfigurableEnvironment env = context.getEnvironment();
+        env.getPropertySources().addLast(new MapPropertySource("foo", Collections.singletonMap("the.ComputedIDDataConnector.salt", (Object)salt)));
+        env.setPlaceholderPrefix("%{");
+        env.setPlaceholderSuffix("}");
+        
+        final ComputedIDDataConnector connector =  getBean(DATACONNECTOR_FILE_PATH + "computedProperty.xml", ComputedIDDataConnector.class, context, false);
+        
+        Assert.assertEquals(connector.getSalt(), salt.getBytes());
+    }
+
 }