Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor changes to improve robustess of LDAP tests.

This commit is contained in:
Luke Taylor 2007-10-02 14:50:08 +00:00
parent 5a3f5fcd78
commit 438dc44004
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/test/java/org/springframework/security/config/LdapBeanDefinitionParserTests.java
View File

@ -41,6 +41,5 @@ public class LdapBeanDefinitionParserTests {
template.lookup("uid=ben,ou=people"); template.lookup("uid=ben,ou=people");
} }
} }

24
core/src/test/java/org/springframework/security/ldap/AbstractLdapIntegrationTests.java
View File

@ -23,6 +23,7 @@ import org.junit.Before;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.After; import org.junit.After;
import org.apache.directory.server.protocol.shared.store.LdifFileLoader; import org.apache.directory.server.protocol.shared.store.LdifFileLoader;
import org.apache.directory.server.core.DirectoryService;
import javax.naming.directory.DirContext; import javax.naming.directory.DirContext;
import javax.naming.Name; import javax.naming.Name;
@ -31,6 +32,7 @@ import javax.naming.NamingEnumeration;
import javax.naming.Binding; import javax.naming.Binding;
import javax.naming.ContextNotEmptyException; import javax.naming.ContextNotEmptyException;
import javax.naming.NameNotFoundException; import javax.naming.NameNotFoundException;
import java.util.Set;
/** /**
* Based on class borrowed from Spring Ldap project. * Based on class borrowed from Spring Ldap project.
@ -46,15 +48,31 @@ public abstract class AbstractLdapIntegrationTests {
} }
@BeforeClass @BeforeClass
public static void loadContext() { public static void loadContext() throws NamingException {
shutdownRunningServers();
appContext = new ClassPathXmlApplicationContext("/org/springframework/security/ldap/ldapIntegrationTestContext.xml"); appContext = new ClassPathXmlApplicationContext("/org/springframework/security/ldap/ldapIntegrationTestContext.xml");
} }
@AfterClass @AfterClass
public static void closeContext() { public static void closeContext() throws Exception {
appContext.close(); if(appContext != null) {
appContext.close();
}
shutdownRunningServers();
} }
private static void shutdownRunningServers() throws NamingException {
DirectoryService ds = DirectoryService.getInstance();
if (ds.isStarted()) {
System.out.println("WARNING: Discovered running DirectoryService with configuration: " + ds.getConfiguration().getStartupConfiguration().toString());
System.out.println("Shutting it down...");
ds.shutdown();
}
}
@Before @Before
public void onSetUp() throws Exception { public void onSetUp() throws Exception {
} }