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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Jun 30 05:42:05 2014
New Revision: 6191

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6191&view=rev
Log:
IDP-385 No need to relax schema validation for attribute filter parsing.

Modified:
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueMatcherParserTest.java

Modified: trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java?rev=6191&r1=6190&r2=6191&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java (original)
+++ trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java Mon Jun 30 05:42:05 2014
@@ -84,18 +84,10 @@
     }
 
     protected <Type> Type getBean(String fileName, Class<Type> claz, GenericApplicationContext context) {
-        return getBean(fileName, claz, context, false);
-    }
-
-    protected <Type> Type getBean(String fileName, Class<Type> claz, GenericApplicationContext context,
-            boolean supressValidation) {
 
         SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader =
                 new SchemaTypeAwareXMLBeanDefinitionReader(context);
 
-        if (supressValidation) {
-            beanDefinitionReader.setValidating(false);
-        }
         beanDefinitionReader.loadBeanDefinitions(fileName);
 
         context.refresh();
@@ -107,31 +99,22 @@
     }
 
     protected PolicyRequirementRule getPolicyRule(String fileName) throws ComponentInitializationException {
-        return getPolicyRule(fileName, false);
-    }
-
-    protected PolicyRequirementRule getPolicyRule(String fileName, boolean supressValidation)
-            throws ComponentInitializationException {
 
         GenericApplicationContext context = new GenericApplicationContext();
         context.setDisplayName("ApplicationContext: Policy Rule");
 
         final AttributeFilterPolicy policy =
-                getBean(POLICY_RULE_PATH + fileName, AttributeFilterPolicy.class, context, supressValidation);
+                getBean(POLICY_RULE_PATH + fileName, AttributeFilterPolicy.class, context);
         policy.initialize();
         return policy.getPolicyRequirementRule();
     }
 
     protected Matcher getMatcher(String fileName) throws ComponentInitializationException {
-        return getMatcher(fileName, false);
-    }
-
-    protected Matcher getMatcher(String fileName, boolean supressValidation) throws ComponentInitializationException {
 
         GenericApplicationContext context = new GenericApplicationContext();
         context.setDisplayName("ApplicationContext: Matcher");
 
-        final AttributeRule rule = getBean(MATCHER_PATH + fileName, AttributeRule.class, context, supressValidation);
+        final AttributeRule rule = getBean(MATCHER_PATH + fileName, AttributeRule.class, context);
         rule.initialize();
         return rule.getMatcher();
 

Modified: trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueMatcherParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueMatcherParserTest.java?rev=6191&r1=6190&r2=6191&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueMatcherParserTest.java (original)
+++ trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/matcher/AttributeValueMatcherParserTest.java Mon Jun 30 05:42:05 2014
@@ -70,7 +70,7 @@
 
     @Test public void targetedPolicy() throws ComponentInitializationException {
 
-        final PolicyRequirementRule rule = getPolicyRule("attributeValueId.xml", true);
+        final PolicyRequirementRule rule = getPolicyRule("attributeValueId.xml");
 
         AttributeFilterContext filterContext = new AttributeFilterContext();
         filterContext.setPrefilteredIdPAttributes(epaUid.values());
@@ -128,7 +128,7 @@
 
     @Test public void targetedMatcher() throws ComponentInitializationException {
 
-        final Matcher matcher = getMatcher("attributeValueId.xml", true);
+        final Matcher matcher = getMatcher("attributeValueId.xml");
 
         AttributeFilterContext filterContext = new AttributeFilterContext();
         filterContext.setPrefilteredIdPAttributes(epaUid.values());