directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1062251 [10/13] - in /directory: apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ apacheds/trunk/core-api/src/main/java/org/apache/directo...
Date Sat, 22 Jan 2011 20:08:59 GMT
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java Sat Jan 22 20:08:48 2011
@@ -36,7 +36,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.ber.tlv.TLVStateEnum;
 import org.apache.directory.shared.ldap.message.BindRequest;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.filterchain.IoFilter.NextFilter;
 import org.apache.mina.core.session.DummySession;
@@ -141,7 +141,7 @@ public class LdapDecoderTest
         assertTrue( bindRequest.isVersion3() );
         assertEquals( "uid=akarasulu,dc=example,dc=com", bindRequest.getName().toString() );
         assertTrue( bindRequest.isSimple() );
-        assertEquals( "password", StringTools.utf8ToString( bindRequest.getCredentials() ) );
+        assertEquals( "password", Strings.utf8ToString(bindRequest.getCredentials()) );
     }
 
 
@@ -211,7 +211,7 @@ public class LdapDecoderTest
         assertTrue( bindRequest.isVersion3() );
         assertEquals( "uid=akarasulu,dc=example,dc=com", bindRequest.getName().toString() );
         assertTrue( bindRequest.isSimple() );
-        assertEquals( "password", StringTools.utf8ToString( bindRequest.getCredentials() ) );
+        assertEquals( "password", Strings.utf8ToString(bindRequest.getCredentials()) );
         
         // The second message
         bindRequest = ( BindRequest ) ( ( LdapProtocolDecoderOutput ) result ).getMessage();
@@ -220,7 +220,7 @@ public class LdapDecoderTest
         assertTrue( bindRequest.isVersion3() );
         assertEquals( "uid=akarasulu,dc=example,dc=com", bindRequest.getName().toString() );
         assertTrue( bindRequest.isSimple() );
-        assertEquals( "password", StringTools.utf8ToString( bindRequest.getCredentials() ) );
+        assertEquals( "password", Strings.utf8ToString(bindRequest.getCredentials()) );
     }
 
 
@@ -340,7 +340,7 @@ public class LdapDecoderTest
         assertTrue( bindRequest.isVersion3() );
         assertEquals( "uid=akarasulu,dc=example,dc=com", bindRequest.getName().toString() );
         assertTrue( bindRequest.isSimple() );
-        assertEquals( "password", StringTools.utf8ToString( bindRequest.getCredentials() ) );
+        assertEquals( "password", Strings.utf8ToString(bindRequest.getCredentials()) );
     }
 
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java Sat Jan 22 20:08:48 2011
@@ -40,7 +40,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.LdapEncoder;
 import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -133,7 +132,7 @@ public class BindRequestPerfTest
         assertTrue( bindRequest.isVersion3() );
         assertEquals( "uid=akarasulu,dc=example,dc=com", bindRequest.getName().toString() );
         assertTrue( bindRequest.isSimple() );
-        assertEquals( "password", StringTools.utf8ToString( bindRequest.getCredentials() ) );
+        assertEquals( "password", Strings.utf8ToString(bindRequest.getCredentials()) );
 
         // Check the Control
         Map<String, Control> controls = bindRequest.getControls();
@@ -183,7 +182,7 @@ public class BindRequestPerfTest
 
             bindRequest.setSimple( true );
             bindRequest.setName( name );
-            bindRequest.setCredentials( StringTools.getBytesUtf8( "password" ) );
+            bindRequest.setCredentials( Strings.getBytesUtf8("password") );
             Control control = new ControlImpl( "2.16.840.1.113730.3.4.2" );
 
             bindRequest.addControl( control );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java Sat Jan 22 20:08:48 2011
@@ -42,7 +42,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.Message;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -210,7 +209,7 @@ public class BindRequestTest
         assertTrue( bindRequest.isVersion3() );
         assertEquals( "uid=akarasulu,dc=example,dc=com", bindRequest.getName().toString() );
         assertTrue( bindRequest.isSimple() );
-        assertEquals( "password", StringTools.utf8ToString( bindRequest.getCredentials() ) );
+        assertEquals( "password", Strings.utf8ToString(bindRequest.getCredentials()) );
 
         // Check the encoding
         try
@@ -372,7 +371,7 @@ public class BindRequestTest
         assertTrue( bindRequest.isVersion3() );
         assertEquals( "", bindRequest.getName().toString() );
         assertTrue( bindRequest.isSimple() );
-        assertEquals( "password", StringTools.utf8ToString( bindRequest.getCredentials() ) );
+        assertEquals( "password", Strings.utf8ToString(bindRequest.getCredentials()) );
 
         // Check the encoding
         try
@@ -532,7 +531,7 @@ public class BindRequestTest
         assertEquals( "uid=akarasulu,dc=example,dc=com", bindRequest.getName().toString() );
         assertFalse( bindRequest.isSimple() );
         assertEquals( "KERBEROS_V4", bindRequest.getSaslMechanism() );
-        assertEquals( "abcdef", StringTools.utf8ToString( bindRequest.getCredentials() ) );
+        assertEquals( "abcdef", Strings.utf8ToString(bindRequest.getCredentials()) );
 
         // Check the encoding
         try
@@ -609,7 +608,7 @@ public class BindRequestTest
         assertEquals( "", bindRequest.getName().toString() );
         assertFalse( bindRequest.isSimple() );
         assertEquals( "KERBEROS_V4", bindRequest.getSaslMechanism() );
-        assertEquals( "abcdef", StringTools.utf8ToString( bindRequest.getCredentials() ) );
+        assertEquals( "abcdef", Strings.utf8ToString(bindRequest.getCredentials()) );
 
         // Check the encoding
         try
@@ -922,7 +921,7 @@ public class BindRequestTest
         assertTrue( bindRequest.isVersion3() );
         assertEquals( "", bindRequest.getName().toString() );
         assertTrue( bindRequest.isSimple() );
-        assertEquals( "", StringTools.utf8ToString( bindRequest.getCredentials() ) );
+        assertEquals( "", Strings.utf8ToString(bindRequest.getCredentials()) );
 
         // Check the encoding
         try
@@ -1131,7 +1130,7 @@ public class BindRequestTest
         assertEquals( "", bindRequest.getName().toString() );
         assertFalse( bindRequest.isSimple() );
         assertEquals( "", bindRequest.getSaslMechanism() );
-        assertEquals( "", StringTools.utf8ToString( bindRequest.getCredentials() ) );
+        assertEquals( "", Strings.utf8ToString(bindRequest.getCredentials()) );
 
         // Check the encoding
         try
@@ -1202,7 +1201,7 @@ public class BindRequestTest
         assertEquals( "", bindRequest.getName().toString() );
         assertFalse( bindRequest.isSimple() );
         assertEquals( "", bindRequest.getSaslMechanism() );
-        assertEquals( "", StringTools.utf8ToString( bindRequest.getCredentials() ) );
+        assertEquals( "", Strings.utf8ToString(bindRequest.getCredentials()) );
 
         // Check the Control
         Map<String, Control> controls = bindRequest.getControls();
@@ -1281,7 +1280,7 @@ public class BindRequestTest
         assertEquals( "", bindRequest.getName().toString() );
         assertFalse( bindRequest.isSimple() );
         assertEquals( "", bindRequest.getSaslMechanism() );
-        assertEquals( "", StringTools.utf8ToString( bindRequest.getCredentials() ) );
+        assertEquals( "", Strings.utf8ToString(bindRequest.getCredentials()) );
 
         // Check the Control
         Map<String, Control> controls = bindRequest.getControls();

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java Sat Jan 22 20:08:48 2011
@@ -40,7 +40,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.LdapEncoder;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -282,7 +281,7 @@ public class BindResponseTest
         assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() );
         assertEquals( "", bindResponse.getLdapResult().getMatchedDn().getName() );
         assertEquals( "", bindResponse.getLdapResult().getErrorMessage() );
-        assertEquals( "", StringTools.utf8ToString( bindResponse.getServerSaslCreds() ) );
+        assertEquals( "", Strings.utf8ToString(bindResponse.getServerSaslCreds()) );
 
         // Check the encoding
         try
@@ -368,7 +367,7 @@ public class BindResponseTest
         assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() );
         assertEquals( "", bindResponse.getLdapResult().getMatchedDn().getName() );
         assertEquals( "", bindResponse.getLdapResult().getErrorMessage() );
