[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: Mon Jun 30 06:28:04 2014
New Revision: 6196

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

Modified:
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParserTest.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsDataConnectorParserTest.java

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParserTest.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/ldap/LdapDataConnectorParserTest.java?rev=6196&r1=6195&r2=6196&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParserTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParserTest.java Mon Jun 30 06:28:04 2014
@@ -102,7 +102,7 @@
     @Test public void v2Config() throws ComponentInitializationException, ServiceException, ResolutionException {
         LDAPDataConnector dataConnector =
                 getLdapDataConnector(
-                        new String[] {"net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-v2.xml"}, false);
+                        new String[] {"net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-v2.xml"});
         Assert.assertNotNull(dataConnector);
         doTest(dataConnector);
 
@@ -119,7 +119,7 @@
                 getLdapDataConnector(
                         new String[] {
                         "net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-v2-props.xml",
-                        "net/shibboleth/idp/attribute/resolver/spring/dc/ldap/PropertyPlaceholder.xml"}, true);
+                        "net/shibboleth/idp/attribute/resolver/spring/dc/ldap/PropertyPlaceholder.xml"});
         Assert.assertNotNull(dataConnector);
         doTest(dataConnector);
 
@@ -133,7 +133,7 @@
 
     @Test public void springConfig() throws ComponentInitializationException, ServiceException, ResolutionException {
         LDAPDataConnector dataConnector =
-                getLdapDataConnector(new String[] {"net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring.xml"}, true);
+                getLdapDataConnector(new String[] {"net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring.xml"});
         Assert.assertNotNull(dataConnector);
         doTest(dataConnector);
 
@@ -149,7 +149,7 @@
         LDAPDataConnector dataConnector =
                 getLdapDataConnector(
                         new String[] {
-                        "net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-props.xml"}, true);
+                        "net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-props.xml"});
         Assert.assertNotNull(dataConnector);
         doTest(dataConnector);
 
@@ -191,7 +191,7 @@
 
     }
 
-    protected LDAPDataConnector getLdapDataConnector(final String[] beanDefinitions, boolean suppressValidation) {
+    protected LDAPDataConnector getLdapDataConnector(final String[] beanDefinitions) {
         GenericApplicationContext context = new GenericApplicationContext();
         context.setDisplayName("ApplicationContext: " + LdapDataConnectorParserTest.class);
 
@@ -201,9 +201,8 @@
 
         SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader =
                 new SchemaTypeAwareXMLBeanDefinitionReader(context);
-        if (suppressValidation) {
-            beanDefinitionReader.setValidating(false);
-        }
+
+        beanDefinitionReader.setValidating(true);
 
         beanDefinitionReader.loadBeanDefinitions(beanDefinitions);
         context.refresh();

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsDataConnectorParserTest.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/rdbms/RdbmsDataConnectorParserTest.java?rev=6196&r1=6195&r2=6196&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsDataConnectorParserTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsDataConnectorParserTest.java Mon Jun 30 06:28:04 2014
@@ -67,7 +67,7 @@
     

[... 50 lines stripped ...]