You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/01/29 17:11:00 UTC
svn commit: r1065054 - in
/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del:
DelRequestTest.java DelResponseTest.java
Author: akarasulu
Date: Sat Jan 29 16:10:59 2011
New Revision: 1065054
URL: http://svn.apache.org/viewvc?rev=1065054&view=rev
Log:
more test fixes
Modified:
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java?rev=1065054&r1=1065053&r2=1065054&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java Sat Jan 29 16:10:59 2011
@@ -32,13 +32,14 @@ import org.apache.directory.junit.tools.
import org.apache.directory.shared.asn1.DecoderException;
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
-import org.apache.directory.shared.asn1.ber.Asn1Container;
+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.ResponseCarryingException;
+import org.apache.directory.shared.ldap.codec.decorators.DeleteRequestDecorator;
import org.apache.directory.shared.ldap.model.message.*;
-import org.apache.directory.shared.ldap.model.message.DeleteRequestImpl;
-import org.apache.directory.shared.ldap.model.message.DeleteResponseImpl;
import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -56,6 +57,8 @@ public class DelRequestTest
/** The encoder instance */
LdapEncoder encoder = new LdapEncoder();
+ ILdapCodecService codec = new DefaultLdapCodecService();
+
/**
* Test the decoding of a full DelRequest
@@ -82,12 +85,12 @@ public class DelRequestTest
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<DeleteRequestDecorator> container = new LdapMessageContainer<DeleteRequestDecorator>( codec );
// Decode a DelRequest PDU
try
{
- ldapDecoder.decode( stream, ldapMessageContainer );
+ ldapDecoder.decode( stream, container );
}
catch ( DecoderException de )
{
@@ -96,7 +99,7 @@ public class DelRequestTest
}
// Check the decoded DelRequest PDU
- DeleteRequest delRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getDeleteRequest();
+ DeleteRequest delRequest = container.getMessage();
assertEquals( 1, delRequest.getMessageId() );
assertEquals( "cn=testModify,ou=users,ou=system", delRequest.getName().toString() );
@@ -149,12 +152,12 @@ public class DelRequestTest
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<DeleteRequestDecorator> container = new LdapMessageContainer<DeleteRequestDecorator>( codec );
// Decode a DelRequest PDU
try
{
- ldapDecoder.decode( stream, ldapMessageContainer );
+ ldapDecoder.decode( stream, container );
}
catch ( DecoderException de )
{
@@ -191,12 +194,12 @@ public class DelRequestTest
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<DeleteRequestDecorator> container = new LdapMessageContainer<DeleteRequestDecorator>( codec );
// Decode a DelRequest PDU
try
{
- ldapDecoder.decode( stream, ldapMessageContainer );
+ ldapDecoder.decode( stream, container );
fail( "We should never reach this point !!!" );
}
catch ( DecoderException de )
@@ -235,12 +238,12 @@ public class DelRequestTest
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<DeleteRequestDecorator> container = new LdapMessageContainer<DeleteRequestDecorator>( codec );
// Decode a DelRequest PDU
try
{
- ldapDecoder.decode( stream, ldapMessageContainer );
+ ldapDecoder.decode( stream, container );
}
catch ( DecoderException de )
{
@@ -249,7 +252,7 @@ public class DelRequestTest
}
// Check the decoded DelRequest PDU
- DeleteRequest delRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getDeleteRequest();
+ DeleteRequest delRequest = container.getMessage();
assertEquals( 1, delRequest.getMessageId() );
assertEquals( "cn=testModify,ou=users,ou=system", delRequest.getName().toString() );
@@ -259,9 +262,10 @@ public class DelRequestTest
assertEquals( 1, controls.size() );
- Control control = controls.get( "2.16.840.1.113730.3.4.2" );
+ @SuppressWarnings("unchecked")
+ ICodecControl<Control> control = ( ICodecControl<Control> ) controls.get( "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()) );
+ assertEquals( "", Strings.dumpBytes( ( byte[] ) control.getValue() ) );
DeleteRequest internalDeleteRequest = new DeleteRequestImpl( delRequest.getMessageId() );
internalDeleteRequest.setName( delRequest.getName() );
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java?rev=1065054&r1=1065053&r2=1065054&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java Sat Jan 29 16:10:59 2011
@@ -31,10 +31,13 @@ import org.apache.directory.junit.tools.
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
-import org.apache.directory.shared.asn1.ber.Asn1Container;
import org.apache.directory.shared.asn1.DecoderException;
+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.DeleteResponseDecorator;
import org.apache.directory.shared.ldap.model.message.DeleteResponse;
import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.model.message.Control;
@@ -55,6 +58,7 @@ public class DelResponseTest
/** The encoder instance */
LdapEncoder encoder = new LdapEncoder();
+ ILdapCodecService codec = new DefaultLdapCodecService();
/**
* Test the decoding of a DelResponse
@@ -93,12 +97,13 @@ public class DelResponseTest
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<DeleteResponseDecorator> container =
+ new LdapMessageContainer<DeleteResponseDecorator>( codec );
// Decode the DelResponse PDU
try
{
- ldapDecoder.decode( stream, ldapMessageContainer );
+ ldapDecoder.decode( stream, container );
}
catch ( DecoderException de )
{
@@ -107,7 +112,7 @@ public class DelResponseTest
}
// Check the decoded DelResponse PDU
- DeleteResponse delResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getDeleteResponse();
+ DeleteResponse delResponse = container.getMessage();
assertEquals( 1, delResponse.getMessageId() );
assertEquals( ResultCodeEnum.ALIAS_PROBLEM, delResponse.getLdapResult().getResultCode() );
@@ -153,12 +158,14 @@ public class DelResponseTest
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<DeleteResponseDecorator> container =
+ new LdapMessageContainer<DeleteResponseDecorator>( codec );
+
// Decode a DelResponse message
try
{
- ldapDecoder.decode( stream, ldapMessageContainer );
+ ldapDecoder.decode( stream, container );
}
catch ( DecoderException de )
{
@@ -217,12 +224,13 @@ public class DelResponseTest
stream.flip();
// Allocate a LdapMessage Container
- Asn1Container ldapMessageContainer = new LdapMessageContainer();
+ LdapMessageContainer<DeleteResponseDecorator> container =
+ new LdapMessageContainer<DeleteResponseDecorator>( codec );
// Decode the DelResponse PDU
try
{
- ldapDecoder.decode( stream, ldapMessageContainer );
+ ldapDecoder.decode( stream, container );
}
catch ( DecoderException de )
{
@@ -231,7 +239,7 @@ public class DelResponseTest
}
// Check the decoded DelResponse PDU
- DeleteResponse delResponse = ( ( LdapMessageContainer ) ldapMessageContainer ).getDeleteResponse();
+ DeleteResponse delResponse = container.getMessage();
assertEquals( 1, delResponse.getMessageId() );
assertEquals( ResultCodeEnum.ALIAS_PROBLEM, delResponse.getLdapResult().getResultCode() );
@@ -243,9 +251,10 @@ public class DelResponseTest
assertEquals( 1, controls.size() );
- Control control = controls.get( "2.16.840.1.113730.3.4.2" );
+ @SuppressWarnings("unchecked")
+ ICodecControl<Control> control = ( ICodecControl<Control> ) controls.get( "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()) );
+ assertEquals( "", Strings.dumpBytes( ( byte[] ) control.getValue() ) );
// Check the encoding
try
@@ -255,7 +264,7 @@ public class DelResponseTest
// Check the length
assertEquals( 0x4A, bb.limit() );
- String encodedPdu = Strings.dumpBytes(bb.array());
+ String encodedPdu = Strings.dumpBytes( bb.array() );
assertEquals( encodedPdu, decodedPdu );
}