-        assertEquals( "", StringTools.utf8ToString( bindResponse.getServerSaslCreds() ) );
+        assertEquals( "", Strings.utf8ToString(bindResponse.getServerSaslCreds()) );
 
         // Check the Control
         Map<String, Control> controls = bindResponse.getControls();
@@ -450,7 +449,7 @@ public class BindResponseTest
         assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() );
         assertEquals( "", bindResponse.getLdapResult().getMatchedDn().getName() );
         assertEquals( "", bindResponse.getLdapResult().getErrorMessage() );
-        assertEquals( "AB", StringTools.utf8ToString( bindResponse.getServerSaslCreds() ) );
+        assertEquals( "AB", Strings.utf8ToString(bindResponse.getServerSaslCreds()) );
 
         // Check the encoding
         try

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncDoneValueControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncDoneValueControlTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncDoneValueControlTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncDoneValueControlTest.java Sat Jan 22 20:08:48 2011
@@ -35,7 +35,6 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueControl;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueControlContainer;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueControlDecoder;
-import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -80,7 +79,7 @@ public class SyncDoneValueControlTest
         }
 
         SyncDoneValueControl control = container.getSyncDoneValueControl();
-        assertEquals( "xkcd", StringTools.utf8ToString( control.getCookie() ) );
+        assertEquals( "xkcd", Strings.utf8ToString(control.getCookie()) );
         assertTrue( control.isRefreshDeletes() );
         
         // test encoding
@@ -234,7 +233,7 @@ public class SyncDoneValueControlTest
         }
 
         SyncDoneValueControl control = container.getSyncDoneValueControl();
-        assertEquals( "", StringTools.utf8ToString( control.getCookie() ) );
+        assertEquals( "", Strings.utf8ToString(control.getCookie()) );
         assertFalse( control.isRefreshDeletes() );
 
         // test encoding

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncInfoValueControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncInfoValueControlTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncInfoValueControlTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncInfoValueControlTest.java Sat Jan 22 20:08:48 2011
@@ -35,7 +35,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueControlContainer;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueControlDecoder;
 import org.apache.directory.shared.ldap.message.control.replication.SynchronizationInfoEnum;
-import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -82,7 +81,7 @@ public class SyncInfoValueControlTest
 
         SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.NEW_COOKIE, syncInfoValue.getType() );
-        assertEquals( "abc", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
+        assertEquals( "abc", Strings.utf8ToString(syncInfoValue.getCookie()) );
         
         // Check the encoding
         try
@@ -141,7 +140,7 @@ public class SyncInfoValueControlTest
 
         SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.NEW_COOKIE, syncInfoValue.getType() );
-        assertEquals( "", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
+        assertEquals( "", Strings.utf8ToString(syncInfoValue.getCookie()) );
         
         // Check the encoding
         try
@@ -205,7 +204,7 @@ public class SyncInfoValueControlTest
 
         SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.REFRESH_DELETE, syncInfoValue.getType() );
-        assertEquals( "abc", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
+        assertEquals( "abc", Strings.utf8ToString(syncInfoValue.getCookie()) );
         assertTrue( syncInfoValue.isRefreshDone() );
         
         // Check the encoding
@@ -269,7 +268,7 @@ public class SyncInfoValueControlTest
 
         SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.REFRESH_DELETE, syncInfoValue.getType() );
-        assertEquals( "abc", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
+        assertEquals( "abc", Strings.utf8ToString(syncInfoValue.getCookie()) );
         assertFalse( syncInfoValue.isRefreshDone() );
         
         // Check the encoding
@@ -333,7 +332,7 @@ public class SyncInfoValueControlTest
 
         SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.REFRESH_DELETE, syncInfoValue.getType() );
-        assertEquals( "abc", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
+        assertEquals( "abc", Strings.utf8ToString(syncInfoValue.getCookie()) );
         assertTrue( syncInfoValue.isRefreshDone() );
         
         // Check the encoding
@@ -396,7 +395,7 @@ public class SyncInfoValueControlTest
 
         SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.REFRESH_DELETE, syncInfoValue.getType() );
-        assertEquals( "", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
+        assertEquals( "", Strings.utf8ToString(syncInfoValue.getCookie()) );
         assertFalse( syncInfoValue.isRefreshDone() );
         
         // Check the encoding
@@ -457,7 +456,7 @@ public class SyncInfoValueControlTest
 
         SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.REFRESH_DELETE, syncInfoValue.getType() );
-        assertEquals( "", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
+        assertEquals( "", Strings.utf8ToString(syncInfoValue.getCookie()) );
         assertTrue( syncInfoValue.isRefreshDone() );
         
         // Check the encoding
@@ -522,7 +521,7 @@ public class SyncInfoValueControlTest
 
         SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.REFRESH_PRESENT, syncInfoValue.getType() );
-        assertEquals( "abc", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
+        assertEquals( "abc", Strings.utf8ToString(syncInfoValue.getCookie()) );
         assertTrue( syncInfoValue.isRefreshDone() );
         
         // Check the encoding
@@ -586,7 +585,7 @@ public class SyncInfoValueControlTest
 
         SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.REFRESH_PRESENT, syncInfoValue.getType() );
-        assertEquals( "abc", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
+        assertEquals( "abc", Strings.utf8ToString(syncInfoValue.getCookie()) );
         assertFalse( syncInfoValue.isRefreshDone() );
         
         // Check the encoding
@@ -650,7 +649,7 @@ public class SyncInfoValueControlTest
 
         SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.REFRESH_PRESENT, syncInfoValue.getType() );
-        assertEquals( "abc", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
+        assertEquals( "abc", Strings.utf8ToString(syncInfoValue.getCookie()) );
         assertTrue( syncInfoValue.isRefreshDone() );
         
         // Check the encoding
@@ -713,7 +712,7 @@ public class SyncInfoValueControlTest
 
         SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.REFRESH_PRESENT, syncInfoValue.getType() );
-        assertEquals( "", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
+        assertEquals( "", Strings.utf8ToString(syncInfoValue.getCookie()) );
         assertFalse( syncInfoValue.isRefreshDone() );
         
         // Check the encoding
@@ -774,7 +773,7 @@ public class SyncInfoValueControlTest
 
         SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.REFRESH_PRESENT, syncInfoValue.getType() );
-        assertEquals( "", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
+        assertEquals( "", Strings.utf8ToString(syncInfoValue.getCookie()) );
         assertTrue( syncInfoValue.isRefreshDone() );
         
         // Check the encoding
@@ -965,7 +964,7 @@ public class SyncInfoValueControlTest
         
         SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.SYNC_ID_SET, syncInfoValue.getType() );
-        assertEquals( "", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
+        assertEquals( "", Strings.utf8ToString(syncInfoValue.getCookie()) );
         assertFalse( syncInfoValue.isRefreshDeletes() );
         assertEquals( 0, syncInfoValue.getSyncUUIDs().size() );
         
@@ -1037,7 +1036,7 @@ public class SyncInfoValueControlTest
         }
         SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.SYNC_ID_SET, syncInfoValue.getType() );
-        assertEquals( "", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
+        assertEquals( "", Strings.utf8ToString(syncInfoValue.getCookie()) );
         assertFalse( syncInfoValue.isRefreshDeletes() );
         assertEquals( 3, syncInfoValue.getSyncUUIDs().size() );
         
@@ -1120,7 +1119,7 @@ public class SyncInfoValueControlTest
         }
         SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.SYNC_ID_SET, syncInfoValue.getType() );
-        assertEquals( "abc", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
+        assertEquals( "abc", Strings.utf8ToString(syncInfoValue.getCookie()) );
         assertFalse( syncInfoValue.isRefreshDeletes() );
         assertEquals( 0, syncInfoValue.getSyncUUIDs().size() );
         
@@ -1195,7 +1194,7 @@ public class SyncInfoValueControlTest
         
         SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.SYNC_ID_SET, syncInfoValue.getType() );
-        assertEquals( "abc", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
+        assertEquals( "abc", Strings.utf8ToString(syncInfoValue.getCookie()) );
         assertFalse( syncInfoValue.isRefreshDeletes() );
         assertEquals( 3, syncInfoValue.getSyncUUIDs().size() );
         
@@ -1279,7 +1278,7 @@ public class SyncInfoValueControlTest
         }
         SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.SYNC_ID_SET, syncInfoValue.getType() );
