You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/01/20 18:49:55 UTC
svn commit: r1061416 [2/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...
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java Thu Jan 20 17:49:48 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.codec.options.ApOptions;
import org.apache.directory.shared.kerberos.components.EncryptedData;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -320,7 +320,7 @@ public class ApReq extends KerberosMessa
if ( IS_DEBUG )
{
- LOG.debug( "AP-REQ encoding : {}", StringTools.dumpBytes( buffer.array() ) );
+ LOG.debug( "AP-REQ encoding : {}", Strings.dumpBytes(buffer.array()) );
LOG.debug( "AP-REQ initial value : {}", toString() );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java Thu Jan 20 17:49:48 2011
@@ -35,6 +35,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.EncryptionKey;
import org.apache.directory.shared.kerberos.components.PrincipalName;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -524,7 +525,7 @@ public class Authenticator extends Kerbe
if ( IS_DEBUG )
{
- LOG.debug( "Authenticator encoding : {}", StringTools.dumpBytes( buffer.array() ) );
+ LOG.debug( "Authenticator encoding : {}", Strings.dumpBytes(buffer.array()) );
LOG.debug( "Authenticator initial value : {}", toString() );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncApRepPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncApRepPart.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncApRepPart.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncApRepPart.java Thu Jan 20 17:49:48 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.KerberosTime;
import org.apache.directory.shared.kerberos.components.EncryptionKey;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -302,7 +302,7 @@ public class EncApRepPart extends Kerber
if ( IS_DEBUG )
{
- LOG.debug( "EncApRepPart encoding : {}", StringTools.dumpBytes( buffer.array() ) );
+ LOG.debug( "EncApRepPart encoding : {}", Strings.dumpBytes(buffer.array()) );
LOG.debug( "EncApRepPart initial value : {}", toString() );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbCred.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbCred.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbCred.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbCred.java Thu Jan 20 17:49:48 2011
@@ -34,7 +34,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.components.EncryptedData;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -190,7 +190,7 @@ public class KrbCred extends KerberosMes
if ( IS_DEBUG )
{
- log.debug( "KrbCred encoding : {}", StringTools.dumpBytes( buffer.array() ) );
+ log.debug( "KrbCred encoding : {}", Strings.dumpBytes(buffer.array()) );
log.debug( "KrbCred initial value : {}", toString() );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java Thu Jan 20 17:49:48 2011
@@ -34,6 +34,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.PrincipalName;
import org.apache.directory.shared.kerberos.exceptions.ErrorType;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -647,7 +648,7 @@ public class KrbError extends KerberosMe
if ( IS_DEBUG )
{
- log.debug( "KrbError encoding : {}", StringTools.dumpBytes( buffer.array() ) );
+ log.debug( "KrbError encoding : {}", Strings.dumpBytes(buffer.array()) );
log.debug( "KrbError initial value : {}", toString() );
}
@@ -701,7 +702,7 @@ public class KrbError extends KerberosMe
if ( eData != null )
{
- sb.append( " eData: " ).append( StringTools.dumpBytes( eData ) ).append( '\n' );
+ sb.append( " eData: " ).append( Strings.dumpBytes(eData) ).append( '\n' );
}
sb.append( "}\n" );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbPriv.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbPriv.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbPriv.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbPriv.java Thu Jan 20 17:49:48 2011
@@ -32,7 +32,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.components.EncryptedData;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -177,7 +177,7 @@ public class KrbPriv extends KerberosMes
if ( IS_DEBUG )
{
- log.debug( "KrbPriv encoding : {}", StringTools.dumpBytes( buffer.array() ) );
+ log.debug( "KrbPriv encoding : {}", Strings.dumpBytes(buffer.array()) );
log.debug( "KrbPriv initial value : {}", toString() );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbSafe.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbSafe.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbSafe.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbSafe.java Thu Jan 20 17:49:48 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.components.Checksum;
import org.apache.directory.shared.kerberos.components.KrbSafeBody;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -216,7 +216,7 @@ public class KrbSafe extends KerberosMes
if ( IS_DEBUG )
{
- log.debug( "KrbSafe encoding : {}", StringTools.dumpBytes( buffer.array() ) );
+ log.debug( "KrbSafe encoding : {}", Strings.dumpBytes(buffer.array()) );
log.debug( "KrbSafe initial value : {}", toString() );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java Thu Jan 20 17:49:48 2011
@@ -35,6 +35,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.PrincipalName;
import org.apache.directory.shared.kerberos.exceptions.InvalidTicketException;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -341,7 +342,7 @@ public class Ticket extends KerberosMess
if ( IS_DEBUG )
{
- LOG.debug( "Ticket encoding : {}", StringTools.dumpBytes( buffer.array() ) );
+ LOG.debug( "Ticket encoding : {}", Strings.dumpBytes(buffer.array()) );
LOG.debug( "Ticket initial value : {}", toString() );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/components/TicketTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/components/TicketTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/components/TicketTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/components/TicketTest.java Thu Jan 20 17:49:48 2011
@@ -28,7 +28,7 @@ import org.apache.directory.junit.tools.
import org.apache.directory.server.kerberos.shared.store.TicketFactory;
import org.apache.directory.shared.kerberos.components.EncryptionKey;
import org.apache.directory.shared.kerberos.messages.Ticket;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -86,8 +86,8 @@ public class TicketTest
};
// We will just compared the first bytes (everything before the encrypted data)
- String expectedResultString = StringTools.dumpBytes( expectedResult );
- String resultString = StringTools.dumpBytes( encodedTicket ).substring( 0, expectedResultString.length() );
+ String expectedResultString = Strings.dumpBytes(expectedResult);
+ String resultString = Strings.dumpBytes(encodedTicket).substring( 0, expectedResultString.length() );
assertEquals( expectedResultString, resultString );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedDataTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedDataTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedDataTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedDataTest.java Thu Jan 20 17:49:48 2011
@@ -30,7 +30,7 @@ import org.apache.directory.junit.tools.
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.apache.directory.shared.kerberos.components.EncryptedData;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -64,7 +64,7 @@ public class EncryptedDataTest
0x04, 0x04, 0x01, 0x02, 0x03, 0x04
};
- assertEquals( StringTools.dumpBytes( expectedResult ), StringTools.dumpBytes( encoded.array() ) );
+ assertEquals( Strings.dumpBytes(expectedResult), Strings.dumpBytes(encoded.array()) );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalNameTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalNameTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalNameTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalNameTest.java Thu Jan 20 17:49:48 2011
@@ -28,7 +28,7 @@ import org.apache.directory.junit.tools.
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
import org.apache.directory.shared.kerberos.codec.types.PrincipalNameType;
import org.apache.directory.shared.kerberos.components.PrincipalName;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -61,7 +61,7 @@ public class PrincipalNameTest
'T', 'e', 's', 't'
};
- assertEquals( StringTools.dumpBytes( expectedResult ), StringTools.dumpBytes( encoded.array() ) );
+ assertEquals( Strings.dumpBytes(expectedResult), Strings.dumpBytes(encoded.array()) );
}
@@ -91,7 +91,7 @@ public class PrincipalNameTest
'T', 'e', 's', 't', '3'
};
- assertEquals( StringTools.dumpBytes( expectedResult ), StringTools.dumpBytes( encoded.array() ) );
+ assertEquals( Strings.dumpBytes(expectedResult), Strings.dumpBytes(encoded.array()) );
}
@@ -114,6 +114,6 @@ public class PrincipalNameTest
0x1B, 0x00
};
- assertEquals( StringTools.dumpBytes( expectedResult ), StringTools.dumpBytes( encoded.array() ) );
+ assertEquals( Strings.dumpBytes(expectedResult), Strings.dumpBytes(encoded.array()) );
}
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdAndOrDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdAndOrDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdAndOrDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdAndOrDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.kerberos.codec.adAndOr.AdAndOrContainer;
import org.apache.directory.shared.kerberos.components.AdAndOr;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
/**
@@ -66,7 +66,7 @@ public class AdAndOrDecoderTest
0x04, 0x06, 'g', 'h', 'i', 'j', 'k', 'l'
} );
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
AdAndOrContainer adAndOrContainer = new AdAndOrContainer();
@@ -94,7 +94,7 @@ public class AdAndOrDecoderTest
// Check the length
assertEquals( 0x2D, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
assertEquals( encodedPdu, decodedPdu );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdIfRelevantDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdIfRelevantDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdIfRelevantDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdIfRelevantDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -36,6 +36,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.AdIfRelevant;
import org.apache.directory.shared.kerberos.components.AuthorizationDataEntry;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
/**
@@ -68,7 +69,7 @@ public class AdIfRelevantDecoderTest
0x04, 0x06, 'g', 'h', 'i', 'j', 'k', 'l'
} );
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
AdIfRelevantContainer adIfRelevantContainer = new AdIfRelevantContainer();
@@ -108,7 +109,7 @@ public class AdIfRelevantDecoderTest
// Check the length
assertEquals( 0x24, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
assertEquals( encodedPdu, decodedPdu );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdKdcIssuedDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdKdcIssuedDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdKdcIssuedDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdKdcIssuedDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -45,6 +45,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.PrincipalName;
import org.apache.directory.shared.kerberos.crypto.checksum.ChecksumType;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -99,7 +100,7 @@ public class AdKdcIssuedDecoderTest
0x04, 0x06, 'g', 'h', 'i', 'j', 'k', 'l'
} );
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
// Allocate a AdKdcIssued Container
@@ -157,7 +158,7 @@ public class AdKdcIssuedDecoderTest
// Check the length
assertEquals( 0x60, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
assertEquals( encodedPdu, decodedPdu );
}
@@ -202,7 +203,7 @@ public class AdKdcIssuedDecoderTest
0x04, 0x06, 'g', 'h', 'i', 'j', 'k', 'l'
} );
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
// Allocate a AdKdcIssued Container
@@ -260,7 +261,7 @@ public class AdKdcIssuedDecoderTest
// Check the length
assertEquals( 0x3B, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
assertEquals( encodedPdu, decodedPdu );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdMandatoryForKdcDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdMandatoryForKdcDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdMandatoryForKdcDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdMandatoryForKdcDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -36,6 +36,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.AdMandatoryForKdc;
import org.apache.directory.shared.kerberos.components.AuthorizationDataEntry;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
/**
@@ -68,7 +69,7 @@ public class AdMandatoryForKdcDecoderTes
0x04, 0x06, 'g', 'h', 'i', 'j', 'k', 'l'
} );
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
AdMandatoryForKdcContainer adMandatoryForKdcContainer = new AdMandatoryForKdcContainer();
@@ -108,7 +109,7 @@ public class AdMandatoryForKdcDecoderTes
// Check the length
assertEquals( 0x24, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
assertEquals( encodedPdu, decodedPdu );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthenticatorDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthenticatorDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthenticatorDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthenticatorDecoderTest.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.kerberos.codec.authenticator.AuthenticatorContainer;
import org.apache.directory.shared.kerberos.messages.Authenticator;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -107,7 +107,7 @@ public class AuthenticatorDecoderTest
0x04, 0x06, 'g', 'h', 'i', 'j', 'k', 'l'
});
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
// Allocate a Authenticator Container
@@ -140,7 +140,7 @@ public class AuthenticatorDecoderTest
// Check the length
assertEquals( 0x95, encodedPdu.limit() );
- assertEquals( decodedPdu, StringTools.dumpBytes( encodedPdu.array() ) );
+ assertEquals( decodedPdu, Strings.dumpBytes(encodedPdu.array()) );
}
catch ( EncoderException ee )
{
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthorizationDataDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthorizationDataDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthorizationDataDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthorizationDataDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -36,6 +36,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.AuthorizationData;
import org.apache.directory.shared.kerberos.components.AuthorizationDataEntry;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
/**
@@ -68,7 +69,7 @@ public class AuthorizationDataDecoderTes
0x04, 0x03, 'g', 'h', 'i'
} );
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
AuthorizationDataContainer authDataContainer = new AuthorizationDataContainer();
@@ -108,7 +109,7 @@ public class AuthorizationDataDecoderTes
// Check the length
assertEquals( 0x21, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
assertEquals( encodedPdu, decodedPdu );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ChecksumDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ChecksumDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ChecksumDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ChecksumDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -34,6 +34,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.Checksum;
import org.apache.directory.shared.kerberos.crypto.checksum.ChecksumType;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
/**
@@ -59,7 +60,7 @@ public class ChecksumDecoderTest
0x04, 0x06, 'c', 'h', 'k', 's', 'u', 'm'
} );
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
ChecksumContainer chkContainer = new ChecksumContainer();
@@ -87,7 +88,7 @@ public class ChecksumDecoderTest
// Check the length
assertEquals( 0x11, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
assertEquals( encodedPdu, decodedPdu );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfo2DecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfo2DecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfo2DecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfo2DecoderTest.java Thu Jan 20 17:49:48 2011
@@ -35,7 +35,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.apache.directory.shared.kerberos.components.ETypeInfo2;
import org.apache.directory.shared.kerberos.components.ETypeInfo2Entry;
-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 +74,7 @@ public class ETypeInfo2DecoderTest
0x1B, 0x04, 0x35, 0x36, 0x37, 0x38
} );
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
// Allocate a ETypeInfo2 Container
@@ -116,7 +116,7 @@ public class ETypeInfo2DecoderTest
// Check the length
assertEquals( 0x20, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
assertEquals( encodedPdu, decodedPdu );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfo2EntryDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfo2EntryDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfo2EntryDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfo2EntryDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -35,6 +35,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.apache.directory.shared.kerberos.components.ETypeInfo2Entry;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
/**
@@ -65,7 +66,7 @@ public class ETypeInfo2EntryDecoderTest
0x04, 0x04, 0x31, 0x32, 0x33, 0x34
} );
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
ETypeInfo2EntryContainer container = new ETypeInfo2EntryContainer();
@@ -96,7 +97,7 @@ public class ETypeInfo2EntryDecoderTest
// Check the length
assertEquals( 0x17, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
assertEquals( encodedPdu, decodedPdu );
}
@@ -124,7 +125,7 @@ public class ETypeInfo2EntryDecoderTest
0x02, 0x01, 0x05
} );
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
ETypeInfo2EntryContainer container = new ETypeInfo2EntryContainer();
@@ -155,7 +156,7 @@ public class ETypeInfo2EntryDecoderTest
// Check the length
assertEquals( 0x07, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
assertEquals( encodedPdu, decodedPdu );
}
@@ -242,7 +243,7 @@ public class ETypeInfo2EntryDecoderTest
// Check the length
assertEquals( 0x07, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
ByteBuffer stream2 = ByteBuffer.allocate( 0x07 );
@@ -253,7 +254,7 @@ public class ETypeInfo2EntryDecoderTest
0x02, 0x01, 0x05
} );
- String decodedPdu2 = StringTools.dumpBytes( stream2.array() );
+ String decodedPdu2 = Strings.dumpBytes(stream2.array());
assertEquals( encodedPdu, decodedPdu2 );
}
@@ -417,7 +418,7 @@ public class ETypeInfo2EntryDecoderTest
// Check the length
assertEquals( 0x07, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
ByteBuffer stream2 = ByteBuffer.allocate( 0x07 );
@@ -428,7 +429,7 @@ public class ETypeInfo2EntryDecoderTest
0x02, 0x01, (byte)0xFF
} );
- String decodedPdu2 = StringTools.dumpBytes( stream2.array() );
+ String decodedPdu2 = Strings.dumpBytes(stream2.array());
assertEquals( decodedPdu2, encodedPdu );
}
catch ( EncoderException ee )
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfoDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfoDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfoDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfoDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -38,6 +38,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.ETypeInfo;
import org.apache.directory.shared.kerberos.components.ETypeInfoEntry;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -76,7 +77,7 @@ public class ETypeInfoDecoderTest
0x04, 0x04, 0x35, 0x36, 0x37, 0x38
} );
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
// Allocate a ETypeInfo Container
@@ -118,7 +119,7 @@ public class ETypeInfoDecoderTest
// Check the length
assertEquals( 0x20, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
assertEquals( encodedPdu, decodedPdu );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfoEntryDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfoEntryDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfoEntryDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfoEntryDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -35,6 +35,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.apache.directory.shared.kerberos.components.ETypeInfoEntry;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
/**
@@ -63,7 +64,7 @@ public class ETypeInfoEntryDecoderTest
0x04, 0x04, 0x31, 0x32, 0x33, 0x34
} );
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
ETypeInfoEntryContainer container = new ETypeInfoEntryContainer();
@@ -93,7 +94,7 @@ public class ETypeInfoEntryDecoderTest
// Check the length
assertEquals( 0x0F, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
assertEquals( encodedPdu, decodedPdu );
}
@@ -121,7 +122,7 @@ public class ETypeInfoEntryDecoderTest
0x02, 0x01, 0x05
} );
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
ETypeInfoEntryContainer container = new ETypeInfoEntryContainer();
@@ -151,7 +152,7 @@ public class ETypeInfoEntryDecoderTest
// Check the length
assertEquals( 0x07, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
assertEquals( encodedPdu, decodedPdu );
}
@@ -237,7 +238,7 @@ public class ETypeInfoEntryDecoderTest
// Check the length
assertEquals( 0x07, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
ByteBuffer stream2 = ByteBuffer.allocate( 0x07 );
@@ -248,7 +249,7 @@ public class ETypeInfoEntryDecoderTest
0x02, 0x01, 0x05
} );
- String decodedPdu2 = StringTools.dumpBytes( stream2.array() );
+ String decodedPdu2 = Strings.dumpBytes(stream2.array());
assertEquals( encodedPdu, decodedPdu2 );
}
@@ -411,7 +412,7 @@ public class ETypeInfoEntryDecoderTest
// Check the length
assertEquals( 0x07, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
ByteBuffer stream2 = ByteBuffer.allocate( 0x07 );
@@ -422,7 +423,7 @@ public class ETypeInfoEntryDecoderTest
0x02, 0x01, (byte)0xFF
} );
- String decodedPdu2 = StringTools.dumpBytes( stream2.array() );
+ String decodedPdu2 = Strings.dumpBytes(stream2.array());
assertEquals( decodedPdu2, encodedPdu );
}
catch ( EncoderException ee )
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncApRepPartDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncApRepPartDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncApRepPartDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncApRepPartDecoderTest.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.kerberos.codec.encApRepPart.EncApRepPartContainer;
import org.apache.directory.shared.kerberos.messages.EncApRepPart;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -76,7 +76,7 @@ public class EncApRepPartDecoderTest
0x30, 0x39,
});
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
// Allocate a EncApRepPart Container
@@ -109,7 +109,7 @@ public class EncApRepPartDecoderTest
// Check the length
assertEquals( 0x33, encodedPdu.limit() );
- assertEquals( decodedPdu, StringTools.dumpBytes( encodedPdu.array() ) );
+ assertEquals( decodedPdu, Strings.dumpBytes(encodedPdu.array()) );
}
catch ( EncoderException ee )
{
@@ -298,7 +298,7 @@ public class EncApRepPartDecoderTest
0x30, 0x39,
});
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
// Allocate a EncApRepPart Container
@@ -331,7 +331,7 @@ public class EncApRepPartDecoderTest
// Check the length
assertEquals( 0x22, encodedPdu.limit() );
- assertEquals( decodedPdu, StringTools.dumpBytes( encodedPdu.array() ) );
+ assertEquals( decodedPdu, Strings.dumpBytes(encodedPdu.array()) );
}
catch ( EncoderException ee )
{
@@ -367,7 +367,7 @@ public class EncApRepPartDecoderTest
0x04, 0x04, 'A', 'B', 'C', 'D',
});
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
// Allocate a EncApRepPart Container
@@ -400,7 +400,7 @@ public class EncApRepPartDecoderTest
// Check the length
assertEquals( 0x2D, encodedPdu.limit() );
- assertEquals( decodedPdu, StringTools.dumpBytes( encodedPdu.array() ) );
+ assertEquals( decodedPdu, Strings.dumpBytes(encodedPdu.array()) );
}
catch ( EncoderException ee )
{
@@ -430,7 +430,7 @@ public class EncApRepPartDecoderTest
0x02, 0x01, 0x7F,
});
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
// Allocate a EncApRepPart Container
@@ -463,7 +463,7 @@ public class EncApRepPartDecoderTest
// Check the length
assertEquals( 0x1C, encodedPdu.limit() );
- assertEquals( decodedPdu, StringTools.dumpBytes( encodedPdu.array() ) );
+ assertEquals( decodedPdu, Strings.dumpBytes(encodedPdu.array()) );
}
catch ( EncoderException ee )
{
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPartDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPartDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPartDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPartDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.kerberos.codec.EncKdcRepPart.EncKdcRepPartContainer;
import org.apache.directory.shared.kerberos.components.EncKdcRepPart;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
/**
@@ -400,7 +400,7 @@ public class EncKdcRepPartDecoderTest
0x61, 0x62, 0x63, 0x64, 0x65, 0x66,
});
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
// Allocate a EncKdcRepPart Container
@@ -429,7 +429,7 @@ public class EncKdcRepPartDecoderTest
encKdcRepPart.encode( bb );
- String encoded = StringTools.dumpBytes( bb.array() );
+ String encoded = Strings.dumpBytes(bb.array());
assertEquals( decoded, encoded );
}
catch( EncoderException e )
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKrbPrivPartDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKrbPrivPartDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKrbPrivPartDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKrbPrivPartDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.kerberos.codec.encKrbPrivPart.EncKrbPrivPartContainer;
import org.apache.directory.shared.kerberos.components.EncKrbPrivPart;
import org.apache.directory.shared.kerberos.components.HostAddress;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
/**
@@ -78,7 +78,7 @@ public class EncKrbPrivPartDecoderTest
0x04, 0x04, 127, 0, 0, 1
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
EncKrbPrivPartContainer container = new EncKrbPrivPartContainer( stream );
@@ -114,7 +114,7 @@ public class EncKrbPrivPartDecoderTest
encKrbPrivPart.encode( bb );
- String encoded = StringTools.dumpBytes( bb.array() );
+ String encoded = Strings.dumpBytes(bb.array());
assertEquals( decoded, encoded );
}
catch( EncoderException e )
@@ -156,7 +156,7 @@ public class EncKrbPrivPartDecoderTest
0x04, 0x04, 127, 0, 0, 1
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
EncKrbPrivPartContainer container = new EncKrbPrivPartContainer( stream );
@@ -191,7 +191,7 @@ public class EncKrbPrivPartDecoderTest
enKrbPrivPart.encode( bb );
- String encoded = StringTools.dumpBytes( bb.array() );
+ String encoded = Strings.dumpBytes(bb.array());
assertEquals( decoded, encoded );
}
catch( EncoderException e )
@@ -231,7 +231,7 @@ public class EncKrbPrivPartDecoderTest
0x04, 0x04, 127, 0, 0, 1
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
EncKrbPrivPartContainer container = new EncKrbPrivPartContainer( stream );
@@ -266,7 +266,7 @@ public class EncKrbPrivPartDecoderTest
encKrbPrivPart.encode( bb );
- String encoded = StringTools.dumpBytes( bb.array() );
+ String encoded = Strings.dumpBytes(bb.array());
assertEquals( decoded, encoded );
}
catch( EncoderException e )
@@ -304,7 +304,7 @@ public class EncKrbPrivPartDecoderTest
0x04, 0x04, 127, 0, 0, 1
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
EncKrbPrivPartContainer container = new EncKrbPrivPartContainer( stream );
@@ -340,7 +340,7 @@ public class EncKrbPrivPartDecoderTest
encKrbPrivPart.encode( bb );
- String encoded = StringTools.dumpBytes( bb.array() );
+ String encoded = Strings.dumpBytes(bb.array());
assertEquals( decoded, encoded );
}
catch( EncoderException e )
@@ -382,7 +382,7 @@ public class EncKrbPrivPartDecoderTest
0x04, 0x04, 127, 0, 0, 1
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
EncKrbPrivPartContainer container = new EncKrbPrivPartContainer( stream );
@@ -418,7 +418,7 @@ public class EncKrbPrivPartDecoderTest
encKrbPrivPart.encode( bb );
- String encoded = StringTools.dumpBytes( bb.array() );
+ String encoded = Strings.dumpBytes(bb.array());
assertEquals( decoded, encoded );
}
catch( EncoderException e )
@@ -451,7 +451,7 @@ public class EncKrbPrivPartDecoderTest
// NO r-address
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
EncKrbPrivPartContainer container = new EncKrbPrivPartContainer( stream );
@@ -487,7 +487,7 @@ public class EncKrbPrivPartDecoderTest
encKrbPrivPart.encode( bb );
- String encoded = StringTools.dumpBytes( bb.array() );
+ String encoded = Strings.dumpBytes(bb.array());
assertEquals( decoded, encoded );
}
catch( EncoderException e )
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptedDataDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptedDataDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptedDataDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptedDataDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -38,6 +38,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.apache.directory.shared.kerberos.components.EncryptedData;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -72,7 +73,7 @@ public class EncryptedDataDecoderTest
0x04, 0x06, 'a', 'b', 'c', 'd', 'e', 'f'
} );
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
// Allocate a EncryptedData Container
@@ -105,7 +106,7 @@ public class EncryptedDataDecoderTest
// Check the length
assertEquals( 0x16, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
assertEquals( encodedPdu, decodedPdu );
}
@@ -135,7 +136,7 @@ public class EncryptedDataDecoderTest
0x04, 0x06, 'a', 'b', 'c', 'd', 'e', 'f'
} );
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
// Allocate a EncryptedData Container
@@ -168,7 +169,7 @@ public class EncryptedDataDecoderTest
// Check the length
assertEquals( 0x11, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
assertEquals( encodedPdu, decodedPdu );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptionKeyDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptionKeyDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptionKeyDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptionKeyDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -34,6 +34,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.apache.directory.shared.kerberos.components.EncryptionKey;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
/**
@@ -59,7 +60,7 @@ public class EncryptionKeyDecoderTest
0x04, 0x06, 'k', 'e', 'y', 'v', 'a', 'l'
} );
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
EncryptionKeyContainer container = new EncryptionKeyContainer();
@@ -89,7 +90,7 @@ public class EncryptionKeyDecoderTest
// Check the length
assertEquals( 0x11, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
assertEquals( encodedPdu, decodedPdu );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/HostAddressDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/HostAddressDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/HostAddressDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/HostAddressDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -37,6 +37,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.codec.types.HostAddrType;
import org.apache.directory.shared.kerberos.components.HostAddress;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -69,7 +70,7 @@ public class HostAddressDecoderTest
0x04, 0x0B, '1', '9', '2', '.', '1', '6', '8', '.', '0', '.', '1'
} );
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
// Allocate a HostAddress Container
@@ -101,7 +102,7 @@ public class HostAddressDecoderTest
// Check the length
assertEquals( 0x16, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
assertEquals( encodedPdu, decodedPdu );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/HostAddressesDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/HostAddressesDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/HostAddressesDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/HostAddressesDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -39,6 +39,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.HostAddress;
import org.apache.directory.shared.kerberos.components.HostAddresses;
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 +83,7 @@ public class HostAddressesDecoderTest
0x04, 0x0B, '1', '9', '2', '.', '1', '6', '8', '.', '0', '.', '3'
} );
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
// Allocate a HostAddresses Container
@@ -124,7 +125,7 @@ public class HostAddressesDecoderTest
// Check the length
assertEquals( 0x44, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
assertEquals( encodedPdu, decodedPdu );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KdcReqBodyDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KdcReqBodyDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KdcReqBodyDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KdcReqBodyDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -44,7 +44,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.KdcReqBody;
import org.apache.directory.shared.kerberos.components.PrincipalName;
import org.apache.directory.shared.kerberos.messages.Ticket;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -497,7 +497,7 @@ public class KdcReqBodyDecoderTest
0x02, 0x01, 0x12
});
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
// Allocate a KdcReqBody Container
@@ -527,7 +527,7 @@ public class KdcReqBodyDecoderTest
// Check the length
assertEquals( 0x40, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
//assertEquals( decodedPdu, encodedPdu );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbErrorDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbErrorDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbErrorDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbErrorDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -35,7 +35,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.codec.krbError.KrbErrorContainer;
import org.apache.directory.shared.kerberos.exceptions.ErrorType;
import org.apache.directory.shared.kerberos.messages.KrbError;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
/**
@@ -95,7 +95,7 @@ public class KrbErrorDecoderTest
0x00, 0x01
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
KrbErrorContainer container = new KrbErrorContainer( stream );
@@ -135,7 +135,7 @@ public class KrbErrorDecoderTest
{
buffer = krbError.encode( buffer );
- assertEquals( decoded, StringTools.dumpBytes( buffer.array() ) );
+ assertEquals( decoded, Strings.dumpBytes(buffer.array()) );
}
catch( EncoderException e )
{
@@ -195,7 +195,7 @@ public class KrbErrorDecoderTest
0x00, 0x01
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
KrbErrorContainer container = new KrbErrorContainer( stream );
@@ -222,7 +222,7 @@ public class KrbErrorDecoderTest
{
buffer = krbError.encode( buffer );
- assertEquals( decoded, StringTools.dumpBytes( buffer.array() ) );
+ assertEquals( decoded, Strings.dumpBytes(buffer.array()) );
}
catch( EncoderException e )
{
@@ -280,7 +280,7 @@ public class KrbErrorDecoderTest
0x00, 0x01
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
KrbErrorContainer container = new KrbErrorContainer( stream );
@@ -307,7 +307,7 @@ public class KrbErrorDecoderTest
{
buffer = krbError.encode( buffer );
- assertEquals( decoded, StringTools.dumpBytes( buffer.array() ) );
+ assertEquals( decoded, Strings.dumpBytes(buffer.array()) );
}
catch( EncoderException e )
{
@@ -364,7 +364,7 @@ public class KrbErrorDecoderTest
0x00, 0x01
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
KrbErrorContainer container = new KrbErrorContainer( stream );
@@ -392,7 +392,7 @@ public class KrbErrorDecoderTest
{
buffer = krbError.encode( buffer );
- assertEquals( decoded, StringTools.dumpBytes( buffer.array() ) );
+ assertEquals( decoded, Strings.dumpBytes(buffer.array()) );
}
catch( EncoderException e )
{
@@ -450,7 +450,7 @@ public class KrbErrorDecoderTest
0x00, 0x01
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
KrbErrorContainer container = new KrbErrorContainer( stream );
@@ -477,7 +477,7 @@ public class KrbErrorDecoderTest
{
buffer = krbError.encode( buffer );
- assertEquals( decoded, StringTools.dumpBytes( buffer.array() ) );
+ assertEquals( decoded, Strings.dumpBytes(buffer.array()) );
}
catch( EncoderException e )
{
@@ -530,7 +530,7 @@ public class KrbErrorDecoderTest
0x00, 0x01
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
KrbErrorContainer container = new KrbErrorContainer( stream );
@@ -557,7 +557,7 @@ public class KrbErrorDecoderTest
{
buffer = krbError.encode( buffer );
- assertEquals( decoded, StringTools.dumpBytes( buffer.array() ) );
+ assertEquals( decoded, Strings.dumpBytes(buffer.array()) );
}
catch( EncoderException e )
{
@@ -608,7 +608,7 @@ public class KrbErrorDecoderTest
0x00, 0x01
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
KrbErrorContainer container = new KrbErrorContainer( stream );
@@ -636,7 +636,7 @@ public class KrbErrorDecoderTest
{
buffer = krbError.encode( buffer );
- assertEquals( decoded, StringTools.dumpBytes( buffer.array() ) );
+ assertEquals( decoded, Strings.dumpBytes(buffer.array()) );
}
catch( EncoderException e )
{
@@ -694,7 +694,7 @@ public class KrbErrorDecoderTest
0x00, 0x01
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
KrbErrorContainer container = new KrbErrorContainer( stream );
@@ -721,7 +721,7 @@ public class KrbErrorDecoderTest
{
buffer = krbError.encode( buffer );
- assertEquals( decoded, StringTools.dumpBytes( buffer.array() ) );
+ assertEquals( decoded, Strings.dumpBytes(buffer.array()) );
}
catch( EncoderException e )
{
@@ -777,7 +777,7 @@ public class KrbErrorDecoderTest
0x1B, 0x5, 'e', 't', 'e', 'x', 't'
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
KrbErrorContainer container = new KrbErrorContainer( stream );
@@ -804,7 +804,7 @@ public class KrbErrorDecoderTest
{
buffer = krbError.encode( buffer );
- assertEquals( decoded, StringTools.dumpBytes( buffer.array() ) );
+ assertEquals( decoded, Strings.dumpBytes(buffer.array()) );
}
catch( EncoderException e )
{
@@ -859,7 +859,7 @@ public class KrbErrorDecoderTest
// NO etext and edata
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
KrbErrorContainer container = new KrbErrorContainer( stream );
@@ -887,7 +887,7 @@ public class KrbErrorDecoderTest
{
buffer = krbError.encode( buffer );
- assertEquals( decoded, StringTools.dumpBytes( buffer.array() ) );
+ assertEquals( decoded, Strings.dumpBytes(buffer.array()) );
}
catch( EncoderException e )
{
@@ -928,7 +928,7 @@ public class KrbErrorDecoderTest
0x1B, 0x05, 's', 'n', 'a', 'm', 'e',
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
KrbErrorContainer container = new KrbErrorContainer( stream );
@@ -960,7 +960,7 @@ public class KrbErrorDecoderTest
{
buffer = krbError.encode( buffer );
- assertEquals( decoded, StringTools.dumpBytes( buffer.array() ) );
+ assertEquals( decoded, Strings.dumpBytes(buffer.array()) );
}
catch( EncoderException e )
{
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbPrivDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbPrivDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbPrivDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbPrivDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -32,7 +32,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.codec.krbPriv.KrbPrivContainer;
import org.apache.directory.shared.kerberos.messages.KrbPriv;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
/**
@@ -63,7 +63,7 @@ public class KrbPrivDecoderTest
int streamLen = data.length;
ByteBuffer stream = ByteBuffer.wrap( data );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
Asn1Decoder decoder = new Asn1Decoder();
@@ -92,7 +92,7 @@ public class KrbPrivDecoderTest
ByteBuffer bb = ByteBuffer.allocate( encodedLen );
krbPriv.encode( bb );
- String encoded = StringTools.dumpBytes( bb.array() );
+ String encoded = Strings.dumpBytes(bb.array());
assertEquals( decoded, encoded );
}
catch( EncoderException e )
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbSafeBodyDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbSafeBodyDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbSafeBodyDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbSafeBodyDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.kerberos.codec.krbSafeBody.KrbSafeBodyContainer;
import org.apache.directory.shared.kerberos.components.HostAddress;
import org.apache.directory.shared.kerberos.components.KrbSafeBody;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
/**
@@ -77,7 +77,7 @@ public class KrbSafeBodyDecoderTest
0x04, 0x04, 127, 0, 0, 1
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
KrbSafeBodyContainer container = new KrbSafeBodyContainer();
@@ -114,7 +114,7 @@ public class KrbSafeBodyDecoderTest
body.encode( bb );
- String encoded = StringTools.dumpBytes( bb.array() );
+ String encoded = Strings.dumpBytes(bb.array());
assertEquals( decoded, encoded );
}
catch( EncoderException e )
@@ -155,7 +155,7 @@ public class KrbSafeBodyDecoderTest
0x04, 0x04, 127, 0, 0, 1
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
KrbSafeBodyContainer container = new KrbSafeBodyContainer();
@@ -191,7 +191,7 @@ public class KrbSafeBodyDecoderTest
body.encode( bb );
- String encoded = StringTools.dumpBytes( bb.array() );
+ String encoded = Strings.dumpBytes(bb.array());
assertEquals( decoded, encoded );
}
catch( EncoderException e )
@@ -230,7 +230,7 @@ public class KrbSafeBodyDecoderTest
0x04, 0x04, 127, 0, 0, 1
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
KrbSafeBodyContainer container = new KrbSafeBodyContainer();
@@ -266,7 +266,7 @@ public class KrbSafeBodyDecoderTest
body.encode( bb );
- String encoded = StringTools.dumpBytes( bb.array() );
+ String encoded = Strings.dumpBytes(bb.array());
assertEquals( decoded, encoded );
}
catch( EncoderException e )
@@ -303,7 +303,7 @@ public class KrbSafeBodyDecoderTest
0x04, 0x04, 127, 0, 0, 1
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
KrbSafeBodyContainer container = new KrbSafeBodyContainer();
@@ -340,7 +340,7 @@ public class KrbSafeBodyDecoderTest
body.encode( bb );
- String encoded = StringTools.dumpBytes( bb.array() );
+ String encoded = Strings.dumpBytes(bb.array());
assertEquals( decoded, encoded );
}
catch( EncoderException e )
@@ -381,7 +381,7 @@ public class KrbSafeBodyDecoderTest
0x04, 0x04, 127, 0, 0, 1
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
KrbSafeBodyContainer container = new KrbSafeBodyContainer();
@@ -418,7 +418,7 @@ public class KrbSafeBodyDecoderTest
body.encode( bb );
- String encoded = StringTools.dumpBytes( bb.array() );
+ String encoded = Strings.dumpBytes(bb.array());
assertEquals( decoded, encoded );
}
catch( EncoderException e )
@@ -450,7 +450,7 @@ public class KrbSafeBodyDecoderTest
// NO r-address
} );
- String decoded = StringTools.dumpBytes( stream.array() );
+ String decoded = Strings.dumpBytes(stream.array());
stream.flip();
KrbSafeBodyContainer container = new KrbSafeBodyContainer();
@@ -487,7 +487,7 @@ public class KrbSafeBodyDecoderTest
body.encode( bb );
- String encoded = StringTools.dumpBytes( bb.array() );
+ String encoded = Strings.dumpBytes(bb.array());
assertEquals( decoded, encoded );
}
catch( EncoderException e )
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbSafeDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbSafeDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbSafeDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbSafeDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.codec.krbSafe.KrbSafeContainer;
import org.apache.directory.shared.kerberos.messages.KrbSafe;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
/**
@@ -72,7 +72,7 @@ public class KrbSafeDecoderTest
0x04, 0x02, 0x00, 0x01
};
- String decoded = StringTools.dumpBytes( data );
+ String decoded = Strings.dumpBytes(data);
int streamLen = data.length;
ByteBuffer stream = ByteBuffer.wrap( data );
@@ -105,7 +105,7 @@ public class KrbSafeDecoderTest
ByteBuffer bb = ByteBuffer.allocate( encodedLen );
krbSafe.encode( bb );
- String encoded = StringTools.dumpBytes( bb.array() );
+ String encoded = Strings.dumpBytes(bb.array());
assertEquals( decoded, encoded );
}
catch( EncoderException e )
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/LastReqDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/LastReqDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/LastReqDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/LastReqDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.codec.types.LastReqType;
import org.apache.directory.shared.kerberos.components.LastReq;
import org.apache.directory.shared.kerberos.components.LastReqEntry;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
/**
@@ -66,7 +66,7 @@ public class LastReqDecoderTest
0x18, 0x0F, '2', '0', '1', '0', '1', '1', '1', '0', '1', '5', '4', '5', '2', '6', 'Z'
} );
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
LastReqContainer lastReqContainer = new LastReqContainer();
@@ -106,7 +106,7 @@ public class LastReqDecoderTest
// Check the length
assertEquals( 0x36, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
assertEquals( encodedPdu, decodedPdu );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/MethodDataDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/MethodDataDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/MethodDataDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/MethodDataDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -38,6 +38,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.MethodData;
import org.apache.directory.shared.kerberos.components.PaData;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -76,7 +77,7 @@ public class MethodDataDecoderTest
0x04, 0x06, 'g', 'h', 'i', 'j', 'k', 'l'
} );
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
// Allocate a METHOD-DATA Container
@@ -118,7 +119,7 @@ public class MethodDataDecoderTest
// Check the length
assertEquals( 0x24, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
assertEquals( encodedPdu, decodedPdu );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaDataDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaDataDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaDataDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaDataDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -34,6 +34,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.codec.types.PaDataType;
import org.apache.directory.shared.kerberos.components.PaData;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
/**
@@ -59,7 +60,7 @@ public class PaDataDecoderTest
0x04, 0x06, 'p', 'a', 'd', 'a', 't', 'a'
} );
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
PaDataContainer container = new PaDataContainer();
@@ -89,7 +90,7 @@ public class PaDataDecoderTest
// Check the length
assertEquals( 0x11, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
assertEquals( encodedPdu, decodedPdu );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTimestampDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTimestampDecoderTest.java?rev=1061416&r1=1061415&r2=1061416&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTimestampDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTimestampDecoderTest.java Thu Jan 20 17:49:48 2011
@@ -37,6 +37,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.apache.directory.shared.kerberos.components.PaEncTimestamp;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -71,7 +72,7 @@ public class PaEncTimestampDecoderTest
0x04, 0x06, 'a', 'b', 'c', 'd', 'e', 'f'
} );
- String decodedPdu = StringTools.dumpBytes( stream.array() );
+ String decodedPdu = Strings.dumpBytes(stream.array());
stream.flip();
// Allocate a PaEncTimestamp Container
@@ -104,7 +105,7 @@ public class PaEncTimestampDecoderTest
// Check the length
assertEquals( 0x16, bb.limit() );
- String encodedPdu = StringTools.dumpBytes( bb.array() );
+ String encodedPdu = Strings.dumpBytes(bb.array());
assertEquals( encodedPdu, decodedPdu );
}