You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by lu...@apache.org on 2015/02/14 18:29:17 UTC
svn commit: r1659820 -
/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/ldap/client/template/LdapConnectionTemplateTest.java
Author: lucastheisen
Date: Sat Feb 14 17:29:16 2015
New Revision: 1659820
URL: http://svn.apache.org/r1659820
Log:
added additional unit tests for search using filter builder
Modified:
directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/ldap/client/template/LdapConnectionTemplateTest.java
Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/ldap/client/template/LdapConnectionTemplateTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/ldap/client/template/LdapConnectionTemplateTest.java?rev=1659820&r1=1659819&r2=1659820&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/ldap/client/template/LdapConnectionTemplateTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/ldap/client/template/LdapConnectionTemplateTest.java Sat Feb 14 17:29:16 2015
@@ -26,6 +26,11 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
+import static org.apache.directory.ldap.client.api.search.FilterBuilder.and;
+import static org.apache.directory.ldap.client.api.search.FilterBuilder.equal;
+import static org.apache.directory.ldap.client.api.search.FilterBuilder.endsWith;
+import static org.apache.directory.ldap.client.api.search.FilterBuilder.startsWith;
+
import java.util.List;
@@ -326,7 +331,7 @@ public class LdapConnectionTemplateTest
assertNotNull( muppets );
assertEquals( 6, muppets.size() );
- ldapConnectionTemplate.search(
+ muppets = ldapConnectionTemplate.search(
ldapConnectionTemplate.newSearchRequest(
"ou=people,dc=example,dc=com",
"(objectClass=inetOrgPerson)",
@@ -334,6 +339,23 @@ public class LdapConnectionTemplateTest
Muppet.getEntryMapper() );
assertNotNull( muppets );
assertEquals( 6, muppets.size() );
+
+ muppets = ldapConnectionTemplate.search(
+ ldapConnectionTemplate.newSearchRequest(
+ "ou=people,dc=example,dc=com",
+ endsWith( "mail", "@muppets.com" ),
+ SearchScope.ONELEVEL ),
+ Muppet.getEntryMapper() );
+ assertNotNull( muppets );
+ assertEquals( 6, muppets.size() );
+
+ muppets = ldapConnectionTemplate.search(
+ "ou=people,dc=example,dc=com",
+ and( startsWith( "mail", "kermit" ), endsWith( "mail", "@muppets.com" ) ),
+ SearchScope.ONELEVEL,
+ Muppet.getEntryMapper() );
+ assertNotNull( muppets );
+ assertEquals( 1, muppets.size() );
}
@@ -371,21 +393,20 @@ public class LdapConnectionTemplateTest
assertNotNull( ldapConnectionTemplate );
List<Muppet> muppets = ldapConnectionTemplate.search(
- "ou=people,dc=example,dc=com",
- "(objectClass=inetOrgPerson)",
- SearchScope.ONELEVEL,
- Muppet.getEntryMapper() );
- assertNotNull( muppets );
- assertEquals( 6, muppets.size() );
-
- ldapConnectionTemplate.search(
- ldapConnectionTemplate.newSearchRequest(
- "ou=people,dc=example,dc=com",
- "(objectClass=inetOrgPerson)",
- SearchScope.ONELEVEL ),
- Muppet.getEntryMapper() );
- assertNotNull( muppets );
- assertEquals( 6, muppets.size() );
+ "ou=people,dc=example,dc=com",
+ "(objectClass=inetOrgPerson)",
+ SearchScope.ONELEVEL,
+ Muppet.getEntryMapper() );
+ assertNotNull( muppets );
+ assertEquals( 6, muppets.size() );
+
+ muppets = ldapConnectionTemplate.search(
+ "ou=people,dc=example,dc=com",
+ equal( "objectClass", "inetOrgPerson" ),
+ SearchScope.ONELEVEL,
+ Muppet.getEntryMapper() );
+ assertNotNull( muppets );
+ assertEquals( 6, muppets.size() );
}