-        assertEquals( "", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
+        assertEquals( "", Strings.utf8ToString(syncInfoValue.getCookie()) );
         assertTrue( syncInfoValue.isRefreshDeletes() );
         assertEquals( 0, syncInfoValue.getSyncUUIDs().size() );
         
@@ -1353,7 +1352,7 @@ public class SyncInfoValueControlTest
         }
         SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.SYNC_ID_SET, syncInfoValue.getType() );
-        assertEquals( "", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
+        assertEquals( "", Strings.utf8ToString(syncInfoValue.getCookie()) );
         assertTrue( syncInfoValue.isRefreshDeletes() );
         assertEquals( 3, syncInfoValue.getSyncUUIDs().size() );
         
@@ -1438,7 +1437,7 @@ public class SyncInfoValueControlTest
         }
         SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.SYNC_ID_SET, syncInfoValue.getType() );
-        assertEquals( "abc", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
+        assertEquals( "abc", Strings.utf8ToString(syncInfoValue.getCookie()) );
         assertTrue( syncInfoValue.isRefreshDeletes() );
         assertEquals( 0, syncInfoValue.getSyncUUIDs().size() );
         
@@ -1515,7 +1514,7 @@ public class SyncInfoValueControlTest
         
         SyncInfoValueControl syncInfoValue = container.getSyncInfoValueControl();
         assertEquals( SynchronizationInfoEnum.SYNC_ID_SET, syncInfoValue.getType() );
-        assertEquals( "abc", StringTools.utf8ToString( syncInfoValue.getCookie() ) );
+        assertEquals( "abc", Strings.utf8ToString(syncInfoValue.getCookie()) );
         assertTrue( syncInfoValue.isRefreshDeletes() );
         assertEquals( 3, syncInfoValue.getSyncUUIDs().size() );
         

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncRequestValueControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncRequestValueControlTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncRequestValueControlTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncRequestValueControlTest.java Sat Jan 22 20:08:48 2011
@@ -35,7 +35,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.SyncRequestValueControlContainer;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.SyncRequestValueControlDecoder;
 import org.apache.directory.shared.ldap.message.control.replication.SynchronizationModeEnum;
-import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -83,7 +82,7 @@ public class SyncRequestValueControlTest
 
         SyncRequestValueControl syncRequestValue = container.getSyncRequestValueControl();
         assertEquals( SynchronizationModeEnum.REFRESH_ONLY, syncRequestValue.getMode() );
-        assertEquals( "abc", StringTools.utf8ToString( syncRequestValue.getCookie() ) );
+        assertEquals( "abc", Strings.utf8ToString(syncRequestValue.getCookie()) );
         assertEquals( false, syncRequestValue.isReloadHint() );
 
         // Check the encoding
@@ -152,7 +151,7 @@ public class SyncRequestValueControlTest
 
         SyncRequestValueControl syncRequestValue = container.getSyncRequestValueControl();
         assertEquals( SynchronizationModeEnum.REFRESH_AND_PERSIST, syncRequestValue.getMode() );
-        assertEquals( "abc", StringTools.utf8ToString( syncRequestValue.getCookie() ) );
+        assertEquals( "abc", Strings.utf8ToString(syncRequestValue.getCookie()) );
         assertEquals( false, syncRequestValue.isReloadHint() );
 
         // Check the encoding
@@ -423,7 +422,7 @@ public class SyncRequestValueControlTest
 
         SyncRequestValueControl syncRequestValue = container.getSyncRequestValueControl();
         assertEquals( SynchronizationModeEnum.REFRESH_AND_PERSIST, syncRequestValue.getMode() );
-        assertEquals( "abc", StringTools.utf8ToString( syncRequestValue.getCookie() ) );
+        assertEquals( "abc", Strings.utf8ToString(syncRequestValue.getCookie()) );
         assertEquals( false, syncRequestValue.isReloadHint() );
 
         // Check the encoding
@@ -491,7 +490,7 @@ public class SyncRequestValueControlTest
 
         SyncRequestValueControl syncRequestValue = container.getSyncRequestValueControl();
         assertEquals( SynchronizationModeEnum.REFRESH_AND_PERSIST, syncRequestValue.getMode() );
-        assertEquals( "", StringTools.utf8ToString( syncRequestValue.getCookie() ) );
+        assertEquals( "", Strings.utf8ToString(syncRequestValue.getCookie()) );
         assertEquals( false, syncRequestValue.isReloadHint() );
 
         // Check the encoding

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncStateValueControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncStateValueControlTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncStateValueControlTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/controls/replication/SyncStateValueControlTest.java Sat Jan 22 20:08:48 2011
@@ -36,7 +36,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueControlContainer;
 import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueControlDecoder;
 import org.apache.directory.shared.ldap.message.control.replication.SyncStateTypeEnum;
-import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -85,8 +84,8 @@ public class SyncStateValueControlTest
 
         SyncStateValueControl syncStateValue = container.getSyncStateValueControl();
         assertEquals( SyncStateTypeEnum.PRESENT, syncStateValue.getSyncStateType() );
-        assertEquals( "abc", StringTools.utf8ToString( syncStateValue.getEntryUUID() ) );
-        assertEquals( "xkcd", StringTools.utf8ToString( syncStateValue.getCookie() ) );
+        assertEquals( "abc", Strings.utf8ToString(syncStateValue.getEntryUUID()) );
+        assertEquals( "xkcd", Strings.utf8ToString(syncStateValue.getCookie()) );
 
         // Check the encoding
         try
@@ -150,7 +149,7 @@ public class SyncStateValueControlTest
 
         SyncStateValueControl syncStateValue = container.getSyncStateValueControl();
         assertEquals( SyncStateTypeEnum.ADD, syncStateValue.getSyncStateType() );
-        assertEquals( "abc", StringTools.utf8ToString( syncStateValue.getEntryUUID() ) );
+        assertEquals( "abc", Strings.utf8ToString(syncStateValue.getEntryUUID()) );
         assertNull( syncStateValue.getCookie() );
 
         // Check the encoding
@@ -216,8 +215,8 @@ public class SyncStateValueControlTest
 
         SyncStateValueControl syncStateValue = container.getSyncStateValueControl();
         assertEquals( SyncStateTypeEnum.MODIFY, syncStateValue.getSyncStateType() );
-        assertEquals( "abc", StringTools.utf8ToString( syncStateValue.getEntryUUID() ) );
-        assertEquals( "", StringTools.utf8ToString( syncStateValue.getCookie() ) );
+        assertEquals( "abc", Strings.utf8ToString(syncStateValue.getEntryUUID()) );
+        assertEquals( "", Strings.utf8ToString(syncStateValue.getCookie()) );
 
         // Check the encoding
         try
@@ -372,8 +371,8 @@ public class SyncStateValueControlTest
 
         SyncStateValueControl syncStateValue = container.getSyncStateValueControl();
         assertEquals( SyncStateTypeEnum.MODDN, syncStateValue.getSyncStateType() );
-        assertEquals( "abc", StringTools.utf8ToString( syncStateValue.getEntryUUID() ) );
-        assertEquals( "xkcd", StringTools.utf8ToString( syncStateValue.getCookie() ) );
+        assertEquals( "abc", Strings.utf8ToString(syncStateValue.getEntryUUID()) );
+        assertEquals( "xkcd", Strings.utf8ToString(syncStateValue.getCookie()) );
 
         // Check the encoding
         try

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java Sat Jan 22 20:08:48 2011
@@ -37,7 +37,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.ExtendedRequest;
 import org.apache.directory.shared.ldap.message.LdapEncoder;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -99,7 +98,7 @@ public class ExtendedRequestTest
 
         assertEquals( 1, extendedRequest.getMessageId() );
         assertEquals( "1.3.6.1.5.5.2", extendedRequest.getRequestName() );
-        assertEquals( "value", StringTools.utf8ToString( extendedRequest.getRequestValue() ) );
+        assertEquals( "value", Strings.utf8ToString(extendedRequest.getRequestValue()) );
 
         // Check the encoding
         try
@@ -170,7 +169,7 @@ public class ExtendedRequestTest
 
         assertEquals( 1, extendedRequest.getMessageId() );
         assertEquals( "1.3.6.1.5.5.2", extendedRequest.getRequestName() );
-        assertEquals( "value", StringTools.utf8ToString( extendedRequest.getRequestValue() ) );
+        assertEquals( "value", Strings.utf8ToString(extendedRequest.getRequestValue()) );
 
         // Check the Control
         Map<String, Control> controls = extendedRequest.getControls();
@@ -251,7 +250,7 @@ public class ExtendedRequestTest
 
         assertEquals( 1, extendedRequest.getMessageId() );
         assertEquals( "1.3.6.1.5.5.2", extendedRequest.getRequestName() );
-        assertEquals( "", StringTools.utf8ToString( extendedRequest.getRequestValue() ) );
+        assertEquals( "", Strings.utf8ToString(extendedRequest.getRequestValue()) );
 
         // Check the Control
         Map<String, Control> controls = extendedRequest.getControls();
@@ -496,7 +495,7 @@ public class ExtendedRequestTest
 
         assertEquals( 1, extendedRequest.getMessageId() );
         assertEquals( "1.3.6.1.5.5.2", extendedRequest.getRequestName() );
-        assertEquals( "", StringTools.utf8ToString( extendedRequest.getRequestValue() ) );
+        assertEquals( "", Strings.utf8ToString(extendedRequest.getRequestValue()) );
 
         // Check the encoding
         try

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java Sat Jan 22 20:08:48 2011
@@ -38,7 +38,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.LdapEncoder;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -111,7 +110,7 @@ public class ExtendedResponseTest
         assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() );
         assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() );
         assertEquals( "1.3.6.1.5.5.2", extendedResponse.getID() );
