Spring/spring-ldap
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LDAP-55: Remove unused constant JNDI_ENV_BASE_PATH_KEY

Browse Source 
http://opensource.atlassian.com/projects/spring/browse/LDAP-55
This commit is contained in:
Ulrik Sandberg
2007-04-26 12:01:46 +00:00
parent b7f9dcdfae
commit a273409154
2 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-ldap/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
View File

@@ -153,7 +153,7 @@ public abstract class AbstractContextSource implements ContextSource,
StringBuffer providerUrlBuffer = new StringBuffer(1024);
for (int i = 0; i < ldapUrls.length; i++) {
providerUrlBuffer.append(ldapUrls[i]);
if (base != DistinguishedName.EMPTY_PATH) {
if (!DistinguishedName.EMPTY_PATH.equals(base)) {
if (!ldapUrls[i].endsWith("/")) {
providerUrlBuffer.append("/");
}
@@ -251,7 +251,7 @@ public abstract class AbstractContextSource implements ContextSource,
"At least one server url must be set");
}
if (base != DistinguishedName.EMPTY_PATH
if (!DistinguishedName.EMPTY_PATH.equals(base)
&& getJdkVersion().compareTo(JDK_142) < 0) {
throw new IllegalArgumentException(
"Base path is not supported for JDK versions < 1.4.2");
@@ -293,7 +293,7 @@ public abstract class AbstractContextSource implements ContextSource,
env.put(Context.OBJECT_FACTORIES, dirObjectFactory.getName());
}
if (base != DistinguishedName.EMPTY_PATH) {
if (!DistinguishedName.EMPTY_PATH.equals(base)) {
// Save the base path for use in the DefaultDirObjectFactory.
env.put(DefaultDirObjectFactory.JNDI_ENV_BASE_PATH_KEY, base);
}

62
spring-ldap/src/test/java/org/springframework/ldap/core/support/LdapContextSourceTest.java
View File

@@ -25,7 +25,7 @@ import javax.naming.ldap.ControlFactory;
import junit.framework.TestCase;
import org.springframework.ldap.core.AuthenticationSource;
import org.springframework.ldap.core.support.LdapContextSource;
import org.springframework.ldap.core.DistinguishedName;
import com.sun.jndi.ldap.ctl.ResponseControlFactory;
@@ -87,6 +87,10 @@ public class LdapContextSourceTest extends TestCase {
assertNull(env.get(Context.SECURITY_PRINCIPAL));
assertNull(env.get(Context.SECURITY_CREDENTIALS));
// check that base was added to environment
assertEquals(new DistinguishedName("dc=example,dc=se"), env
.get(DefaultDirObjectFactory.JNDI_ENV_BASE_PATH_KEY));
// Verify that changing values does not change the environment values.
tested.setBase("dc=other,dc=se");
tested.setUrl("ldap://ldap2.example.com:389");
@@ -98,6 +102,9 @@ public class LdapContextSourceTest extends TestCase {
assertEquals("true", env.get(LdapContextSource.SUN_LDAP_POOLING_FLAG));
assertNull(env.get(Context.SECURITY_PRINCIPAL));
assertNull(env.get(Context.SECURITY_CREDENTIALS));
assertEquals(new DistinguishedName("dc=example,dc=se"), env
.get(DefaultDirObjectFactory.JNDI_ENV_BASE_PATH_KEY));
}
public void testGetAnonymousEnvWithNoBaseSet() throws Exception {
@@ -106,6 +113,21 @@ public class LdapContextSourceTest extends TestCase {
Hashtable env = tested.getAnonymousEnv();
assertEquals("ldap://ldap.example.com:389", env
.get(Context.PROVIDER_URL));
// check that base was not added to environment
assertNull(env.get(DefaultDirObjectFactory.JNDI_ENV_BASE_PATH_KEY));
}
public void testGetAnonymousEnvWithEmptyBaseSet() throws Exception {
tested.setUrl("ldap://ldap.example.com:389");
tested.setBase(null);
tested.afterPropertiesSet();
Hashtable env = tested.getAnonymousEnv();
assertEquals("ldap://ldap.example.com:389", env
.get(Context.PROVIDER_URL));
// check that base was not added to environment
assertNull(env.get(DefaultDirObjectFactory.JNDI_ENV_BASE_PATH_KEY));
}
public void testOldJdkWithNoBaseSetShouldWork() throws Exception {
@@ -116,6 +138,10 @@ public class LdapContextSourceTest extends TestCase {
};
tested.setUrl("ldap://ldap.example.com:389");
tested.afterPropertiesSet();
// check that base was not added to environment
Hashtable env = tested.getAnonymousEnv();
assertNull(env.get(DefaultDirObjectFactory.JNDI_ENV_BASE_PATH_KEY));
}
public void testOldJdkWithBaseSetShouldNotWork() throws Exception {
@@ -134,7 +160,7 @@ public class LdapContextSourceTest extends TestCase {
}
}
public void testOldJdkWithBaseSetToEmptyPathShouldNotWork() throws Exception {
public void testOldJdkWithBaseSetToEmptyPathShouldWork() throws Exception {
tested = new LdapContextSource() {
String getJdkVersion() {
return "1.3";
@@ -142,12 +168,11 @@ public class LdapContextSourceTest extends TestCase {
};
tested.setUrl("ldap://ldap.example.com:389");
tested.setBase(null);
try {
tested.afterPropertiesSet();
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException expected) {
assertTrue(true);
}
tested.afterPropertiesSet();
// check that base was not added to environment
Hashtable env = tested.getAnonymousEnv();
assertNull(env.get(DefaultDirObjectFactory.JNDI_ENV_BASE_PATH_KEY));
}
public void testGetAuthenticatedEnv() throws Exception {
@@ -164,6 +189,10 @@ public class LdapContextSourceTest extends TestCase {
assertEquals("true", env.get(LdapContextSource.SUN_LDAP_POOLING_FLAG));
assertEquals("cn=Some User", env.get(Context.SECURITY_PRINCIPAL));
assertEquals("secret", env.get(Context.SECURITY_CREDENTIALS));
// check that base was added to environment
assertEquals(new DistinguishedName("dc=example,dc=se"), env
.get(DefaultDirObjectFactory.JNDI_ENV_BASE_PATH_KEY));
}
public void testGetAuthenticatedEnv_DummyAuthenticationProvider()
@@ -202,10 +231,9 @@ public class LdapContextSourceTest extends TestCase {
Hashtable env = tested.getAuthenticatedEnv();
assertEquals("cn=Some Other User", env.get(Context.SECURITY_PRINCIPAL));
assertEquals("other secret", env.get(Context.SECURITY_CREDENTIALS));
}
public void testGetAnonymousEnv_DontCacheEnv() throws Exception {
public void testGetAnonymousEnvWhenCacheIsOff() throws Exception {
tested.setBase("dc=example,dc=se");
tested.setUrl("ldap://ldap.example.com:389");
tested.setPooled(true);
@@ -226,21 +254,23 @@ public class LdapContextSourceTest extends TestCase {
.get(Context.PROVIDER_URL));
}
public void testsetResponseControlFactory_Null() throws Exception {
public void testSetResponseControlFactoryToNull() throws Exception {
tested.setResponseControlFactory(null);
assertNotNull(tested.getResponseControlFactory());
assertEquals(ResponseControlFactory.class, tested
.getResponseControlFactory());
}
public void testsetResponseControlFactory_Valid() throws Exception {
tested.setResponseControlFactory(ControlFactory.class);
assertEquals(ControlFactory.class, tested.getResponseControlFactory());
public void testSetValidResponseControlFactory() throws Exception {
Class validClass = ControlFactory.class;
tested.setResponseControlFactory(validClass);
assertEquals(validClass, tested.getResponseControlFactory());
}
public void testsetResponseControlFactory_Invalid() throws Exception {
public void testSetInvalidResponseControlFactory() throws Exception {
try {
tested.setResponseControlFactory(Control.class);
Class invalidClass = Control.class;
tested.setResponseControlFactory(invalidClass);
fail("IllegalArgumentException expected");
} catch (IllegalArgumentException expected) {
assertTrue(true);