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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Feb 10 04:43:30 2014
New Revision: 5344

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5344&view=rev
Log:
IDP-266 Move the spring beans up out from 'ad' so that the principal connectors can borrow them

Added:
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/idStore.xml
      - copied unchanged from r5342, trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/idStore.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/idStore2.xml
      - copied unchanged from r5342, trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/idStore2.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/sealer.xml
      - copied unchanged from r5342, trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/sealer.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/velocity2.xml
      - copied unchanged from r5342, trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/velocity2.xml
Modified:
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/BaseAttributeDefinitionParserTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/idStore.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/idStore2.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/sealer.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/velocity.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/velocity2.xml

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=5344&r1=5343&r2=5344&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 Mon Feb 10 04:43:30 2014
@@ -36,14 +36,16 @@
  * Test for {@link SimpleAttributeDefinitionParser} and by extension {@link BaseAttributeDefinitionParser}.
  */
 public abstract class BaseAttributeDefinitionParserTest extends OpenSAMLInitBaseTestCase {
+    
+    public static final String BEAN_FILE_PATH = "net/shibboleth/idp/attribute/resolver/spring/";
 
-    public static final String ATTRIBUTE_FILE_PATH = "net/shibboleth/idp/attribute/resolver/spring/ad/";
+    public static final String ATTRIBUTE_FILE_PATH = BEAN_FILE_PATH + "ad/";
 
-    public static final String DATACONNECTOR_FILE_PATH = "net/shibboleth/idp/attribute/resolver/spring/dc/";
+    public static final String DATACONNECTOR_FILE_PATH = BEAN_FILE_PATH + "dc/";
 
-    public static final String ENCODER_FILE_PATH = "net/shibboleth/idp/attribute/resolver/spring/enc/";
+    public static final String ENCODER_FILE_PATH = BEAN_FILE_PATH + "enc/";
 
-    public static final String PRINCIPALCONNECTOR_FILE_PATH = "net/shibboleth/idp/attribute/resolver/spring/pc/";
+    public static final String PRINCIPALCONNECTOR_FILE_PATH = BEAN_FILE_PATH + "pc/";
 
     protected <Type> Type getBean(String fileName, Class<Type> claz, GenericApplicationContext context,
             boolean supressValid) {
@@ -93,7 +95,7 @@
         context.setDisplayName("ApplicationContext: " + claz);
         XmlBeanDefinitionReader configReader = new XmlBeanDefinitionReader(context);
 
-        configReader.loadBeanDefinitions(ATTRIBUTE_FILE_PATH + beanFileName);
+        configReader.loadBeanDefinitions(BEAN_FILE_PATH + beanFileName);
 
         return getAttributeDefn(fileName, claz, context, supressValidation);
     }
@@ -138,5 +140,17 @@
 
         return getBean(PRINCIPALCONNECTOR_FILE_PATH + fileName, PrincipalConnector.class, context);
     }
+    
+    protected PrincipalConnector getPrincipalConnector(String fileName, String beanFileName) {
+
+        GenericApplicationContext context = new GenericApplicationContext();
+        context.setDisplayName("ApplicationContext: " + PrincipalConnector.class);
+        XmlBeanDefinitionReader configReader = new XmlBeanDefinitionReader(context);
+
+        configReader.loadBeanDefinitions(BEAN_FILE_PATH + beanFileName);
+

[... 6 lines stripped ...]