-        assertEquals( "value", StringTools.utf8ToString( ( byte[] ) extendedResponse.getEncodedValue() ) );
+        assertEquals( "value", Strings.utf8ToString((byte[]) extendedResponse.getEncodedValue()) );
 
         // Check the encoding
         try
@@ -203,7 +202,7 @@ public class ExtendedResponseTest
         assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() );
         assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() );
         assertEquals( "1.3.6.1.5.5.2", extendedResponse.getID() );
-        assertEquals( "value", StringTools.utf8ToString( ( byte[] ) extendedResponse.getEncodedValue() ) );
+        assertEquals( "value", Strings.utf8ToString((byte[]) extendedResponse.getEncodedValue()) );
 
         // Check the Control
         Map<String, Control> controls = extendedResponse.getControls();
@@ -573,7 +572,7 @@ public class ExtendedResponseTest
         assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() );
         assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() );
         assertEquals( "1.3.6.1.5.5.2", extendedResponse.getID() );
-        assertEquals( "", StringTools.utf8ToString( ( byte[] ) extendedResponse.getEncodedValue() ) );
+        assertEquals( "", Strings.utf8ToString((byte[]) extendedResponse.getEncodedValue()) );
 
         // Check the encoding
         try
@@ -660,7 +659,7 @@ public class ExtendedResponseTest
         assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() );
         assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() );
         assertEquals( "1.3.6.1.5.5.2", extendedResponse.getID() );
-        assertEquals( "", StringTools.utf8ToString( ( byte[] ) extendedResponse.getEncodedValue() ) );
+        assertEquals( "", Strings.utf8ToString((byte[]) extendedResponse.getEncodedValue()) );
 
         // Check the Control
         Map<String, Control> controls = extendedResponse.getControls();
@@ -752,7 +751,7 @@ public class ExtendedResponseTest
         assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() );
         assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() );
         assertEquals( "1.3.6.1.5.5.2", extendedResponse.getID() );
-        assertEquals( "", StringTools.utf8ToString( ( byte[] ) extendedResponse.getEncodedValue() ) );
+        assertEquals( "", Strings.utf8ToString((byte[]) extendedResponse.getEncodedValue()) );
 
         // Check the encoding
         try
@@ -840,7 +839,7 @@ public class ExtendedResponseTest
         assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() );
         assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() );
         assertEquals( "1.3.6.1.5.5.2", extendedResponse.getID() );
-        assertEquals( "", StringTools.utf8ToString( ( byte[] ) extendedResponse.getEncodedValue() ) );
+        assertEquals( "", Strings.utf8ToString((byte[]) extendedResponse.getEncodedValue()) );
 
         // Check the Control
         Map<String, Control> controls = extendedResponse.getControls();

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/StoredProcedureTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/StoredProcedureTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/StoredProcedureTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/StoredProcedureTest.java Sat Jan 22 20:08:48 2011
@@ -36,7 +36,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.extended.operations.storedProcedure.StoredProcedureContainer;
 import org.apache.directory.shared.ldap.codec.extended.operations.storedProcedure.StoredProcedureDecoder;
 import org.apache.directory.shared.ldap.codec.extended.operations.storedProcedure.StoredProcedure.StoredProcedureParameter;
-import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -96,24 +95,24 @@ public class StoredProcedureTest
 
         assertEquals("Java", storedProcedure.getLanguage());
         
-        assertEquals( "execute", StringTools.utf8ToString( storedProcedure.getProcedure() ) );
+        assertEquals( "execute", Strings.utf8ToString(storedProcedure.getProcedure()) );
 
         assertEquals( 3, storedProcedure.getParameters().size() );
 
         StoredProcedureParameter param = storedProcedure.getParameters().get( 0 );
 
-        assertEquals( "int", StringTools.utf8ToString( param.getType() ) );
+        assertEquals( "int", Strings.utf8ToString(param.getType()) );
         assertEquals( 1, param.getValue()[0] );
 
         param = storedProcedure.getParameters().get( 1 );
 
-        assertEquals( "boolean", StringTools.utf8ToString( param.getType() ) );
-        assertEquals( "true", StringTools.utf8ToString( param.getValue() ) );
+        assertEquals( "boolean", Strings.utf8ToString(param.getType()) );
+        assertEquals( "true", Strings.utf8ToString(param.getValue()) );
 
         param = storedProcedure.getParameters().get( 2 );
 
-        assertEquals( "String", StringTools.utf8ToString( param.getType() ) );
-        assertEquals( "parameter3", StringTools.utf8ToString( param.getValue() ) );
+        assertEquals( "String", Strings.utf8ToString(param.getType()) );
+        assertEquals( "parameter3", Strings.utf8ToString(param.getValue()) );
 
         // Check the encoding
         try
@@ -167,7 +166,7 @@ public class StoredProcedureTest
 
         assertEquals("Java", storedProcedure.getLanguage());
         
-        assertEquals( "execute", StringTools.utf8ToString( storedProcedure.getProcedure() ) );
+        assertEquals( "execute", Strings.utf8ToString(storedProcedure.getProcedure()) );
 
         assertEquals( 0, storedProcedure.getParameters().size() );
         
@@ -227,13 +226,13 @@ public class StoredProcedureTest
 
         assertEquals("Java", storedProcedure.getLanguage());
         
-        assertEquals( "execute", StringTools.utf8ToString( storedProcedure.getProcedure() ) );
+        assertEquals( "execute", Strings.utf8ToString(storedProcedure.getProcedure()) );
 
         assertEquals( 1, storedProcedure.getParameters().size() );
 
         StoredProcedureParameter param = storedProcedure.getParameters().get( 0 );
 
-        assertEquals( "int", StringTools.utf8ToString( param.getType() ) );
+        assertEquals( "int", Strings.utf8ToString(param.getType()) );
         assertEquals( 1, param.getValue()[0] );
 
         // Check the encoding

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java Sat Jan 22 20:08:48 2011
@@ -37,7 +37,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.IntermediateResponse;
 import org.apache.directory.shared.ldap.message.LdapEncoder;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -99,7 +98,7 @@ public class IntermediateResponseTest
 
         assertEquals( 1, intermediateResponse.getMessageId() );
         assertEquals( "1.3.6.1.5.5.2", intermediateResponse.getResponseName() );
-        assertEquals( "value", StringTools.utf8ToString( intermediateResponse.getResponseValue() ) );
+        assertEquals( "value", Strings.utf8ToString(intermediateResponse.getResponseValue()) );
 
         // Check the encoding
         try
@@ -170,7 +169,7 @@ public class IntermediateResponseTest
 
         assertEquals( 1, intermediateResponse.getMessageId() );
         assertEquals( "1.3.6.1.5.5.2", intermediateResponse.getResponseName() );
-        assertEquals( "value", StringTools.utf8ToString( intermediateResponse.getResponseValue() ) );
+        assertEquals( "value", Strings.utf8ToString(intermediateResponse.getResponseValue()) );
 
         // Check the Control
         Map<String, Control> controls = intermediateResponse.getControls();
