[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 Sep  2 08:38:13 2013
New Revision: 4736

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4736&view=rev
Log:
IDP-273 Widen out the AttributeResolverTest to contain many more attribute definitions and a few data connectors.

Added:
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ldapDataConnectorTest.ldif
Modified:
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverServiceTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/logback-test.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverServiceTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverServiceTest.java?rev=4736&r1=4735&r2=4736&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverServiceTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverServiceTest.java Mon Sep  2 08:38:13 2013
@@ -27,18 +27,38 @@
 import net.shibboleth.idp.spring.SchemaTypeAwareXMLBeanDefinitionReader;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 
+import org.opensaml.core.OpenSAMLInitBaseTestCase;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.support.GenericApplicationContext;
 import org.testng.Assert;
+import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
+
+import com.unboundid.ldap.listener.InMemoryDirectoryServer;
+import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig;
+import com.unboundid.ldap.listener.InMemoryListenerConfig;
+import com.unboundid.ldap.sdk.LDAPException;
 
 /** A work in progress to test the attribute resolver service. */
 // TODO incomplete
-public class AttributeResolverServiceTest {
+public class AttributeResolverServiceTest extends OpenSAMLInitBaseTestCase {
 
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(AttributeResolverServiceTest.class);
+    private InMemoryDirectoryServer directoryServer;
+
+    @BeforeTest public void setupDirectoryServer() throws LDAPException {
+
+        InMemoryDirectoryServerConfig config = new InMemoryDirectoryServerConfig("dc=shibboleth,dc=net");
+        config.setListenerConfigs(InMemoryListenerConfig.createLDAPConfig("default", 10391));
+        config.addAdditionalBindCredentials("cn=Directory Manager", "password");
+        directoryServer = new InMemoryDirectoryServer(config);
+        directoryServer
+                .importFromLDIF(true,
+                        "src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ldapDataConnectorTest.ldif");
+        directoryServer.startListening();
+    }
 
     // stub test
     @Test public void one() throws ComponentInitializationException, ServiceException, ResolutionException {

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/logback-test.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/logback-test.xml?rev=4736&r1=4735&r2=4736&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/logback-test.xml (original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/logback-test.xml Mon Sep  2 08:38:13 2013
@@ -2,6 +2,9 @@
 
 <configuration>
     <logger name="net.shibboleth.idp.attribute.resolver.spring" level="TRACE"/>
+    <logger name="net.shibboleth.idp.attribute.resolver.api" level="DEBUG"/>
+    <logger name="net.shibboleth.idp.attribute.resolver.impl" level="DEBUG"/>
+    <logger name="net.shibboleth.idp.service" level="DEBUG"/>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml?rev=4736&r1=4735&r2=4736&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml (original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml Mon Sep  2 08:38:13 2013

[... 95 lines stripped ...]