You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2011/01/29 16:58:52 UTC
svn commit: r1065048 - in
/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search:
SearchRequestMatchingRuleAssertionTest.java SearchRequestSubstringTest.java
Author: elecharny
Date: Sat Jan 29 15:58:52 2011
New Revision: 1065048
URL: http://svn.apache.org/viewvc?rev=1065048&view=rev
Log:
Some more searchRequest tests fixed
Modified:
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java?rev=1065048&r1=1065047&r2=1065048&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java Sat Jan 29 15:58:52 2011
@@ -36,10 +36,12 @@ import org.apache.directory.junit.tools.
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
import org.apache.directory.shared.asn1.DecoderException;
import org.apache.directory.shared.asn1.EncoderException;
-import org.apache.directory.shared.asn1.ber.Asn1Container;
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
+import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService;
+import org.apache.directory.shared.ldap.codec.ILdapCodecService;
import org.apache.directory.shared.ldap.codec.LdapEncoder;
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
+import org.apache.directory.shared.ldap.codec.decorators.SearchRequestDecorator;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.filter.ExprNode;
import org.apache.directory.shared.ldap.model.filter.ExtensibleNode;
@@ -66,6 +68,10 @@ public class SearchRequestMatchingRuleAs
/** The encoder instance */
LdapEncoder encoder = new LdapEncoder();
+ /** The codec service */
+ ILdapCodecService codec = new DefaultLdapCodecService();
+
+ /** An oid normalizer map */
static Map<String, OidNormalizer> oids = new HashMap<String, OidNormalizer>();
@@ -173,7 +179,8 @@ public class SearchRequestMatchingRuleAs
stream.flip();
// Allocate a BindRequest Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
try
{
@@ -185,7 +192,7 @@ public class SearchRequestMatchingRuleAs
fail( de.getMessage() );
}
- SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest();
+ SearchRequest searchRequest = ldapMessageContainer.getMessage();
assertEquals( 1, searchRequest.getMessageId() );
assertEquals( "dc=example,dc=com", searchRequest.getBase().toString() );
@@ -249,7 +256,8 @@ public class SearchRequestMatchingRuleAs
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
// Decode a SearchRequest message
try
@@ -293,7 +301,8 @@ public class SearchRequestMatchingRuleAs
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
// Decode a SearchRequest message
try
@@ -337,7 +346,8 @@ public class SearchRequestMatchingRuleAs
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
// Decode a SearchRequest message
try
@@ -384,7 +394,8 @@ public class SearchRequestMatchingRuleAs
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
// Decode a SearchRequest message
try
@@ -397,7 +408,7 @@ public class SearchRequestMatchingRuleAs
fail( de.getMessage() );
}
- SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest();
+ SearchRequest searchRequest = ldapMessageContainer.getMessage();
assertEquals( 4, searchRequest.getMessageId() );
assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() );
@@ -453,7 +464,8 @@ public class SearchRequestMatchingRuleAs
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
// Decode a SearchRequest message
try
@@ -547,7 +559,8 @@ public class SearchRequestMatchingRuleAs
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
// Decode a SearchRequest message
try
@@ -593,7 +606,8 @@ public class SearchRequestMatchingRuleAs
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
// Decode a SearchRequest message
try
@@ -639,7 +653,8 @@ public class SearchRequestMatchingRuleAs
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
// Decode a SearchRequest message
try
@@ -685,7 +700,8 @@ public class SearchRequestMatchingRuleAs
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
// Decode a SearchRequest message
try
@@ -697,7 +713,7 @@ public class SearchRequestMatchingRuleAs
fail( de.getMessage() );
}
- SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest();
+ SearchRequest searchRequest = ldapMessageContainer.getMessage();
assertEquals( 4, searchRequest.getMessageId() );
assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() );
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java?rev=1065048&r1=1065047&r2=1065048&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java Sat Jan 29 15:58:52 2011
@@ -34,10 +34,13 @@ import org.apache.directory.junit.tools.
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
import org.apache.directory.shared.asn1.DecoderException;
import org.apache.directory.shared.asn1.EncoderException;
-import org.apache.directory.shared.asn1.ber.Asn1Container;
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
+import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService;
+import org.apache.directory.shared.ldap.codec.ICodecControl;
+import org.apache.directory.shared.ldap.codec.ILdapCodecService;
import org.apache.directory.shared.ldap.codec.LdapEncoder;
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
+import org.apache.directory.shared.ldap.codec.decorators.SearchRequestDecorator;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.filter.ExprNode;
import org.apache.directory.shared.ldap.model.filter.SearchScope;
@@ -65,6 +68,10 @@ public class SearchRequestSubstringTest
/** The encoder instance */
LdapEncoder encoder = new LdapEncoder();
+ /** The codec service */
+ ILdapCodecService codec = new DefaultLdapCodecService();
+
+ /** An oid normalizer map */
static Map<String, OidNormalizer> oids = new HashMap<String, OidNormalizer>();
@@ -153,7 +160,8 @@ public class SearchRequestSubstringTest
stream.flip();
// Allocate a BindRequest Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
try
{
@@ -165,7 +173,7 @@ public class SearchRequestSubstringTest
fail( de.getMessage() );
}
- SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest();
+ SearchRequest searchRequest = ldapMessageContainer.getMessage();
assertEquals( 1, searchRequest.getMessageId() );
assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() );
@@ -299,7 +307,8 @@ public class SearchRequestSubstringTest
stream.flip();
// Allocate a BindRequest Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
try
{
@@ -311,7 +320,7 @@ public class SearchRequestSubstringTest
fail( de.getMessage() );
}
- SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest();
+ SearchRequest searchRequest = ldapMessageContainer.getMessage();
assertEquals( 1, searchRequest.getMessageId() );
assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() );
@@ -342,7 +351,7 @@ public class SearchRequestSubstringTest
assertEquals( 1, controls.size() );
- Control control = searchRequest.getControl( "2.16.840.1.113730.3.4.2" );
+ ICodecControl<Control> control = ( ICodecControl<Control> )searchRequest.getControl( "2.16.840.1.113730.3.4.2" );
assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() );
assertEquals( "", Strings.dumpBytes((byte[]) control.getValue()) );
@@ -427,7 +436,8 @@ public class SearchRequestSubstringTest
stream.flip();
// Allocate a BindRequest Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
try
{
@@ -439,7 +449,7 @@ public class SearchRequestSubstringTest
fail( de.getMessage() );
}
- SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest();
+ SearchRequest searchRequest = ldapMessageContainer.getMessage();
assertEquals( 1, searchRequest.getMessageId() );
assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() );
@@ -549,7 +559,8 @@ public class SearchRequestSubstringTest
stream.flip();
// Allocate a BindRequest Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
try
{
@@ -561,7 +572,7 @@ public class SearchRequestSubstringTest
fail( de.getMessage() );
}
- SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest();
+ SearchRequest searchRequest = ldapMessageContainer.getMessage();
assertEquals( 1, searchRequest.getMessageId() );
assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() );
@@ -672,7 +683,8 @@ public class SearchRequestSubstringTest
stream.flip();
// Allocate a BindRequest Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
try
{
@@ -684,7 +696,7 @@ public class SearchRequestSubstringTest
fail( de.getMessage() );
}
- SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest();
+ SearchRequest searchRequest = ldapMessageContainer.getMessage();
assertEquals( 1, searchRequest.getMessageId() );
assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() );
@@ -794,7 +806,8 @@ public class SearchRequestSubstringTest
stream.flip();
// Allocate a BindRequest Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
try
{
@@ -806,7 +819,7 @@ public class SearchRequestSubstringTest
fail( de.getMessage() );
}
- SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest();
+ SearchRequest searchRequest = ldapMessageContainer.getMessage();
assertEquals( 1, searchRequest.getMessageId() );
assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() );
@@ -919,7 +932,8 @@ public class SearchRequestSubstringTest
stream.flip();
// Allocate a BindRequest Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
try
{
@@ -931,7 +945,7 @@ public class SearchRequestSubstringTest
fail( de.getMessage() );
}
- SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest();
+ SearchRequest searchRequest = ldapMessageContainer.getMessage();
assertEquals( 1, searchRequest.getMessageId() );
assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() );
@@ -1042,7 +1056,8 @@ public class SearchRequestSubstringTest
stream.flip();
// Allocate a BindRequest Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
try
{
@@ -1054,7 +1069,7 @@ public class SearchRequestSubstringTest
fail( de.getMessage() );
}
- SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest();
+ SearchRequest searchRequest = ldapMessageContainer.getMessage();
assertEquals( 1, searchRequest.getMessageId() );
assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() );
@@ -1164,7 +1179,8 @@ public class SearchRequestSubstringTest
stream.flip();
// Allocate a BindRequest Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
try
{
@@ -1176,7 +1192,7 @@ public class SearchRequestSubstringTest
fail( de.getMessage() );
}
- SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest();
+ SearchRequest searchRequest = ldapMessageContainer.getMessage();
assertEquals( 1, searchRequest.getMessageId() );
assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() );
@@ -1307,7 +1323,8 @@ public class SearchRequestSubstringTest
stream.flip();
// Allocate a BindRequest Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
try
{
@@ -1319,7 +1336,7 @@ public class SearchRequestSubstringTest
fail( de.getMessage() );
}
- SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest();
+ SearchRequest searchRequest = ldapMessageContainer.getMessage();
assertEquals( 1, searchRequest.getMessageId() );
assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() );
@@ -1394,7 +1411,8 @@ public class SearchRequestSubstringTest
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
// Decode a SearchRequest message
try
@@ -1437,7 +1455,8 @@ public class SearchRequestSubstringTest
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
// Decode a SearchRequest message
try
@@ -1483,7 +1502,8 @@ public class SearchRequestSubstringTest
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
// Decode a SearchRequest message
try
@@ -1529,7 +1549,8 @@ public class SearchRequestSubstringTest
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
// Decode a SearchRequest message
try
@@ -1575,7 +1596,8 @@ public class SearchRequestSubstringTest
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
// Decode a SearchRequest message
try
@@ -1621,7 +1643,8 @@ public class SearchRequestSubstringTest
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
// Decode a SearchRequest message
try
@@ -1667,7 +1690,8 @@ public class SearchRequestSubstringTest
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
// Decode a SearchRequest message
try
@@ -1717,7 +1741,8 @@ public class SearchRequestSubstringTest
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
// Decode a SearchRequest message
try
@@ -1767,7 +1792,8 @@ public class SearchRequestSubstringTest
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
// Decode a SearchRequest message
try
@@ -1817,7 +1843,8 @@ public class SearchRequestSubstringTest
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
// Decode a SearchRequest message
try
@@ -1866,7 +1893,8 @@ public class SearchRequestSubstringTest
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
// Decode a SearchRequest message
try
@@ -1915,7 +1943,8 @@ public class SearchRequestSubstringTest
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
+ new LdapMessageContainer<SearchRequestDecorator>( codec );
// Decode a SearchRequest message
try