@@ -251,7 +250,7 @@ public class IntermediateResponseTest
 
         assertEquals( 1, intermediateResponse.getMessageId() );
         assertEquals( "1.3.6.1.5.5.2", intermediateResponse.getResponseName() );
-        assertEquals( "", StringTools.utf8ToString( intermediateResponse.getResponseValue() ) );
+        assertEquals( "", Strings.utf8ToString(intermediateResponse.getResponseValue()) );
 
         // Check the Control
         Map<String, Control> controls = intermediateResponse.getControls();
@@ -495,7 +494,7 @@ public class IntermediateResponseTest
 
         assertEquals( 1, intermediateResponse.getMessageId() );
         assertEquals( "1.3.6.1.5.5.2", intermediateResponse.getResponseName() );
-        assertEquals( "", StringTools.utf8ToString( intermediateResponse.getResponseValue() ) );
+        assertEquals( "", Strings.utf8ToString(intermediateResponse.getResponseValue()) );
 
         // Check the encoding
         try
@@ -558,7 +557,7 @@ public class IntermediateResponseTest
 
         assertEquals( 1, intermediateResponse.getMessageId() );
         assertEquals( "", intermediateResponse.getResponseName() );
-        assertEquals( "value", StringTools.utf8ToString( intermediateResponse.getResponseValue() ) );
+        assertEquals( "value", Strings.utf8ToString(intermediateResponse.getResponseValue()) );
 
         // Check the encoding
         try
@@ -621,7 +620,7 @@ public class IntermediateResponseTest
 
         assertEquals( 1, intermediateResponse.getMessageId() );
         assertEquals( "1.3.6.1.5.5.2", intermediateResponse.getResponseName() );
-        assertEquals( "", StringTools.utf8ToString( intermediateResponse.getResponseValue() ) );
+        assertEquals( "", Strings.utf8ToString(intermediateResponse.getResponseValue()) );
 
         // Check the encoding
         try

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java Sat Jan 22 20:08:48 2011
@@ -41,7 +41,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.Referral;
 import org.apache.directory.shared.ldap.message.SearchResultReference;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -103,7 +102,7 @@ public class SearchResultReferenceTest
             stream.put( ( byte ) 0x04 );
             stream.put( ( byte ) ldapUrls[i].getBytes().length );
 
-            byte[] bytes = StringTools.getBytesUtf8( ldapUrls[i] );
+            byte[] bytes = Strings.getBytesUtf8(ldapUrls[i]);
 
             for ( int j = 0; j < bytes.length; j++ )
             {
@@ -136,7 +135,7 @@ public class SearchResultReferenceTest
 
         for ( int i = 0; i < ldapUrls.length; i++ )
         {
-            ldapUrlsSet.add( StringTools.utf8ToString( ldapUrls[i].getBytes() ) );
+            ldapUrlsSet.add( Strings.utf8ToString(ldapUrls[i].getBytes()) );
         }
 
         Referral referral = searchResultReference.getReferral();
@@ -267,7 +266,7 @@ public class SearchResultReferenceTest
 
         for ( int i = 0; i < ldapUrls.length; i++ )
         {
-            ldapUrlsSet.add( StringTools.utf8ToString( ldapUrls[i].getBytes() ) );
+            ldapUrlsSet.add( Strings.utf8ToString(ldapUrls[i].getBytes()) );
         }
 
         Referral referral = searchResultReference.getReferral();

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java Sat Jan 22 20:08:48 2011
@@ -35,7 +35,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsControl;
 import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsControlContainer;
 import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsControlDecoder;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.StringConstants;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -81,7 +81,7 @@ public class PagedSearchControlTest
 
         PagedResultsControl pagedSearch = container.getPagedSearchControl();
         assertEquals( 32, pagedSearch.getSize() );
-        assertTrue( Arrays.equals( StringTools.getBytesUtf8( "test" ), 
+        assertTrue( Arrays.equals( Strings.getBytesUtf8("test"),
             pagedSearch.getCookie() ) );
             
         bb.flip();
@@ -103,7 +103,7 @@ public class PagedSearchControlTest
 
         PagedResultsControl ctrl = new PagedResultsControl();
         ctrl.setSize( 32 );
-        ctrl.setCookie( StringTools.getBytesUtf8( "test" ) );
+        ctrl.setCookie( Strings.getBytesUtf8("test") );
 
         bb = ctrl.encode( ByteBuffer.allocate( ctrl.computeLength() ) );
         String decoded = Strings.dumpBytes(bb.array());
@@ -232,7 +232,7 @@ public class PagedSearchControlTest
 
         PagedResultsControl pagedSearch = container.getPagedSearchControl();
         assertEquals( Integer.MAX_VALUE, pagedSearch.getSize() );
-        assertTrue( Arrays.equals( StringTools.getBytesUtf8( "test" ), 
+        assertTrue( Arrays.equals( Strings.getBytesUtf8("test"),
             pagedSearch.getCookie() ) );
             
         bb.flip();
@@ -255,7 +255,7 @@ public class PagedSearchControlTest
 
         PagedResultsControl ctrl = new PagedResultsControl();
         ctrl.setSize( -1 );
-        ctrl.setCookie( StringTools.getBytesUtf8( "test" ) );
+        ctrl.setCookie( Strings.getBytesUtf8("test") );
 
         bb = ctrl.encode( ByteBuffer.allocate( ctrl.computeLength() ) );
         String decoded = Strings.dumpBytes(bb.array());
@@ -327,7 +327,7 @@ public class PagedSearchControlTest
         PagedResultsControl pagedSearch = container.getPagedSearchControl();
         assertEquals( 32, pagedSearch.getSize() );
         assertNotNull( pagedSearch.getCookie() );
-        assertEquals( StringTools.EMPTY_BYTES, pagedSearch.getCookie() );
+        assertEquals( StringConstants.EMPTY_BYTES, pagedSearch.getCookie() );
             
         ByteBuffer buffer = ByteBuffer.allocate( 0x23 );
         buffer.put( new byte[]

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/BinaryValueAttributeTypeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/BinaryValueAttributeTypeTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/BinaryValueAttributeTypeTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/BinaryValueAttributeTypeTest.java Sat Jan 22 20:08:48 2011
@@ -43,7 +43,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.Normalizer;
 import org.apache.directory.shared.ldap.schema.comparators.ByteArrayComparator;
 import org.apache.directory.shared.ldap.schema.syntaxCheckers.OctetStringSyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.StringConstants;
+import org.apache.directory.shared.util.Strings;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -102,7 +103,7 @@ public class BinaryValueAttributeTypeTes
                         newVal[i++] = (byte)(b & 0x007F); 
                     }
                     
-                    return new BinaryValue( StringTools.trim( newVal ) );
+                    return new BinaryValue( Strings.trim(newVal) );
                 }
 
                 throw new IllegalStateException( "expected byte[] to normalize" );
@@ -249,9 +250,9 @@ public class BinaryValueAttributeTypeTes
     {
         AttributeType attribute = EntryUtils.getBytesAttributeType();
         
-        BinaryValue value = new BinaryValue( attribute, StringTools.EMPTY_BYTES );
+        BinaryValue value = new BinaryValue( attribute, StringConstants.EMPTY_BYTES );
         
-        assertEquals( StringTools.EMPTY_BYTES, value.getReference() );
+        assertEquals( StringConstants.EMPTY_BYTES, value.getReference() );
         assertFalse( value.isNull() );
     }
     
@@ -299,10 +300,10 @@ public class BinaryValueAttributeTypeTes
         
         assertEquals( bv, bv1 );
         
-        bv = new BinaryValue( StringTools.EMPTY_BYTES );
+        bv = new BinaryValue( StringConstants.EMPTY_BYTES );
         
         assertNotSame( bv, bv1 );
-        assertTrue( Arrays.equals( StringTools.EMPTY_BYTES, bv.getBytes() ) );
+        assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, bv.getBytes() ) );
         
         bv = new BinaryValue( BYTES2 );
         bv1 = bv.clone();
@@ -356,8 +357,8 @@ public class BinaryValueAttributeTypeTes
         BinaryValue value = new BinaryValue( attribute, null );
         assertNull( value.getNormalizedValue() );
 
-        value = new BinaryValue( attribute, StringTools.EMPTY_BYTES );
-        assertTrue( Arrays.equals(  StringTools.EMPTY_BYTES, value.getNormalizedValue() ) );
+        value = new BinaryValue( attribute, StringConstants.EMPTY_BYTES );
+        assertTrue( Arrays.equals(  StringConstants.EMPTY_BYTES, value.getNormalizedValue() ) );
 
         value = new BinaryValue( attribute, BYTES2 );
         assertTrue( Arrays.equals( BYTES1, value.getNormalizedValue() ) );
@@ -374,8 +375,8 @@ public class BinaryValueAttributeTypeTes
         BinaryValue value = new BinaryValue( attribute, null );
         assertNull( value.getNormalizedValue() );
 
-        value = new BinaryValue( attribute, StringTools.EMPTY_BYTES );
-        assertTrue( Arrays.equals(  StringTools.EMPTY_BYTES, value.getNormalizedValue() ) );
+        value = new BinaryValue( attribute, StringConstants.EMPTY_BYTES );
+        assertTrue( Arrays.equals(  StringConstants.EMPTY_BYTES, value.getNormalizedValue() ) );
 
         value = new BinaryValue( attribute, BYTES2 );
         assertTrue( Arrays.equals( BYTES1, value.getNormalizedValue() ) );
@@ -392,8 +393,8 @@ public class BinaryValueAttributeTypeTes
         BinaryValue value = new BinaryValue( attribute, null );
         assertNull( value.getNormalizedValueReference() );
 
-        value = new BinaryValue( attribute, StringTools.EMPTY_BYTES );
-        assertTrue( Arrays.equals(  StringTools.EMPTY_BYTES, value.getNormalizedValueReference() ) );
+        value = new BinaryValue( attribute, StringConstants.EMPTY_BYTES );
+        assertTrue( Arrays.equals(  StringConstants.EMPTY_BYTES, value.getNormalizedValueReference() ) );
 
         value = new BinaryValue( attribute, BYTES2 );
         assertTrue( Arrays.equals( BYTES1, value.getNormalizedValueReference() ) );
@@ -425,7 +426,7 @@ public class BinaryValueAttributeTypeTes
         BinaryValue value = new BinaryValue( attribute, null );
         assertTrue( value.isValid() );
         
-        value = new BinaryValue( attribute, StringTools.EMPTY_BYTES );
+        value = new BinaryValue( attribute, StringConstants.EMPTY_BYTES );
         assertTrue( value.isValid() );
 
         value = new BinaryValue( attribute, new byte[]{0x01, 0x02} );
@@ -483,7 +484,7 @@ public class BinaryValueAttributeTypeTes
         bv.normalize();
         assertTrue( bv.isSame() );
         
-        bv = new BinaryValue( attribute, StringTools.EMPTY_BYTES );
+        bv = new BinaryValue( attribute, StringConstants.EMPTY_BYTES );
         bv.normalize();
         assertTrue( bv.isSame() );
 
@@ -526,9 +527,9 @@ public class BinaryValueAttributeTypeTes
         bv.normalize();
         assertEquals( null, bv.getNormalizedValue() );
         
-        bv = new BinaryValue( attribute, StringTools.EMPTY_BYTES );
+        bv = new BinaryValue( attribute, StringConstants.EMPTY_BYTES );
         bv.normalize();
-        assertTrue( Arrays.equals( StringTools.EMPTY_BYTES, bv.getNormalizedValue() ) );
+        assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, bv.getNormalizedValue() ) );
 
         bv = new BinaryValue( attribute, BYTES2 );
         bv.normalize();
