You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by fe...@apache.org on 2010/01/20 20:39:06 UTC
svn commit: r901348 [2/2] - in /directory/shared/trunk:
dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/
ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/
ldap-client-api/src/main/java/org/apache/directory/...
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java?rev=901348&r1=901347&r2=901348&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java Wed Jan 20 19:39:05 2010
@@ -56,7 +56,7 @@
@Test
public void testRdnNull()
{
- assertEquals( "", new Rdn().toString() );
+ assertEquals( "", new RDN().toString() );
}
@@ -68,7 +68,7 @@
@Test
public void testRdnEmpty() throws InvalidNameException
{
- assertEquals( "", new Rdn( "" ).toString() );
+ assertEquals( "", new RDN( "" ).toString() );
}
@@ -80,7 +80,7 @@
@Test
public void testRdnSimple() throws InvalidNameException
{
- assertEquals( "a=b", new Rdn( "a = b" ).toString() );
+ assertEquals( "a=b", new RDN( "a = b" ).toString() );
}
@@ -92,7 +92,7 @@
@Test
public void testRdnComposite() throws InvalidNameException
{
- assertEquals( "a=b+c=d", new Rdn( "a = b + c = d" ).toString() );
+ assertEquals( "a=b+c=d", new RDN( "a = b + c = d" ).toString() );
}
@@ -105,22 +105,22 @@
@Test
public void testRdnCompositeWithSpace() throws InvalidNameException
{
- assertEquals( "a=b", new Rdn( "a=b" ).toString() );
- assertEquals( "a=b", new Rdn( " a=b" ).toString() );
- assertEquals( "a=b", new Rdn( "a =b" ).toString() );
- assertEquals( "a=b", new Rdn( "a= b" ).toString() );
- assertEquals( "a=b", new Rdn( "a=b " ).toString() );
- assertEquals( "a=b", new Rdn( " a =b" ).toString() );
- assertEquals( "a=b", new Rdn( " a= b" ).toString() );
- assertEquals( "a=b", new Rdn( " a=b " ).toString() );
- assertEquals( "a=b", new Rdn( "a = b" ).toString() );
- assertEquals( "a=b", new Rdn( "a =b " ).toString() );
- assertEquals( "a=b", new Rdn( "a= b " ).toString() );
- assertEquals( "a=b", new Rdn( " a = b" ).toString() );
- assertEquals( "a=b", new Rdn( " a =b " ).toString() );
- assertEquals( "a=b", new Rdn( " a= b " ).toString() );
- assertEquals( "a=b", new Rdn( "a = b " ).toString() );
- assertEquals( "a=b", new Rdn( " a = b " ).toString() );
+ assertEquals( "a=b", new RDN( "a=b" ).toString() );
+ assertEquals( "a=b", new RDN( " a=b" ).toString() );
+ assertEquals( "a=b", new RDN( "a =b" ).toString() );
+ assertEquals( "a=b", new RDN( "a= b" ).toString() );
+ assertEquals( "a=b", new RDN( "a=b " ).toString() );
+ assertEquals( "a=b", new RDN( " a =b" ).toString() );
+ assertEquals( "a=b", new RDN( " a= b" ).toString() );
+ assertEquals( "a=b", new RDN( " a=b " ).toString() );
+ assertEquals( "a=b", new RDN( "a = b" ).toString() );
+ assertEquals( "a=b", new RDN( "a =b " ).toString() );
+ assertEquals( "a=b", new RDN( "a= b " ).toString() );
+ assertEquals( "a=b", new RDN( " a = b" ).toString() );
+ assertEquals( "a=b", new RDN( " a =b " ).toString() );
+ assertEquals( "a=b", new RDN( " a= b " ).toString() );
+ assertEquals( "a=b", new RDN( "a = b " ).toString() );
+ assertEquals( "a=b", new RDN( " a = b " ).toString() );
}
@@ -132,7 +132,7 @@
@Test
public void testRdnSimpleMultivaluedAttribute() throws InvalidNameException
{
- String result = new Rdn( "a = b + c = d" ).toString();
+ String result = new RDN( "a = b + c = d" ).toString();
assertEquals( "a=b+c=d", result );
}
@@ -146,7 +146,7 @@
@Test
public void testRdnCompositeMultivaluedAttribute() throws InvalidNameException
{
- Rdn rdn = new Rdn( "a =b+c=d + e=f + g =h + i =j " );
+ RDN rdn = new RDN( "a =b+c=d + e=f + g =h + i =j " );
// NameComponent are not ordered
assertEquals( "b", rdn.getValue( "a" ) );
@@ -165,7 +165,7 @@
@Test
public void testRdnOidUpper() throws InvalidNameException
{
- assertEquals( "oid.12.34.56=azerty", new Rdn( "OID.12.34.56 = azerty" ).toString() );
+ assertEquals( "oid.12.34.56=azerty", new RDN( "OID.12.34.56 = azerty" ).toString() );
}
@@ -177,7 +177,7 @@
@Test
public void testRdnOidLower() throws InvalidNameException
{
- assertEquals( "oid.12.34.56=azerty", new Rdn( "oid.12.34.56 = azerty" ).toString() );
+ assertEquals( "oid.12.34.56=azerty", new RDN( "oid.12.34.56 = azerty" ).toString() );
}
@@ -190,7 +190,7 @@
@Test
public void testRdnOidWithoutPrefix() throws InvalidNameException
{
- assertEquals( "12.34.56=azerty", new Rdn( "12.34.56 = azerty" ).toString() );
+ assertEquals( "12.34.56=azerty", new RDN( "12.34.56 = azerty" ).toString() );
}
@@ -203,7 +203,7 @@
@Test
public void testRdnCompositeOidWithoutPrefix() throws InvalidNameException
{
- String result = new Rdn( "12.34.56 = azerty + 7.8 = test" ).toString();
+ String result = new RDN( "12.34.56 = azerty + 7.8 = test" ).toString();
assertEquals( "12.34.56=azerty+7.8=test", result );
}
@@ -219,7 +219,7 @@
String rdn = StringTools.utf8ToString( new byte[]
{ 'a', '=', '\\', ',', '=', '\\', '+', '\\', '<', '\\', '>', '#', '\\', ';', '\\', '\\', '\\', '"', '\\',
'C', '3', '\\', 'A', '9' } );
- assertEquals( "a=\\,=\\+\\<\\>#\\;\\\\\\\"\u00E9", new Rdn( rdn ).toString() );
+ assertEquals( "a=\\,=\\+\\<\\>#\\;\\\\\\\"\u00E9", new RDN( rdn ).toString() );
}
@@ -229,7 +229,7 @@
@Test
public void testRdnHexStringAttributeValue() throws InvalidNameException
{
- assertEquals( "a=#0010A0AAFF", new Rdn( "a = #0010A0AAFF" ).toString() );
+ assertEquals( "a=#0010A0AAFF", new RDN( "a = #0010A0AAFF" ).toString() );
}
/**
@@ -240,7 +240,7 @@
{
try
{
- new Rdn( "a=#zz" );
+ new RDN( "a=#zz" );
fail();
}
catch ( InvalidNameException ine )
@@ -257,7 +257,7 @@
@Test
public void testRdnQuotedAttributeValue() throws InvalidNameException
{
- assertEquals( "a=quoted \\\"value", new Rdn( "a = quoted \\\"value" ).toString() );
+ assertEquals( "a=quoted \\\"value", new RDN( "a = quoted \\\"value" ).toString() );
}
@@ -267,7 +267,7 @@
@Test
public void testParseRDNNull()
{
- Rdn rdn = null;
+ RDN rdn = null;
try
{
@@ -289,9 +289,9 @@
@Test
public void testRDNCloningOneNameComponent() throws InvalidNameException
{
- Rdn rdn = new Rdn( "a", "a", "b", "b" );
+ RDN rdn = new RDN( "a", "a", "b", "b" );
- Rdn rdnClone = ( Rdn ) rdn.clone();
+ RDN rdnClone = ( RDN ) rdn.clone();
RdnParser.parse( "c=d", rdn );
@@ -307,7 +307,7 @@
@Test
public void testRDNCreation() throws InvalidNameException
{
- Rdn rdn = new Rdn( "A", " b " );
+ RDN rdn = new RDN( "A", " b " );
assertEquals( "a=\\ b \\ ", rdn.getNormName() );
assertEquals( "A= b ", rdn.getUpName() );
}
@@ -321,9 +321,9 @@
@Test
public void testRDNCloningTwoNameComponent() throws InvalidNameException
{
- Rdn rdn = new Rdn( "a = b + aa = bb" );
+ RDN rdn = new RDN( "a = b + aa = bb" );
- Rdn rdnClone = ( Rdn ) rdn.clone();
+ RDN rdnClone = ( RDN ) rdn.clone();
rdn.clear();
RdnParser.parse( "c=d", rdn );
@@ -342,8 +342,8 @@
@Test
public void testRDNCompareToNull() throws InvalidNameException
{
- Rdn rdn1 = new Rdn( " a = b + c = d + a = f + g = h " );
- Rdn rdn2 = null;
+ RDN rdn1 = new RDN( " a = b + c = d + a = f + g = h " );
+ RDN rdn2 = null;
assertTrue( rdn1.compareTo( rdn2 ) > 0 );
}
@@ -356,8 +356,8 @@
@Test
public void testRDNCompareToNCS2NC() throws InvalidNameException
{
- Rdn rdn1 = new Rdn( " a = b + c = d + a = f + g = h " );
- Rdn rdn2 = new Rdn( " a = b " );
+ RDN rdn1 = new RDN( " a = b + c = d + a = f + g = h " );
+ RDN rdn2 = new RDN( " a = b " );
assertTrue( rdn1.compareTo( rdn2 ) > 0 );
}
@@ -370,8 +370,8 @@
@Test
public void testRDNCompareToNC2NCS() throws InvalidNameException
{
- Rdn rdn1 = new Rdn( " a = b " );
- Rdn rdn2 = new Rdn( " a = b + c = d + a = f + g = h " );
+ RDN rdn1 = new RDN( " a = b " );
+ RDN rdn2 = new RDN( " a = b + c = d + a = f + g = h " );
assertTrue( rdn1.compareTo( rdn2 ) < 0 );
}
@@ -385,8 +385,8 @@
@Test
public void testRDNCompareToNCS2NCSOrdered() throws InvalidNameException
{
- Rdn rdn1 = new Rdn( " a = b + c = d + a = f + g = h " );
- Rdn rdn2 = new Rdn( " a = b + c = d + a = f + g = h " );
+ RDN rdn1 = new RDN( " a = b + c = d + a = f + g = h " );
+ RDN rdn2 = new RDN( " a = b + c = d + a = f + g = h " );
assertEquals( 0, rdn1.compareTo( rdn2 ) );
}
@@ -400,8 +400,8 @@
@Test
public void testRDNCompareToNCS2NCSUnordered() throws InvalidNameException
{
- Rdn rdn1 = new Rdn( " a = b + a = f + g = h + c = d " );
- Rdn rdn2 = new Rdn( " a = b + c = d + a = f + g = h " );
+ RDN rdn1 = new RDN( " a = b + a = f + g = h + c = d " );
+ RDN rdn2 = new RDN( " a = b + c = d + a = f + g = h " );
assertEquals( 0, rdn1.compareTo( rdn2 ) );
}
@@ -415,8 +415,8 @@
@Test
public void testRDNCompareToNCS2NCSNotEquals() throws InvalidNameException
{
- Rdn rdn1 = new Rdn( " a = f + g = h + c = d " );
- Rdn rdn2 = new Rdn( " c = d + a = h + g = h " );
+ RDN rdn1 = new RDN( " a = f + g = h + c = d " );
+ RDN rdn2 = new RDN( " c = d + a = h + g = h " );
assertTrue( rdn1.compareTo( rdn2 ) < 0 );
assertTrue( rdn2.compareTo( rdn1 ) > 0 );
@@ -434,22 +434,22 @@
public void testCompareSecondAtav() throws InvalidNameException
{
// the second ATAV differs
- Rdn rdn1 = new Rdn( " a = b + c = d " );
- Rdn rdn2 = new Rdn( " a = b + c = y " );
+ RDN rdn1 = new RDN( " a = b + c = d " );
+ RDN rdn2 = new RDN( " a = b + c = y " );
assertTrue( rdn1.compareTo( rdn2 ) < 0 );
assertTrue( rdn2.compareTo( rdn1 ) > 0 );
assertEquals( 0, rdn1.compareTo( rdn2 ) + rdn2.compareTo( rdn1 ) );
// the third ATAV differs
- Rdn rdn3 = new Rdn( " a = b + c = d + e = f " );
- Rdn rdn4 = new Rdn( " a = b + c = d + e = y " );
+ RDN rdn3 = new RDN( " a = b + c = d + e = f " );
+ RDN rdn4 = new RDN( " a = b + c = d + e = y " );
assertTrue( rdn3.compareTo( rdn4 ) < 0 );
assertTrue( rdn4.compareTo( rdn3 ) > 0 );
assertEquals( 0, rdn3.compareTo( rdn4 ) + rdn4.compareTo( rdn3 ) );
// the second ATAV differs in value only
- Rdn rdn5 = new Rdn( " a = b + a = c " );
- Rdn rdn6 = new Rdn( " a = b + a = y " );
+ RDN rdn5 = new RDN( " a = b + a = c " );
+ RDN rdn6 = new RDN( " a = b + a = y " );
assertTrue( rdn5.compareTo( rdn6 ) < 0 );
assertTrue( rdn6.compareTo( rdn5 ) > 0 );
assertEquals( 0, rdn5.compareTo( rdn6 ) + rdn6.compareTo( rdn5 ) );
@@ -466,18 +466,18 @@
@Test
public void testCompareIndependentFromOrder() throws InvalidNameException
{
- Rdn rdn1 = new Rdn( " a = b + c = d " );
- Rdn rdn2 = new Rdn( " c = d + a = b " );
+ RDN rdn1 = new RDN( " a = b + c = d " );
+ RDN rdn2 = new RDN( " c = d + a = b " );
assertEquals( 0, rdn1.compareTo( rdn2 ) );
- rdn1 = new Rdn( " a = b + c = e " );
- rdn2 = new Rdn( " c = d + a = b " );
+ rdn1 = new RDN( " a = b + c = e " );
+ rdn2 = new RDN( " c = d + a = b " );
assertTrue( rdn1.compareTo( rdn2 ) > 0 );
assertTrue( rdn2.compareTo( rdn1 ) < 0 );
assertEquals( 0, rdn1.compareTo( rdn2 ) + rdn2.compareTo( rdn1 ) );
- rdn1 = new Rdn( " a = b + c = d " );
- rdn2 = new Rdn( " e = f + g = h " );
+ rdn1 = new RDN( " a = b + c = d " );
+ rdn2 = new RDN( " e = f + g = h " );
assertTrue( rdn1.compareTo( rdn2 ) < 0 );
assertTrue( rdn2.compareTo( rdn1 ) > 0 );
assertEquals( 0, rdn1.compareTo( rdn2 ) + rdn2.compareTo( rdn1 ) );
@@ -493,8 +493,8 @@
@Test
public void testCompareInvertableNC2NC() throws InvalidNameException
{
- Rdn rdn1 = new Rdn( " a = b " );
- Rdn rdn2 = new Rdn( " a = c " );
+ RDN rdn1 = new RDN( " a = b " );
+ RDN rdn2 = new RDN( " a = c " );
assertTrue( rdn1.compareTo( rdn2 ) < 0 );
assertTrue( rdn2.compareTo( rdn1 ) > 0 );
assertEquals( 0, rdn1.compareTo( rdn2 ) + rdn2.compareTo( rdn1 ) );
@@ -511,8 +511,8 @@
@Test
public void testCompareInvertableNCS2NCSDifferentValues() throws InvalidNameException
{
- Rdn rdn1 = new Rdn( " a = b + a = c " );
- Rdn rdn2 = new Rdn( " a = b + a = y " );
+ RDN rdn1 = new RDN( " a = b + a = c " );
+ RDN rdn2 = new RDN( " a = b + a = y " );
assertTrue( rdn1.compareTo( rdn2 ) < 0 );
assertTrue( rdn2.compareTo( rdn1 ) > 0 );
assertEquals( 0, rdn1.compareTo( rdn2 ) + rdn2.compareTo( rdn1 ) );
@@ -528,8 +528,8 @@
@Test
public void testCompareInvertableNCS2NCSDifferentTypes() throws InvalidNameException
{
- Rdn rdn1 = new Rdn( " a = b + c = d " );
- Rdn rdn2 = new Rdn( " e = f + g = h " );
+ RDN rdn1 = new RDN( " a = b + c = d " );
+ RDN rdn2 = new RDN( " e = f + g = h " );
assertTrue( rdn1.compareTo( rdn2 ) < 0 );
assertTrue( rdn2.compareTo( rdn1 ) > 0 );
assertEquals( 0, rdn1.compareTo( rdn2 ) + rdn2.compareTo( rdn1 ) );
@@ -545,8 +545,8 @@
@Test
public void testCompareInvertableNCS2NCSUnordered() throws InvalidNameException
{
- Rdn rdn1 = new Rdn( " c = d + a = b " );
- Rdn rdn2 = new Rdn( " a = b + e = f " );
+ RDN rdn1 = new RDN( " c = d + a = b " );
+ RDN rdn2 = new RDN( " a = b + e = f " );
assertTrue( rdn1.compareTo( rdn2 ) < 0 );
assertTrue( rdn2.compareTo( rdn1 ) > 0 );
assertEquals( 0, rdn1.compareTo( rdn2 ) + rdn2.compareTo( rdn1 ) );
@@ -561,7 +561,7 @@
@Test
public void testRDNCompareToNullRdn() throws InvalidNameException
{
- Rdn rdn1 = new Rdn( " a = b " );
+ RDN rdn1 = new RDN( " a = b " );
assertEquals( 1, rdn1.compareTo( null ) );
}
@@ -575,9 +575,9 @@
@Test
public void testRDNCompareToBadObject() throws InvalidNameException
{
- Rdn rdn1 = new Rdn( " a = b " );
+ RDN rdn1 = new RDN( " a = b " );
- assertEquals( Rdn.UNDEFINED, rdn1.compareTo( "test" ) );
+ assertEquals( RDN.UNDEFINED, rdn1.compareTo( "test" ) );
}
@@ -589,8 +589,8 @@
@Test
public void testRDNCompareToNC2NC() throws InvalidNameException
{
- Rdn rdn1 = new Rdn( " a = b " );
- Rdn rdn2 = new Rdn( " a = b " );
+ RDN rdn1 = new RDN( " a = b " );
+ RDN rdn2 = new RDN( " a = b " );
assertEquals( 0, rdn1.compareTo( rdn2 ) );
}
@@ -604,8 +604,8 @@
@Test
public void testRDNCompareToNC2NCUperCase() throws InvalidNameException
{
- Rdn rdn1 = new Rdn( " a = b " );
- Rdn rdn2 = new Rdn( " A = b " );
+ RDN rdn1 = new RDN( " a = b " );
+ RDN rdn2 = new RDN( " A = b " );
assertEquals( 0, rdn1.compareTo( rdn2 ) );
assertEquals( true, rdn1.equals( rdn2 ) );
@@ -620,8 +620,8 @@
@Test
public void testRDNCompareToNC2NCNotEquals() throws InvalidNameException
{
- Rdn rdn1 = new Rdn( " a = b " );
- Rdn rdn2 = new Rdn( " A = d " );
+ RDN rdn1 = new RDN( " a = b " );
+ RDN rdn2 = new RDN( " A = d " );
assertTrue( rdn1.compareTo( rdn2 ) < 0 );
}
@@ -636,7 +636,7 @@
@Test
public void testGetValue() throws InvalidNameException
{
- Rdn rdn = new Rdn( " a = b + a = f + g = h + c = d " );
+ RDN rdn = new RDN( " a = b + a = f + g = h + c = d " );
assertEquals( "b", rdn.getNormValue() );
}
@@ -651,7 +651,7 @@
@Test
public void testGetType() throws InvalidNameException
{
- Rdn rdn = new Rdn( " a = b + a = f + g = h + c = d " );
+ RDN rdn = new RDN( " a = b + a = f + g = h + c = d " );
assertEquals( "a", rdn.getNormType() );
}
@@ -665,7 +665,7 @@
@Test
public void testGetSize() throws InvalidNameException
{
- Rdn rdn = new Rdn( " a = b + a = f + g = h + c = d " );
+ RDN rdn = new RDN( " a = b + a = f + g = h + c = d " );
assertEquals( 4, rdn.size() );
}
@@ -678,7 +678,7 @@
@Test
public void testGetSize0()
{
- Rdn rdn = new Rdn();
+ RDN rdn = new RDN();
assertEquals( 0, rdn.size() );
}
@@ -692,26 +692,26 @@
@Test
public void testEquals() throws InvalidNameException
{
- Rdn rdn = new Rdn( "a=b + c=d + a=f" );
+ RDN rdn = new RDN( "a=b + c=d + a=f" );
assertFalse( rdn.equals( null ) );
assertFalse( rdn.equals( "test" ) );
- assertFalse( rdn.equals( new Rdn( "a=c + c=d + a=f" ) ) );
- assertFalse( rdn.equals( new Rdn( "a=b" ) ) );
- assertTrue( rdn.equals( new Rdn( "a=b + c=d + a=f" ) ) );
- assertTrue( rdn.equals( new Rdn( "a=b + C=d + A=f" ) ) );
- assertTrue( rdn.equals( new Rdn( "c=d + a=f + a=b" ) ) );
+ assertFalse( rdn.equals( new RDN( "a=c + c=d + a=f" ) ) );
+ assertFalse( rdn.equals( new RDN( "a=b" ) ) );
+ assertTrue( rdn.equals( new RDN( "a=b + c=d + a=f" ) ) );
+ assertTrue( rdn.equals( new RDN( "a=b + C=d + A=f" ) ) );
+ assertTrue( rdn.equals( new RDN( "c=d + a=f + a=b" ) ) );
}
@Test
public void testUnescapeValueHexa()
{
- byte[] res = ( byte[] ) Rdn.unescapeValue( "#fF" );
+ byte[] res = ( byte[] ) RDN.unescapeValue( "#fF" );
assertEquals( "0xFF ", StringTools.dumpBytes( res ) );
- res = ( byte[] ) Rdn.unescapeValue( "#0123456789aBCDEF" );
+ res = ( byte[] ) RDN.unescapeValue( "#0123456789aBCDEF" );
assertEquals( "0x01 0x23 0x45 0x67 0x89 0xAB 0xCD 0xEF ", StringTools.dumpBytes( res ) );
}
@@ -721,7 +721,7 @@
{
try
{
- Rdn.unescapeValue( "#fF1" );
+ RDN.unescapeValue( "#fF1" );
fail(); // Should not happen
}
catch ( IllegalArgumentException iae )
@@ -734,7 +734,7 @@
@Test
public void testUnescapeValueString()
{
- String res = ( String ) Rdn.unescapeValue( "azerty" );
+ String res = ( String ) RDN.unescapeValue( "azerty" );
assertEquals( "azerty", res );
}
@@ -743,7 +743,7 @@
@Test
public void testUnescapeValueStringSpecial()
{
- String res = ( String ) Rdn.unescapeValue( "\\\\\\#\\,\\+\\;\\<\\>\\=\\\"\\ " );
+ String res = ( String ) RDN.unescapeValue( "\\\\\\#\\,\\+\\;\\<\\>\\=\\\"\\ " );
assertEquals( "\\#,+;<>=\" ", res );
}
@@ -752,7 +752,7 @@
@Test
public void testUnescapeValueStringWithSpaceInTheMiddle()
{
- String res = ( String ) Rdn.unescapeValue( "a b" );
+ String res = ( String ) RDN.unescapeValue( "a b" );
assertEquals( "a b", res );
}
@@ -761,7 +761,7 @@
@Test
public void testUnescapeValueStringWithSpaceInAtTheBeginning()
{
- String res = ( String ) Rdn.unescapeValue( "\\ a b" );
+ String res = ( String ) RDN.unescapeValue( "\\ a b" );
assertEquals( " a b", res );
}
@@ -770,7 +770,7 @@
@Test
public void testUnescapeValueStringWithSpaceInAtTheEnd()
{
- String res = ( String ) Rdn.unescapeValue( "a b\\ " );
+ String res = ( String ) RDN.unescapeValue( "a b\\ " );
assertEquals( "a b ", res );
}
@@ -779,7 +779,7 @@
@Test
public void testUnescapeValueStringWithPoundInTheMiddle()
{
- String res = ( String ) Rdn.unescapeValue( "a#b" );
+ String res = ( String ) RDN.unescapeValue( "a#b" );
assertEquals( "a#b", res );
}
@@ -788,7 +788,7 @@
@Test
public void testUnescapeValueStringWithPoundAtTheEnd()
{
- String res = ( String ) Rdn.unescapeValue( "ab#" );
+ String res = ( String ) RDN.unescapeValue( "ab#" );
assertEquals( "ab#", res );
}
@@ -797,7 +797,7 @@
@Test
public void testEscapeValueString()
{
- String res = Rdn.escapeValue( StringTools.getBytesUtf8( "azerty" ) );
+ String res = RDN.escapeValue( StringTools.getBytesUtf8( "azerty" ) );
assertEquals( "azerty", res );
}
@@ -806,7 +806,7 @@
@Test
public void testEscapeValueStringSpecial()
{
- String res = Rdn.escapeValue( StringTools.getBytesUtf8( "\\#,+;<>=\" " ) );
+ String res = RDN.escapeValue( StringTools.getBytesUtf8( "\\#,+;<>=\" " ) );
assertEquals( "\\\\#\\,\\+\\;\\<\\>\\=\\\"\\ ", res );
}
@@ -815,7 +815,7 @@
@Test
public void testEscapeValueNumeric()
{
- String res = Rdn.escapeValue( new byte[]
+ String res = RDN.escapeValue( new byte[]
{ '-', 0x00, '-', 0x1F, '-', 0x7F, '-' } );
assertEquals( "-\\00-\\1F-\\7F-", res );
@@ -825,7 +825,7 @@
@Test
public void testEscapeValueMix()
{
- String res = Rdn.escapeValue( new byte[]
+ String res = RDN.escapeValue( new byte[]
{ '\\', 0x00, '-', '+', '#', 0x7F, '-' } );
assertEquals( "\\\\\\00-\\+#\\7F-", res );
@@ -835,7 +835,7 @@
@Test
public void testDIRSERVER_703() throws InvalidNameException
{
- Rdn rdn = new Rdn( "cn=Kate Bush+sn=Bush" );
+ RDN rdn = new RDN( "cn=Kate Bush+sn=Bush" );
assertEquals( "cn=Kate Bush+sn=Bush", rdn.getUpName() );
}
@@ -843,7 +843,7 @@
@Test
public void testMultiValuedIterator() throws InvalidNameException
{
- Rdn rdn = new Rdn( "cn=Kate Bush+sn=Bush" );
+ RDN rdn = new RDN( "cn=Kate Bush+sn=Bush" );
Iterator<AVA> iterator = rdn.iterator();
assertNotNull( iterator );
assertTrue( iterator.hasNext() );
@@ -857,7 +857,7 @@
@Test
public void testSingleValuedIterator() throws InvalidNameException
{
- Rdn rdn = new Rdn( "cn=Kate Bush" );
+ RDN rdn = new RDN( "cn=Kate Bush" );
Iterator<AVA> iterator = rdn.iterator();
assertNotNull( iterator );
assertTrue( iterator.hasNext() );
@@ -869,7 +869,7 @@
@Test
public void testEmptyIterator()
{
- Rdn rdn = new Rdn();
+ RDN rdn = new RDN();
Iterator<AVA> iterator = rdn.iterator();
assertNotNull( iterator );
assertFalse( iterator.hasNext() );
@@ -879,7 +879,7 @@
@Test
public void testRdnWithSpaces() throws InvalidNameException
{
- Rdn rdn = new Rdn( "cn=a\\ b\\ c" );
+ RDN rdn = new RDN( "cn=a\\ b\\ c" );
assertEquals( "cn=a b c", rdn.toString() );
}
@@ -887,14 +887,14 @@
@Test
public void testEscapedSpaceInValue() throws InvalidNameException
{
- Rdn rdn1 = new Rdn( "cn=a b c" );
- Rdn rdn2 = new Rdn( "cn=a\\ b\\ c" );
+ RDN rdn1 = new RDN( "cn=a b c" );
+ RDN rdn2 = new RDN( "cn=a\\ b\\ c" );
assertEquals( "cn=a b c", rdn1.toString() );
assertEquals( "cn=a b c", rdn2.toString() );
assertTrue( rdn1.equals( rdn2 ) );
- Rdn rdn3 = new Rdn( "cn=\\ a b c\\ " );
- Rdn rdn4 = new Rdn( "cn=\\ a\\ b\\ c\\ " );
+ RDN rdn3 = new RDN( "cn=\\ a b c\\ " );
+ RDN rdn4 = new RDN( "cn=\\ a\\ b\\ c\\ " );
assertEquals( "cn=\\ a b c\\ ", rdn3.toString() );
assertEquals( "cn=\\ a b c\\ ", rdn4.toString() );
assertTrue( rdn3.equals( rdn4 ) );
@@ -904,14 +904,14 @@
@Test
public void testEscapedHashInValue() throws InvalidNameException
{
- Rdn rdn1 = new Rdn( "cn=a#b#c" );
- Rdn rdn2 = new Rdn( "cn=a\\#b\\#c" );
+ RDN rdn1 = new RDN( "cn=a#b#c" );
+ RDN rdn2 = new RDN( "cn=a\\#b\\#c" );
assertEquals( "cn=a#b#c", rdn1.toString() );
assertEquals( "cn=a#b#c", rdn2.toString() );
assertTrue( rdn1.equals( rdn2 ) );
- Rdn rdn3 = new Rdn( "cn=\\#a#b#c\\#" );
- Rdn rdn4 = new Rdn( "cn=\\#a\\#b\\#c\\#" );
+ RDN rdn3 = new RDN( "cn=\\#a#b#c\\#" );
+ RDN rdn4 = new RDN( "cn=\\#a\\#b\\#c\\#" );
assertEquals( "cn=\\#a#b#c#", rdn3.toString() );
assertEquals( "cn=\\#a#b#c#", rdn4.toString() );
assertTrue( rdn3.equals( rdn4 ) );
@@ -922,27 +922,27 @@
public void testEscapedAttributeValue()
{
// space doesn't need to be escaped in the middle of a string
- assertEquals( "a b", Rdn.escapeValue( "a b" ) );
- assertEquals( "a b c", Rdn.escapeValue( "a b c" ) );
- assertEquals( "a b c d", Rdn.escapeValue( "a b c d" ) );
+ assertEquals( "a b", RDN.escapeValue( "a b" ) );
+ assertEquals( "a b c", RDN.escapeValue( "a b c" ) );
+ assertEquals( "a b c d", RDN.escapeValue( "a b c d" ) );
// space must be escaped at the beginning and the end of a string
- assertEquals( "\\ a b", Rdn.escapeValue( " a b" ) );
- assertEquals( "a b\\ ", Rdn.escapeValue( "a b " ) );
- assertEquals( "\\ a b\\ ", Rdn.escapeValue( " a b " ) );
- assertEquals( "\\ a b \\ ", Rdn.escapeValue( " a b " ) );
+ assertEquals( "\\ a b", RDN.escapeValue( " a b" ) );
+ assertEquals( "a b\\ ", RDN.escapeValue( "a b " ) );
+ assertEquals( "\\ a b\\ ", RDN.escapeValue( " a b " ) );
+ assertEquals( "\\ a b \\ ", RDN.escapeValue( " a b " ) );
// hash doesn't need to be escaped in the middle and the end of a string
- assertEquals( "a#b", Rdn.escapeValue( "a#b" ) );
- assertEquals( "a#b#", Rdn.escapeValue( "a#b#" ) );
- assertEquals( "a#b#c", Rdn.escapeValue( "a#b#c" ) );
- assertEquals( "a#b#c#", Rdn.escapeValue( "a#b#c#" ) );
- assertEquals( "a#b#c#d", Rdn.escapeValue( "a#b#c#d" ) );
- assertEquals( "a#b#c#d#", Rdn.escapeValue( "a#b#c#d#" ) );
+ assertEquals( "a#b", RDN.escapeValue( "a#b" ) );
+ assertEquals( "a#b#", RDN.escapeValue( "a#b#" ) );
+ assertEquals( "a#b#c", RDN.escapeValue( "a#b#c" ) );
+ assertEquals( "a#b#c#", RDN.escapeValue( "a#b#c#" ) );
+ assertEquals( "a#b#c#d", RDN.escapeValue( "a#b#c#d" ) );
+ assertEquals( "a#b#c#d#", RDN.escapeValue( "a#b#c#d#" ) );
// hash must be escaped at the beginning of a string
- assertEquals( "\\#a#b", Rdn.escapeValue( "#a#b" ) );
- assertEquals( "\\##a#b", Rdn.escapeValue( "##a#b" ) );
+ assertEquals( "\\#a#b", RDN.escapeValue( "#a#b" ) );
+ assertEquals( "\\##a#b", RDN.escapeValue( "##a#b" ) );
}
@@ -954,7 +954,7 @@
@Test
public void testEmptyRDNSerialization() throws NamingException, IOException, ClassNotFoundException
{
- Rdn rdn = new Rdn( "" );
+ RDN rdn = new RDN( "" );
rdn.normalize();
@@ -968,7 +968,7 @@
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- Rdn rdn2 = (Rdn)in.readObject();
+ RDN rdn2 = (RDN)in.readObject();
assertEquals( rdn, rdn2 );
}
@@ -977,7 +977,7 @@
@Test
public void testNullRdnSerialization() throws IOException, ClassNotFoundException
{
- Rdn rdn = new Rdn();
+ RDN rdn = new RDN();
rdn.normalize();
@@ -991,7 +991,7 @@
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- Rdn rdn2 = (Rdn)in.readObject();
+ RDN rdn2 = (RDN)in.readObject();
assertEquals( rdn, rdn2 );
}
@@ -1003,7 +1003,7 @@
@Test
public void testSimpleRdnSerialization() throws NamingException, IOException, ClassNotFoundException
{
- Rdn rdn = new Rdn( "a=b" );
+ RDN rdn = new RDN( "a=b" );
rdn.normalize();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1016,7 +1016,7 @@
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- Rdn rdn2 = (Rdn)in.readObject();
+ RDN rdn2 = (RDN)in.readObject();
assertEquals( rdn, rdn2 );
}
@@ -1028,7 +1028,7 @@
@Test
public void testSimpleRdn2Serialization() throws NamingException, IOException, ClassNotFoundException
{
- Rdn rdn = new Rdn( " ABC = DEF " );
+ RDN rdn = new RDN( " ABC = DEF " );
rdn.normalize();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1041,7 +1041,7 @@
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- Rdn rdn2 = (Rdn)in.readObject();
+ RDN rdn2 = (RDN)in.readObject();
assertEquals( rdn, rdn2 );
}
@@ -1053,7 +1053,7 @@
@Test
public void testSimpleRdnNoValueSerialization() throws NamingException, IOException, ClassNotFoundException
{
- Rdn rdn = new Rdn( " ABC =" );
+ RDN rdn = new RDN( " ABC =" );
rdn.normalize();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1066,7 +1066,7 @@
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- Rdn rdn2 = (Rdn)in.readObject();
+ RDN rdn2 = (RDN)in.readObject();
assertEquals( rdn, rdn2 );
}
@@ -1078,7 +1078,7 @@
@Test
public void testSimpleRdnOneValueSerialization() throws NamingException, IOException, ClassNotFoundException
{
- Rdn rdn = new Rdn( " ABC = def " );
+ RDN rdn = new RDN( " ABC = def " );
rdn.normalize();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1091,7 +1091,7 @@
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- Rdn rdn2 = (Rdn)in.readObject();
+ RDN rdn2 = (RDN)in.readObject();
assertEquals( rdn, rdn2 );
}
@@ -1103,7 +1103,7 @@
@Test
public void testSimpleRdnThreeValuesSerialization() throws NamingException, IOException, ClassNotFoundException
{
- Rdn rdn = new Rdn( " A = a + B = b + C = c " );
+ RDN rdn = new RDN( " A = a + B = b + C = c " );
rdn.normalize();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1116,7 +1116,7 @@
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- Rdn rdn2 = (Rdn)in.readObject();
+ RDN rdn2 = (RDN)in.readObject();
assertEquals( rdn, rdn2 );
}
@@ -1129,7 +1129,7 @@
public void testSimpleRdnThreeValuesUnorderedSerialization() throws NamingException, IOException,
ClassNotFoundException
{
- Rdn rdn = new Rdn( " B = b + A = a + C = c " );
+ RDN rdn = new RDN( " B = b + A = a + C = c " );
rdn.normalize();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1142,7 +1142,7 @@
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- Rdn rdn2 = (Rdn)in.readObject();
+ RDN rdn2 = (RDN)in.readObject();
assertEquals( rdn, rdn2 );
}
@@ -1156,7 +1156,7 @@
@Test
public void testEmptyRDNStaticSerialization() throws NamingException, IOException, ClassNotFoundException
{
- Rdn rdn = new Rdn( "" );
+ RDN rdn = new RDN( "" );
rdn.normalize();
@@ -1171,7 +1171,7 @@
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- Rdn rdn2 = RdnSerializer.deserialize( in );
+ RDN rdn2 = RdnSerializer.deserialize( in );
assertEquals( rdn, rdn2 );
}
@@ -1180,7 +1180,7 @@
@Test
public void testNullRdnStaticSerialization() throws IOException, ClassNotFoundException
{
- Rdn rdn = new Rdn();
+ RDN rdn = new RDN();
rdn.normalize();
@@ -1195,7 +1195,7 @@
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- Rdn rdn2 = RdnSerializer.deserialize( in );
+ RDN rdn2 = RdnSerializer.deserialize( in );
assertEquals( rdn, rdn2 );
}
@@ -1207,7 +1207,7 @@
@Test
public void testSimpleRdnStaticSerialization() throws NamingException, IOException, ClassNotFoundException
{
- Rdn rdn = new Rdn( "a=b" );
+ RDN rdn = new RDN( "a=b" );
rdn.normalize();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1221,7 +1221,7 @@
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- Rdn rdn2 = RdnSerializer.deserialize( in );
+ RDN rdn2 = RdnSerializer.deserialize( in );
assertEquals( rdn, rdn2 );
}
@@ -1233,7 +1233,7 @@
@Test
public void testSimpleRdn2StaticSerialization() throws NamingException, IOException, ClassNotFoundException
{
- Rdn rdn = new Rdn( " ABC = DEF " );
+ RDN rdn = new RDN( " ABC = DEF " );
rdn.normalize();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1247,7 +1247,7 @@
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- Rdn rdn2 = RdnSerializer.deserialize( in );
+ RDN rdn2 = RdnSerializer.deserialize( in );
assertEquals( rdn, rdn2 );
}
@@ -1259,7 +1259,7 @@
@Test
public void testSimpleRdnNoValueStaticSerialization() throws NamingException, IOException, ClassNotFoundException
{
- Rdn rdn = new Rdn( " ABC =" );
+ RDN rdn = new RDN( " ABC =" );
rdn.normalize();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1273,7 +1273,7 @@
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- Rdn rdn2 = RdnSerializer.deserialize( in );
+ RDN rdn2 = RdnSerializer.deserialize( in );
assertEquals( rdn, rdn2 );
}
@@ -1285,7 +1285,7 @@
@Test
public void testSimpleRdnOneValueStaticSerialization() throws NamingException, IOException, ClassNotFoundException
{
- Rdn rdn = new Rdn( " ABC = def " );
+ RDN rdn = new RDN( " ABC = def " );
rdn.normalize();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1299,7 +1299,7 @@
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- Rdn rdn2 = RdnSerializer.deserialize( in );
+ RDN rdn2 = RdnSerializer.deserialize( in );
assertEquals( rdn, rdn2 );
}
@@ -1312,7 +1312,7 @@
public void testSimpleRdnThreeValuesStaticSerialization() throws NamingException, IOException,
ClassNotFoundException
{
- Rdn rdn = new Rdn( " A = a + B = b + C = c " );
+ RDN rdn = new RDN( " A = a + B = b + C = c " );
rdn.normalize();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1326,7 +1326,7 @@
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- Rdn rdn2 = RdnSerializer.deserialize( in );
+ RDN rdn2 = RdnSerializer.deserialize( in );
assertEquals( rdn, rdn2 );
}
@@ -1339,7 +1339,7 @@
public void testSimpleRdnThreeValuesUnorderedStaticSerialization() throws NamingException, IOException,
ClassNotFoundException
{
- Rdn rdn = new Rdn( " B = b + A = a + C = c " );
+ RDN rdn = new RDN( " B = b + A = a + C = c " );
rdn.normalize();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1353,7 +1353,7 @@
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- Rdn rdn2 = RdnSerializer.deserialize( in );
+ RDN rdn2 = RdnSerializer.deserialize( in );
assertEquals( rdn, rdn2 );
}
@@ -1367,8 +1367,8 @@
{
assertTrue( RdnParser.isValid( "a=" ) );
assertTrue( RdnParser.isValid( "a=\"\"" ) );
- assertEquals( "a=", new Rdn( "a=\"\"" ).toString() );
- assertEquals( "a=", new Rdn( "a=" ).toString() );
+ assertEquals( "a=", new RDN( "a=\"\"" ).toString() );
+ assertEquals( "a=", new RDN( "a=" ).toString() );
}
@@ -1379,14 +1379,14 @@
public void testRdnWithEscapedComa() throws InvalidNameException
{
assertTrue( RdnParser.isValid( "a=b\\,c" ) );
- assertEquals( "a=b\\,c", new Rdn( "a=b\\,c" ).toString() );
+ assertEquals( "a=b\\,c", new RDN( "a=b\\,c" ).toString() );
assertTrue( RdnParser.isValid( "a=\"b,c\"" ) );
- assertEquals( "a=b\\,c", new Rdn( "a=\"b,c\"" ).toString() );
- assertEquals( "a=\"b,c\"", new Rdn( "a=\"b,c\"" ).getUpName() );
+ assertEquals( "a=b\\,c", new RDN( "a=\"b,c\"" ).toString() );
+ assertEquals( "a=\"b,c\"", new RDN( "a=\"b,c\"" ).getUpName() );
assertTrue( RdnParser.isValid( "a=\"b\\,c\"" ) );
- Rdn rdn = new Rdn( "a=\"b\\,c\"" );
+ RDN rdn = new RDN( "a=\"b\\,c\"" );
assertEquals( "a=\"b\\,c\"", rdn.getUpName() );
assertEquals( "a=b\\,c", rdn.toString() );
}
@@ -1403,8 +1403,8 @@
{
// Use upper case attribute types to test if normalized types are used
// for comparison
- Rdn rdn = new Rdn( " A = b + C = d" );
- Rdn clonedRdn = ( Rdn ) rdn.clone();
+ RDN rdn = new RDN( " A = b + C = d" );
+ RDN clonedRdn = ( RDN ) rdn.clone();
assertEquals( 0, rdn.compareTo( clonedRdn ) );
assertEquals( true, rdn.equals( clonedRdn ) );
@@ -1422,8 +1422,8 @@
{
// Use upper case attribute types to test if normalized types are used
// for comparison
- Rdn rdn = new Rdn( " A = b + C = d" );
- Rdn copiedRdn = new Rdn( rdn );
+ RDN rdn = new RDN( " A = b + C = d" );
+ RDN copiedRdn = new RDN( rdn );
assertEquals( 0, rdn.compareTo( copiedRdn ) );
assertEquals( true, rdn.equals( copiedRdn ) );
@@ -1436,7 +1436,7 @@
@Test
public void testGetUpNameMultipleAtav() throws InvalidNameException
{
- Rdn rdn = new Rdn( " A = b + C = d " );
+ RDN rdn = new RDN( " A = b + C = d " );
assertEquals( " A = b + C = d ", rdn.getUpName() );
}