Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 47943 invoked from network); 20 Jan 2011 17:50:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 20 Jan 2011 17:50:34 -0000 Received: (qmail 76304 invoked by uid 500); 20 Jan 2011 17:50:34 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 76185 invoked by uid 500); 20 Jan 2011 17:50:34 -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 76079 invoked by uid 99); 20 Jan 2011 17:50:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 17:50: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, 20 Jan 2011 17:50:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E72482388AB9; Thu, 20 Jan 2011 17:49:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1061416 [5/6] - in /directory: apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/ apacheds/trunk/core-integ/src/test/j... Date: Thu, 20 Jan 2011 17:49:55 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110120174957.E72482388AB9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java Thu Jan 20 17:49:48 2011 @@ -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/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/CancelRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/CancelRequestTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/CancelRequestTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/CancelRequestTest.java Thu Jan 20 17:49:48 2011 @@ -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/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/CertGenerationRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/CertGenerationRequestTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/CertGenerationRequestTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/CertGenerationRequestTest.java Thu Jan 20 17:49:48 2011 @@ -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/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectTest.java Thu Jan 20 17:49:48 2011 @@ -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/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdownTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdownTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdownTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdownTest.java Thu Jan 20 17:49:48 2011 @@ -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/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/StoredProcedureTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/StoredProcedureTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/StoredProcedureTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/StoredProcedureTest.java Thu Jan 20 17:49:48 2011 @@ -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/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java Thu Jan 20 17:49:48 2011 @@ -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/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java Thu Jan 20 17:49:48 2011 @@ -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/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java Thu Jan 20 17:49:48 2011 @@ -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/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java Thu Jan 20 17:49:48 2011 @@ -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/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java Thu Jan 20 17:49:48 2011 @@ -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/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=1061416&r1=1061415&r2=1061416&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 Thu Jan 20 17:49:48 2011 @@ -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 ) ); } 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=1061416&r1=1061415&r2=1061416&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 Thu Jan 20 17:49:48 2011 @@ -46,7 +46,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.control.Control; 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; @@ -148,7 +148,7 @@ public class SearchRequestSubstringTest // LDAPString } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -200,7 +200,7 @@ public class SearchRequestSubstringTest // Check the length assertEquals( 0x64, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x53 ), decodedPdu.substring( 0, 0x53 ) ); } @@ -294,7 +294,7 @@ public class SearchRequestSubstringTest 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 BindRequest Container @@ -343,7 +343,7 @@ public class SearchRequestSubstringTest Control control = searchRequest.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 // We won't check the whole PDU, as it may differs because @@ -355,7 +355,7 @@ public class SearchRequestSubstringTest // Check the length assertEquals( 0x0081, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x53 ), decodedPdu.substring( 0, 0x53 ) ); } @@ -422,7 +422,7 @@ public class SearchRequestSubstringTest // LDAPString } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -476,7 +476,7 @@ public class SearchRequestSubstringTest // Check the length assertEquals( 0x64, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x53 ), decodedPdu.substring( 0, 0x53 ) ); } @@ -544,7 +544,7 @@ public class SearchRequestSubstringTest // LDAPString } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -598,7 +598,7 @@ public class SearchRequestSubstringTest // Check the length assertEquals( 0x67, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x58 ), decodedPdu.substring( 0, 0x58 ) ); } @@ -667,7 +667,7 @@ public class SearchRequestSubstringTest // LDAPString } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -721,7 +721,7 @@ public class SearchRequestSubstringTest // Check the length assertEquals( 0x6A, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x5B ), decodedPdu.substring( 0, 0x5B ) ); } @@ -789,7 +789,7 @@ public class SearchRequestSubstringTest // LDAPString } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -842,7 +842,7 @@ public class SearchRequestSubstringTest // Check the length assertEquals( 0x67, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x58 ), decodedPdu.substring( 0, 0x58 ) ); } @@ -914,7 +914,7 @@ public class SearchRequestSubstringTest 0x04, 0x05, 'a', 't', 't', 'r', '2' // AttributeDescription ::= LDAPString } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -969,7 +969,7 @@ public class SearchRequestSubstringTest // Check the length assertEquals( 0x6A, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x5B ), decodedPdu.substring( 0, 0x5B ) ); } @@ -1037,7 +1037,7 @@ public class SearchRequestSubstringTest // LDAPString } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -1090,7 +1090,7 @@ public class SearchRequestSubstringTest // Check the length assertEquals( 0x67, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x58 ), decodedPdu.substring( 0, 0x58 ) ); } @@ -1159,7 +1159,7 @@ public class SearchRequestSubstringTest // LDAPString } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -1215,7 +1215,7 @@ public class SearchRequestSubstringTest // Check the length assertEquals( 0x6A, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x5B ), decodedPdu.substring( 0, 0x5B ) ); } @@ -1302,7 +1302,7 @@ public class SearchRequestSubstringTest // LDAPString } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -1356,7 +1356,7 @@ public class SearchRequestSubstringTest // Check the length assertEquals( 0x67, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x5B ), decodedPdu.substring( 0, 0x5B ) ); } Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java Thu Jan 20 17:49:48 2011 @@ -55,7 +55,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.control.Control; 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.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -168,7 +168,7 @@ public class SearchRequestTest 0x04, 0x05, 'a', 't', 't', 'r', '2' // AttributeDescription ::= LDAPString } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -261,7 +261,7 @@ public class SearchRequestTest // Check the length assertEquals( 0x90, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x81 ), decodedPdu.substring( 0, 0x81 ) ); } @@ -335,7 +335,7 @@ public class SearchRequestTest 0x04, 0x05, 'a', 't', 't', 'r', '2' // AttributeDescription ::= LDAPString } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -429,7 +429,7 @@ public class SearchRequestTest // Check the length assertEquals( 0x0090, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x81 ), decodedPdu.substring( 0, 0x81 ) ); } @@ -510,7 +510,7 @@ public class SearchRequestTest // LDAPString } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -597,7 +597,7 @@ public class SearchRequestTest // Check the length assertEquals( 0x7B, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x6C ), decodedPdu.substring( 0, 0x6C ) ); } @@ -655,7 +655,7 @@ public class SearchRequestTest 0x00, 0x00, // Some trailing 00, useless. 0x00, 0x00, 0x00, 0x00 } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -702,7 +702,7 @@ public class SearchRequestTest // Check the length assertEquals( 0x39, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu.substring( 0, decodedPdu.length() - 35 ) ); } @@ -933,7 +933,7 @@ public class SearchRequestTest 0x04, 0x05, 'a', 't', 't', 'r', '2' // attr2 } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -1015,7 +1015,7 @@ public class SearchRequestTest // Check the length assertEquals( 0x0096, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x87 ), decodedPdu.substring( 0, 0x87 ) ); } @@ -1069,7 +1069,7 @@ public class SearchRequestTest ByteBuffer stream = ByteBuffer.allocate( asn1BER.length ); stream.put( asn1BER ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); Asn1Container ldapMessageContainer = new LdapMessageContainer(); @@ -1120,7 +1120,7 @@ public class SearchRequestTest // Check the length assertEquals( 0x81, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( decodedPdu, encodedPdu ); } catch ( EncoderException ee ) @@ -1369,7 +1369,7 @@ public class SearchRequestTest ByteBuffer stream = ByteBuffer.allocate( asn1BER.length ); stream.put( asn1BER ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); Asn1Container ldapMessageContainer = new LdapMessageContainer(); @@ -1417,7 +1417,7 @@ public class SearchRequestTest // Check the length assertEquals( 0x5F, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( decodedPdu, encodedPdu ); } catch ( EncoderException ee ) @@ -1555,7 +1555,7 @@ public class SearchRequestTest 0x04, 0x05, 'a', 't', 't', 'r', '2' // AttributeDescription ::= LDAPString } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -1648,7 +1648,7 @@ public class SearchRequestTest // Check the length assertEquals( 0x6F, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x6F ), decodedPdu.substring( 0, 0x6F ) ); } @@ -2585,7 +2585,7 @@ public class SearchRequestTest ByteBuffer stream = ByteBuffer.allocate( asn1BER.length ); stream.put( asn1BER ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -2638,7 +2638,7 @@ public class SearchRequestTest // Check the length assertEquals( 0x43, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -2677,7 +2677,7 @@ public class SearchRequestTest ByteBuffer stream = ByteBuffer.allocate( asn1BER.length ); stream.put( asn1BER ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -2731,7 +2731,7 @@ public class SearchRequestTest // Check the length assertEquals( 0x46, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -3018,7 +3018,7 @@ public class SearchRequestTest ByteBuffer stream = ByteBuffer.allocate( asn1BER.length ); stream.put( asn1BER ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a LdapMessage Container @@ -3082,7 +3082,7 @@ public class SearchRequestTest // Check the length assertEquals( 0x62, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -3133,7 +3133,7 @@ public class SearchRequestTest 0x30, 0x00, // AttributeDescriptionList ::= SEQUENCE OF AttributeDescription } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -3185,7 +3185,7 @@ public class SearchRequestTest // Check the length assertEquals( 0x25, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x25 ), decodedPdu.substring( 0, 0x25 ) ); } @@ -3237,7 +3237,7 @@ public class SearchRequestTest 0x30, 0x00, // AttributeDescriptionList ::= SEQUENCE OF AttributeDescription } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -3296,7 +3296,7 @@ public class SearchRequestTest // Check the length assertEquals( 0x27, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x27 ), decodedPdu.substring( 0, 0x27 ) ); } @@ -3353,7 +3353,7 @@ public class SearchRequestTest 0x30, 0x00, // AttributeDescriptionList ::= SEQUENCE OF AttributeDescription } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -3422,7 +3422,7 @@ public class SearchRequestTest // Check the length assertEquals( 0x2F, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x2F ), decodedPdu.substring( 0, 0x2F ) ); } @@ -3473,7 +3473,7 @@ public class SearchRequestTest 0x30, 0x00, // AttributeDescriptionList ::= SEQUENCE OF AttributeDescription } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -3539,7 +3539,7 @@ public class SearchRequestTest // Check the length assertEquals( 0x29, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x29 ), decodedPdu.substring( 0, 0x29 ) ); } @@ -3596,7 +3596,7 @@ public class SearchRequestTest 0x30, 0x00, // AttributeDescriptionList ::= SEQUENCE OF AttributeDescription } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -3672,7 +3672,7 @@ public class SearchRequestTest // Check the length assertEquals( 0x31, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x31 ), decodedPdu.substring( 0, 0x31 ) ); } @@ -3728,7 +3728,7 @@ public class SearchRequestTest 0x30, 0x00, // AttributeDescriptionList ::= SEQUENCE OF AttributeDescription } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -3804,7 +3804,7 @@ public class SearchRequestTest // Check the length assertEquals( 0x31, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x31 ), decodedPdu.substring( 0, 0x31 ) ); } @@ -3864,7 +3864,7 @@ public class SearchRequestTest 0x30, 0x00, // AttributeDescriptionList ::= SEQUENCE OF AttributeDescription } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -3950,7 +3950,7 @@ public class SearchRequestTest // Check the length assertEquals( 0x39, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x39 ), decodedPdu.substring( 0, 0x39 ) ); } @@ -4010,7 +4010,7 @@ public class SearchRequestTest 0x30, 0x00, // AttributeDescriptionList ::= SEQUENCE OF AttributeDescription } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -4096,7 +4096,7 @@ public class SearchRequestTest // Check the length assertEquals( 0x39, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x39 ), decodedPdu.substring( 0, 0x39 ) ); } @@ -4153,7 +4153,7 @@ public class SearchRequestTest 0x30, 0x00 // AttributeDescriptionList ::= SEQUENCE OF AttributeDescription } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -4236,7 +4236,7 @@ public class SearchRequestTest // Check the length assertEquals( 0x33, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x33 ), decodedPdu.substring( 0, 0x33 ) ); } @@ -4297,7 +4297,7 @@ public class SearchRequestTest 0x30, 0x00 // AttributeDescriptionList ::= SEQUENCE OF AttributeDescription } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -4390,7 +4390,7 @@ public class SearchRequestTest // Check the length assertEquals( 0x3B, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x3B ), decodedPdu.substring( 0, 0x3B ) ); } @@ -4446,7 +4446,7 @@ public class SearchRequestTest 0x30, 0x00 // AttributeDescriptionList ::= SEQUENCE OF AttributeDescription } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -4528,7 +4528,7 @@ public class SearchRequestTest // Check the length assertEquals( 0x3B, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu.substring( 0, 0x3B ), decodedPdu.substring( 0, 0x3B ) ); } Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java Thu Jan 20 17:49:48 2011 @@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.SearchResultDone; 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 SearchResultDoneTest // } } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -112,7 +112,7 @@ public class SearchResultDoneTest // Check the length assertEquals( 0x0E, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); } @@ -161,7 +161,7 @@ public class SearchResultDoneTest } ); - String decodedPdu = StringTools.dumpBytes( stream.array() ); + String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); // Allocate a BindRequest Container @@ -191,7 +191,7 @@ public class SearchResultDoneTest 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 @@ -201,7 +201,7 @@ public class SearchResultDoneTest // Check the length assertEquals( 0x2B, bb.limit() ); - String encodedPdu = StringTools.dumpBytes( bb.array() ); + String encodedPdu = Strings.dumpBytes(bb.array()); assertEquals( encodedPdu, decodedPdu ); }