@@ -561,8 +562,8 @@ public class BinaryValueAttributeTypeTes
      */
     @Test public void testNormalizedBinaryValueSerialization() throws LdapException, IOException, ClassNotFoundException
     {
-        byte[] v1 = StringTools.getBytesUtf8( "  Test   Test  " );
-        byte[] v1Norm = StringTools.getBytesUtf8( "Test   Test" );
+        byte[] v1 = Strings.getBytesUtf8("  Test   Test  ");
+        byte[] v1Norm = Strings.getBytesUtf8("Test   Test");
         
         // First check with a value which will be normalized
         BinaryValue sbv = new BinaryValue( at, v1 );
@@ -585,7 +586,7 @@ public class BinaryValueAttributeTypeTes
      */
     @Test public void testNormalizedBinarySameValueSerialization() throws LdapException, IOException, ClassNotFoundException
     {
-        byte[] v1 = StringTools.getBytesUtf8( "Test   Test" );
+        byte[] v1 = Strings.getBytesUtf8("Test   Test");
         
         // First check with a value which will be normalized
         BinaryValue sbv = new BinaryValue( at, v1 );
@@ -601,8 +602,8 @@ public class BinaryValueAttributeTypeTes
      */
     @Test public void testNoNormalizedBinaryValueSerialization() throws LdapException, IOException, ClassNotFoundException
     {
-        byte[] v1 = StringTools.getBytesUtf8( "test" );
-        byte[] v1Norm = StringTools.getBytesUtf8( "test" );
+        byte[] v1 = Strings.getBytesUtf8("test");
+        byte[] v1Norm = Strings.getBytesUtf8("test");
 
         // First check with a value which will be normalized
         BinaryValue sbv = new BinaryValue( at, v1 );
@@ -645,13 +646,13 @@ public class BinaryValueAttributeTypeTes
     @Test public void testEmptyBinaryValueSerialization() throws LdapException, IOException, ClassNotFoundException
     {
         // First check with a value which will be normalized
-        BinaryValue sbv = new BinaryValue( at, StringTools.EMPTY_BYTES );
+        BinaryValue sbv = new BinaryValue( at, StringConstants.EMPTY_BYTES );
         
         sbv.normalize();
         byte[] normalized = sbv.getNormalizedValueReference();
         
-        assertTrue( Arrays.equals( StringTools.EMPTY_BYTES, normalized ) );
-        assertTrue( Arrays.equals( StringTools.EMPTY_BYTES, sbv.getBytes() ) );
+        assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, normalized ) );
+        assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, sbv.getBytes() ) );
         
         BinaryValue sbvSer = deserializeValue( serializeValue( sbv ), at );
         
@@ -664,8 +665,8 @@ public class BinaryValueAttributeTypeTes
      */
     @Test public void testSameNormalizedBinaryValueSerialization() throws LdapException, IOException, ClassNotFoundException
     {
-        byte[] v1 = StringTools.getBytesUtf8( "test" );
-        byte[] v1Norm = StringTools.getBytesUtf8( "test" );
+        byte[] v1 = Strings.getBytesUtf8("test");
+        byte[] v1Norm = Strings.getBytesUtf8("test");
 
         // First check with a value which will be normalized
         BinaryValue sbv = new BinaryValue( at, v1 );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/BinaryValueTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/BinaryValueTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/BinaryValueTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/BinaryValueTest.java Sat Jan 22 20:08:48 2011
@@ -34,12 +34,11 @@ import java.util.Arrays;
 
 import org.apache.directory.junit.tools.Concurrent;
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
-import org.apache.directory.shared.ldap.entry.BinaryValue;
-import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.schema.Normalizer;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.StringConstants;
+import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -76,7 +75,7 @@ public class BinaryValueTest
                     newVal[i++] = (byte)(b & 0x007F); 
                 }
                 
-                return new BinaryValue( StringTools.trim( newVal ) );
+                return new BinaryValue( Strings.trim(newVal) );
             }
 
             throw new IllegalStateException( "expected byte[] to normalize" );
@@ -100,7 +99,7 @@ public class BinaryValueTest
         {
             if ( value.isBinary() )
             {
-                return new BinaryValue( StringTools.EMPTY_BYTES );
+                return new BinaryValue( StringConstants.EMPTY_BYTES );
             }
 
             throw new IllegalStateException( "expected byte[] to normalize" );
@@ -207,8 +206,8 @@ public class BinaryValueTest
         BinaryValue bv = new BinaryValue();
         assertEquals( 0, bv.hashCode() );
         
-        bv = new BinaryValue( StringTools.EMPTY_BYTES );
-        int h = Arrays.hashCode( StringTools.EMPTY_BYTES );
+        bv = new BinaryValue( StringConstants.EMPTY_BYTES );
+        int h = Arrays.hashCode( StringConstants.EMPTY_BYTES );
         assertEquals( h, bv.hashCode() );
         
         h = Arrays.hashCode( BYTES1 );
@@ -233,17 +232,17 @@ public class BinaryValueTest
     @Test
     public void testBinaryValueEmpty() throws LdapException
     {
-        BinaryValue cbv = new BinaryValue( StringTools.EMPTY_BYTES );
+        BinaryValue cbv = new BinaryValue( StringConstants.EMPTY_BYTES );
         
-        assertTrue( Arrays.equals( StringTools.EMPTY_BYTES, cbv.getBytes() ) );
-        assertTrue( Arrays.equals( StringTools.EMPTY_BYTES, cbv.get() ) );
-        assertTrue( Arrays.equals( StringTools.EMPTY_BYTES, cbv.getReference() ) );
+        assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, cbv.getBytes() ) );
+        assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, cbv.get() ) );
+        assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, cbv.getReference() ) );
         assertFalse( cbv.isNormalized() );
         assertTrue( cbv.isValid( BINARY_CHECKER ) );
         assertFalse( cbv.isNull() );
         assertNotNull( cbv.getNormalizedValue() );
