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

Added some tests for issues described in certain forum posts, like thread 86640.

Browse Source
This commit is contained in:
Ulrik Sandberg
2010-03-28 22:22:42 +00:00
parent c6fba9a763
commit c7b17868b7
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/test/java/org/springframework/ldap/core/DistinguishedNameTest.java
View File

@@ -554,6 +554,20 @@ public class DistinguishedNameTest extends TestCase {
assertNotNull(name);
}
/**
* Test for http://forum.springsource.org/showthread.php?t=86640.
*/
public void testDistinguishedNameWithDotParsesProperly() {
DistinguishedName name = new DistinguishedName("cn=first.last,OU=DevTest Users,DC=xyz,DC=com");
assertEquals("cn=first.last,ou=DevTest Users,dc=xyz,dc=com", name.toCompactString());
DistinguishedName dn = new DistinguishedName();
dn.parse("cn=first.last,OU=DevTest Users,DC=xyz,DC=com");
assertEquals("first.last", dn.getValue("cn"));
assertEquals("DevTest Users", dn.getValue("ou"));
assertEquals("xyz", dn.getLdapRdn(1).getValue());
assertEquals("com", dn.getLdapRdn(0).getValue());
}
public void testToStringCompact() {
try {
DistinguishedName name = new DistinguishedName("cn=john doe, ou=company");

18
test/integration-tests/src/test/java/org/springframework/ldap/filter/HardcodedFilterIntegrationTest.java
View File

@@ -20,6 +20,9 @@ import static junit.framework.Assert.assertTrue;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.core.LdapTemplate;
import org.springframework.ldap.core.support.CountNameClassPairCallbackHandler;
import org.springframework.ldap.itest.filter.DummyFilterConsumer;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@@ -27,17 +30,28 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
/**
* @author Mattias Hellborg Arthursson
*/
@ContextConfiguration(locations = { "/conf/hardcodedFilterTestContext.xml" })
@ContextConfiguration(locations = { "/conf/hardcodedFilterTestContext.xml", "/conf/ldapTemplateTestContext.xml" })
public class HardcodedFilterIntegrationTest extends AbstractJUnit4SpringContextTests {
@Autowired
private DummyFilterConsumer dummyFilterConsumer;
@Autowired
private LdapTemplate ldapTemplate;
@Test
public void verifyThatFilterEditorWorks() {
Filter filter = dummyFilterConsumer.getFilter();
assertTrue(filter instanceof HardcodedFilter);
assertEquals("(&(objectclass=person)(!(objectclass=computer))", filter.toString());
}
@Test
public void verifyThatWildcardsAreUnescaped() {
HardcodedFilter filter = new HardcodedFilter("cn=Some*");
CountNameClassPairCallbackHandler handler = new CountNameClassPairCallbackHandler();
ldapTemplate.search(DistinguishedName.EMPTY_PATH, filter.encode(), handler);
int hits = handler.getNoOfRows();
assertTrue("expected more than one hit, got " + hits, hits > 1);
}
}