You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2005/12/27 00:32:38 UTC
svn commit: r359127 [2/2] - in
/directory/shared/ldap/trunk/apache2-provider/src:
main/java/org/apache/asn1new/ldap/ main/java/org/apache/asn1new/ldap/codec/
main/java/org/apache/asn1new/ldap/codec/grammar/
main/java/org/apache/asn1new/ldap/codec/primi...
Modified: directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/utils/DNUtils.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/utils/DNUtils.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/utils/DNUtils.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/codec/utils/DNUtils.java Mon Dec 26 15:31:58 2005
@@ -16,7 +16,7 @@
*/
package org.apache.asn1new.ldap.codec.utils;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
/**
* Utility class used by the LdapDN Parser.
@@ -184,7 +184,7 @@
{
byte c = byteArray[index++];
- if ( ( c > 127 ) || ( StringUtils.ALPHA[c] == false ) )
+ if ( ( c > 127 ) || ( StringTools.ALPHA[c] == false ) )
{
return -1;
}
@@ -215,7 +215,7 @@
{
char c = charArray[index++];
- if ( ( c > 127 ) || ( StringUtils.ALPHA[c] == false ) )
+ if ( ( c > 127 ) || ( StringTools.ALPHA[c] == false ) )
{
return PARSING_ERROR;
}
@@ -252,9 +252,9 @@
}
else
{
- if ( StringUtils.isHex( byteArray, index++ ) )
+ if ( StringTools.isHex( byteArray, index++ ) )
{
- return StringUtils.isHex( byteArray, index );
+ return StringTools.isHex( byteArray, index );
}
else
{
@@ -290,9 +290,9 @@
}
else
{
- if ( StringUtils.isHex( charArray, index++ ) )
+ if ( StringTools.isHex( charArray, index++ ) )
{
- return StringUtils.isHex( charArray, index );
+ return StringTools.isHex( charArray, index );
}
else
{
@@ -338,7 +338,7 @@
}
else
{
- return StringUtils.countBytesPerChar(byteArray, index);
+ return StringTools.countBytesPerChar(byteArray, index);
}
}
}
@@ -411,7 +411,7 @@
}
else
{
- return StringUtils.countBytesPerChar(byteArray, index);
+ return StringTools.countBytesPerChar(byteArray, index);
}
}
}
@@ -460,9 +460,9 @@
*/
public static int parseHexPair( byte[] byteArray, int index )
{
- if ( StringUtils.isHex( byteArray, index ) )
+ if ( StringTools.isHex( byteArray, index ) )
{
- if ( StringUtils.isHex( byteArray, index + 1 ) )
+ if ( StringTools.isHex( byteArray, index + 1 ) )
{
return index + 2;
}
@@ -489,9 +489,9 @@
*/
public static int parseHexPair( char[] charArray, int index )
{
- if ( StringUtils.isHex( charArray, index ) )
+ if ( StringTools.isHex( charArray, index ) )
{
- if ( StringUtils.isHex( charArray, index + 1 ) )
+ if ( StringTools.isHex( charArray, index + 1 ) )
{
return index + TWO_CHARS;
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/AddRequest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/AddRequest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/AddRequest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/AddRequest.java Mon Dec 26 15:31:58 2005
@@ -20,11 +20,11 @@
import org.apache.asn1new.ber.tlv.Length;
import org.apache.asn1new.ber.tlv.UniversalTag;
import org.apache.asn1new.ber.tlv.Value;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.asn1new.ldap.codec.LdapConstants;
import org.apache.asn1new.ldap.codec.primitives.LdapDN;
import org.apache.asn1new.ldap.codec.primitives.LdapString;
import org.apache.ldap.common.util.AttributeUtils;
+import org.apache.ldap.common.util.StringTools;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -247,7 +247,7 @@
if ( value instanceof String )
{
- int valueLength = StringUtils.getBytesUtf8( (String)value ).length;
+ int valueLength = StringTools.getBytesUtf8( (String)value ).length;
localValuesLength += 1 + Length.getNbBytes( valueLength ) + valueLength;
}
else
@@ -395,7 +395,7 @@
if ( log.isDebugEnabled() )
{
- log.debug( "AddRequest encoding : " + StringUtils.dumpBytes( buffer.array() ) );
+ log.debug( "AddRequest encoding : " + StringTools.dumpBytes( buffer.array() ) );
log.debug( "AddRequest initial value : " + toString() );
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/BindRequest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/BindRequest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/BindRequest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/BindRequest.java Mon Dec 26 15:31:58 2005
@@ -24,7 +24,7 @@
import org.apache.asn1new.ber.tlv.Value;
import org.apache.asn1new.ldap.codec.LdapConstants;
import org.apache.asn1new.ldap.codec.primitives.LdapDN;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
/**
@@ -256,7 +256,7 @@
sb.append( " BindRequest\n" );
sb.append( " Version : '" ).append( version ).append( "'\n" );
- if ( StringUtils.isEmpty( name.toString() ) )
+ if ( StringTools.isEmpty( name.toString() ) )
{
sb.append( " Name : anonymous\n" );
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/CompareRequest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/CompareRequest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/CompareRequest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/CompareRequest.java Mon Dec 26 15:31:58 2005
@@ -26,7 +26,7 @@
import org.apache.asn1new.ldap.codec.LdapConstants;
import org.apache.asn1new.ldap.codec.primitives.LdapDN;
import org.apache.asn1new.ldap.codec.primitives.LdapString;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
/**
@@ -179,7 +179,7 @@
if ( assertionValue instanceof String )
{
- int assertionValueLength = StringUtils.getBytesUtf8( (String)assertionValue ).length;
+ int assertionValueLength = StringTools.getBytesUtf8( (String)assertionValue ).length;
avaLength +=
1 + Length.getNbBytes( assertionValueLength ) + assertionValueLength;
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/Control.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/Control.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/Control.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/Control.java Mon Dec 26 15:31:58 2005
@@ -25,7 +25,7 @@
import org.apache.asn1new.ber.tlv.UniversalTag;
import org.apache.asn1new.ber.tlv.Value;
import org.apache.asn1new.ldap.codec.primitives.LdapString;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
/**
@@ -86,7 +86,7 @@
}
else if ( controlValue instanceof String )
{
- return StringUtils.getBytesUtf8( (String)controlValue );
+ return StringTools.getBytesUtf8( (String)controlValue );
}
else
{
@@ -226,7 +226,7 @@
}
else
{
- sb.append(" Control value : '").append( StringUtils.dumpBytes( (byte[])controlValue ) ).append("'\n");
+ sb.append(" Control value : '").append( StringTools.dumpBytes( (byte[])controlValue ) ).append("'\n");
}
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ExtendedResponse.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ExtendedResponse.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ExtendedResponse.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ExtendedResponse.java Mon Dec 26 15:31:58 2005
@@ -22,8 +22,8 @@
import org.apache.asn1.codec.EncoderException;
import org.apache.asn1new.ber.tlv.Length;
import org.apache.asn1new.primitives.OID;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.asn1new.ldap.codec.LdapConstants;
+import org.apache.ldap.common.util.StringTools;
/**
@@ -142,7 +142,7 @@
{
if ( response instanceof String )
{
- int responseLength = StringUtils.getBytesUtf8( (String)response ).length;
+ int responseLength = StringTools.getBytesUtf8( (String)response ).length;
extendedResponseLength += 1 + Length.getNbBytes( responseLength ) + responseLength;
}
else
@@ -202,7 +202,7 @@
if ( response instanceof String )
{
- byte[] responseBytes = StringUtils.getBytesUtf8( (String)response );
+ byte[] responseBytes = StringTools.getBytesUtf8( (String)response );
buffer.put( Length.getBytes( responseBytes.length ) );
if ( responseBytes.length != 0 )
Modified: directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ModifyRequest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ModifyRequest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ModifyRequest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/ModifyRequest.java Mon Dec 26 15:31:58 2005
@@ -20,10 +20,10 @@
import org.apache.asn1new.ber.tlv.Length;
import org.apache.asn1new.ber.tlv.UniversalTag;
import org.apache.asn1new.ber.tlv.Value;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.asn1new.ldap.codec.LdapConstants;
import org.apache.asn1new.ldap.codec.primitives.LdapDN;
import org.apache.asn1new.ldap.codec.primitives.LdapString;
+import org.apache.ldap.common.util.StringTools;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -159,7 +159,7 @@
*/
public void addAttributeTypeAndValues( LdapString type )
{
- currentAttribute = new BasicAttribute( StringUtils.lowerCase( type.getString() ) );
+ currentAttribute = new BasicAttribute( StringTools.lowerCase( type.getString() ) );
int operation = 0;
@@ -316,7 +316,7 @@
if ( value instanceof String )
{
- int valueLength = StringUtils.getBytesUtf8( (String)value ).length;
+ int valueLength = StringTools.getBytesUtf8( (String)value ).length;
localValuesLength += 1 + Length.getNbBytes( valueLength ) + valueLength;
}
else
@@ -550,7 +550,7 @@
if ( attributeValue instanceof String )
{
- sb.append( StringUtils.utf8ToString( (byte[])attributeValue ) ).append( "' \n" );
+ sb.append( StringTools.utf8ToString( (byte[])attributeValue ) ).append( "' \n" );
}
else
{
Modified: directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchRequest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchRequest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchRequest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchRequest.java Mon Dec 26 15:31:58 2005
@@ -24,7 +24,7 @@
import org.apache.asn1new.ldap.codec.primitives.LdapDN;
import org.apache.asn1new.ldap.codec.primitives.LdapString;
import org.apache.asn1new.ldap.pojo.filters.Filter;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import java.io.UnsupportedEncodingException;
import java.nio.BufferOverflowException;
@@ -126,7 +126,7 @@
*/
public void addAttribute( LdapString attribute )
{
- attributes.put( new BasicAttribute( StringUtils.lowerCase( attribute.getString() ) ) );
+ attributes.put( new BasicAttribute( StringTools.lowerCase( attribute.getString() ) ) );
}
/**
Modified: directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchResultEntry.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchResultEntry.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchResultEntry.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/SearchResultEntry.java Mon Dec 26 15:31:58 2005
@@ -20,11 +20,11 @@
import org.apache.asn1new.ber.tlv.Length;
import org.apache.asn1new.ber.tlv.UniversalTag;
import org.apache.asn1new.ber.tlv.Value;
-import org.apache.asn1.codec.util.StringUtils;
import org.apache.asn1new.ldap.codec.LdapConstants;
import org.apache.asn1new.ldap.codec.primitives.LdapDN;
import org.apache.asn1new.ldap.codec.primitives.LdapString;
import org.apache.ldap.common.util.AttributeUtils;
+import org.apache.ldap.common.util.StringTools;
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
@@ -166,7 +166,7 @@
*/
public void addAttributeValues( LdapString type )
{
- currentAttributeValue = new BasicAttribute( StringUtils.lowerCase( type.getString() ) );
+ currentAttributeValue = new BasicAttribute( StringTools.lowerCase( type.getString() ) );
partialAttributeList.put( currentAttributeValue );
}
@@ -262,7 +262,7 @@
{
String stringValue = (String)value;
- int stringLength = StringUtils.getBytesUtf8( stringValue ).length;
+ int stringLength = StringTools.getBytesUtf8( stringValue ).length;
localValuesLength += 1 + Length.getNbBytes( stringLength ) + stringLength;
}
else
Modified: directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/AttributeValueAssertionFilter.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/AttributeValueAssertionFilter.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/AttributeValueAssertionFilter.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/AttributeValueAssertionFilter.java Mon Dec 26 15:31:58 2005
@@ -24,7 +24,7 @@
import org.apache.asn1new.ber.tlv.Value;
import org.apache.asn1new.ldap.codec.LdapConstants;
import org.apache.asn1new.ldap.pojo.AttributeValueAssertion;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
/**
@@ -132,7 +132,7 @@
if ( assertionValue instanceof String )
{
- assertionValueLength = StringUtils.getBytesUtf8( (String)assertionValue ).length;
+ assertionValueLength = StringTools.getBytesUtf8( (String)assertionValue ).length;
}
else
{
Modified: directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/ExtensibleMatchFilter.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/ExtensibleMatchFilter.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/ExtensibleMatchFilter.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/main/java/org/apache/asn1new/ldap/pojo/filters/ExtensibleMatchFilter.java Mon Dec 26 15:31:58 2005
@@ -25,7 +25,7 @@
import org.apache.asn1new.ber.tlv.Value;
import org.apache.asn1new.ldap.codec.LdapConstants;
import org.apache.asn1new.ldap.codec.primitives.LdapString;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
/**
@@ -203,7 +203,7 @@
{
if ( matchValue instanceof String )
{
- int matchValueLength = StringUtils.getBytesUtf8( (String)matchValue ).length;
+ int matchValueLength = StringTools.getBytesUtf8( (String)matchValue ).length;
matchingRuleAssertionLength += 1 + Length.getNbBytes( matchValueLength ) + matchValueLength;
}
else
@@ -287,7 +287,7 @@
if ( matchValue instanceof String )
{
- byte[] matchValueBytes = StringUtils.getBytesUtf8( (String)matchValue );
+ byte[] matchValueBytes = StringTools.getBytesUtf8( (String)matchValue );
buffer.put( Length.getBytes( matchValueBytes.length ) );
if ( matchValueBytes.length != 0 )
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/AbandonRequestTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/AbandonRequestTest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/AbandonRequestTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/AbandonRequestTest.java Mon Dec 26 15:31:58 2005
@@ -24,7 +24,7 @@
import org.apache.asn1new.ber.containers.IAsn1Container;
import org.apache.asn1new.ldap.pojo.AbandonRequest;
import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -52,7 +52,7 @@
// AbandonRequest ::= [APPLICATION 16] MessageID
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a LdapMessageContainer Container
@@ -84,7 +84,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
@@ -130,7 +130,7 @@
0x04, 0x0D, '1', '.', '3', '.', '6', '.', '1', '.', '5', '.', '5', '.', '4'
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a LdapMessageContainer Container
@@ -162,7 +162,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
@@ -190,7 +190,7 @@
// AbandonRequest ::= [APPLICATION 16] MessageID
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a LdapMessageContainer Container
@@ -222,7 +222,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/AddRequestTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/AddRequestTest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/AddRequestTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/AddRequestTest.java Mon Dec 26 15:31:58 2005
@@ -31,7 +31,7 @@
import org.apache.asn1new.ber.containers.IAsn1Container;
import org.apache.asn1new.ldap.pojo.AddRequest;
import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -76,7 +76,7 @@
0x04, 0x05, 't', 'e', 's', 't', '3',
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a LdapMessage Container
@@ -161,7 +161,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/AddResponseTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/AddResponseTest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/AddResponseTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/AddResponseTest.java Mon Dec 26 15:31:58 2005
@@ -24,7 +24,7 @@
import org.apache.asn1new.ber.containers.IAsn1Container;
import org.apache.asn1new.ldap.pojo.AddResponse;
import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -59,7 +59,7 @@
// }
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a LdapMessage Container
@@ -92,7 +92,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/BindRequestTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/BindRequestTest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/BindRequestTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/BindRequestTest.java Mon Dec 26 15:31:58 2005
@@ -26,7 +26,7 @@
import org.apache.asn1new.ldap.pojo.LdapMessage;
import org.apache.asn1new.ldap.pojo.SaslCredentials;
import org.apache.asn1new.ldap.pojo.SimpleAuthentication;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -60,7 +60,7 @@
'p', 'a', 's', 's', 'w', 'o', 'r', 'd'
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a LdapMessage Container
@@ -85,7 +85,7 @@
Assert.assertEquals( 3, br.getVersion() );
Assert.assertEquals( "uid=akarasulu,dc=example,dc=com", br.getName() );
Assert.assertEquals( true, ( br.getAuthentication() instanceof SimpleAuthentication ) );
- Assert.assertEquals( "password", StringUtils.utf8ToString( ( ( SimpleAuthentication ) br.getAuthentication() ).getSimple() ) );
+ Assert.assertEquals( "password", StringTools.utf8ToString( ( ( SimpleAuthentication ) br.getAuthentication() ).getSimple() ) );
// Check the length
Assert.assertEquals(0x35, message.computeLength());
@@ -95,7 +95,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
@@ -172,7 +172,7 @@
'p', 'a', 's', 's', 'w', 'o', 'r', 'd'
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
@@ -198,7 +198,7 @@
Assert.assertEquals( 3, br.getVersion() );
Assert.assertEquals( "", br.getName() );
Assert.assertEquals( true, ( br.getAuthentication() instanceof SimpleAuthentication ) );
- Assert.assertEquals( "password", StringUtils.utf8ToString( ( (SimpleAuthentication)br.getAuthentication() ).getSimple() ) );
+ Assert.assertEquals( "password", StringTools.utf8ToString( ( (SimpleAuthentication)br.getAuthentication() ).getSimple() ) );
// Check the length
Assert.assertEquals(0x16, message.computeLength());
@@ -208,7 +208,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
@@ -247,7 +247,7 @@
'K', 'E', 'R', 'B', 'E', 'R', 'O', 'S', '_', 'V', '4'
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a LdapMessage Container
@@ -282,7 +282,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
@@ -326,7 +326,7 @@
'a', 'b', 'c', 'd', 'e', 'f'
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a LdapMessage Container
@@ -352,7 +352,7 @@
Assert.assertEquals( "uid=akarasulu,dc=example,dc=com", br.getName() );
Assert.assertEquals( true, ( br.getAuthentication() instanceof SaslCredentials ) );
Assert.assertEquals( "KERBEROS_V4", ( ( SaslCredentials ) br.getAuthentication() ).getMechanism() );
- Assert.assertEquals( "abcdef", StringUtils.utf8ToString( ( ( SaslCredentials ) br.getAuthentication() ).getCredentials() ) );
+ Assert.assertEquals( "abcdef", StringTools.utf8ToString( ( ( SaslCredentials ) br.getAuthentication() ).getCredentials() ) );
// Check the length
Assert.assertEquals(0x40, message.computeLength());
@@ -362,7 +362,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/BindResponseTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/BindResponseTest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/BindResponseTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/BindResponseTest.java Mon Dec 26 15:31:58 2005
@@ -24,7 +24,7 @@
import org.apache.asn1new.ber.containers.IAsn1Container;
import org.apache.asn1new.ldap.pojo.BindResponse;
import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -60,7 +60,7 @@
// serverSaslCreds [7] OCTET STRING OPTIONAL }
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a LdapMessage Container
@@ -94,7 +94,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
@@ -132,7 +132,7 @@
(byte)0x87, 0x02, 'A', 'B' // serverSaslCreds [7] OCTET STRING OPTIONAL }
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a LdapMessage Container
@@ -157,7 +157,7 @@
Assert.assertEquals( 0, br.getLdapResult().getResultCode() );
Assert.assertEquals( "", br.getLdapResult().getMatchedDN() );
Assert.assertEquals( "", br.getLdapResult().getErrorMessage() );
- Assert.assertEquals( "AB", StringUtils.utf8ToString( br.getServerSaslCreds() ) );
+ Assert.assertEquals( "AB", StringTools.utf8ToString( br.getServerSaslCreds() ) );
// Check the length
Assert.assertEquals(0x12, message.computeLength());
@@ -167,7 +167,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/CompareRequestTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/CompareRequestTest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/CompareRequestTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/CompareRequestTest.java Mon Dec 26 15:31:58 2005
@@ -26,7 +26,7 @@
import org.apache.asn1new.ber.containers.IAsn1Container;
import org.apache.asn1new.ldap.pojo.CompareRequest;
import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -64,7 +64,7 @@
0x04, 0x05, 'v', 'a', 'l', 'u', 'e'
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a LdapMessage Container
@@ -98,7 +98,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/CompareResponseTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/CompareResponseTest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/CompareResponseTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/CompareResponseTest.java Mon Dec 26 15:31:58 2005
@@ -24,7 +24,7 @@
import org.apache.asn1new.ber.containers.IAsn1Container;
import org.apache.asn1new.ldap.pojo.CompareResponse;
import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -61,7 +61,7 @@
// }
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a LdapMessage Container
@@ -95,7 +95,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/DelRequestTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/DelRequestTest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/DelRequestTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/DelRequestTest.java Mon Dec 26 15:31:58 2005
@@ -26,7 +26,7 @@
import org.apache.asn1new.ber.containers.IAsn1Container;
import org.apache.asn1new.ldap.pojo.DelRequest;
import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -58,7 +58,7 @@
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 = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a LdapMessage Container
@@ -90,7 +90,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/DelResponseTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/DelResponseTest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/DelResponseTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/DelResponseTest.java Mon Dec 26 15:31:58 2005
@@ -24,7 +24,7 @@
import org.apache.asn1new.ber.containers.IAsn1Container;
import org.apache.asn1new.ldap.pojo.DelResponse;
import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -63,7 +63,7 @@
// }
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a LdapMessage Container
@@ -97,7 +97,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ExtendedRequestTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ExtendedRequestTest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ExtendedRequestTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ExtendedRequestTest.java Mon Dec 26 15:31:58 2005
@@ -26,7 +26,7 @@
import org.apache.asn1new.ber.containers.IAsn1Container;
import org.apache.asn1new.ldap.pojo.ExtendedRequest;
import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -59,7 +59,7 @@
(byte)0x81, 0x05, 'v', 'a', 'l', 'u', 'e'
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a LdapMessage Container
@@ -82,7 +82,7 @@
Assert.assertEquals( 1, message.getMessageId() );
Assert.assertEquals( "1.3.6.1.5.5.2", extendedRequest.getRequestName() );
- Assert.assertEquals( "value", StringUtils.utf8ToString( extendedRequest.getRequestValue() ) );
+ Assert.assertEquals( "value", StringTools.utf8ToString( extendedRequest.getRequestValue() ) );
// Check the length
Assert.assertEquals(0x16, message.computeLength());
@@ -92,7 +92,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
@@ -123,7 +123,7 @@
(byte)0x80, 0x06, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x02,
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a LdapMessage Container
@@ -155,7 +155,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ExtendedResponseTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ExtendedResponseTest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ExtendedResponseTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ExtendedResponseTest.java Mon Dec 26 15:31:58 2005
@@ -26,7 +26,7 @@
import org.apache.asn1new.ber.containers.IAsn1Container;
import org.apache.asn1new.ldap.pojo.ExtendedResponse;
import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -67,7 +67,7 @@
(byte)0x8B, 0x05, 'v', 'a', 'l', 'u', 'e'
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a LdapMessage Container
@@ -93,7 +93,7 @@
Assert.assertEquals( "", extendedResponse.getLdapResult().getMatchedDN() );
Assert.assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() );
Assert.assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() );
- Assert.assertEquals( "value", StringUtils.utf8ToString( (byte[])extendedResponse.getResponse() ) );
+ Assert.assertEquals( "value", StringTools.utf8ToString( (byte[])extendedResponse.getResponse() ) );
// Check the length
Assert.assertEquals(0x1D, message.computeLength());
@@ -103,7 +103,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
@@ -140,7 +140,7 @@
// referral [3] Referral OPTIONAL } // requestName [0] LDAPOID,
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a LdapMessage Container
@@ -174,7 +174,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/LdapDecoderTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/LdapDecoderTest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/LdapDecoderTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/LdapDecoderTest.java Mon Dec 26 15:31:58 2005
@@ -26,7 +26,7 @@
import org.apache.asn1new.ldap.pojo.BindRequest;
import org.apache.asn1new.ldap.pojo.LdapMessage;
import org.apache.asn1new.ldap.pojo.SimpleAuthentication;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import java.nio.ByteBuffer;
@@ -91,7 +91,7 @@
Assert.assertEquals( "uid=akarasulu,dc=example,dc=com", br.getName() );
Assert.assertEquals( true, ( br.getAuthentication() instanceof SimpleAuthentication ) );
Assert.assertEquals( "password",
- StringUtils.utf8ToString( ( ( SimpleAuthentication ) br.getAuthentication() ).getSimple() ) );
+ StringTools.utf8ToString( ( ( SimpleAuthentication ) br.getAuthentication() ).getSimple() ) );
}
/**
@@ -217,7 +217,7 @@
Assert.assertEquals( "uid=akarasulu,dc=example,dc=com", br.getName() );
Assert.assertEquals( true, ( br.getAuthentication() instanceof SimpleAuthentication ) );
Assert.assertEquals( "password",
- StringUtils.utf8ToString( ( ( SimpleAuthentication ) br.getAuthentication() ).getSimple() ) );
+ StringTools.utf8ToString( ( ( SimpleAuthentication ) br.getAuthentication() ).getSimple() ) );
}
/**
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ModifyDNRequestTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ModifyDNRequestTest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ModifyDNRequestTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ModifyDNRequestTest.java Mon Dec 26 15:31:58 2005
@@ -26,7 +26,7 @@
import org.apache.asn1new.ber.containers.IAsn1Container;
import org.apache.asn1new.ldap.pojo.LdapMessage;
import org.apache.asn1new.ldap.pojo.ModifyDNRequest;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -64,7 +64,7 @@
(byte)0x80, 0x09, 'o', 'u', '=', 's', 'y', 's', 't', 'e', 'm'
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a ModifyRequest Container
@@ -97,7 +97,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
@@ -134,7 +134,7 @@
// newSuperior [0] LDAPDN OPTIONAL }
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a ModifyRequest Container
@@ -166,7 +166,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ModifyDNResponseTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ModifyDNResponseTest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ModifyDNResponseTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ModifyDNResponseTest.java Mon Dec 26 15:31:58 2005
@@ -24,7 +24,7 @@
import org.apache.asn1new.ber.containers.IAsn1Container;
import org.apache.asn1new.ldap.pojo.LdapMessage;
import org.apache.asn1new.ldap.pojo.ModifyDNResponse;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -61,7 +61,7 @@
// }
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a LdapMessage Container
@@ -95,7 +95,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ModifyRequestTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ModifyRequestTest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ModifyRequestTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ModifyRequestTest.java Mon Dec 26 15:31:58 2005
@@ -32,7 +32,7 @@
import org.apache.asn1new.ber.containers.IAsn1Container;
import org.apache.asn1new.ldap.pojo.LdapMessage;
import org.apache.asn1new.ldap.pojo.ModifyRequest;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -87,7 +87,7 @@
0x04, 0x04, 't', 'e', 's', 't'
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a LdapMessage Container
@@ -148,7 +148,7 @@
}
else
{
- Assert.assertTrue( vals.contains( StringUtils.utf8ToString( (byte[])value ) ) );
+ Assert.assertTrue( vals.contains( StringTools.utf8ToString( (byte[])value ) ) );
}
vals.remove( value.toString() );
@@ -162,7 +162,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
@@ -282,7 +282,7 @@
}
else
{
- Assert.assertTrue( vals.contains( StringUtils.utf8ToString( (byte[])value ) ) );
+ Assert.assertTrue( vals.contains( StringTools.utf8ToString( (byte[])value ) ) );
}
vals.remove( value.toString() );
@@ -295,7 +295,7 @@
try
{
ByteBuffer bb = message.encode( null );
- String decodedPdu1 = StringUtils.dumpBytes( bb.array() );
+ String decodedPdu1 = StringTools.dumpBytes( bb.array() );
try
{
@@ -311,7 +311,7 @@
ByteBuffer bb2 = message2.encode( null );
- String decodedPdu2 = StringUtils.dumpBytes( bb2.array() );
+ String decodedPdu2 = StringTools.dumpBytes( bb2.array() );
Assert.assertEquals( decodedPdu1, decodedPdu2 );
}
@@ -435,7 +435,7 @@
}
else
{
- Assert.assertTrue( vals.contains( StringUtils.utf8ToString( (byte[])value ) ) );
+ Assert.assertTrue( vals.contains( StringTools.utf8ToString( (byte[])value ) ) );
}
vals.remove( value.toString() );
@@ -448,7 +448,7 @@
try
{
ByteBuffer bb = message.encode( null );
- String decodedPdu1 = StringUtils.dumpBytes( bb.array() );
+ String decodedPdu1 = StringTools.dumpBytes( bb.array() );
try
{
@@ -464,7 +464,7 @@
ByteBuffer bb2 = message2.encode( null );
- String decodedPdu2 = StringUtils.dumpBytes( bb2.array() );
+ String decodedPdu2 = StringTools.dumpBytes( bb2.array() );
Assert.assertEquals( decodedPdu1, decodedPdu2 );
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ModifyResponseTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ModifyResponseTest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ModifyResponseTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/ModifyResponseTest.java Mon Dec 26 15:31:58 2005
@@ -24,7 +24,7 @@
import org.apache.asn1new.ber.containers.IAsn1Container;
import org.apache.asn1new.ldap.pojo.LdapMessage;
import org.apache.asn1new.ldap.pojo.ModifyResponse;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -61,7 +61,7 @@
// }
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a LdapMessage Container
@@ -95,7 +95,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchRequestTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchRequestTest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchRequestTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchRequestTest.java Mon Dec 26 15:31:58 2005
@@ -36,7 +36,7 @@
import org.apache.asn1new.ldap.pojo.filters.OrFilter;
import org.apache.asn1new.ldap.pojo.filters.PresentFilter;
import org.apache.asn1new.ldap.pojo.filters.SubstringFilter;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -110,7 +110,7 @@
0x04, 0x05, 'a', 't', 't', 'r', '2' // AttributeDescription ::= LDAPString
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a BindRequest Container
@@ -198,7 +198,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu.substring( 0, 0x81 ), decodedPdu.substring( 0, 0x81 ) );
}
@@ -273,7 +273,7 @@
0x04, 0x05, 'a', 't', 't', 'r', '2' // AttributeDescription ::= LDAPString
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a BindRequest Container
@@ -365,7 +365,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu.substring( 0, 0x81 ), decodedPdu.substring( 0, 0x81 ) );
}
@@ -435,7 +435,7 @@
0x04, 0x05, 'a', 't', 't', 'r', '2' // AttributeDescription ::= LDAPString
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a BindRequest Container
@@ -520,7 +520,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu.substring( 0, 0x6C ), decodedPdu.substring( 0, 0x6C ) );
}
@@ -576,7 +576,7 @@
0x00, 0x00
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a BindRequest Container
@@ -621,7 +621,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu.substring( 0, decodedPdu.length() - 35) );
}
@@ -681,7 +681,7 @@
0x04, 0x05, 'a', 't', 't', 'r', '2' // AttributeDescription ::= LDAPString
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a BindRequest Container
@@ -733,7 +733,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu.substring( 0, 0x53 ), decodedPdu.substring( 0, 0x53 ) );
}
@@ -793,7 +793,7 @@
0x04, 0x05, 'a', 't', 't', 'r', '2' // AttributeDescription ::= LDAPString
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a BindRequest Container
@@ -847,7 +847,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu.substring( 0, 0x53 ), decodedPdu.substring( 0, 0x53 ) );
}
@@ -908,7 +908,7 @@
0x04, 0x05, 'a', 't', 't', 'r', '2' // AttributeDescription ::= LDAPString
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a BindRequest Container
@@ -962,7 +962,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu.substring( 0, 0x58 ), decodedPdu.substring( 0, 0x58 ) );
}
@@ -1024,7 +1024,7 @@
0x04, 0x05, 'a', 't', 't', 'r', '2' // AttributeDescription ::= LDAPString
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a BindRequest Container
@@ -1078,7 +1078,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu.substring( 0, 0x5B ), decodedPdu.substring( 0, 0x5B ) );
}
@@ -1139,7 +1139,7 @@
0x04, 0x05, 'a', 't', 't', 'r', '2' // AttributeDescription ::= LDAPString
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a BindRequest Container
@@ -1192,7 +1192,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu.substring( 0, 0x58 ), decodedPdu.substring( 0, 0x58 ) );
}
@@ -1254,7 +1254,7 @@
0x04, 0x05, 'a', 't', 't', 'r', '2' // AttributeDescription ::= LDAPString
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a BindRequest Container
@@ -1309,7 +1309,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu.substring( 0, 0x5B ), decodedPdu.substring( 0, 0x5B ) );
}
@@ -1370,7 +1370,7 @@
0x04, 0x05, 'a', 't', 't', 'r', '2' // AttributeDescription ::= LDAPString
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a BindRequest Container
@@ -1423,7 +1423,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu.substring( 0, 0x58 ), decodedPdu.substring( 0, 0x58 ) );
}
@@ -1485,7 +1485,7 @@
0x04, 0x05, 'a', 't', 't', 'r', '2' // AttributeDescription ::= LDAPString
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a BindRequest Container
@@ -1541,7 +1541,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu.substring( 0, 0x5B ), decodedPdu.substring( 0, 0x5B ) );
}
@@ -1594,7 +1594,7 @@
0x04, 0x05, 0x61, 0x74, 0x74, 0x72, 0x32 // attr2
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a BindRequest Container
@@ -1673,7 +1673,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu.substring( 0, 0x87 ), decodedPdu.substring( 0, 0x87 ) );
}
@@ -1718,7 +1718,7 @@
0x04, 0x05, 0x61, 0x74, 0x74, 0x72, 0x32 // attr2
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a BindRequest Container
@@ -1763,7 +1763,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu.substring( 0, 0x56 ), decodedPdu.substring( 0, 0x56 ) );
}
@@ -1815,7 +1815,7 @@
ByteBuffer stream = ByteBuffer.allocate( asn1BER.length );
stream.put( asn1BER );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
IAsn1Container ldapMessageContainer = new LdapMessageContainer();
@@ -1861,7 +1861,7 @@
try
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
catch ( EncoderException ee )
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchResultDoneTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchResultDoneTest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchResultDoneTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchResultDoneTest.java Mon Dec 26 15:31:58 2005
@@ -24,7 +24,7 @@
import org.apache.asn1new.ber.containers.IAsn1Container;
import org.apache.asn1new.ldap.pojo.LdapMessage;
import org.apache.asn1new.ldap.pojo.SearchResultDone;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -62,7 +62,7 @@
// }
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a BindRequest Container
@@ -94,7 +94,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchResultEntryTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchResultEntryTest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchResultEntryTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchResultEntryTest.java Mon Dec 26 15:31:58 2005
@@ -30,7 +30,7 @@
import org.apache.asn1new.ber.containers.IAsn1Container;
import org.apache.asn1new.ldap.pojo.LdapMessage;
import org.apache.asn1new.ldap.pojo.SearchResultEntry;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -75,7 +75,7 @@
0x04, 0x12, 'o', 'r', 'g', 'a', 'n', 'i', 'z', 'a', 't', 'i', 'o', 'n', 'a', 'l', 'U', 'n', 'i', 't'
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a BindRequest Container
@@ -132,7 +132,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
@@ -288,7 +288,7 @@
0x02, 0x01, 0x02 // messageID MessageID ...
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a BindRequest Container
@@ -354,7 +354,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
// We have to supress the last 5 chars from the decodedPDU, as they
// belongs to the next message.
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchResultReferenceTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchResultReferenceTest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchResultReferenceTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/SearchResultReferenceTest.java Mon Dec 26 15:31:58 2005
@@ -30,7 +30,7 @@
import org.apache.asn1new.ldap.codec.primitives.LdapURLEncodingException;
import org.apache.asn1new.ldap.pojo.LdapMessage;
import org.apache.asn1new.ldap.pojo.SearchResultReference;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -100,7 +100,7 @@
}
}
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a BindRequest Container
@@ -159,7 +159,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/UnBindRequestTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/UnBindRequestTest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/UnBindRequestTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/UnBindRequestTest.java Mon Dec 26 15:31:58 2005
@@ -23,7 +23,7 @@
import org.apache.asn1new.ber.Asn1Decoder;
import org.apache.asn1new.ber.containers.IAsn1Container;
import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -49,7 +49,7 @@
// UnbindRequest ::= [APPLICATION 2] NULL
} );
- String decodedPdu = StringUtils.dumpBytes( stream.array() );
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a BindRequest Container
@@ -76,7 +76,7 @@
{
ByteBuffer bb = message.encode( null );
- String encodedPdu = StringUtils.dumpBytes( bb.array() );
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
Assert.assertEquals(encodedPdu, decodedPdu );
}
Modified: directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/utils/DNUtilsTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/utils/DNUtilsTest.java?rev=359127&r1=359126&r2=359127&view=diff
==============================================================================
--- directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/utils/DNUtilsTest.java (original)
+++ directory/shared/ldap/trunk/apache2-provider/src/test/org/apache/asn1new/ldap/codec/utils/DNUtilsTest.java Mon Dec 26 15:31:58 2005
@@ -16,7 +16,7 @@
*/
package org.apache.asn1new.ldap.codec.utils;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.ldap.common.util.StringTools;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -36,7 +36,7 @@
public void testAreEqualsFull()
{
// Full compare
- Assert.assertEquals( 6, StringUtils.areEquals( "azerty".getBytes(), 0, "azerty" ) );
+ Assert.assertEquals( 6, StringTools.areEquals( "azerty".getBytes(), 0, "azerty" ) );
}
/**
@@ -45,7 +45,7 @@
public void testAreEqualsDiff()
{
// First character is !=
- Assert.assertEquals( -1, StringUtils.areEquals( "azerty".getBytes(), 0, "Azerty" ) );
+ Assert.assertEquals( -1, StringTools.areEquals( "azerty".getBytes(), 0, "Azerty" ) );
}
/**
@@ -54,7 +54,7 @@
public void testAreEqualsEmpty()
{
// Compare to an empty string
- Assert.assertEquals( -1, StringUtils.areEquals( "azerty".getBytes(), 0, "" ) );
+ Assert.assertEquals( -1, StringTools.areEquals( "azerty".getBytes(), 0, "" ) );
}
/**
@@ -63,7 +63,7 @@
public void testAreEqualsFirstCharDiff()
{
// First character is !=
- Assert.assertEquals( -1, StringUtils.areEquals( "azerty".getBytes(), 0, "Azerty" ) );
+ Assert.assertEquals( -1, StringTools.areEquals( "azerty".getBytes(), 0, "Azerty" ) );
}
/**
@@ -72,7 +72,7 @@
public void testAreEqualsMiddleCharDiff()
{
// First character is !=
- Assert.assertEquals( -1, StringUtils.areEquals( "azerty".getBytes(), 0, "azeRty" ) );
+ Assert.assertEquals( -1, StringTools.areEquals( "azerty".getBytes(), 0, "azeRty" ) );
}
/**
@@ -81,7 +81,7 @@
public void testAreEqualsLastCharDiff()
{
// First character is !=
- Assert.assertEquals( -1, StringUtils.areEquals( "azerty".getBytes(), 0, "azertY" ) );
+ Assert.assertEquals( -1, StringTools.areEquals( "azerty".getBytes(), 0, "azertY" ) );
}
/**
@@ -90,12 +90,12 @@
public void testAreEqualsCharByChar()
{
// Index must be incremented after each comparison
- Assert.assertEquals( 1, StringUtils.areEquals( "azerty".getBytes(), 0, "a" ) );
- Assert.assertEquals( 2, StringUtils.areEquals( "azerty".getBytes(), 1, "z" ) );
- Assert.assertEquals( 3, StringUtils.areEquals( "azerty".getBytes(), 2, "e" ) );
- Assert.assertEquals( 4, StringUtils.areEquals( "azerty".getBytes(), 3, "r" ) );
- Assert.assertEquals( 5, StringUtils.areEquals( "azerty".getBytes(), 4, "t" ) );
- Assert.assertEquals( 6, StringUtils.areEquals( "azerty".getBytes(), 5, "y" ) );
+ Assert.assertEquals( 1, StringTools.areEquals( "azerty".getBytes(), 0, "a" ) );
+ Assert.assertEquals( 2, StringTools.areEquals( "azerty".getBytes(), 1, "z" ) );
+ Assert.assertEquals( 3, StringTools.areEquals( "azerty".getBytes(), 2, "e" ) );
+ Assert.assertEquals( 4, StringTools.areEquals( "azerty".getBytes(), 3, "r" ) );
+ Assert.assertEquals( 5, StringTools.areEquals( "azerty".getBytes(), 4, "t" ) );
+ Assert.assertEquals( 6, StringTools.areEquals( "azerty".getBytes(), 5, "y" ) );
}
/**
@@ -104,7 +104,7 @@
public void testAreEqualsTooShort()
{
// length too short
- Assert.assertEquals( -1, StringUtils.areEquals( "azerty".getBytes(), 0, "azertyiop" ) );
+ Assert.assertEquals( -1, StringTools.areEquals( "azerty".getBytes(), 0, "azertyiop" ) );
}
/**
@@ -113,7 +113,7 @@
public void testAreEqualsTooShortMiddle()
{
// length too short
- Assert.assertEquals( -1, StringUtils.areEquals( "azerty".getBytes(), 0, "ertyiop" ) );
+ Assert.assertEquals( -1, StringTools.areEquals( "azerty".getBytes(), 0, "ertyiop" ) );
}
/**
@@ -122,7 +122,7 @@
public void testAreEqualsLastChar()
{
// last character
- Assert.assertEquals( 6, StringUtils.areEquals( "azerty".getBytes(), 5, "y" ) );
+ Assert.assertEquals( 6, StringTools.areEquals( "azerty".getBytes(), 5, "y" ) );
}
/**
@@ -131,6 +131,6 @@
public void testAreEqualsMiddle()
{
// In the middle
- Assert.assertEquals( 4, StringUtils.areEquals( "azerty".getBytes(), 2, "er" ) );
+ Assert.assertEquals( 4, StringTools.areEquals( "azerty".getBytes(), 2, "er" ) );
}
}