-        assertTrue( Arrays.equals( StringTools.EMPTY_BYTES, cbv.getNormalizedValue() ) );
-        assertTrue( Arrays.equals( StringTools.EMPTY_BYTES, cbv.getNormalizedValueReference() ) );
+        assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, cbv.getNormalizedValue() ) );
+        assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, cbv.getNormalizedValueReference() ) );
     }
 
 
@@ -312,11 +311,11 @@ public class BinaryValueTest
         assertTrue( bv.isNormalized() );
         assertEquals( null, bv.getNormalizedValue() );
         
-        bv = new BinaryValue( StringTools.EMPTY_BYTES );
+        bv = new BinaryValue( StringConstants.EMPTY_BYTES );
         bv.normalize( BINARY_NORMALIZER );
         assertTrue( bv.isNormalized() );
-        assertTrue( Arrays.equals( StringTools.EMPTY_BYTES, bv.getBytes() ) );
-        assertTrue( Arrays.equals( StringTools.EMPTY_BYTES, bv.getNormalizedValue() ) );
+        assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, bv.getBytes() ) );
+        assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, bv.getNormalizedValue() ) );
         
         bv = new BinaryValue( BYTES1 );
         bv.normalize( BINARY_NORMALIZER );
@@ -404,9 +403,9 @@ public class BinaryValueTest
         
         assertNull( bv.get() );
         
-        bv = new BinaryValue( StringTools.EMPTY_BYTES );
+        bv = new BinaryValue( StringConstants.EMPTY_BYTES );
         assertNotNull( bv.get() );
-        assertTrue( Arrays.equals( StringTools.EMPTY_BYTES, bv.get() ) );
+        assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, bv.get() ) );
         
         bv = new BinaryValue( BYTES1 );
         byte[] copy = bv.get();
@@ -457,7 +456,7 @@ public class BinaryValueTest
         
         assertEquals( "null", bv.toString() );
 
-        bv = new BinaryValue( StringTools.EMPTY_BYTES );
+        bv = new BinaryValue( StringConstants.EMPTY_BYTES );
         assertEquals( "''", bv.toString() );
 
         bv = new BinaryValue( BYTES1 );
@@ -472,9 +471,9 @@ public class BinaryValueTest
         
         assertNull( bv.getReference() );
         
-        bv = new BinaryValue( StringTools.EMPTY_BYTES );
+        bv = new BinaryValue( StringConstants.EMPTY_BYTES );
         assertNotNull( bv.getReference() );
-        assertTrue( Arrays.equals( StringTools.EMPTY_BYTES, bv.getReference() ) );
+        assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, bv.getReference() ) );
         
         bv = new BinaryValue( BYTES1 );
         byte[] reference = bv.getReference();
@@ -494,9 +493,9 @@ public class BinaryValueTest
         
         assertNull( bv.get() );
         
-        bv = new BinaryValue( StringTools.EMPTY_BYTES );
+        bv = new BinaryValue( StringConstants.EMPTY_BYTES );
         assertNotNull( bv.get() );
-        assertTrue( Arrays.equals( StringTools.EMPTY_BYTES, bv.getBytes() ) );
+        assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, bv.getBytes() ) );
         
         bv = new BinaryValue( BYTES1 );
         byte[] get = bv.getBytes();
@@ -558,7 +557,7 @@ public class BinaryValueTest
         
         assertTrue( bv.isNull() );
         
-        bv = new BinaryValue( StringTools.EMPTY_BYTES );
+        bv = new BinaryValue( StringConstants.EMPTY_BYTES );
         assertFalse( bv.isNull() );
         
         bv = new BinaryValue( BYTES1 );
@@ -575,7 +574,7 @@ public class BinaryValueTest
         bv.isValid( BINARY_CHECKER );
         assertTrue( bv.isValid() );
         
-        bv = new BinaryValue( StringTools.EMPTY_BYTES );
+        bv = new BinaryValue( StringConstants.EMPTY_BYTES );
         assertFalse( bv.isValid() );
         bv.isValid( BINARY_CHECKER );
         assertTrue( bv.isValid() );
@@ -599,7 +598,7 @@ public class BinaryValueTest
         
         assertTrue( bv.isValid( BINARY_CHECKER ) ) ;
         
-        bv = new BinaryValue( StringTools.EMPTY_BYTES );
+        bv = new BinaryValue( StringConstants.EMPTY_BYTES );
         assertTrue( bv.isValid( BINARY_CHECKER ) );
         
         bv = new BinaryValue( BYTES1 );
@@ -619,10 +618,10 @@ public class BinaryValueTest
         assertTrue( bv.isNormalized() );
         assertEquals( null, bv.getNormalizedValue() );
         
-        bv = new BinaryValue( StringTools.EMPTY_BYTES );
+        bv = new BinaryValue( StringConstants.EMPTY_BYTES );
         bv.normalize();
         assertTrue( bv.isNormalized() );
-        assertTrue( Arrays.equals( StringTools.EMPTY_BYTES, bv.getNormalizedValue() ) );
+        assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, bv.getNormalizedValue() ) );
         
         bv = new BinaryValue( BYTES2 );
         bv.normalize();
@@ -641,9 +640,9 @@ public class BinaryValueTest
         assertTrue( bv.isValid( BINARY_CHECKER ) );
         assertTrue( bv.isNull() );
 
-        bv = new BinaryValue( StringTools.EMPTY_BYTES );
+        bv = new BinaryValue( StringConstants.EMPTY_BYTES );
         assertNotNull( bv.get() );
-        assertTrue( Arrays.equals( StringTools.EMPTY_BYTES, bv.getBytes() ) );
+        assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, bv.getBytes() ) );
         assertFalse( bv.isNormalized() );
         assertTrue( bv.isValid( BINARY_CHECKER ) );
         assertFalse( bv.isNull() );
@@ -796,7 +795,7 @@ public class BinaryValueTest
     {
         BinaryValue bv = new BinaryValue();
         bv.setNormalized( true );
-        bv = new BinaryValue( StringTools.EMPTY_BYTES );
+        bv = new BinaryValue( StringConstants.EMPTY_BYTES );
         bv.isValid( BINARY_CHECKER );
         bv.normalize( BINARY_NORMALIZER );
 
@@ -817,7 +816,7 @@ public class BinaryValueTest
     {
         BinaryValue bv = new BinaryValue();
         bv.setNormalized( false );
-        bv = new BinaryValue( StringTools.EMPTY_BYTES );
+        bv = new BinaryValue( StringConstants.EMPTY_BYTES );
         bv.isValid( BINARY_CHECKER );
 
         BinaryValue cbvSer = deserializeValue( serializeValue( bv ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttributeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttributeTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttributeTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/DefaultEntryAttributeTest.java Sat Jan 22 20:08:48 2011
@@ -37,15 +37,11 @@ import javax.naming.directory.InvalidAtt
 
 import org.apache.directory.junit.tools.Concurrent;
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
-import org.apache.directory.shared.ldap.entry.BinaryValue;
-import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
-import org.apache.directory.shared.ldap.entry.StringValue;
-import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
 import org.apache.directory.shared.ldap.schema.syntaxCheckers.Ia5StringSyntaxChecker;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.StringConstants;
+import org.apache.directory.shared.util.Strings;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -651,10 +647,10 @@ public class DefaultEntryAttributeTest
         
         EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
         
-        nbAdded = attr2.add( StringTools.EMPTY_BYTES );
+        nbAdded = attr2.add( StringConstants.EMPTY_BYTES );
         assertEquals( 1, nbAdded );
         assertFalse( attr2.isHR() );
-        assertTrue( Arrays.equals( StringTools.EMPTY_BYTES, attr2.getBytes() ) );
+        assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, attr2.getBytes() ) );
         
         EntryAttribute attr3 = new DefaultEntryAttribute( "test" );
         
@@ -1201,10 +1197,10 @@ public class DefaultEntryAttributeTest
         
         EntryAttribute attr2 = new DefaultEntryAttribute( "test" );
         
-        nbAdded = attr2.add( StringTools.EMPTY_BYTES );
+        nbAdded = attr2.add( StringConstants.EMPTY_BYTES );
         assertEquals( 1, nbAdded );
         assertFalse( attr2.isHR() );
-        assertTrue( Arrays.equals( StringTools.EMPTY_BYTES, attr2.getBytes() ) );
+        assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, attr2.getBytes() ) );
         
         EntryAttribute attr3 = new DefaultEntryAttribute( "test" );
         
