SEC-1132: package refactoring of non-core modules

This commit is contained in:
Luke Taylor
2009-03-27 05:01:03 +00:00
parent bec84f874a
commit f746a20ab4
83 changed files with 215 additions and 256 deletions

View File

@@ -1,7 +1,7 @@
package org.springframework.security.config;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.*;
import static org.springframework.security.config.LdapProviderBeanDefinitionParser.*;
import org.junit.After;
import org.junit.Test;
@@ -9,11 +9,13 @@ import org.springframework.security.Authentication;
import org.springframework.security.config.BeanIds;
import org.springframework.security.config.SecurityConfigurationException;
import org.springframework.security.config.util.InMemoryXmlApplicationContext;
import org.springframework.security.ldap.authentication.BindAuthenticator;
import org.springframework.security.ldap.authentication.LdapAuthenticationProvider;
import org.springframework.security.ldap.authentication.PasswordComparisonAuthenticator;
import org.springframework.security.ldap.userdetails.InetOrgPersonContextMapper;
import org.springframework.security.ldap.userdetails.LdapUserDetailsImpl;
import org.springframework.security.providers.ProviderManager;
import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
import org.springframework.security.providers.ldap.LdapAuthenticationProvider;
import org.springframework.security.userdetails.ldap.InetOrgPersonContextMapper;
import org.springframework.security.userdetails.ldap.LdapUserDetailsImpl;
import org.springframework.security.util.FieldUtils;
@@ -32,6 +34,13 @@ public class LdapProviderBeanDefinitionParserTests {
}
}
@Test
public void beanClassNamesAreCorrect() throws Exception {
assertEquals(PROVIDER_CLASS, LdapAuthenticationProvider.class.getName());
assertEquals(BIND_AUTH_CLASS, BindAuthenticator.class.getName());
assertEquals(PASSWD_AUTH_CLASS, PasswordComparisonAuthenticator.class.getName());
}
@Test
public void simpleProviderAuthenticatesCorrectly() {
setContext("<ldap-server /> <ldap-authentication-provider group-search-filter='member={0}' />");

View File

@@ -1,18 +1,27 @@
package org.springframework.security.config;
import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
import static org.springframework.security.config.LdapUserServiceBeanDefinitionParser.*;
import java.util.Set;
import org.junit.After;
import org.junit.Test;
import org.springframework.security.GrantedAuthorityImpl;
import org.springframework.security.config.util.InMemoryXmlApplicationContext;
import org.springframework.security.util.AuthorityUtils;
import org.springframework.security.userdetails.UserDetailsService;
import org.springframework.security.ldap.populator.DefaultLdapAuthoritiesPopulator;
import org.springframework.security.ldap.search.FilterBasedLdapUserSearch;
import org.springframework.security.ldap.userdetails.InetOrgPerson;
import org.springframework.security.ldap.userdetails.InetOrgPersonContextMapper;
import org.springframework.security.ldap.userdetails.LdapUserDetailsMapper;
import org.springframework.security.ldap.userdetails.LdapUserDetailsService;
import org.springframework.security.ldap.userdetails.Person;
import org.springframework.security.ldap.userdetails.PersonContextMapper;
import org.springframework.security.userdetails.UserDetails;
import org.springframework.security.userdetails.ldap.InetOrgPerson;
import org.springframework.security.userdetails.ldap.Person;
import org.junit.Test;
import org.junit.After;
import static org.junit.Assert.*;
import org.springframework.security.userdetails.UserDetailsService;
import org.springframework.security.util.AuthorityUtils;
import org.w3c.dom.Element;
/**
* @author Luke Taylor
@@ -29,6 +38,16 @@ public class LdapUserServiceBeanDefinitionParserTests {
}
}
@Test
public void beanClassNamesAreCorrect() throws Exception {
assertEquals(LDAP_SEARCH_CLASS, FilterBasedLdapUserSearch.class.getName());
assertEquals(PERSON_MAPPER_CLASS, PersonContextMapper.class.getName());
assertEquals(INET_ORG_PERSON_MAPPER_CLASS, InetOrgPersonContextMapper.class.getName());
assertEquals(LDAP_USER_MAPPER_CLASS, LdapUserDetailsMapper.class.getName());
assertEquals(LDAP_AUTHORITIES_POPULATOR_CLASS, DefaultLdapAuthoritiesPopulator.class.getName());
assertEquals(LdapUserDetailsService.class.getName(), new LdapUserServiceBeanDefinitionParser().getBeanClassName(mock(Element.class)));
}
@Test
public void minimalConfigurationIsParsedOk() throws Exception {
setContext("<ldap-user-service user-search-filter='(uid={0})' /><ldap-server url='ldap://127.0.0.1:343/dc=springframework,dc=org' />");