You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2016/11/21 23:23:38 UTC
svn commit: r1770782 - in
/directory/shared/branches/shared-value/ldap/model/src:
main/java/org/apache/directory/api/ldap/model/message/controls/
main/java/org/apache/directory/api/ldap/model/name/
main/java/org/apache/directory/api/ldap/model/url/ tes...
Author: elecharny
Date: Mon Nov 21 23:23:38 2016
New Revision: 1770782
URL: http://svn.apache.org/viewvc?rev=1770782&view=rev
Log:
Using the Strings.EMPTY_BTES instead of the StringConstants.EMPTY_BYTES constant
Modified:
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/PagedResultsImpl.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Rdn.java
directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/url/LdapUrl.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/AttributeTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/BinaryValueAttributeTypeTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/BinaryValueTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/ValueSerializationTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifControlSerializationTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/controls/OpaqueControlTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/OctetStringSyntaxCheckerTest.java
directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/UuidSyntaxCheckerTest.java
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/PagedResultsImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/PagedResultsImpl.java?rev=1770782&r1=1770781&r2=1770782&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/PagedResultsImpl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/controls/PagedResultsImpl.java Mon Nov 21 23:23:38 2016
@@ -20,7 +20,6 @@
package org.apache.directory.api.ldap.model.message.controls;
-import org.apache.directory.api.util.StringConstants;
import org.apache.directory.api.util.Strings;
import java.util.Arrays;
@@ -63,7 +62,7 @@ public class PagedResultsImpl extends Ab
private int size;
/** The exchanged cookie */
- private byte[] cookie = StringConstants.EMPTY_BYTES;
+ private byte[] cookie = Strings.EMPTY_BYTES;
/**
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Rdn.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Rdn.java?rev=1770782&r1=1770781&r2=1770782&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Rdn.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/name/Rdn.java Mon Nov 21 23:23:38 2016
@@ -39,7 +39,6 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.util.Chars;
import org.apache.directory.api.util.Hex;
import org.apache.directory.api.util.Serialize;
-import org.apache.directory.api.util.StringConstants;
import org.apache.directory.api.util.Strings;
import org.apache.directory.api.util.Unicode;
import org.slf4j.Logger;
@@ -1309,7 +1308,7 @@ public class Rdn implements Cloneable, E
if ( chars.length == 1 )
{
// The value is only containing a #
- return StringConstants.EMPTY_BYTES;
+ return Strings.EMPTY_BYTES;
}
if ( ( chars.length % 2 ) != 1 )
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/url/LdapUrl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/url/LdapUrl.java?rev=1770782&r1=1770781&r2=1770782&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/url/LdapUrl.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/url/LdapUrl.java Mon Nov 21 23:23:38 2016
@@ -1041,7 +1041,7 @@ public class LdapUrl
{
if ( bytes == null )
{
- return StringConstants.EMPTY_BYTES;
+ return Strings.EMPTY_BYTES;
}
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
Modified: directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/AttributeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/AttributeTest.java?rev=1770782&r1=1770781&r2=1770782&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/AttributeTest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/AttributeTest.java Mon Nov 21 23:23:38 2016
@@ -38,7 +38,6 @@ import javax.naming.directory.InvalidAtt
import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.api.ldap.model.exception.LdapInvalidAttributeValueException;
-import org.apache.directory.api.util.StringConstants;
import org.apache.directory.api.util.Strings;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -641,10 +640,10 @@ public class AttributeTest
Attribute attr2 = new DefaultAttribute( "test" );
- nbAdded = attr2.add( StringConstants.EMPTY_BYTES );
+ nbAdded = attr2.add( Strings.EMPTY_BYTES );
assertEquals( 1, nbAdded );
assertFalse( attr2.isHumanReadable() );
- assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, attr2.getBytes() ) );
+ assertTrue( Arrays.equals( Strings.EMPTY_BYTES, attr2.getBytes() ) );
assertEquals( 1, attr2.size() );
Attribute attr3 = new DefaultAttribute( "test" );
@@ -1179,10 +1178,10 @@ public class AttributeTest
Attribute attr2 = new DefaultAttribute( "test" );
- nbAdded = attr2.add( StringConstants.EMPTY_BYTES );
+ nbAdded = attr2.add( Strings.EMPTY_BYTES );
assertEquals( 1, nbAdded );
assertFalse( attr2.isHumanReadable() );
- assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, attr2.getBytes() ) );
+ assertTrue( Arrays.equals( Strings.EMPTY_BYTES, attr2.getBytes() ) );
Attribute attr3 = new DefaultAttribute( "test" );
Modified: directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/BinaryValueAttributeTypeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/BinaryValueAttributeTypeTest.java?rev=1770782&r1=1770781&r2=1770782&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/BinaryValueAttributeTypeTest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/BinaryValueAttributeTypeTest.java Mon Nov 21 23:23:38 2016
@@ -44,7 +44,6 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.schema.PrepareString;
import org.apache.directory.api.ldap.model.schema.comparators.ByteArrayComparator;
import org.apache.directory.api.ldap.model.schema.syntaxCheckers.OctetStringSyntaxChecker;
-import org.apache.directory.api.util.StringConstants;
import org.apache.directory.api.util.Strings;
import org.junit.Before;
import org.junit.Test;
@@ -236,9 +235,9 @@ public class BinaryValueAttributeTypeTes
{
AttributeType attribute = EntryUtils.getBytesAttributeType();
- Value value = new Value( attribute, StringConstants.EMPTY_BYTES );
+ Value value = new Value( attribute, Strings.EMPTY_BYTES );
- assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, value.getBytes() ) );
+ assertTrue( Arrays.equals( Strings.EMPTY_BYTES, value.getBytes() ) );
assertFalse( value.isNull() );
}
@@ -288,10 +287,10 @@ public class BinaryValueAttributeTypeTes
assertEquals( bv, bv1 );
- bv = new Value( StringConstants.EMPTY_BYTES );
+ bv = new Value( Strings.EMPTY_BYTES );
assertNotSame( bv, bv1 );
- assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, bv.getBytes() ) );
+ assertTrue( Arrays.equals( Strings.EMPTY_BYTES, bv.getBytes() ) );
bv = new Value( at, BYTES2 );
bv1 = bv.clone();
@@ -346,8 +345,8 @@ public class BinaryValueAttributeTypeTes
Value value = new Value( attribute, ( byte[] ) null );
assertNull( value.getBytes() );
- value = new Value( attribute, StringConstants.EMPTY_BYTES );
- assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, value.getBytes() ) );
+ value = new Value( attribute, Strings.EMPTY_BYTES );
+ assertTrue( Arrays.equals( Strings.EMPTY_BYTES, value.getBytes() ) );
value = new Value( attribute, BYTES2 );
assertTrue( Arrays.equals( BYTES2, value.getBytes() ) );
@@ -365,8 +364,8 @@ public class BinaryValueAttributeTypeTes
Value value = new Value( attribute, ( byte[] ) null );
assertNull( value.getBytes() );
- value = new Value( attribute, StringConstants.EMPTY_BYTES );
- assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, value.getBytes() ) );
+ value = new Value( attribute, Strings.EMPTY_BYTES );
+ assertTrue( Arrays.equals( Strings.EMPTY_BYTES, value.getBytes() ) );
value = new Value( attribute, BYTES2 );
assertTrue( Arrays.equals( BYTES2, value.getBytes() ) );
@@ -384,8 +383,8 @@ public class BinaryValueAttributeTypeTes
Value value = new Value( attribute, ( byte[] ) null );
assertNull( value.getBytes() );
- value = new Value( attribute, StringConstants.EMPTY_BYTES );
- assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, value.getBytes() ) );
+ value = new Value( attribute, Strings.EMPTY_BYTES );
+ assertTrue( Arrays.equals( Strings.EMPTY_BYTES, value.getBytes() ) );
value = new Value( attribute, BYTES2 );
assertTrue( Arrays.equals( BYTES2, value.getBytes() ) );
@@ -417,7 +416,7 @@ public class BinaryValueAttributeTypeTes
AttributeType attribute = EntryUtils.getBytesAttributeType();
new Value( attribute, ( byte[] ) null );
- new Value( attribute, StringConstants.EMPTY_BYTES );
+ new Value( attribute, Strings.EMPTY_BYTES );
new Value( attribute, new byte[]
{ 0x01, 0x02 } );
@@ -491,8 +490,8 @@ public class BinaryValueAttributeTypeTes
assertEquals( null, bv.getBytes() );
- bv = new Value( attribute, StringConstants.EMPTY_BYTES );
- assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, bv.getBytes() ) );
+ bv = new Value( attribute, Strings.EMPTY_BYTES );
+ assertTrue( Arrays.equals( Strings.EMPTY_BYTES, bv.getBytes() ) );
bv = new Value( attribute, BYTES2 );
assertTrue( Arrays.equals( BYTES2, bv.getBytes() ) );
@@ -587,12 +586,12 @@ public class BinaryValueAttributeTypeTes
public void testEmptyBinaryValueSerialization() throws LdapException, IOException, ClassNotFoundException
{
// First check with a value which will be normalized
- Value sbv = new Value( at, StringConstants.EMPTY_BYTES );
+ Value sbv = new Value( at, Strings.EMPTY_BYTES );
byte[] normalized = sbv.getBytes();
- assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, normalized ) );
- assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, sbv.getBytes() ) );
+ assertTrue( Arrays.equals( Strings.EMPTY_BYTES, normalized ) );
+ assertTrue( Arrays.equals( Strings.EMPTY_BYTES, sbv.getBytes() ) );
Value sbvSer = deserializeValue( serializeValue( sbv ), at );
Modified: directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/BinaryValueTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/BinaryValueTest.java?rev=1770782&r1=1770781&r2=1770782&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/BinaryValueTest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/BinaryValueTest.java Mon Nov 21 23:23:38 2016
@@ -43,7 +43,6 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
import org.apache.directory.api.ldap.model.schema.comparators.ByteArrayComparator;
import org.apache.directory.api.ldap.model.schema.syntaxCheckers.OctetStringSyntaxChecker;
-import org.apache.directory.api.util.StringConstants;
import org.apache.directory.api.util.Strings;
import org.junit.Before;
import org.junit.Test;
@@ -222,8 +221,8 @@ public class BinaryValueTest
Value bv = new Value( ( byte[] ) null );
assertEquals( 0, bv.hashCode() );
- bv = new Value( StringConstants.EMPTY_BYTES );
- int h = Arrays.hashCode( StringConstants.EMPTY_BYTES );
+ bv = new Value( Strings.EMPTY_BYTES );
+ int h = Arrays.hashCode( Strings.EMPTY_BYTES );
assertEquals( h, bv.hashCode() );
h = Arrays.hashCode( BYTES1 );
@@ -248,13 +247,13 @@ public class BinaryValueTest
@Test
public void testBinaryValueEmpty() throws LdapException
{
- Value cbv = new Value( StringConstants.EMPTY_BYTES );
+ Value cbv = new Value( Strings.EMPTY_BYTES );
- assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, cbv.getBytes() ) );
+ assertTrue( Arrays.equals( Strings.EMPTY_BYTES, cbv.getBytes() ) );
assertFalse( cbv.isSchemaAware() );
assertTrue( cbv.isValid( BINARY_CHECKER ) );
assertFalse( cbv.isNull() );
- assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, cbv.getBytes() ) );
+ assertTrue( Arrays.equals( Strings.EMPTY_BYTES, cbv.getBytes() ) );
}
@@ -309,10 +308,10 @@ public class BinaryValueTest
assertTrue( bv.isSchemaAware() );
assertNull( bv.getBytes() );
- bv = new Value( StringConstants.EMPTY_BYTES );
+ bv = new Value( Strings.EMPTY_BYTES );
bv = new Value( at, bv );
assertTrue( bv.isSchemaAware() );
- assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, bv.getBytes() ) );
+ assertTrue( Arrays.equals( Strings.EMPTY_BYTES, bv.getBytes() ) );
bv = new Value( BYTES1 );
bv = new Value( at, bv );
@@ -395,9 +394,9 @@ public class BinaryValueTest
assertEquals( "", bv.getValue() );
- bv = new Value( StringConstants.EMPTY_BYTES );
+ bv = new Value( Strings.EMPTY_BYTES );
assertNotNull( bv.getBytes() );
- assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, bv.getBytes() ) );
+ assertTrue( Arrays.equals( Strings.EMPTY_BYTES, bv.getBytes() ) );
bv = new Value( BYTES1 );
byte[] copy = bv.getBytes();
@@ -446,7 +445,7 @@ public class BinaryValueTest
assertEquals( "null", bv.toString() );
- bv = new Value( StringConstants.EMPTY_BYTES );
+ bv = new Value( Strings.EMPTY_BYTES );
assertEquals( "", bv.toString() );
bv = new Value( BYTES1 );
@@ -461,9 +460,9 @@ public class BinaryValueTest
assertEquals( "", bv.getValue() );
- bv = new Value( StringConstants.EMPTY_BYTES );
+ bv = new Value( Strings.EMPTY_BYTES );
assertEquals( "", bv.getValue() );
- assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, bv.getBytes() ) );
+ assertTrue( Arrays.equals( Strings.EMPTY_BYTES, bv.getBytes() ) );
bv = new Value( BYTES1 );
byte[] get = bv.getBytes();
@@ -500,7 +499,7 @@ public class BinaryValueTest
assertTrue( bv.isNull() );
- bv = new Value( StringConstants.EMPTY_BYTES );
+ bv = new Value( Strings.EMPTY_BYTES );
assertFalse( bv.isNull() );
bv = new Value( BYTES1 );
@@ -515,7 +514,7 @@ public class BinaryValueTest
assertTrue( bv.isValid( BINARY_CHECKER ) );
- bv = new Value( StringConstants.EMPTY_BYTES );
+ bv = new Value( Strings.EMPTY_BYTES );
assertTrue( bv.isValid( BINARY_CHECKER ) );
bv = new Value( BYTES1 );
@@ -535,7 +534,7 @@ public class BinaryValueTest
assertTrue( bv.isValid( BINARY_CHECKER ) );
- bv = new Value( StringConstants.EMPTY_BYTES );
+ bv = new Value( Strings.EMPTY_BYTES );
assertTrue( bv.isValid( BINARY_CHECKER ) );
bv = new Value( BYTES1 );
@@ -555,10 +554,10 @@ public class BinaryValueTest
assertTrue( bv.isSchemaAware() );
assertEquals( null, bv.getBytes() );
- bv = new Value( StringConstants.EMPTY_BYTES );
+ bv = new Value( Strings.EMPTY_BYTES );
bv = new Value( at, bv );
assertTrue( bv.isSchemaAware() );
- assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, bv.getBytes() ) );
+ assertTrue( Arrays.equals( Strings.EMPTY_BYTES, bv.getBytes() ) );
bv = new Value( BYTES2 );
bv = new Value( at, bv );
@@ -577,9 +576,9 @@ public class BinaryValueTest
assertTrue( bv.isValid( BINARY_CHECKER ) );
assertTrue( bv.isNull() );
- bv = new Value( StringConstants.EMPTY_BYTES );
+ bv = new Value( Strings.EMPTY_BYTES );
assertEquals( "", bv.getValue() );
- assertTrue( Arrays.equals( StringConstants.EMPTY_BYTES, bv.getBytes() ) );
+ assertTrue( Arrays.equals( Strings.EMPTY_BYTES, bv.getBytes() ) );
assertFalse( bv.isSchemaAware() );
assertTrue( bv.isValid( BINARY_CHECKER ) );
assertFalse( bv.isNull() );
@@ -708,7 +707,7 @@ public class BinaryValueTest
public void testSerializeEmptyValue() throws LdapException, IOException, ClassNotFoundException
{
Value bv = new Value( ( byte[] ) null );
- bv = new Value( StringConstants.EMPTY_BYTES );
+ bv = new Value( Strings.EMPTY_BYTES );
bv.isValid( BINARY_CHECKER );
bv = new Value( at, bv );
@@ -725,7 +724,7 @@ public class BinaryValueTest
public void testSerializeEmptyValueNotNormalized() throws LdapException, IOException, ClassNotFoundException
{
Value bv = new Value( ( byte[] ) null );
- bv = new Value( StringConstants.EMPTY_BYTES );
+ bv = new Value( Strings.EMPTY_BYTES );
bv.isValid( BINARY_CHECKER );
Value cbvSer = deserializeValue( null, serializeValue( bv ) );
Modified: directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/ValueSerializationTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/ValueSerializationTest.java?rev=1770782&r1=1770781&r2=1770782&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/ValueSerializationTest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/ValueSerializationTest.java Mon Nov 21 23:23:38 2016
@@ -37,7 +37,6 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.schema.comparators.StringComparator;
import org.apache.directory.api.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer;
import org.apache.directory.api.ldap.model.schema.syntaxCheckers.OctetStringSyntaxChecker;
-import org.apache.directory.api.util.StringConstants;
import org.apache.directory.api.util.Strings;
import org.junit.Before;
import org.junit.Ignore;
@@ -60,10 +59,10 @@ public class ValueSerializationTest
private static byte[] data = new byte[]
{ 0x01, 0x02, 0x03, 0x04 };
Value bv1 = new Value( data );
- Value bv2 = new Value( StringConstants.EMPTY_BYTES );
+ Value bv2 = new Value( Strings.EMPTY_BYTES );
Value bv3 = new Value( ( byte[] ) null );
Value bv1n = new Value( data );
- Value bv2n = new Value( StringConstants.EMPTY_BYTES );
+ Value bv2n = new Value( Strings.EMPTY_BYTES );
Value bv3n = new Value( ( byte[] ) null );
Value sv1 = new Value( "test" );
Value sv2 = new Value( "" );
Modified: directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifControlSerializationTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifControlSerializationTest.java?rev=1770782&r1=1770781&r2=1770782&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifControlSerializationTest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifControlSerializationTest.java Mon Nov 21 23:23:38 2016
@@ -31,7 +31,7 @@ import java.io.ObjectOutputStream;
import org.apache.directory.api.ldap.model.ldif.LdifControl;
import org.apache.directory.api.ldap.model.message.Control;
import org.apache.directory.api.ldap.model.message.controls.OpaqueControl;
-import org.apache.directory.api.util.StringConstants;
+import org.apache.directory.api.util.Strings;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -71,7 +71,7 @@ public class LdifControlSerializationTes
controlCriticalEmptyData = new OpaqueControl( "1.2.3.4.3" );
controlCriticalEmptyData.setCritical( true );
- ( ( OpaqueControl ) controlCriticalEmptyData ).setEncodedValue( StringConstants.EMPTY_BYTES );
+ ( ( OpaqueControl ) controlCriticalEmptyData ).setEncodedValue( Strings.EMPTY_BYTES );
controlNoCriticalWithData = new OpaqueControl( "1.2.3.4.4" );
controlNoCriticalWithData.setCritical( false );
Modified: directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/controls/OpaqueControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/controls/OpaqueControlTest.java?rev=1770782&r1=1770781&r2=1770782&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/controls/OpaqueControlTest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/message/controls/OpaqueControlTest.java Mon Nov 21 23:23:38 2016
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertFal
import static org.junit.Assert.assertTrue;
import org.apache.directory.api.ldap.model.message.controls.OpaqueControl;
-import org.apache.directory.api.util.StringConstants;
+import org.apache.directory.api.util.Strings;
import org.junit.Test;
@@ -41,7 +41,7 @@ public class OpaqueControlTest
assertFalse( control.hasEncodedValue() );
- control.setEncodedValue( StringConstants.EMPTY_BYTES );
+ control.setEncodedValue( Strings.EMPTY_BYTES );
assertTrue( control.hasEncodedValue() );
}
Modified: directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/OctetStringSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/OctetStringSyntaxCheckerTest.java?rev=1770782&r1=1770781&r2=1770782&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/OctetStringSyntaxCheckerTest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/OctetStringSyntaxCheckerTest.java Mon Nov 21 23:23:38 2016
@@ -26,7 +26,7 @@ import com.mycila.junit.concurrent.Concu
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.api.ldap.model.schema.syntaxCheckers.OctetStringSyntaxChecker;
-import org.apache.directory.api.util.StringConstants;
+import org.apache.directory.api.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -53,7 +53,7 @@ public class OctetStringSyntaxCheckerTes
@Test
public void testEmptyOctetString()
{
- assertTrue( checker.isValidSyntax( StringConstants.EMPTY_BYTES ) );
+ assertTrue( checker.isValidSyntax( Strings.EMPTY_BYTES ) );
}
Modified: directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/UuidSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/UuidSyntaxCheckerTest.java?rev=1770782&r1=1770781&r2=1770782&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/UuidSyntaxCheckerTest.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/UuidSyntaxCheckerTest.java Mon Nov 21 23:23:38 2016
@@ -27,7 +27,6 @@ import com.mycila.junit.concurrent.Concu
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.api.ldap.model.schema.syntaxCheckers.UuidSyntaxChecker;
-import org.apache.directory.api.util.StringConstants;
import org.apache.directory.api.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -55,7 +54,7 @@ public class UuidSyntaxCheckerTest
@Test
public void testEmptyUuid()
{
- assertFalse( checker.isValidSyntax( StringConstants.EMPTY_BYTES ) );
+ assertFalse( checker.isValidSyntax( Strings.EMPTY_BYTES ) );
}