Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 84688 invoked from network); 16 Dec 2010 10:20:33 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 16 Dec 2010 10:20:33 -0000 Received: (qmail 32759 invoked by uid 500); 16 Dec 2010 10:20:33 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 32703 invoked by uid 500); 16 Dec 2010 10:20:33 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 32632 invoked by uid 99); 16 Dec 2010 10:20:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Dec 2010 10:20:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Dec 2010 10:20:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0366D2388B1B; Thu, 16 Dec 2010 10:19:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1049873 [6/8] - in /directory: apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/ apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ apac... Date: Thu, 16 Dec 2010 10:19:41 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101216101946.0366D2388B1B@eris.apache.org> Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncInfoValueControlTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncInfoValueControlTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncInfoValueControlTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncInfoValueControlTest.java Thu Dec 16 10:19:33 2010 @@ -36,6 +36,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueControlDecoder; import org.apache.directory.shared.ldap.message.control.replication.SynchronizationInfoEnum; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -101,7 +102,7 @@ public class SyncInfoValueControlTest buffer.flip(); ByteBuffer encoded = syncInfoValue.encode( ByteBuffer.allocate( syncInfoValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -159,7 +160,7 @@ public class SyncInfoValueControlTest buffer.flip(); ByteBuffer encoded = syncInfoValue.encode( ByteBuffer.allocate( syncInfoValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -226,7 +227,7 @@ public class SyncInfoValueControlTest buffer.flip(); ByteBuffer encoded = syncInfoValue.encode( ByteBuffer.allocate( syncInfoValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -291,7 +292,7 @@ public class SyncInfoValueControlTest buffer.flip(); ByteBuffer encoded = syncInfoValue.encode( ByteBuffer.allocate( syncInfoValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -354,7 +355,7 @@ public class SyncInfoValueControlTest buffer.flip(); ByteBuffer encoded = syncInfoValue.encode( ByteBuffer.allocate( syncInfoValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -417,7 +418,7 @@ public class SyncInfoValueControlTest buffer.flip(); ByteBuffer encoded = syncInfoValue.encode( ByteBuffer.allocate( syncInfoValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -476,7 +477,7 @@ public class SyncInfoValueControlTest buffer.flip(); ByteBuffer encoded = syncInfoValue.encode( ByteBuffer.allocate( syncInfoValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -543,7 +544,7 @@ public class SyncInfoValueControlTest buffer.flip(); ByteBuffer encoded = syncInfoValue.encode( ByteBuffer.allocate( syncInfoValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -608,7 +609,7 @@ public class SyncInfoValueControlTest buffer.flip(); ByteBuffer encoded = syncInfoValue.encode( ByteBuffer.allocate( syncInfoValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -671,7 +672,7 @@ public class SyncInfoValueControlTest buffer.flip(); ByteBuffer encoded = syncInfoValue.encode( ByteBuffer.allocate( syncInfoValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -734,7 +735,7 @@ public class SyncInfoValueControlTest buffer.flip(); ByteBuffer encoded = syncInfoValue.encode( ByteBuffer.allocate( syncInfoValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -793,7 +794,7 @@ public class SyncInfoValueControlTest buffer.flip(); ByteBuffer encoded = syncInfoValue.encode( ByteBuffer.allocate( syncInfoValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -987,7 +988,7 @@ public class SyncInfoValueControlTest buffer.flip(); ByteBuffer encoded = syncInfoValue.encode( ByteBuffer.allocate( syncInfoValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -1078,7 +1079,7 @@ public class SyncInfoValueControlTest buffer.flip(); ByteBuffer encoded = syncInfoValue.encode( ByteBuffer.allocate( syncInfoValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -1143,7 +1144,7 @@ public class SyncInfoValueControlTest buffer.flip(); ByteBuffer encoded = syncInfoValue.encode( ByteBuffer.allocate( syncInfoValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -1237,7 +1238,7 @@ public class SyncInfoValueControlTest buffer.flip(); ByteBuffer encoded = syncInfoValue.encode( ByteBuffer.allocate( syncInfoValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -1302,7 +1303,7 @@ public class SyncInfoValueControlTest buffer.flip(); ByteBuffer encoded = syncInfoValue.encode( ByteBuffer.allocate( syncInfoValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -1395,7 +1396,7 @@ public class SyncInfoValueControlTest buffer.flip(); ByteBuffer encoded = syncInfoValue.encode( ByteBuffer.allocate( syncInfoValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -1462,7 +1463,7 @@ public class SyncInfoValueControlTest buffer.flip(); ByteBuffer encoded = syncInfoValue.encode( ByteBuffer.allocate( syncInfoValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -1558,7 +1559,7 @@ public class SyncInfoValueControlTest buffer.flip(); ByteBuffer encoded = syncInfoValue.encode( ByteBuffer.allocate( syncInfoValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncModifyDnControlTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncModifyDnControlTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncModifyDnControlTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncModifyDnControlTest.java Thu Dec 16 10:19:33 2010 @@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.controls.replication.syncmodifydn.SyncModifyDnControl; import org.apache.directory.shared.ldap.codec.controls.replication.syncmodifydn.SyncModifyDnControlContainer; import org.apache.directory.shared.ldap.codec.controls.replication.syncmodifydn.SyncModifyDnControlDecoder; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -102,7 +102,7 @@ public class SyncModifyDnControlTest buffer.flip(); ByteBuffer encoded = syncmodDnControl.encode( ByteBuffer.allocate( syncmodDnControl.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -166,7 +166,7 @@ public class SyncModifyDnControlTest buffer.flip(); ByteBuffer encoded = syncmodDnControl.encode( ByteBuffer.allocate( syncmodDnControl.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -233,7 +233,7 @@ public class SyncModifyDnControlTest buffer.flip(); ByteBuffer encoded = syncmodDnControl.encode( ByteBuffer.allocate( syncmodDnControl.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncRequestValueControlTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncRequestValueControlTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncRequestValueControlTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncRequestValueControlTest.java Thu Dec 16 10:19:33 2010 @@ -36,6 +36,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.SyncRequestValueControlDecoder; import org.apache.directory.shared.ldap.message.control.replication.SynchronizationModeEnum; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -106,8 +107,8 @@ public class SyncRequestValueControlTest buffer.flip(); bb = syncRequestValue.encode( ByteBuffer.allocate( syncRequestValue.computeLength() ) ); - String decoded = StringTools.dumpBytes( bb.array() ); - String expected = StringTools.dumpBytes( buffer.array() ); + String decoded = Strings.dumpBytes(bb.array()); + String expected = Strings.dumpBytes(buffer.array()); assertEquals( expected, decoded ); } catch ( EncoderException ee ) @@ -175,8 +176,8 @@ public class SyncRequestValueControlTest buffer.flip(); bb = syncRequestValue.encode( ByteBuffer.allocate( syncRequestValue.computeLength() ) ); - String decoded = StringTools.dumpBytes( bb.array() ); - String expected = StringTools.dumpBytes( buffer.array() ); + String decoded = Strings.dumpBytes(bb.array()); + String expected = Strings.dumpBytes(buffer.array()); assertEquals( expected, decoded ); } catch ( EncoderException ee ) @@ -242,8 +243,8 @@ public class SyncRequestValueControlTest buffer.flip(); bb = syncRequestValue.encode( ByteBuffer.allocate( syncRequestValue.computeLength() ) ); - String decoded = StringTools.dumpBytes( bb.array() ); - String expected = StringTools.dumpBytes( buffer.array() ); + String decoded = Strings.dumpBytes(bb.array()); + String expected = Strings.dumpBytes(buffer.array()); assertEquals( expected, decoded ); } catch ( EncoderException ee ) @@ -311,8 +312,8 @@ public class SyncRequestValueControlTest buffer.flip(); bb = syncRequestValue.encode( ByteBuffer.allocate( syncRequestValue.computeLength() ) ); - String decoded = StringTools.dumpBytes( bb.array() ); - String expected = StringTools.dumpBytes( buffer.array() ); + String decoded = Strings.dumpBytes(bb.array()); + String expected = Strings.dumpBytes(buffer.array()); assertEquals( expected, decoded ); } catch ( EncoderException ee ) @@ -378,8 +379,8 @@ public class SyncRequestValueControlTest buffer.flip(); bb = syncRequestValue.encode( ByteBuffer.allocate( syncRequestValue.computeLength() ) ); - String decoded = StringTools.dumpBytes( bb.array() ); - String expected = StringTools.dumpBytes( buffer.array() ); + String decoded = Strings.dumpBytes(bb.array()); + String expected = Strings.dumpBytes(buffer.array()); assertEquals( expected, decoded ); } catch ( EncoderException ee ) @@ -446,8 +447,8 @@ public class SyncRequestValueControlTest buffer.flip(); bb = syncRequestValue.encode( ByteBuffer.allocate( syncRequestValue.computeLength() ) ); - String decoded = StringTools.dumpBytes( bb.array() ); - String expected = StringTools.dumpBytes( buffer.array() ); + String decoded = Strings.dumpBytes(bb.array()); + String expected = Strings.dumpBytes(buffer.array()); assertEquals( expected, decoded ); } catch ( EncoderException ee ) @@ -513,8 +514,8 @@ public class SyncRequestValueControlTest buffer.flip(); bb = syncRequestValue.encode( ByteBuffer.allocate( syncRequestValue.computeLength() ) ); - String decoded = StringTools.dumpBytes( bb.array() ); - String expected = StringTools.dumpBytes( buffer.array() ); + String decoded = Strings.dumpBytes(bb.array()); + String expected = Strings.dumpBytes(buffer.array()); assertEquals( expected, decoded ); } catch ( EncoderException ee ) Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncStateValueControlTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncStateValueControlTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncStateValueControlTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncStateValueControlTest.java Thu Dec 16 10:19:33 2010 @@ -37,6 +37,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueControlDecoder; import org.apache.directory.shared.ldap.message.control.replication.SyncStateTypeEnum; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -109,7 +110,7 @@ public class SyncStateValueControlTest buffer.flip(); ByteBuffer encoded = syncStateValue.encode( ByteBuffer.allocate( syncStateValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -173,7 +174,7 @@ public class SyncStateValueControlTest buffer.flip(); ByteBuffer encoded = syncStateValue.encode( ByteBuffer.allocate( syncStateValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -239,7 +240,7 @@ public class SyncStateValueControlTest buffer.flip(); ByteBuffer encoded = syncStateValue.encode( ByteBuffer.allocate( syncStateValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { @@ -396,7 +397,7 @@ public class SyncStateValueControlTest buffer.flip(); ByteBuffer encoded = syncStateValue.encode( ByteBuffer.allocate( syncStateValue.computeLength() ) ); - assertEquals( StringTools.dumpBytes( buffer.array() ), StringTools.dumpBytes( encoded.array() ) ); + assertEquals( Strings.dumpBytes(buffer.array()), Strings.dumpBytes(encoded.array()) ); } catch ( EncoderException ee ) { Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java Thu Dec 16 10:19:33 2010 @@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.Message; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -81,7 +81,7 @@ public class DelRequestTest 0x4A, 0x20, 'c', 'n', '=', 't', 'e', 's', 't', 'M', 'o', 'd', 'i', 'f', 'y', ',', 'o', 'u', '=', 'u', 's', 'e', 'r', 's', ',', 'o', 'u', '=', 's', 'y', 's', 't', 'e', 'm' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -116,7 +116,7 @@ public class DelRequestTest // Check the length assertEquals( 0x27, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -234,7 +234,7 @@ public class DelRequestTest 0x30, 0x19, 0x04, 0x17, 0x32, 0x2E, 0x31, 0x36, 0x2E, 0x38, 0x34, 0x30, 0x2E, 0x31, 0x2E, 0x31, 0x31, 0x33, 0x37, 0x33, 0x30, 0x2E, 0x33, 0x2E, 0x34, 0x2E, 0x32 } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -264,7 +264,7 @@ public class DelRequestTest Control control = controls.get( "2.16.840.1.113730.3.4.2" ); assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() ); - assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) ); + assertEquals( "", Strings.dumpBytes((byte[]) control.getValue()) ); DeleteRequest internalDeleteRequest = new DeleteRequestImpl( delRequest.getMessageId() ); internalDeleteRequest.setName( delRequest.getName() ); @@ -278,7 +278,7 @@ public class DelRequestTest // Check the length assertEquals( 0x44, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java Thu Dec 16 10:19:33 2010 @@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -89,7 +89,7 @@ public class DelResponseTest // } } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -122,7 +122,7 @@ public class DelResponseTest // Check the length assertEquals( 0x2D, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -213,7 +213,7 @@ public class DelResponseTest } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -245,7 +245,7 @@ public class DelResponseTest Control control = controls.get( "2.16.840.1.113730.3.4.2" ); assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() ); - assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) ); + assertEquals( "", Strings.dumpBytes((byte[]) control.getValue()) ); // Check the encoding try @@ -255,7 +255,7 @@ public class DelResponseTest // Check the length assertEquals( 0x4A, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java Thu Dec 16 10:19:33 2010 @@ -38,6 +38,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -75,7 +76,7 @@ public class ExtendedRequestTest // requestValue [1] OCTET STRING OPTIONAL } ( byte ) 0x81, 0x05, 'v', 'a', 'l', 'u', 'e' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -108,7 +109,7 @@ public class ExtendedRequestTest // Check the length assertEquals( 0x1D, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -146,7 +147,7 @@ public class ExtendedRequestTest 0x30, 0x19, 0x04, 0x17, '2', '.', '1', '6', '.', '8', '4', '0', '.', '1', '.', '1', '1', '3', '7', '3', '0', '.', '3', '.', '4', '.', '2' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -178,7 +179,7 @@ public class ExtendedRequestTest assertTrue( extendedRequest.hasControl( "2.16.840.1.113730.3.4.2" ) ); Control control = extendedRequest.getControl( "2.16.840.1.113730.3.4.2" ); - assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) ); + assertEquals( "", Strings.dumpBytes((byte[]) control.getValue()) ); // Check the encoding try @@ -188,7 +189,7 @@ public class ExtendedRequestTest // Check the length assertEquals( 0x3A, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -227,7 +228,7 @@ public class ExtendedRequestTest 0x30, 0x19, 0x04, 0x17, '2', '.', '1', '6', '.', '8', '4', '0', '.', '1', '.', '1', '1', '3', '7', '3', '0', '.', '3', '.', '4', '.', '2' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -260,7 +261,7 @@ public class ExtendedRequestTest assertTrue( extendedRequest.hasControl( "2.16.840.1.113730.3.4.2" ) ); Control control = extendedRequest.getControl( "2.16.840.1.113730.3.4.2" ); - assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) ); + assertEquals( "", Strings.dumpBytes((byte[]) control.getValue()) ); // Check the encoding try @@ -270,7 +271,7 @@ public class ExtendedRequestTest // Check the length assertEquals( 0x33, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -406,7 +407,7 @@ public class ExtendedRequestTest // requestName [0] LDAPOID, ( byte ) 0x80, 0x0D, '1', '.', '3', '.', '6', '.', '1', '.', '5', '.', '5', '.', '2', } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -438,7 +439,7 @@ public class ExtendedRequestTest // Check the length assertEquals( 0x16, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -472,7 +473,7 @@ public class ExtendedRequestTest ( byte ) 0x80, 0x0D, '1', '.', '3', '.', '6', '.', '1', '.', '5', '.', '5', '.', '2', ( byte ) 0x81, 0x00 } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -505,7 +506,7 @@ public class ExtendedRequestTest // Check the length assertEquals( 0x18, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java Thu Dec 16 10:19:33 2010 @@ -39,6 +39,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -84,7 +85,7 @@ public class ExtendedResponseTest // response [11] OCTET STRING OPTIONAL } ( byte ) 0x8B, 0x05, 'v', 'a', 'l', 'u', 'e' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -120,7 +121,7 @@ public class ExtendedResponseTest // Check the length assertEquals( 0x24, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -176,7 +177,7 @@ public class ExtendedResponseTest 0x30, 0x19, 0x04, 0x17, '2', '.', '1', '6', '.', '8', '4', '0', '.', '1', '.', '1', '1', '3', '7', '3', '0', '.', '3', '.', '4', '.', '2' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -211,7 +212,7 @@ public class ExtendedResponseTest Control control = controls.get( "2.16.840.1.113730.3.4.2" ); assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() ); - assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) ); + assertEquals( "", Strings.dumpBytes((byte[]) control.getValue()) ); // Check the encoding try @@ -221,7 +222,7 @@ public class ExtendedResponseTest // Check the length assertEquals( 0x41, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -259,7 +260,7 @@ public class ExtendedResponseTest // responseName [0] LDAPOID, } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -293,7 +294,7 @@ public class ExtendedResponseTest // Check the length assertEquals( 0x0E, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -342,7 +343,7 @@ public class ExtendedResponseTest 0x30, 0x19, 0x04, 0x17, 0x32, 0x2E, 0x31, 0x36, 0x2E, 0x38, 0x34, 0x30, 0x2E, 0x31, 0x2E, 0x31, 0x31, 0x33, 0x37, 0x33, 0x30, 0x2E, 0x33, 0x2E, 0x34, 0x2E, 0x32 } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -375,7 +376,7 @@ public class ExtendedResponseTest Control control = controls.get( "2.16.840.1.113730.3.4.2" ); assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() ); - assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) ); + assertEquals( "", Strings.dumpBytes((byte[]) control.getValue()) ); // Check the encoding try @@ -385,7 +386,7 @@ public class ExtendedResponseTest // Check the length assertEquals( 0x2B, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -546,7 +547,7 @@ public class ExtendedResponseTest // responseName [0] LDAPOID, ( byte ) 0x8A, 0x0D, '1', '.', '3', '.', '6', '.', '1', '.', '5', '.', '5', '.', '2', } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -582,7 +583,7 @@ public class ExtendedResponseTest // Check the length assertEquals( 0x1D, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -633,7 +634,7 @@ public class ExtendedResponseTest 0x30, 0x19, 0x04, 0x17, 0x32, 0x2E, 0x31, 0x36, 0x2E, 0x38, 0x34, 0x30, 0x2E, 0x31, 0x2E, 0x31, 0x31, 0x33, 0x37, 0x33, 0x30, 0x2E, 0x33, 0x2E, 0x34, 0x2E, 0x32 } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -668,7 +669,7 @@ public class ExtendedResponseTest Control control = controls.get( "2.16.840.1.113730.3.4.2" ); assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() ); - assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) ); + assertEquals( "", Strings.dumpBytes((byte[]) control.getValue()) ); // Check the encoding try @@ -678,7 +679,7 @@ public class ExtendedResponseTest // Check the length assertEquals( 0x3A, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -725,7 +726,7 @@ public class ExtendedResponseTest ( byte ) 0x8A, 0x0D, '1', '.', '3', '.', '6', '.', '1', '.', '5', '.', '5', '.', '2', ( byte ) 0x8B, 0x00 } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -761,7 +762,7 @@ public class ExtendedResponseTest // Check the length assertEquals( 0x1F, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -813,7 +814,7 @@ public class ExtendedResponseTest 0x30, 0x19, 0x04, 0x17, 0x32, 0x2E, 0x31, 0x36, 0x2E, 0x38, 0x34, 0x30, 0x2E, 0x31, 0x2E, 0x31, 0x31, 0x33, 0x37, 0x33, 0x30, 0x2E, 0x33, 0x2E, 0x34, 0x2E, 0x32 } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -848,7 +849,7 @@ public class ExtendedResponseTest Control control = controls.get( "2.16.840.1.113730.3.4.2" ); assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() ); - assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) ); + assertEquals( "", Strings.dumpBytes((byte[]) control.getValue()) ); // Check the encoding try @@ -858,7 +859,7 @@ public class ExtendedResponseTest // Check the length assertEquals( 0x3C, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/CancelRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/CancelRequestTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/CancelRequestTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/CancelRequestTest.java Thu Dec 16 10:19:33 2010 @@ -36,7 +36,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.extended.operations.cancel.Cancel; import org.apache.directory.shared.ldap.codec.extended.operations.cancel.CancelContainer; import org.apache.directory.shared.ldap.codec.extended.operations.cancel.CancelDecoder; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -66,7 +66,7 @@ public class CancelRequestTest 0x02, 0x01, 0x01 } ).flip(); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); // Allocate a Cancel Container Asn1Container cancelContainer = new CancelContainer(); @@ -91,7 +91,7 @@ public class CancelRequestTest { ByteBuffer bb = cancel.encode(); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/CertGenerationRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/CertGenerationRequestTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/CertGenerationRequestTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/CertGenerationRequestTest.java Thu Dec 16 10:19:33 2010 @@ -33,7 +33,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.ldap.codec.extended.operations.certGeneration.CertGenerationContainer; import org.apache.directory.shared.ldap.codec.extended.operations.certGeneration.CertGenerationObject; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -91,7 +91,7 @@ public class CertGenerationRequestTest bb.put( new byte[] { 0x04, 0x03, 'R', 'S', 'A' } ); - String decodedPdu = StringTools.dumpBytes( bb.array() ); + String decodedPdu = Strings.dumpBytes(bb.array()); bb.flip(); CertGenerationContainer container = new CertGenerationContainer(); @@ -115,7 +115,7 @@ public class CertGenerationRequestTest try { ByteBuffer encodedBuf = certGenObj.encode(); - String encodedPdu = StringTools.dumpBytes( encodedBuf.array() ); + String encodedPdu = Strings.dumpBytes(encodedBuf.array()); assertEquals( decodedPdu, encodedPdu ); } Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectTest.java Thu Dec 16 10:19:33 2010 @@ -34,7 +34,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.extended.operations.gracefulDisconnect.GracefulDisconnect; import org.apache.directory.shared.ldap.codec.extended.operations.gracefulDisconnect.GracefulDisconnectContainer; import org.apache.directory.shared.ldap.codec.extended.operations.gracefulDisconnect.GracefulDisconnectDecoder; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -70,7 +70,7 @@ public class GracefulDisconnectTest 'c', '0', '4', ')' // } } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); GracefulDisconnectContainer container = new GracefulDisconnectContainer(); @@ -101,7 +101,7 @@ public class GracefulDisconnectTest { ByteBuffer bb = gracefulDisconnect.encode(); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -126,7 +126,7 @@ public class GracefulDisconnectTest 0x02, 0x01, 0x01 // timeOffline INTEGER (0..720) DEFAULT 0, } ); - String decodedPdu = StringTools.dumpBytes( bb.array() ); + String decodedPdu = Strings.dumpBytes(bb.array()); bb.flip(); GracefulDisconnectContainer container = new GracefulDisconnectContainer(); @@ -154,7 +154,7 @@ public class GracefulDisconnectTest { ByteBuffer bb1 = gracefulDisconnect.encode(); - String encodedPdu = StringTools.dumpBytes( bb1.array() ); + String encodedPdu = Strings.dumpBytes(bb1.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -180,7 +180,7 @@ public class GracefulDisconnectTest // 0 } ); - String decodedPdu = StringTools.dumpBytes( bb.array() ); + String decodedPdu = Strings.dumpBytes(bb.array()); bb.flip(); GracefulDisconnectContainer container = new GracefulDisconnectContainer(); @@ -208,7 +208,7 @@ public class GracefulDisconnectTest { ByteBuffer bb1 = gracefulDisconnect.encode(); - String encodedPdu = StringTools.dumpBytes( bb1.array() ); + String encodedPdu = Strings.dumpBytes(bb1.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -235,7 +235,7 @@ public class GracefulDisconnectTest // DEFAULT 0, } ); - String decodedPdu = StringTools.dumpBytes( bb.array() ); + String decodedPdu = Strings.dumpBytes(bb.array()); bb.flip(); GracefulDisconnectContainer container = new GracefulDisconnectContainer(); @@ -263,7 +263,7 @@ public class GracefulDisconnectTest { ByteBuffer bb2 = gracefulDisconnect.encode(); - String encodedPdu = StringTools.dumpBytes( bb2.array() ); + String encodedPdu = Strings.dumpBytes(bb2.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -297,7 +297,7 @@ public class GracefulDisconnectTest '0', '0', '%', '5', 'c', '0', '0', '%', '5', 'c', '0', '4', ')' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); GracefulDisconnectContainer container = new GracefulDisconnectContainer(); @@ -328,7 +328,7 @@ public class GracefulDisconnectTest { ByteBuffer bb = gracefulDisconnect.encode(); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -352,7 +352,7 @@ public class GracefulDisconnectTest { 0x30, 0x00 // GracefulDisconnect ::= SEQUENCE { } ); - String decodedPdu = StringTools.dumpBytes( bb.array() ); + String decodedPdu = Strings.dumpBytes(bb.array()); bb.flip(); GracefulDisconnectContainer container = new GracefulDisconnectContainer(); @@ -380,7 +380,7 @@ public class GracefulDisconnectTest { ByteBuffer bb1 = gracefulDisconnect.encode(); - String encodedPdu = StringTools.dumpBytes( bb1.array() ); + String encodedPdu = Strings.dumpBytes(bb1.array()); assertEquals( encodedPdu, decodedPdu ); } Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdownTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdownTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdownTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdownTest.java Thu Dec 16 10:19:33 2010 @@ -33,7 +33,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.Asn1Decoder; import org.apache.directory.shared.ldap.codec.extended.operations.gracefulShutdown.GracefulShutdown; import org.apache.directory.shared.ldap.codec.extended.operations.gracefulShutdown.GracefulShutdownContainer; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -63,7 +63,7 @@ public class GracefulShutdownTest // } } ); - String decodedPdu = StringTools.dumpBytes( bb.array() ); + String decodedPdu = Strings.dumpBytes(bb.array()); bb.flip(); GracefulShutdownContainer container = new GracefulShutdownContainer(); @@ -90,7 +90,7 @@ public class GracefulShutdownTest { ByteBuffer bb1 = gracefulShutdown.encode(); - String encodedPdu = StringTools.dumpBytes( bb1.array() ); + String encodedPdu = Strings.dumpBytes(bb1.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -115,7 +115,7 @@ public class GracefulShutdownTest 0x02, 0x01, 0x01 // timeOffline INTEGER (0..720) DEFAULT 0, } ); - String decodedPdu = StringTools.dumpBytes( bb.array() ); + String decodedPdu = Strings.dumpBytes(bb.array()); bb.flip(); GracefulShutdownContainer container = new GracefulShutdownContainer(); @@ -142,7 +142,7 @@ public class GracefulShutdownTest { ByteBuffer bb1 = gracefulShutdown.encode(); - String encodedPdu = StringTools.dumpBytes( bb1.array() ); + String encodedPdu = Strings.dumpBytes(bb1.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -168,7 +168,7 @@ public class GracefulShutdownTest // 0 } ); - String decodedPdu = StringTools.dumpBytes( bb.array() ); + String decodedPdu = Strings.dumpBytes(bb.array()); bb.flip(); GracefulShutdownContainer container = new GracefulShutdownContainer(); @@ -195,7 +195,7 @@ public class GracefulShutdownTest { ByteBuffer bb1 = gracefulShutdown.encode(); - String encodedPdu = StringTools.dumpBytes( bb1.array() ); + String encodedPdu = Strings.dumpBytes(bb1.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -219,7 +219,7 @@ public class GracefulShutdownTest { 0x30, 0x00 // GracefulShutdown ::= SEQUENCE { } ); - String decodedPdu = StringTools.dumpBytes( bb.array() ); + String decodedPdu = Strings.dumpBytes(bb.array()); bb.flip(); GracefulShutdownContainer container = new GracefulShutdownContainer(); @@ -246,7 +246,7 @@ public class GracefulShutdownTest { ByteBuffer bb1 = gracefulShutdown.encode(); - String encodedPdu = StringTools.dumpBytes( bb1.array() ); + String encodedPdu = Strings.dumpBytes(bb1.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -273,7 +273,7 @@ public class GracefulShutdownTest // DEFAULT 0 } ); - String decodedPdu = StringTools.dumpBytes( bb.array() ); + String decodedPdu = Strings.dumpBytes(bb.array()); bb.flip(); GracefulShutdownContainer container = new GracefulShutdownContainer(); @@ -300,7 +300,7 @@ public class GracefulShutdownTest { ByteBuffer bb1 = gracefulShutdown.encode(); - String encodedPdu = StringTools.dumpBytes( bb1.array() ); + String encodedPdu = Strings.dumpBytes(bb1.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -327,7 +327,7 @@ public class GracefulShutdownTest // DEFAULT 0 } ); - String decodedPdu = StringTools.dumpBytes( bb.array() ); + String decodedPdu = Strings.dumpBytes(bb.array()); bb.flip(); GracefulShutdownContainer container = new GracefulShutdownContainer(); @@ -354,7 +354,7 @@ public class GracefulShutdownTest { ByteBuffer bb1 = gracefulShutdown.encode(); - String encodedPdu = StringTools.dumpBytes( bb1.array() ); + String encodedPdu = Strings.dumpBytes(bb1.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -383,7 +383,7 @@ public class GracefulShutdownTest // 0 } ); - String decodedPdu = StringTools.dumpBytes( bb.array() ); + String decodedPdu = Strings.dumpBytes(bb.array()); bb.flip(); GracefulShutdownContainer container = new GracefulShutdownContainer(); @@ -410,7 +410,7 @@ public class GracefulShutdownTest { ByteBuffer bb1 = gracefulShutdown.encode(); - String encodedPdu = StringTools.dumpBytes( bb1.array() ); + String encodedPdu = Strings.dumpBytes(bb1.array()); assertEquals( encodedPdu, decodedPdu ); } Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/StoredProcedureTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/StoredProcedureTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/StoredProcedureTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/StoredProcedureTest.java Thu Dec 16 10:19:33 2010 @@ -37,6 +37,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.codec.extended.operations.storedProcedure.StoredProcedureDecoder; import org.apache.directory.shared.ldap.codec.extended.operations.storedProcedure.StoredProcedure.StoredProcedureParameter; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -74,7 +75,7 @@ public class StoredProcedureTest 0x04, 0x0A, 'p', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '3' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a StoredProcedure Container @@ -119,7 +120,7 @@ public class StoredProcedureTest { ByteBuffer bb = storedProcedure.encode(); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -145,7 +146,7 @@ public class StoredProcedureTest 0x30, 0x00 } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a StoredProcedure Container @@ -175,7 +176,7 @@ public class StoredProcedureTest { ByteBuffer bb = storedProcedure.encode(); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -205,7 +206,7 @@ public class StoredProcedureTest 0x04, 0x01, 0x01, } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a StoredProcedure Container @@ -240,7 +241,7 @@ public class StoredProcedureTest { ByteBuffer bb = storedProcedure.encode(); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java Thu Dec 16 10:19:33 2010 @@ -38,6 +38,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -75,7 +76,7 @@ public class IntermediateResponseTest // responseValue [1] OCTET STRING OPTIONAL } ( byte ) 0x81, 0x05, 'v', 'a', 'l', 'u', 'e' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -108,7 +109,7 @@ public class IntermediateResponseTest // Check the length assertEquals( 0x1D, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -146,7 +147,7 @@ public class IntermediateResponseTest 0x30, 0x19, 0x04, 0x17, '2', '.', '1', '6', '.', '8', '4', '0', '.', '1', '.', '1', '1', '3', '7', '3', '0', '.', '3', '.', '4', '.', '2' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -178,7 +179,7 @@ public class IntermediateResponseTest Control control = controls.get( "2.16.840.1.113730.3.4.2" ); assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() ); - assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) ); + assertEquals( "", Strings.dumpBytes((byte[]) control.getValue()) ); // Check the encoding try @@ -188,7 +189,7 @@ public class IntermediateResponseTest // Check the length assertEquals( 0x3A, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -227,7 +228,7 @@ public class IntermediateResponseTest 0x30, 0x19, 0x04, 0x17, '2', '.', '1', '6', '.', '8', '4', '0', '.', '1', '.', '1', '1', '3', '7', '3', '0', '.', '3', '.', '4', '.', '2' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -259,7 +260,7 @@ public class IntermediateResponseTest Control control = controls.get( "2.16.840.1.113730.3.4.2" ); assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() ); - assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) ); + assertEquals( "", Strings.dumpBytes((byte[]) control.getValue()) ); // Check the encoding try @@ -269,7 +270,7 @@ public class IntermediateResponseTest // Check the length assertEquals( 0x33, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -405,7 +406,7 @@ public class IntermediateResponseTest // responseName [0] LDAPOID, ( byte ) 0x80, 0x0D, '1', '.', '3', '.', '6', '.', '1', '.', '5', '.', '5', '.', '2', } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -437,7 +438,7 @@ public class IntermediateResponseTest // Check the length assertEquals( 0x16, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -471,7 +472,7 @@ public class IntermediateResponseTest ( byte ) 0x80, 0x0D, '1', '.', '3', '.', '6', '.', '1', '.', '5', '.', '5', '.', '2', ( byte ) 0x81, 0x00 } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -504,7 +505,7 @@ public class IntermediateResponseTest // Check the length assertEquals( 0x18, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -534,7 +535,7 @@ public class IntermediateResponseTest // responseValue [1] OCTET STRING OPTIONAL, ( byte ) 0x81, 0x05, 'v', 'a', 'l', 'u', 'e' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -567,7 +568,7 @@ public class IntermediateResponseTest // Check the length assertEquals( 0x0E, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -597,7 +598,7 @@ public class IntermediateResponseTest // responseName [0] LDAPOID, ( byte ) 0x80, 0x0D, '1', '.', '3', '.', '6', '.', '1', '.', '5', '.', '5', '.', '2', } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -630,7 +631,7 @@ public class IntermediateResponseTest // Check the length assertEquals( 0x16, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java Thu Dec 16 10:19:33 2010 @@ -45,7 +45,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.ModifyResponseImpl; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -106,7 +106,7 @@ public class ModifyRequestTest 0x04, 0x05, 'a', 't', 't', 'r', 's', 0x31, 0x06, // vals SET OF AttributeValue } 0x04, 0x04, 't', 'e', 's', 't' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -157,7 +157,7 @@ public class ModifyRequestTest // Check the length assertEquals( 0x54, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -326,7 +326,7 @@ public class ModifyRequestTest // Check the length assertEquals( 0x8C, bb.limit() ); - String decodedPdu1 = StringTools.dumpBytes( bb.array() ); + String decodedPdu1 = Strings.dumpBytes(bb.array()); try { @@ -341,7 +341,7 @@ public class ModifyRequestTest ModifyRequest modifyRequest2 = ( ( LdapMessageContainer ) ldapMessageContainer ).getModifyRequest(); bb = encoder.encodeMessage( modifyRequest2 ); - String decodedPdu2 = StringTools.dumpBytes( bb.array() ); + String decodedPdu2 = Strings.dumpBytes(bb.array()); assertEquals( decodedPdu1, decodedPdu2 ); } @@ -468,7 +468,7 @@ public class ModifyRequestTest // Check the length assertEquals( 0xB9, bb.limit() ); - String decodedPdu1 = StringTools.dumpBytes( bb.array() ); + String decodedPdu1 = Strings.dumpBytes(bb.array()); try { @@ -483,7 +483,7 @@ public class ModifyRequestTest ModifyRequest modifyRequest2 = ( ( LdapMessageContainer ) ldapMessageContainer ).getModifyRequest(); bb = encoder.encodeMessage( modifyRequest2 ); - String decodedPdu2 = StringTools.dumpBytes( bb.array() ); + String decodedPdu2 = Strings.dumpBytes(bb.array()); assertEquals( decodedPdu1, decodedPdu2 ); } @@ -535,7 +535,7 @@ public class ModifyRequestTest 0x04, 0x05, 'a', 't', 't', 'r', 's', 0x31, 0x06, // vals SET OF AttributeValue } 0x04, 0x04, 't', 'e', 's', 't' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -589,7 +589,7 @@ public class ModifyRequestTest // Check the length assertEquals( 0x5C, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -1064,7 +1064,7 @@ public class ModifyRequestTest 's', 'e', 'r', 's', ',', 'o', 'u', '=', 's', 'y', 's', 't', 'e', 'm', 0x30, 0x0C, 0x30, 0x0A, 0x0A, 0x01, 0x00, 0x30, 0x05, 0x04, 0x01, 'l', 0x31, 0x00 } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -1105,7 +1105,7 @@ public class ModifyRequestTest // Check the length assertEquals( 0x37, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -1144,7 +1144,7 @@ public class ModifyRequestTest 0x30, 0x19, 0x04, 0x17, 0x32, 0x2E, 0x31, 0x36, 0x2E, 0x38, 0x34, 0x30, 0x2E, 0x31, 0x2E, 0x31, 0x31, 0x33, 0x37, 0x33, 0x30, 0x2E, 0x33, 0x2E, 0x34, 0x2E, 0x32 } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -1184,7 +1184,7 @@ public class ModifyRequestTest Control control = modifyRequest.getControl( "2.16.840.1.113730.3.4.2" ); assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() ); - assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) ); + assertEquals( "", Strings.dumpBytes((byte[]) control.getValue()) ); // Check the encoding try @@ -1194,7 +1194,7 @@ public class ModifyRequestTest // Check the length assertEquals( 0x54, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -1230,7 +1230,7 @@ public class ModifyRequestTest 's', 'e', 'r', 's', ',', 'o', 'u', '=', 's', 'y', 's', 't', 'e', 'm', 0x30, 0x12, 0x30, 0x10, 0x0A, 0x01, 0x00, 0x30, 0x0B, 0x04, 0x01, 'l', 0x31, 0x06, 0x04, 0x01, 'a', 0x04, 0x01, 'b' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -1277,7 +1277,7 @@ public class ModifyRequestTest // Check the length assertEquals( 0x3D, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java Thu Dec 16 10:19:33 2010 @@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.ModifyResponse; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -81,7 +81,7 @@ public class ModifyResponseTest // } } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -115,7 +115,7 @@ public class ModifyResponseTest // Check the length assertEquals( 0x0E, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -162,7 +162,7 @@ public class ModifyResponseTest 0x30, 0x19, 0x04, 0x17, 0x32, 0x2E, 0x31, 0x36, 0x2E, 0x38, 0x34, 0x30, 0x2E, 0x31, 0x2E, 0x31, 0x31, 0x33, 0x37, 0x33, 0x30, 0x2E, 0x33, 0x2E, 0x34, 0x2E, 0x32 } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -195,7 +195,7 @@ public class ModifyResponseTest Control control = controls.get( "2.16.840.1.113730.3.4.2" ); assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() ); - assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) ); + assertEquals( "", Strings.dumpBytes((byte[]) control.getValue()) ); // Check the encoding try @@ -205,7 +205,7 @@ public class ModifyResponseTest // Check the length assertEquals( 0x2B, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java Thu Dec 16 10:19:33 2010 @@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.ModifyDnResponseImpl; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -89,7 +89,7 @@ public class ModifyDNRequestTest // newSuperior [0] LDAPDN OPTIONAL } ( byte ) 0x80, 0x09, 'o', 'u', '=', 's', 'y', 's', 't', 'e', 'm' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a ModifyRequest Container @@ -122,7 +122,7 @@ public class ModifyDNRequestTest // Check the length assertEquals( 0x48, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -328,7 +328,7 @@ public class ModifyDNRequestTest 0x30, 0x19, 0x04, 0x17, 0x32, 0x2E, 0x31, 0x36, 0x2E, 0x38, 0x34, 0x30, 0x2E, 0x31, 0x2E, 0x31, 0x31, 0x33, 0x37, 0x33, 0x30, 0x2E, 0x33, 0x2E, 0x34, 0x2E, 0x32 } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a ModifyRequest Container @@ -360,7 +360,7 @@ public class ModifyDNRequestTest Control control = modifyDnRequest.getControl( "2.16.840.1.113730.3.4.2" ); assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() ); - assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) ); + assertEquals( "", Strings.dumpBytes((byte[]) control.getValue()) ); // Check the encoding try @@ -370,7 +370,7 @@ public class ModifyDNRequestTest // Check the length assertEquals( 0x65, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -410,7 +410,7 @@ public class ModifyDNRequestTest // newSuperior [0] LDAPDN OPTIONAL } } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a ModifyRequest Container @@ -442,7 +442,7 @@ public class ModifyDNRequestTest // Check the length assertEquals( 0x3D, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -489,7 +489,7 @@ public class ModifyDNRequestTest 0x30, 0x19, 0x04, 0x17, 0x32, 0x2E, 0x31, 0x36, 0x2E, 0x38, 0x34, 0x30, 0x2E, 0x31, 0x2E, 0x31, 0x31, 0x33, 0x37, 0x33, 0x30, 0x2E, 0x33, 0x2E, 0x34, 0x2E, 0x32 } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a ModifyRequest Container @@ -522,7 +522,7 @@ public class ModifyDNRequestTest Control control = modifyDnRequest.getControl( "2.16.840.1.113730.3.4.2" ); assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() ); - assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) ); + assertEquals( "", Strings.dumpBytes((byte[]) control.getValue()) ); // Check the encoding try @@ -532,7 +532,7 @@ public class ModifyDNRequestTest // Check the length assertEquals( 0x5A, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java Thu Dec 16 10:19:33 2010 @@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.ModifyDnResponse; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; @@ -82,7 +82,7 @@ public class ModifyDNResponseTest // } } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -116,7 +116,7 @@ public class ModifyDNResponseTest // Check the length assertEquals( 0x0E, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -165,7 +165,7 @@ public class ModifyDNResponseTest 0x30, 0x19, 0x04, 0x17, 0x32, 0x2E, 0x31, 0x36, 0x2E, 0x38, 0x34, 0x30, 0x2E, 0x31, 0x2E, 0x31, 0x31, 0x33, 0x37, 0x33, 0x30, 0x2E, 0x33, 0x2E, 0x34, 0x2E, 0x32 } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -198,7 +198,7 @@ public class ModifyDNResponseTest Control control = controls.get( "2.16.840.1.113730.3.4.2" ); assertEquals( "2.16.840.1.113730.3.4.2", control.getOid() ); - assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) ); + assertEquals( "", Strings.dumpBytes((byte[]) control.getValue()) ); // Check the encoding try @@ -208,7 +208,7 @@ public class ModifyDNResponseTest // Check the length assertEquals( 0x2B, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java?rev=1049873&r1=1049872&r2=1049873&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java Thu Dec 16 10:19:33 2010 @@ -47,7 +47,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.SearchRequestImpl; import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimToLowerNormalizer; import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer; -import org.apache.directory.shared.ldap.util.StringTools; +import org.apache.directory.shared.util.Strings; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -168,7 +168,7 @@ public class SearchRequestMatchingRuleAs 0x04, 0x05, 'a', 't', 't', 'r', '0', 0x04, 0x05, 'a', 't', 't', 'r', '1', 0x04, 0x05, 'a', 't', 't', 'r', '2' } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -212,7 +212,7 @@ public class SearchRequestMatchingRuleAs // Check the length assertEquals( 0x63, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x56 ), decodedPdu.substring( 0, 0x56 ) ); }