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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Feb 10 15:37:13 2014
New Revision: 5356

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5356&view=rev
Log:
Allow validation to be disabled for now, a la the RDBMS case.

Modified:
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParserTest.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=5356&r1=5355&r2=5356&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 Feb 10 15:37:13 2014
@@ -101,7 +101,7 @@
 
     @Test public void v2Config() throws ComponentInitializationException, ServiceException, ResolutionException {
         LdapDataConnector dataConnector =
-                getLdapDataConnector("net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-v2.xml");
+                getLdapDataConnector("net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-v2.xml", false);
         Assert.assertNotNull(dataConnector);
         doTest(dataConnector);
 
@@ -115,7 +115,7 @@
 
     @Test public void springConfig() throws ComponentInitializationException, ServiceException, ResolutionException {
         LdapDataConnector dataConnector =
-                getLdapDataConnector("net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring.xml");
+                getLdapDataConnector("net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring.xml", true);
         Assert.assertNotNull(dataConnector);
         doTest(dataConnector);
 
@@ -157,7 +157,7 @@
 
     }
 
-    protected LdapDataConnector getLdapDataConnector(final String springContext) {
+    protected LdapDataConnector getLdapDataConnector(final String springContext, boolean suppressValidation) {
         GenericApplicationContext context = new GenericApplicationContext();
         context.setDisplayName("ApplicationContext: " + LdapDataConnectorParserTest.class);
 
@@ -168,8 +168,10 @@
 
         SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader =
                 new SchemaTypeAwareXMLBeanDefinitionReader(context);
-
-        beanDefinitionReader.setValidating(false);
+        if (suppressValidation) {
+            beanDefinitionReader.setValidating(false);
+        }
+
         beanDefinitionReader.loadBeanDefinitions(springContext);
 
         return (LdapDataConnector) context.getBean("myLDAP");