@@ -1560,7 +1556,7 @@ public class DefaultEntryAttributeTest
     {
         DefaultEntryAttribute dca = new DefaultEntryAttribute( "UserPassword" );
         dca.setHR( false );
-        byte[] password = StringTools.getBytesUtf8( "secret" );
+        byte[] password = Strings.getBytesUtf8("secret");
         dca.add( password );
 
         DefaultEntryAttribute dcaSer = deserializeValue( serializeValue( dca ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java Sat Jan 22 20:08:48 2011
@@ -42,18 +42,11 @@ import java.util.Set;
 import org.apache.directory.junit.tools.Concurrent;
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.entry.BinaryValue;
-import org.apache.directory.shared.ldap.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
-import org.apache.directory.shared.ldap.entry.StringValue;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimToLowerNormalizer;
 import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -1280,7 +1273,7 @@ public class EntryTest
         
         dn.normalize( oids );
         
-        byte[] password = StringTools.getBytesUtf8( "secret" );
+        byte[] password = Strings.getBytesUtf8("secret");
         Entry entry = new DefaultEntry( dn);
         entry.add( "ObjectClass", "top", "person" );
         entry.add( "cn", "test1" );
@@ -1298,7 +1291,7 @@ public class EntryTest
     @Test
     public void testSerializeEntryWithNoDN() throws LdapException, IOException, ClassNotFoundException
     {
-        byte[] password = StringTools.getBytesUtf8( "secret" );
+        byte[] password = Strings.getBytesUtf8("secret");
         Entry entry = new DefaultEntry();
         entry.add( "ObjectClass", "top", "person" );
         entry.add( "cn", "test1" );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/EntryUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/EntryUtils.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/EntryUtils.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/EntryUtils.java Sat Jan 22 20:08:48 2011
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.schema.comparators.ByteArrayComparator;
 import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimToLowerNormalizer;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
 
 /**
  * Some common declaration used by the serverEntry tests.
@@ -267,7 +267,7 @@ public class EntryUtils
                         newVal[i++] = (byte)(b & 0x007F); 
                     }
                     
-                    return new BinaryValue( StringTools.trim( newVal ) );
+                    return new BinaryValue( Strings.trim(newVal) );
                 }
 
                 throw new IllegalStateException( I18n.err( I18n.ERR_04475 ) );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifReaderTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifReaderTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifReaderTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifReaderTest.java Sat Jan 22 20:08:48 2011
@@ -42,7 +42,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.directory.shared.util.Strings;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -1530,7 +1529,7 @@ public class LdifReaderTest
 
         assertEquals( "1.2.840.113556.1.4.805", control.getOid() );
         assertFalse( control.isCritical() );
-        assertEquals( "control-value", StringTools.utf8ToString( control.getValue() ) );
+        assertEquals( "control-value", Strings.utf8ToString(control.getValue()) );
     }
 
 
@@ -1952,28 +1951,28 @@ public class LdifReaderTest
         
         assertEquals( "1.1.3", control.getOid() );
         assertFalse( control.isCritical() );
-        assertEquals( "ABCDEF", StringTools.utf8ToString( control.getValue() ) );
+        assertEquals( "ABCDEF", Strings.utf8ToString(control.getValue()) );
         
         // Forth control
         control = entry.getControl( "1.1.4" );
         
         assertEquals( "1.1.4", control.getOid() );
         assertTrue( control.isCritical() );
-        assertEquals( "ABCDEF", StringTools.utf8ToString( control.getValue() ) );
+        assertEquals( "ABCDEF", Strings.utf8ToString(control.getValue()) );
         
         // Fifth control
         control = entry.getControl( "1.1.5" );
         
         assertEquals( "1.1.5", control.getOid() );
         assertFalse( control.isCritical() );
-        assertEquals( "Emmanuel L\u00e9charny", StringTools.utf8ToString( control.getValue() ) );
+        assertEquals( "Emmanuel L\u00e9charny", Strings.utf8ToString(control.getValue()) );
         
         // Sixth control
         control = entry.getControl( "1.1.6" );
         
         assertEquals( "1.1.6", control.getOid() );
         assertTrue( control.isCritical() );
-        assertEquals( "Emmanuel L\u00e9charny", StringTools.utf8ToString( control.getValue() ) );
+        assertEquals( "Emmanuel L\u00e9charny", Strings.utf8ToString(control.getValue()) );
     }
     
     

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifRevertorTest.java Sat Jan 22 20:08:48 2011
@@ -45,7 +45,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -670,7 +670,7 @@ public class LdifRevertorTest
         assertEquals( ChangeType.ModDn, reversed.getChangeType() );
         assertFalse( reversed.isDeleteOldRdn() );
         assertEquals( rdn.getName(), reversed.getNewRdn() );
-        assertEquals( "dc=example, dc=com", StringTools.trim( reversed.getNewSuperior() ) );
+        assertEquals( "dc=example, dc=com", Strings.trim(reversed.getNewSuperior()) );
         assertNull( reversed.getEntry() );
     }
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java Sat Jan 22 20:08:48 2011
@@ -43,7 +43,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -409,7 +409,7 @@ public class LdifUtilsTest
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertFalse( reversed.isDeleteOldRdn() );
         assertEquals( "cn=john doe", reversed.getNewRdn() );
-        assertEquals( "dc=example, dc=com", StringTools.trim( reversed.getNewSuperior() ) );
+        assertEquals( "dc=example, dc=com", Strings.trim(reversed.getNewSuperior()) );
         assertNull( reversed.getEntry() );
     }
 
@@ -441,7 +441,7 @@ public class LdifUtilsTest
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertTrue( reversed.isDeleteOldRdn() );
         assertEquals( "cn=john doe", reversed.getNewRdn() );
-        assertEquals( "dc=example, dc=com", StringTools.trim( reversed.getNewSuperior() ) );
+        assertEquals( "dc=example, dc=com", Strings.trim(reversed.getNewSuperior()) );
         assertNull( reversed.getEntry() );
     }
     

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/AVATest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/AVATest.java?rev=1062251&r1=1062250&r2=1062251&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/AVATest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/AVATest.java Sat Jan 22 20:08:48 2011
@@ -29,11 +29,12 @@ import java.io.ObjectOutputStream;
 import org.apache.directory.junit.tools.Concurrent;
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.util.StringTools;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+
+import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -279,8 +280,8 @@ public class AVATest
     @Test
     public void testBinaryAtavSerialization() throws LdapException, IOException, ClassNotFoundException
     {
-        byte[] upValue = StringTools.getBytesUtf8( "  Test  " );
-        byte[] normValue = StringTools.getBytesUtf8( "Test" );
+        byte[] upValue = Strings.getBytesUtf8("  Test  ");
+        byte[] normValue = Strings.getBytesUtf8("Test");
 
         AVA atav = new AVA( "cn", "CN", upValue, normValue );
 
@@ -439,8 +440,8 @@ public class AVATest
     @Test
     public void testBinaryAtavStaticSerialization() throws LdapException, IOException, ClassNotFoundException
     {
-        byte[] upValue = StringTools.getBytesUtf8( "  Test  " );
-        byte[] normValue = StringTools.getBytesUtf8( "Test" );
+        byte[] upValue = Strings.getBytesUtf8("  Test  ");
+        byte[] normValue = Strings.getBytesUtf8("Test");
 
         AVA atav = new AVA( "cn", "CN", upValue, normValue );
 



Mime
View raw message