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 2012/01/24 18:44:32 UTC
svn commit: r1235374 [19/27] - in /directory/shared/trunk:
ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/
ldap/model/src/main/java/org/apache/directory/shared/ldap/model/csn/
ldap/model/src/main/java/org/apache/directory/sha...
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java Tue Jan 24 17:44:03 2012
@@ -142,12 +142,12 @@ public class LdifReaderTest
@Test
public void testLdifComments() throws Exception
{
- String ldif =
- "#Comment 1\r" +
- "#\r" +
- " th\n" +
- " is is still a comment\n" +
- "\n";
+ String ldif =
+ "#Comment 1\r" +
+ "#\r" +
+ " th\n" +
+ " is is still a comment\n" +
+ "\n";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -160,15 +160,15 @@ public class LdifReaderTest
@Test
public void testLdifVersion() throws Exception
{
- String ldif =
- "#Comment 1\r" +
- "#\r" +
- " th\n" +
- " is is still a comment\n" +
- "\n" +
- "version:\n" +
- " 1\n" +
- "# end";
+ String ldif =
+ "#Comment 1\r" +
+ "#\r" +
+ " th\n" +
+ " is is still a comment\n" +
+ "\n" +
+ "version:\n" +
+ " 1\n" +
+ "# end";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -182,17 +182,17 @@ public class LdifReaderTest
@Test
public void testLdifVersionStart() throws Exception
{
- String ldif =
- "version:\n" +
- " 1\n" +
- "\n" +
- "dn: cn=app1,ou=applications,ou=conf,dc=apache,dc=org\n" +
- "cn: app1\n" +
- "objectClass: top\n" +
- "objectClass: apApplication\n" +
- "displayName: app1 \n" +
- "dependencies:\n" +
- "envVars:";
+ String ldif =
+ "version:\n" +
+ " 1\n" +
+ "\n" +
+ "dn: cn=app1,ou=applications,ou=conf,dc=apache,dc=org\n" +
+ "cn: app1\n" +
+ "objectClass: top\n" +
+ "objectClass: apApplication\n" +
+ "displayName: app1 \n" +
+ "dependencies:\n" +
+ "envVars:";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -219,13 +219,13 @@ public class LdifReaderTest
@Test
public void testLdifWithoutVersion() throws Exception
{
- String ldif =
- "#Comment 1\r" +
- "#\r" +
- " th\n" +
- " is is still a comment\n" +
- "\n" +
- "# end";
+ String ldif =
+ "#Comment 1\r" +
+ "#\r" +
+ " th\n" +
+ " is is still a comment\n" +
+ "\n" +
+ "# end";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -244,15 +244,15 @@ public class LdifReaderTest
@Test
public void testLdifParserEndSpaces() throws Exception
{
- String ldif =
- "version: 1\n" +
- "dn: cn=app1,ou=applications,ou=conf,dc=apache,dc=org\n" +
- "cn: app1\n" +
- "objectClass: top\n" +
- "objectClass: apApplication\n" +
- "displayName: app1 \n" +
- "dependencies:\n" +
- "envVars:";
+ String ldif =
+ "version: 1\n" +
+ "dn: cn=app1,ou=applications,ou=conf,dc=apache,dc=org\n" +
+ "cn: app1\n" +
+ "objectClass: top\n" +
+ "objectClass: apApplication\n" +
+ "displayName: app1 \n" +
+ "dependencies:\n" +
+ "envVars:";
LdifReader reader = new LdifReader();
@@ -277,25 +277,25 @@ public class LdifReaderTest
public void testLdifParserAddAttrCaseInsensitiveAttrId() throws Exception
{
// test that mixed case attr ids work at all
- String ldif =
- "version: 1\n" +
- "dn: dc=example,dc=com\n" +
- "changetype: modify\n" +
- "add: administrativeRole\n" +
- "administrativeRole: accessControlSpecificArea\n" +
- "-";
+ String ldif =
+ "version: 1\n" +
+ "dn: dc=example,dc=com\n" +
+ "changetype: modify\n" +
+ "add: administrativeRole\n" +
+ "administrativeRole: accessControlSpecificArea\n" +
+ "-";
testReaderAttrIdCaseInsensitive( ldif );
-
+
// test that attr id comparisons are case insensitive and that the version in the add: line is used.
// See DIRSERVER-1029 for some discussion.
- ldif =
- "version: 1\n" +
- "dn: dc=example,dc=com\n" +
- "changetype: modify\n" +
- "add: administrativeRole\n" +
- "administrativerole: accessControlSpecificArea\n" +
- "-";
+ ldif =
+ "version: 1\n" +
+ "dn: dc=example,dc=com\n" +
+ "changetype: modify\n" +
+ "add: administrativeRole\n" +
+ "administrativerole: accessControlSpecificArea\n" +
+ "-";
testReaderAttrIdCaseInsensitive( ldif );
}
@@ -331,23 +331,23 @@ public class LdifReaderTest
@Test
public void testLdifParserCombinedEntriesChanges() throws Exception
{
- String ldif =
- "version: 1\n" +
- "dn: cn=app1,ou=applications,ou=conf,dc=apache,dc=org\n" +
- "cn: app1\n" +
- "objectClass: top\n" +
- "objectClass: apApplication\n" +
- "displayName: app1 \n" +
- "dependencies:\n" +
- "envVars:\n" +
- "\n" +
- "# Delete an entry. The operation will attach the LDAPv3\n" +
- "# Tree Delete Control defined in [9]. The criticality\n" +
- "# field is \"true\" and the controlValue field is\n" +
- "# absent, as required by [9].\n" +
- "dn: ou=Product Development, dc=airius, dc=com\n" +
- "control: 1.2.840.113556.1.4.805 true\n" +
- "changetype: delete\n";
+ String ldif =
+ "version: 1\n" +
+ "dn: cn=app1,ou=applications,ou=conf,dc=apache,dc=org\n" +
+ "cn: app1\n" +
+ "objectClass: top\n" +
+ "objectClass: apApplication\n" +
+ "displayName: app1 \n" +
+ "dependencies:\n" +
+ "envVars:\n" +
+ "\n" +
+ "# Delete an entry. The operation will attach the LDAPv3\n" +
+ "# Tree Delete Control defined in [9]. The criticality\n" +
+ "# field is \"true\" and the controlValue field is\n" +
+ "# absent, as required by [9].\n" +
+ "dn: ou=Product Development, dc=airius, dc=com\n" +
+ "control: 1.2.840.113556.1.4.805 true\n" +
+ "changetype: delete\n";
LdifReader reader = new LdifReader();
@@ -375,22 +375,22 @@ public class LdifReaderTest
@Test
public void testLdifParserCombinedEntriesChanges2() throws Exception
{
- String ldif =
- "version: 1\n" +
- "dn: cn=app1,ou=applications,ou=conf,dc=apache,dc=org\n" +
- "cn: app1\n" +
- "objectClass: top\n" +
- "objectClass: apApplication\n" +
- "displayName: app1 \n" +
- "dependencies:\n" +
- "envVars:\n" +
- "\n" +
- "# Delete an entry. The operation will attach the LDAPv3\n" +
- "# Tree Delete Control defined in [9]. The criticality\n" +
- "# field is \"true\" and the controlValue field is\n" +
- "# absent, as required by [9].\n" +
- "dn: ou=Product Development, dc=airius, dc=com\n" +
- "changetype: delete\n";
+ String ldif =
+ "version: 1\n" +
+ "dn: cn=app1,ou=applications,ou=conf,dc=apache,dc=org\n" +
+ "cn: app1\n" +
+ "objectClass: top\n" +
+ "objectClass: apApplication\n" +
+ "displayName: app1 \n" +
+ "dependencies:\n" +
+ "envVars:\n" +
+ "\n" +
+ "# Delete an entry. The operation will attach the LDAPv3\n" +
+ "# Tree Delete Control defined in [9]. The criticality\n" +
+ "# field is \"true\" and the controlValue field is\n" +
+ "# absent, as required by [9].\n" +
+ "dn: ou=Product Development, dc=airius, dc=com\n" +
+ "changetype: delete\n";
LdifReader reader = new LdifReader();
@@ -418,23 +418,23 @@ public class LdifReaderTest
@Test
public void testLdifParserCombinedChangesEntries() throws Exception
{
- String ldif =
- "version: 1\n" +
- "# Delete an entry. The operation will attach the LDAPv3\n" +
- "# Tree Delete Control defined in [9]. The criticality\n" +
- "# field is \"true\" and the controlValue field is\n" +
- "# absent, as required by [9].\n" +
- "dn: ou=Product Development, dc=airius, dc=com\n" +
- "control: 1.2.840.113556.1.4.805 true\n" +
- "changetype: delete\n" +
- "\n" +
- "dn: cn=app1,ou=applications,ou=conf,dc=apache,dc=org\n" +
- "cn: app1\n" +
- "objectClass: top\n" +
- "objectClass: apApplication\n" +
- "displayName: app1 \n" +
- "dependencies:\n" +
- "envVars:\n";
+ String ldif =
+ "version: 1\n" +
+ "# Delete an entry. The operation will attach the LDAPv3\n" +
+ "# Tree Delete Control defined in [9]. The criticality\n" +
+ "# field is \"true\" and the controlValue field is\n" +
+ "# absent, as required by [9].\n" +
+ "dn: ou=Product Development, dc=airius, dc=com\n" +
+ "control: 1.2.840.113556.1.4.805 true\n" +
+ "changetype: delete\n" +
+ "\n" +
+ "dn: cn=app1,ou=applications,ou=conf,dc=apache,dc=org\n" +
+ "cn: app1\n" +
+ "objectClass: top\n" +
+ "objectClass: apApplication\n" +
+ "displayName: app1 \n" +
+ "dependencies:\n" +
+ "envVars:\n";
LdifReader reader = new LdifReader();
@@ -462,22 +462,22 @@ public class LdifReaderTest
@Test
public void testLdifParserCombinedChangesEntries2() throws Exception
{
- String ldif =
- "version: 1\n" +
- "# Delete an entry. The operation will attach the LDAPv3\n" +
- "# Tree Delete Control defined in [9]. The criticality\n" +
- "# field is \"true\" and the controlValue field is\n" +
- "# absent, as required by [9].\n" +
- "dn: ou=Product Development, dc=airius, dc=com\n" +
- "changetype: delete\n" +
- "\n" +
- "dn: cn=app1,ou=applications,ou=conf,dc=apache,dc=org\n" +
- "cn: app1\n" +
- "objectClass: top\n" +
- "objectClass: apApplication\n" +
- "displayName: app1 \n" +
- "dependencies:\n" +
- "envVars:\n";
+ String ldif =
+ "version: 1\n" +
+ "# Delete an entry. The operation will attach the LDAPv3\n" +
+ "# Tree Delete Control defined in [9]. The criticality\n" +
+ "# field is \"true\" and the controlValue field is\n" +
+ "# absent, as required by [9].\n" +
+ "dn: ou=Product Development, dc=airius, dc=com\n" +
+ "changetype: delete\n" +
+ "\n" +
+ "dn: cn=app1,ou=applications,ou=conf,dc=apache,dc=org\n" +
+ "cn: app1\n" +
+ "objectClass: top\n" +
+ "objectClass: apApplication\n" +
+ "displayName: app1 \n" +
+ "dependencies:\n" +
+ "envVars:\n";
LdifReader reader = new LdifReader();
@@ -500,15 +500,15 @@ public class LdifReaderTest
@Test
public void testLdifParser() throws Exception
{
- String ldif =
- "version: 1\n" +
- "dn: cn=app1,ou=applications,ou=conf,dc=apache,dc=org\n" +
- "cn: app1\n" +
- "objectClass: top\n" +
- "objectClass: apApplication\n" +
- "displayName: app1 \n" +
- "dependencies:\n" +
- "envVars:";
+ String ldif =
+ "version: 1\n" +
+ "dn: cn=app1,ou=applications,ou=conf,dc=apache,dc=org\n" +
+ "cn: app1\n" +
+ "objectClass: top\n" +
+ "objectClass: apApplication\n" +
+ "displayName: app1 \n" +
+ "dependencies:\n" +
+ "envVars:";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -542,19 +542,19 @@ public class LdifReaderTest
@Test
public void testLdifParserMuiltiLineComments() throws Exception
{
- String ldif =
- "#comment\n" +
- " still a comment\n" +
- "dn: cn=app1,ou=applications,ou=conf,dc=apache,dc=org\n" +
- "cn: app1#another comment\n" +
- "objectClass: top\n" +
- "objectClass: apApplication\n" +
- "displayName: app1\n" +
- "serviceType: http\n" +
- "dependencies:\n" +
- "httpHeaders:\n" +
- "startupOptions:\n" +
- "envVars:";
+ String ldif =
+ "#comment\n" +
+ " still a comment\n" +
+ "dn: cn=app1,ou=applications,ou=conf,dc=apache,dc=org\n" +
+ "cn: app1#another comment\n" +
+ "objectClass: top\n" +
+ "objectClass: apApplication\n" +
+ "displayName: app1\n" +
+ "serviceType: http\n" +
+ "dependencies:\n" +
+ "httpHeaders:\n" +
+ "startupOptions:\n" +
+ "envVars:";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -588,19 +588,19 @@ public class LdifReaderTest
@Test
public void testLdifParserMultiLineEntries() throws Exception
{
- String ldif =
- "#comment\n" +
- "dn: cn=app1,ou=appli\n" +
- " cations,ou=conf,dc=apache,dc=org\n" +
- "cn: app1#another comment\n" +
- "objectClass: top\n" +
- "objectClass: apApplication\n" +
- "displayName: app1\n" +
- "serviceType: http\n" +
- "dependencies:\n" +
- "httpHeaders:\n" +
- "startupOptions:\n" +
- "envVars:";
+ String ldif =
+ "#comment\n" +
+ "dn: cn=app1,ou=appli\n" +
+ " cations,ou=conf,dc=apache,dc=org\n" +
+ "cn: app1#another comment\n" +
+ "objectClass: top\n" +
+ "objectClass: apApplication\n" +
+ "displayName: app1\n" +
+ "serviceType: http\n" +
+ "dependencies:\n" +
+ "httpHeaders:\n" +
+ "startupOptions:\n" +
+ "envVars:";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -634,18 +634,18 @@ public class LdifReaderTest
@Test
public void testLdifParserBase64() throws Exception, UnsupportedEncodingException
{
- String ldif =
- "#comment\n" +
- "dn: cn=app1,ou=applications,ou=conf,dc=apache,dc=org\n" +
- "cn:: RW1tYW51ZWwgTMOpY2hhcm55\n" +
- "objectClass: top\n" +
- "objectClass: apApplication\n" +
- "displayName: app1\n" +
- "serviceType: http\n" +
- "dependencies:\n" +
- "httpHeaders:\n" +
- "startupOptions:\n" +
- "envVars:";
+ String ldif =
+ "#comment\n" +
+ "dn: cn=app1,ou=applications,ou=conf,dc=apache,dc=org\n" +
+ "cn:: RW1tYW51ZWwgTMOpY2hhcm55\n" +
+ "objectClass: top\n" +
+ "objectClass: apApplication\n" +
+ "displayName: app1\n" +
+ "serviceType: http\n" +
+ "dependencies:\n" +
+ "httpHeaders:\n" +
+ "startupOptions:\n" +
+ "envVars:";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -679,19 +679,19 @@ public class LdifReaderTest
@Test
public void testLdifParserBase64MultiLine() throws Exception, UnsupportedEncodingException
{
- String ldif =
- "#comment\n" +
- "dn: cn=app1,ou=applications,ou=conf,dc=apache,dc=org\n" +
- "cn:: RW1tYW51ZWwg\n" +
- " TMOpY2hhcm55ICA=\n" +
- "objectClass: top\n" +
- "objectClass: apApplication\n" +
- "displayName: app1\n" +
- "serviceType: http\n" +
- "dependencies:\n" +
- "httpHeaders:\n" +
- "startupOptions:\n" +
- "envVars:";
+ String ldif =
+ "#comment\n" +
+ "dn: cn=app1,ou=applications,ou=conf,dc=apache,dc=org\n" +
+ "cn:: RW1tYW51ZWwg\n" +
+ " TMOpY2hhcm55ICA=\n" +
+ "objectClass: top\n" +
+ "objectClass: apApplication\n" +
+ "displayName: app1\n" +
+ "serviceType: http\n" +
+ "dependencies:\n" +
+ "httpHeaders:\n" +
+ "startupOptions:\n" +
+ "envVars:";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -725,27 +725,27 @@ public class LdifReaderTest
@Test
public void testLdifParserRFC2849Sample1() throws Exception
{
- String ldif =
- "version: 1\n" +
- "dn: cn=Barbara Jensen, ou=Product Development, dc=airius, dc=com\n" +
- "objectclass: top\n" +
- "objectclass: person\n" +
- "objectclass: organizationalPerson\n" +
- "cn: Barbara Jensen\n" +
- "cn: Barbara J Jensen\n" +
- "cn: Babs Jensen\n" +
- "sn: Jensen\n" +
- "uid: bjensen\n" +
- "telephonenumber: +1 408 555 1212\n" +
- "description: A big sailing fan.\n" +
- "\n" +
- "dn: cn=Bjorn Jensen, ou=Accounting, dc=airius, dc=com\n" +
- "objectclass: top\n" +
- "objectclass: person\n" +
- "objectclass: organizationalPerson\n" +
- "cn: Bjorn Jensen\n" +
- "sn: Jensen\n" +
- "telephonenumber: +1 408 555 1212";
+ String ldif =
+ "version: 1\n" +
+ "dn: cn=Barbara Jensen, ou=Product Development, dc=airius, dc=com\n" +
+ "objectclass: top\n" +
+ "objectclass: person\n" +
+ "objectclass: organizationalPerson\n" +
+ "cn: Barbara Jensen\n" +
+ "cn: Barbara J Jensen\n" +
+ "cn: Babs Jensen\n" +
+ "sn: Jensen\n" +
+ "uid: bjensen\n" +
+ "telephonenumber: +1 408 555 1212\n" +
+ "description: A big sailing fan.\n" +
+ "\n" +
+ "dn: cn=Bjorn Jensen, ou=Accounting, dc=airius, dc=com\n" +
+ "objectclass: top\n" +
+ "objectclass: person\n" +
+ "objectclass: organizationalPerson\n" +
+ "cn: Bjorn Jensen\n" +
+ "sn: Jensen\n" +
+ "telephonenumber: +1 408 555 1212";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -807,21 +807,21 @@ public class LdifReaderTest
@Test
public void testLdifParserRFC2849Sample2() throws Exception
{
- String ldif =
- "version: 1\n" +
- "dn: cn=Barbara Jensen, ou=Product Development, dc=airius, dc=com\n" +
- "objectclass: top\n" +
- "objectclass: person\n" +
- "objectclass: organizationalPerson\n" +
- "cn: Barbara Jensen\n" +
- "cn: Barbara J Jensen\n" +
- "cn: Babs Jensen\n" +
- "sn: Jensen\n" +
- "uid: bjensen\n" +
- "telephonenumber: +1 408 555 1212\n" +
- "description:Babs is a big sailing fan, and travels extensively in sea\n" +
- " rch of perfect sailing conditions.\n" +
- "title:Product Manager, Rod and Reel Division";
+ String ldif =
+ "version: 1\n" +
+ "dn: cn=Barbara Jensen, ou=Product Development, dc=airius, dc=com\n" +
+ "objectclass: top\n" +
+ "objectclass: person\n" +
+ "objectclass: organizationalPerson\n" +
+ "cn: Barbara Jensen\n" +
+ "cn: Barbara J Jensen\n" +
+ "cn: Babs Jensen\n" +
+ "sn: Jensen\n" +
+ "uid: bjensen\n" +
+ "telephonenumber: +1 408 555 1212\n" +
+ "description:Babs is a big sailing fan, and travels extensively in sea\n" +
+ " rch of perfect sailing conditions.\n" +
+ "title:Product Manager, Rod and Reel Division";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -866,21 +866,21 @@ public class LdifReaderTest
@Test
public void testLdifParserRFC2849Sample3() throws Exception, Exception
{
- String ldif =
- "version: 1\n" +
- "dn: cn=Gern Jensen, ou=Product Testing, dc=airius, dc=com\n" +
- "objectclass: top\n" +
- "objectclass: person\n" +
- "objectclass: organizationalPerson\n" +
- "cn: Gern Jensen\n" +
- "cn: Gern O Jensen\n" +
- "sn: Jensen\n" +
- "uid: gernj\n" +
- "telephonenumber: +1 408 555 1212\n" +
- "description:: V2hhdCBhIGNhcmVmdWwgcmVhZGVyIHlvdSBhcmUhICBUaGlzIHZhbHVl\n" +
- " IGlzIGJhc2UtNjQtZW5jb2RlZCBiZWNhdXNlIGl0IGhhcyBhIGNvbnRyb2wgY2hhcmFjdG\n" +
- " VyIGluIGl0IChhIENSKS4NICBCeSB0aGUgd2F5LCB5b3Ugc2hvdWxkIHJlYWxseSBnZXQg\n" +
- " b3V0IG1vcmUu";
+ String ldif =
+ "version: 1\n" +
+ "dn: cn=Gern Jensen, ou=Product Testing, dc=airius, dc=com\n" +
+ "objectclass: top\n" +
+ "objectclass: person\n" +
+ "objectclass: organizationalPerson\n" +
+ "cn: Gern Jensen\n" +
+ "cn: Gern O Jensen\n" +
+ "sn: Jensen\n" +
+ "uid: gernj\n" +
+ "telephonenumber: +1 408 555 1212\n" +
+ "description:: V2hhdCBhIGNhcmVmdWwgcmVhZGVyIHlvdSBhcmUhICBUaGlzIHZhbHVl\n" +
+ " IGlzIGJhc2UtNjQtZW5jb2RlZCBiZWNhdXNlIGl0IGhhcyBhIGNvbnRyb2wgY2hhcmFjdG\n" +
+ " VyIGluIGl0IChhIENSKS4NICBCeSB0aGUgd2F5LCB5b3Ugc2hvdWxkIHJlYWxseSBnZXQg\n" +
+ " b3V0IG1vcmUu";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -922,21 +922,21 @@ public class LdifReaderTest
@Test
public void testLdifParserRFC2849Sample3VariousSpacing() throws Exception, Exception
{
- String ldif =
- "version:1\n" +
- "dn:cn=Gern Jensen, ou=Product Testing, dc=airius, dc=com \n" +
- "objectclass:top\n" +
- "objectclass: person \n" +
- "objectclass:organizationalPerson\n" +
- "cn:Gern Jensen\n" +
- "cn:Gern O Jensen\n" +
- "sn:Jensen\n" +
- "uid:gernj\n" +
- "telephonenumber:+1 408 555 1212 \n" +
- "description:: V2hhdCBhIGNhcmVmdWwgcmVhZGVyIHlvdSBhcmUhICBUaGlzIHZhbHVl\n" +
- " IGlzIGJhc2UtNjQtZW5jb2RlZCBiZWNhdXNlIGl0IGhhcyBhIGNvbnRyb2wgY2hhcmFjdG\n" +
- " VyIGluIGl0IChhIENSKS4NICBCeSB0aGUgd2F5LCB5b3Ugc2hvdWxkIHJlYWxseSBnZXQg\n" +
- " b3V0IG1vcmUu ";
+ String ldif =
+ "version:1\n" +
+ "dn:cn=Gern Jensen, ou=Product Testing, dc=airius, dc=com \n" +
+ "objectclass:top\n" +
+ "objectclass: person \n" +
+ "objectclass:organizationalPerson\n" +
+ "cn:Gern Jensen\n" +
+ "cn:Gern O Jensen\n" +
+ "sn:Jensen\n" +
+ "uid:gernj\n" +
+ "telephonenumber:+1 408 555 1212 \n" +
+ "description:: V2hhdCBhIGNhcmVmdWwgcmVhZGVyIHlvdSBhcmUhICBUaGlzIHZhbHVl\n" +
+ " IGlzIGJhc2UtNjQtZW5jb2RlZCBiZWNhdXNlIGl0IGhhcyBhIGNvbnRyb2wgY2hhcmFjdG\n" +
+ " VyIGluIGl0IChhIENSKS4NICBCeSB0aGUgd2F5LCB5b3Ugc2hvdWxkIHJlYWxseSBnZXQg\n" +
+ " b3V0IG1vcmUu ";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -978,60 +978,60 @@ public class LdifReaderTest
@Test
public void testLdifParserRFC2849Sample4() throws Exception, Exception
{
- String ldif =
+ String ldif =
"version: 1\n" +
- "dn:: b3U95Za25qWt6YOoLG89QWlyaXVz\n" +
- "# dn:: ou=���������,o=Airius\n" +
- "objectclass: top\n" +
- "objectclass: organizationalUnit\n" +
- "ou:: 5Za25qWt6YOo\n" +
- "# ou:: ���������\n" +
- "ou;lang-ja:: 5Za25qWt6YOo\n" +
- "# ou;lang-ja:: ���������\n" +
- "ou;lang-ja;phonetic:: 44GI44GE44GO44KH44GG44G2\n" +
- "# ou;lang-ja:: ������������������\n" +
- "ou;lang-en: Sales\n" +
- "description: Japanese office\n" +
- "\n" +
- "dn:: dWlkPXJvZ2FzYXdhcmEsb3U95Za25qWt6YOoLG89QWlyaXVz\n" +
- "# dn:: uid=rogasawara,ou=���������,o=Airius\n" +
- "userpassword: {SHA}O3HSv1MusyL4kTjP+HKI5uxuNoM=\n" +
- "objectclass: top\n" +
- "objectclass: person\n" +
- "objectclass: organizationalPerson\n" +
- "objectclass: inetOrgPerson\n" +
- "uid: rogasawara\n" +
- "mail: rogasawara@airius.co.jp\n" +
- "givenname;lang-ja:: 44Ot44OJ44OL44O8\n" +
- "# givenname;lang-ja:: ������������\n" +
- "sn;lang-ja:: 5bCP56yg5Y6f\n" +
- "# sn;lang-ja:: ���������\n" +
- "cn;lang-ja:: 5bCP56yg5Y6fIOODreODieODi+ODvA==\n" +
- "# cn;lang-ja:: ��������� ������������\n" +
- "title;lang-ja:: 5Za25qWt6YOoIOmDqOmVtw==\n" +
- "# title;lang-ja:: ��������� ������\n" +
- "preferredlanguage: ja\n" +
- "givenname:: 44Ot44OJ44OL44O8\n" +
- "# givenname:: ������������\n" +
- "sn:: 5bCP56yg5Y6f\n" +
- "# sn:: ���������\n" +
- "cn:: 5bCP56yg5Y6fIOODreODieODi+ODvA==\n" +
- "# cn:: ��������� ������������\n" +
- "title:: 5Za25qWt6YOoIOmDqOmVtw==\n" +
- "# title:: ��������� ������\n" +
- "givenname;lang-ja;phonetic:: 44KN44Gp44Gr44O8\n" +
- "# givenname;lang-ja;phonetic:: ������������\n" +
- "sn;lang-ja;phonetic:: 44GK44GM44GV44KP44KJ\n" +
- "# sn;lang-ja;phonetic:: ���������������\n" +
- "cn;lang-ja;phonetic:: 44GK44GM44GV44KP44KJIOOCjeOBqeOBq+ODvA==\n" +
- "# cn;lang-ja;phonetic:: ��������������� ������������\n" +
- "title;lang-ja;phonetic:: 44GI44GE44GO44KH44GG44G2IOOBtuOBoeOCh+OBhg==\n" +
- "# title;lang-ja;phonetic::\n" +
- "# ������������������ ������������\n" +
- "givenname;lang-en: Rodney\n" +
- "sn;lang-en: Ogasawara\n" +
- "cn;lang-en: Rodney Ogasawara\n" +
- "title;lang-en: Sales, Director\n";
+ "dn:: b3U95Za25qWt6YOoLG89QWlyaXVz\n" +
+ "# dn:: ou=���������,o=Airius\n" +
+ "objectclass: top\n" +
+ "objectclass: organizationalUnit\n" +
+ "ou:: 5Za25qWt6YOo\n" +
+ "# ou:: ���������\n" +
+ "ou;lang-ja:: 5Za25qWt6YOo\n" +
+ "# ou;lang-ja:: ���������\n" +
+ "ou;lang-ja;phonetic:: 44GI44GE44GO44KH44GG44G2\n" +
+ "# ou;lang-ja:: ������������������\n" +
+ "ou;lang-en: Sales\n" +
+ "description: Japanese office\n" +
+ "\n" +
+ "dn:: dWlkPXJvZ2FzYXdhcmEsb3U95Za25qWt6YOoLG89QWlyaXVz\n" +
+ "# dn:: uid=rogasawara,ou=���������,o=Airius\n" +
+ "userpassword: {SHA}O3HSv1MusyL4kTjP+HKI5uxuNoM=\n" +
+ "objectclass: top\n" +
+ "objectclass: person\n" +
+ "objectclass: organizationalPerson\n" +
+ "objectclass: inetOrgPerson\n" +
+ "uid: rogasawara\n" +
+ "mail: rogasawara@airius.co.jp\n" +
+ "givenname;lang-ja:: 44Ot44OJ44OL44O8\n" +
+ "# givenname;lang-ja:: ������������\n" +
+ "sn;lang-ja:: 5bCP56yg5Y6f\n" +
+ "# sn;lang-ja:: ���������\n" +
+ "cn;lang-ja:: 5bCP56yg5Y6fIOODreODieODi+ODvA==\n" +
+ "# cn;lang-ja:: ��������� ������������\n" +
+ "title;lang-ja:: 5Za25qWt6YOoIOmDqOmVtw==\n" +
+ "# title;lang-ja:: ��������� ������\n" +
+ "preferredlanguage: ja\n" +
+ "givenname:: 44Ot44OJ44OL44O8\n" +
+ "# givenname:: ������������\n" +
+ "sn:: 5bCP56yg5Y6f\n" +
+ "# sn:: ���������\n" +
+ "cn:: 5bCP56yg5Y6fIOODreODieODi+ODvA==\n" +
+ "# cn:: ��������� ������������\n" +
+ "title:: 5Za25qWt6YOoIOmDqOmVtw==\n" +
+ "# title:: ��������� ������\n" +
+ "givenname;lang-ja;phonetic:: 44KN44Gp44Gr44O8\n" +
+ "# givenname;lang-ja;phonetic:: ������������\n" +
+ "sn;lang-ja;phonetic:: 44GK44GM44GV44KP44KJ\n" +
+ "# sn;lang-ja;phonetic:: ���������������\n" +
+ "cn;lang-ja;phonetic:: 44GK44GM44GV44KP44KJIOOCjeOBqeOBq+ODvA==\n" +
+ "# cn;lang-ja;phonetic:: ��������������� ������������\n" +
+ "title;lang-ja;phonetic:: 44GI44GE44GO44KH44GG44G2IOOBtuOBoeOCh+OBhg==\n" +
+ "# title;lang-ja;phonetic::\n" +
+ "# ������������������ ������������\n" +
+ "givenname;lang-en: Rodney\n" +
+ "sn;lang-en: Ogasawara\n" +
+ "cn;lang-en: Rodney Ogasawara\n" +
+ "title;lang-en: Sales, Director\n";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -1047,8 +1047,8 @@ public class LdifReaderTest
{ "ou;lang-ja", "\u55b6\u696d\u90e8" },
{ "ou;lang-ja;phonetic", "\u3048\u3044\u304e\u3087\u3046\u3076" }, // 3048 = ���, 3044 = ���, 304e = ���
// 3087 = ���, 3046 = ���, 3076 = ���
- { "ou;lang-en", "Sales" },
- { "description", "Japanese office" } },
+ { "ou;lang-en", "Sales" },
+ { "description", "Japanese office" } },
{
{ "dn", "uid=rogasawara,ou=\u55b6\u696d\u90e8,o=Airius" },
{ "userpassword", "{SHA}O3HSv1MusyL4kTjP+HKI5uxuNoM=" },
@@ -1111,20 +1111,20 @@ public class LdifReaderTest
@Test
public void testLdifParserRFC2849Sample5() throws Exception, Exception
{
- String ldif =
- "version: 1\n" +
- "dn: cn=Horatio Jensen, ou=Product Testing, dc=airius, dc=com\n" +
- "objectclass: top\n" +
- "objectclass: person\n" +
- "objectclass: organizationalPerson\n" +
- "cn: Horatio Jensen\n" +
- "cn: Horatio N Jensen\n" +
- "sn: Jensen\n" +
- "uid: hjensen\n" +
- "telephonenumber: +1 408 555 1212\n" +
- "jpegphoto:< file:" +
- HJENSEN_JPEG_FILE.getAbsolutePath() +
- "\n";
+ String ldif =
+ "version: 1\n" +
+ "dn: cn=Horatio Jensen, ou=Product Testing, dc=airius, dc=com\n" +
+ "objectclass: top\n" +
+ "objectclass: person\n" +
+ "objectclass: organizationalPerson\n" +
+ "cn: Horatio Jensen\n" +
+ "cn: Horatio N Jensen\n" +
+ "sn: Jensen\n" +
+ "uid: hjensen\n" +
+ "telephonenumber: +1 408 555 1212\n" +
+ "jpegphoto:< file:" +
+ HJENSEN_JPEG_FILE.getAbsolutePath() +
+ "\n";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -1158,7 +1158,7 @@ public class LdifReaderTest
else if ( "jpegphoto".equalsIgnoreCase( values[i][0] ) )
{
Attribute attr = entry.get( values[i][0] );
- assertEquals( Strings.dumpBytes(data), Strings.dumpBytes(attr.getBytes()) );
+ assertEquals( Strings.dumpBytes( data ), Strings.dumpBytes( attr.getBytes() ) );
}
else
{
@@ -1180,20 +1180,20 @@ public class LdifReaderTest
@Test
public void testLdifParserRFC2849Sample5WithSizeLimit() throws Exception
{
- String ldif =
- "version: 1\n" +
- "dn: cn=Horatio Jensen, ou=Product Testing, dc=airius, dc=com\n" +
- "objectclass: top\n" +
- "objectclass: person\n" +
- "objectclass: organizationalPerson\n" +
- "cn: Horatio Jensen\n" +
- "cn: Horatio N Jensen\n" +
- "sn: Jensen\n" +
- "uid: hjensen\n" +
- "telephonenumber: +1 408 555 1212\n" +
- "jpegphoto:< file:" +
- HJENSEN_JPEG_FILE.getAbsolutePath() +
- "\n";
+ String ldif =
+ "version: 1\n" +
+ "dn: cn=Horatio Jensen, ou=Product Testing, dc=airius, dc=com\n" +
+ "objectclass: top\n" +
+ "objectclass: person\n" +
+ "objectclass: organizationalPerson\n" +
+ "cn: Horatio Jensen\n" +
+ "cn: Horatio N Jensen\n" +
+ "sn: Jensen\n" +
+ "uid: hjensen\n" +
+ "telephonenumber: +1 408 555 1212\n" +
+ "jpegphoto:< file:" +
+ HJENSEN_JPEG_FILE.getAbsolutePath() +
+ "\n";
LdifReader reader = new LdifReader();
reader.setSizeLimit( 128 );
@@ -1214,81 +1214,81 @@ public class LdifReaderTest
@Test
public void testLdifParserRFC2849Sample6() throws Exception, Exception
{
- String ldif =
+ String ldif =
"version: 1\n" +
- // First entry modification : ADD
- "# Add a new entry\n" +
- "dn: cn=Fiona Jensen, ou=Marketing, dc=airius, dc=com\n" +
- "changetype: add\n" +
- "objectclass: top\n" +
- "objectclass: person\n" +
- "objectclass: organizationalPerson\n" +
- "cn: Fiona Jensen\n" +
- "sn: Jensen\n" +
- "uid: fiona\n" +
- "telephonenumber: +1 408 555 1212\n" +
- "jpegphoto:< file:" +
- FIONA_JPEG_FILE.getAbsolutePath() +
- "\n" +
- "\n"
- +
- // Second entry modification : DELETE
- "# Delete an existing entry\n" +
- "dn: cn=Robert Jensen, ou=Marketing, dc=airius, dc=com\n" +
- "changetype: delete\n" +
- "\n"
- +
- // Third entry modification : MODRDN
- "# Modify an entry's relative distinguished name\n" +
- "dn: cn=Paul Jensen, ou=Product Development, dc=airius, dc=com\n" +
- "changetype: modrdn\n" +
- "newrdn: cn=Paula Jensen\n" +
- "deleteoldrdn: 1\n" +
- "\n"
- +
- // Forth entry modification : MODRDN
- "# Rename an entry and move all of its children to a new location in\n" +
- "# the directory tree (only implemented by LDAPv3 servers).\n" +
- "dn: ou=PD Accountants, ou=Product Development, dc=airius, dc=com\n" +
- "changetype: moddn\n" +
- "newrdn: ou=Product Development Accountants\n" +
- "deleteoldrdn: 0\n" +
- "newsuperior: ou=Accounting, dc=airius, dc=com\n" +
- "# Modify an entry: add an additional value to the postaladdress\n" +
- "# attribute, completely delete the description attribute, replace\n" +
- "# the telephonenumber attribute with two values, and delete a specific\n" +
- "# value from the facsimiletelephonenumber attribute\n" +
- "\n"
- +
- // Fitfh entry modification : MODIFY
- "dn: cn=Paula Jensen, ou=Product Development, dc=airius, dc=com\n" +
- "changetype: modify\n" +
- "add: postaladdress\n" +
- "postaladdress: 123 Anystreet $ Sunnyvale, CA $ 94086\n" +
- "-\n" +
- "delete: description\n" +
- "-\n" +
- "replace: telephonenumber\n" +
- "telephonenumber: +1 408 555 1234\n" +
- "telephonenumber: +1 408 555 5678\n" +
- "-\n" +
- "delete: facsimiletelephonenumber\n" +
- "facsimiletelephonenumber: +1 408 555 9876\n" +
- "-\n" +
- "\n"
- +
- // Sixth entry modification : MODIFY
- "# Modify an entry: replace the postaladdress attribute with an empty\n" +
- "# set of values (which will cause the attribute to be removed), and\n" +
- "# delete the entire description attribute. Note that the first will\n" +
- "# always succeed, while the second will only succeed if at least\n" +
- "# one value for the description attribute is present.\n" +
- "dn: cn=Ingrid Jensen, ou=Product Support, dc=airius, dc=com\n" +
- "changetype: modify\n" +
- "replace: postaladdress\n" +
- "-\n" +
- "delete: description\n" +
- "-\n";
+ // First entry modification : ADD
+ "# Add a new entry\n" +
+ "dn: cn=Fiona Jensen, ou=Marketing, dc=airius, dc=com\n" +
+ "changetype: add\n" +
+ "objectclass: top\n" +
+ "objectclass: person\n" +
+ "objectclass: organizationalPerson\n" +
+ "cn: Fiona Jensen\n" +
+ "sn: Jensen\n" +
+ "uid: fiona\n" +
+ "telephonenumber: +1 408 555 1212\n" +
+ "jpegphoto:< file:" +
+ FIONA_JPEG_FILE.getAbsolutePath() +
+ "\n" +
+ "\n"
+ +
+ // Second entry modification : DELETE
+ "# Delete an existing entry\n" +
+ "dn: cn=Robert Jensen, ou=Marketing, dc=airius, dc=com\n" +
+ "changetype: delete\n" +
+ "\n"
+ +
+ // Third entry modification : MODRDN
+ "# Modify an entry's relative distinguished name\n" +
+ "dn: cn=Paul Jensen, ou=Product Development, dc=airius, dc=com\n" +
+ "changetype: modrdn\n" +
+ "newrdn: cn=Paula Jensen\n" +
+ "deleteoldrdn: 1\n" +
+ "\n"
+ +
+ // Forth entry modification : MODRDN
+ "# Rename an entry and move all of its children to a new location in\n" +
+ "# the directory tree (only implemented by LDAPv3 servers).\n" +
+ "dn: ou=PD Accountants, ou=Product Development, dc=airius, dc=com\n" +
+ "changetype: moddn\n" +
+ "newrdn: ou=Product Development Accountants\n" +
+ "deleteoldrdn: 0\n" +
+ "newsuperior: ou=Accounting, dc=airius, dc=com\n" +
+ "# Modify an entry: add an additional value to the postaladdress\n" +
+ "# attribute, completely delete the description attribute, replace\n" +
+ "# the telephonenumber attribute with two values, and delete a specific\n" +
+ "# value from the facsimiletelephonenumber attribute\n" +
+ "\n"
+ +
+ // Fitfh entry modification : MODIFY
+ "dn: cn=Paula Jensen, ou=Product Development, dc=airius, dc=com\n" +
+ "changetype: modify\n" +
+ "add: postaladdress\n" +
+ "postaladdress: 123 Anystreet $ Sunnyvale, CA $ 94086\n" +
+ "-\n" +
+ "delete: description\n" +
+ "-\n" +
+ "replace: telephonenumber\n" +
+ "telephonenumber: +1 408 555 1234\n" +
+ "telephonenumber: +1 408 555 5678\n" +
+ "-\n" +
+ "delete: facsimiletelephonenumber\n" +
+ "facsimiletelephonenumber: +1 408 555 9876\n" +
+ "-\n" +
+ "\n"
+ +
+ // Sixth entry modification : MODIFY
+ "# Modify an entry: replace the postaladdress attribute with an empty\n" +
+ "# set of values (which will cause the attribute to be removed), and\n" +
+ "# delete the entire description attribute. Note that the first will\n" +
+ "# always succeed, while the second will only succeed if at least\n" +
+ "# one value for the description attribute is present.\n" +
+ "dn: cn=Ingrid Jensen, ou=Product Support, dc=airius, dc=com\n" +
+ "changetype: modify\n" +
+ "replace: postaladdress\n" +
+ "-\n" +
+ "delete: description\n" +
+ "-\n";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -1307,36 +1307,36 @@ public class LdifReaderTest
{ "uid", "fiona" },
{ "telephonenumber", "+1 408 555 1212" },
{ "jpegphoto", "" } },
- // Second entry modification : DELETE
- {
- { "dn", "cn=Robert Jensen, ou=Marketing, dc=airius, dc=com" } },
- // Third entry modification : MODRDN
- {
- { "dn", "cn=Paul Jensen, ou=Product Development, dc=airius, dc=com" },
- { "cn=Paula Jensen" } },
- // Forth entry modification : MODRDN
- {
- { "dn", "ou=PD Accountants, ou=Product Development, dc=airius, dc=com" },
- { "ou=Product Development Accountants" },
- { "ou=Accounting, dc=airius, dc=com" } },
- // Fitfh entry modification : MODIFY
- {
- { "dn", "cn=Paula Jensen, ou=Product Development, dc=airius, dc=com" },
- // add
- { "postaladdress", "123 Anystreet $ Sunnyvale, CA $ 94086" },
- // delete
- { "description" },
- // replace
- { "telephonenumber", "+1 408 555 1234", "+1 408 555 5678" },
- // delete
- { "facsimiletelephonenumber", "+1 408 555 9876" }, },
- // Sixth entry modification : MODIFY
- {
- { "dn", "cn=Ingrid Jensen, ou=Product Support, dc=airius, dc=com" },
- // replace
- { "postaladdress" },
- // delete
- { "description" } } };
+ // Second entry modification : DELETE
+ {
+ { "dn", "cn=Robert Jensen, ou=Marketing, dc=airius, dc=com" } },
+ // Third entry modification : MODRDN
+ {
+ { "dn", "cn=Paul Jensen, ou=Product Development, dc=airius, dc=com" },
+ { "cn=Paula Jensen" } },
+ // Forth entry modification : MODRDN
+ {
+ { "dn", "ou=PD Accountants, ou=Product Development, dc=airius, dc=com" },
+ { "ou=Product Development Accountants" },
+ { "ou=Accounting, dc=airius, dc=com" } },
+ // Fitfh entry modification : MODIFY
+ {
+ { "dn", "cn=Paula Jensen, ou=Product Development, dc=airius, dc=com" },
+ // add
+ { "postaladdress", "123 Anystreet $ Sunnyvale, CA $ 94086" },
+ // delete
+ { "description" },
+ // replace
+ { "telephonenumber", "+1 408 555 1234", "+1 408 555 5678" },
+ // delete
+ { "facsimiletelephonenumber", "+1 408 555 9876" }, },
+ // Sixth entry modification : MODIFY
+ {
+ { "dn", "cn=Ingrid Jensen, ou=Product Support, dc=airius, dc=com" },
+ // replace
+ { "postaladdress" },
+ // delete
+ { "description" } } };
LdifEntry entry = entries.get( 0 );
assertTrue( entry.isChangeAdd() );
@@ -1350,7 +1350,7 @@ public class LdifReaderTest
else if ( "jpegphoto".equalsIgnoreCase( values[0][i][0] ) )
{
Attribute attr = entry.get( values[0][i][0] );
- assertEquals( Strings.dumpBytes(data), Strings.dumpBytes(attr.getBytes()) );
+ assertEquals( Strings.dumpBytes( data ), Strings.dumpBytes( attr.getBytes() ) );
}
else
{
@@ -1446,15 +1446,15 @@ public class LdifReaderTest
@Test
public void testLdifParserRFC2849Sample7() throws Exception, Exception
{
- String ldif =
- "version: 1\n" +
- "# Delete an entry. The operation will attach the LDAPv3\n" +
- "# Tree Delete Control defined in [9]. The criticality\n" +
- "# field is \"true\" and the controlValue field is\n" +
- "# absent, as required by [9].\n" +
- "dn: ou=Product Development, dc=airius, dc=com\n" +
- "control: 1.2.840.113556.1.4.805 true\n" +
- "changetype: delete\n";
+ String ldif =
+ "version: 1\n" +
+ "# Delete an entry. The operation will attach the LDAPv3\n" +
+ "# Tree Delete Control defined in [9]. The criticality\n" +
+ "# field is \"true\" and the controlValue field is\n" +
+ "# absent, as required by [9].\n" +
+ "dn: ou=Product Development, dc=airius, dc=com\n" +
+ "control: 1.2.840.113556.1.4.805 true\n" +
+ "changetype: delete\n";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -1476,15 +1476,15 @@ public class LdifReaderTest
@Test
public void testLdifParserRFC2849Sample7NoValueNoCritical() throws Exception, Exception
{
- String ldif =
- "version: 1\n" +
- "# Delete an entry. The operation will attach the LDAPv3\n" +
- "# Tree Delete Control defined in [9]. The criticality\n" +
- "# field is \"true\" and the controlValue field is\n" +
- "# absent, as required by [9].\n" +
- "dn: ou=Product Development, dc=airius, dc=com\n" +
- "control: 1.2.840.113556.1.4.805\n" +
- "changetype: delete\n";
+ String ldif =
+ "version: 1\n" +
+ "# Delete an entry. The operation will attach the LDAPv3\n" +
+ "# Tree Delete Control defined in [9]. The criticality\n" +
+ "# field is \"true\" and the controlValue field is\n" +
+ "# absent, as required by [9].\n" +
+ "dn: ou=Product Development, dc=airius, dc=com\n" +
+ "control: 1.2.840.113556.1.4.805\n" +
+ "changetype: delete\n";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -1506,15 +1506,15 @@ public class LdifReaderTest
@Test
public void testLdifParserRFC2849Sample7NoCritical() throws Exception, Exception
{
- String ldif =
- "version: 1\n" +
- "# Delete an entry. The operation will attach the LDAPv3\n" +
- "# Tree Delete Control defined in [9]. The criticality\n" +
- "# field is \"true\" and the controlValue field is\n" +
- "# absent, as required by [9].\n" +
- "dn: ou=Product Development, dc=airius, dc=com\n" +
- "control: 1.2.840.113556.1.4.805:control-value\n" +
- "changetype: delete\n";
+ String ldif =
+ "version: 1\n" +
+ "# Delete an entry. The operation will attach the LDAPv3\n" +
+ "# Tree Delete Control defined in [9]. The criticality\n" +
+ "# field is \"true\" and the controlValue field is\n" +
+ "# absent, as required by [9].\n" +
+ "dn: ou=Product Development, dc=airius, dc=com\n" +
+ "control: 1.2.840.113556.1.4.805:control-value\n" +
+ "changetype: delete\n";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -1537,15 +1537,15 @@ public class LdifReaderTest
@Test
public void testLdifParserRFC2849Sample7NoOid() throws Exception
{
- String ldif =
- "version: 1\n" +
- "# Delete an entry. The operation will attach the LDAPv3\n" +
- "# Tree Delete Control defined in [9]. The criticality\n" +
- "# field is \"true\" and the controlValue field is\n" +
- "# absent, as required by [9].\n" +
- "dn: ou=Product Development, dc=airius, dc=com\n" +
- "control: true\n" +
- "changetype: delete\n";
+ String ldif =
+ "version: 1\n" +
+ "# Delete an entry. The operation will attach the LDAPv3\n" +
+ "# Tree Delete Control defined in [9]. The criticality\n" +
+ "# field is \"true\" and the controlValue field is\n" +
+ "# absent, as required by [9].\n" +
+ "dn: ou=Product Development, dc=airius, dc=com\n" +
+ "control: true\n" +
+ "changetype: delete\n";
LdifReader reader = new LdifReader();
@@ -1568,15 +1568,15 @@ public class LdifReaderTest
@Test
public void testLdifParserRFC2849Sample7BadOid() throws Exception
{
- String ldif =
- "version: 1\n" +
- "# Delete an entry. The operation will attach the LDAPv3\n" +
- "# Tree Delete Control defined in [9]. The criticality\n" +
- "# field is \"true\" and the controlValue field is\n" +
- "# absent, as required by [9].\n" +
- "dn: ou=Product Development, dc=airius, dc=com\n" +
- "control: 1.2.840.113A556.1.4.805 true\n" +
- "changetype: delete\n";
+ String ldif =
+ "version: 1\n" +
+ "# Delete an entry. The operation will attach the LDAPv3\n" +
+ "# Tree Delete Control defined in [9]. The criticality\n" +
+ "# field is \"true\" and the controlValue field is\n" +
+ "# absent, as required by [9].\n" +
+ "dn: ou=Product Development, dc=airius, dc=com\n" +
+ "control: 1.2.840.113A556.1.4.805 true\n" +
+ "changetype: delete\n";
LdifReader reader = new LdifReader();
@@ -1599,37 +1599,37 @@ public class LdifReaderTest
@Test
public void testLdifReaderDirServer() throws Exception, Exception
{
- String ldif =
- "# -------------------------------------------------------------------\n" +
- "#\n" +
- "# Licensed to the Apache Software Foundation (ASF) under one\n" +
- "# or more contributor license agreements. See the NOTICE file\n" +
- "# distributed with this work for additional information\n" +
- "# regarding copyright ownership. The ASF licenses this file\n" +
- "# to you under the Apache License, Version 2.0 (the\n" +
- "# \"License\"); you may not use this file except in compliance\n" +
- "# with the License. You may obtain a copy of the License at\n" +
- "# \n" +
- "# http://www.apache.org/licenses/LICENSE-2.0\n" +
- "# \n" +
- "# Unless required by applicable law or agreed to in writing,\n" +
- "# software distributed under the License is distributed on an\n" +
- "# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n" +
- "# KIND, either express or implied. See the License for the\n" +
- "# specific language governing permissions and limitations\n" +
- "# under the License. \n" +
- "# \n" +
- "#\n" +
- "# EXAMPLE.COM is freely and reserved for testing according to this RFC:\n" +
- "#\n" +
- "# http://www.rfc-editor.org/rfc/rfc2606.txt\n" +
- "#\n" +
- "# -------------------------------------------------------------------\n" +
- "\n" +
- "dn: ou=Users, dc=example, dc=com\n" +
- "objectclass: top\n" +
- "objectclass: organizationalunit\n" +
- "ou: Users";
+ String ldif =
+ "# -------------------------------------------------------------------\n" +
+ "#\n" +
+ "# Licensed to the Apache Software Foundation (ASF) under one\n" +
+ "# or more contributor license agreements. See the NOTICE file\n" +
+ "# distributed with this work for additional information\n" +
+ "# regarding copyright ownership. The ASF licenses this file\n" +
+ "# to you under the Apache License, Version 2.0 (the\n" +
+ "# \"License\"); you may not use this file except in compliance\n" +
+ "# with the License. You may obtain a copy of the License at\n" +
+ "# \n" +
+ "# http://www.apache.org/licenses/LICENSE-2.0\n" +
+ "# \n" +
+ "# Unless required by applicable law or agreed to in writing,\n" +
+ "# software distributed under the License is distributed on an\n" +
+ "# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n" +
+ "# KIND, either express or implied. See the License for the\n" +
+ "# specific language governing permissions and limitations\n" +
+ "# under the License. \n" +
+ "# \n" +
+ "#\n" +
+ "# EXAMPLE.COM is freely and reserved for testing according to this RFC:\n" +
+ "#\n" +
+ "# http://www.rfc-editor.org/rfc/rfc2606.txt\n" +
+ "#\n" +
+ "# -------------------------------------------------------------------\n" +
+ "\n" +
+ "dn: ou=Users, dc=example, dc=com\n" +
+ "objectclass: top\n" +
+ "objectclass: organizationalunit\n" +
+ "ou: Users";
LdifReader reader = new LdifReader();
@@ -1652,45 +1652,82 @@ public class LdifReaderTest
@Test
public void testLdifParserCommentsEmptyLines() throws Exception, Exception
{
- String ldif =
- "#\n" +
- "# Licensed to the Apache Software Foundation (ASF) under one\n" +
- "# or more contributor license agreements. See the NOTICE file\n" +
- "# distributed with this work for additional information\n" +
- "# regarding copyright ownership. The ASF licenses this file\n" +
- "# to you under the Apache License, Version 2.0 (the\n" +
- "# \"License\"); you may not use this file except in compliance\n" +
- "# with the License. You may obtain a copy of the License at\n" +
- "# \n" +
- "# http://www.apache.org/licenses/LICENSE-2.0\n" +
- "# \n" +
- "# Unless required by applicable law or agreed to in writing,\n" +
- "# software distributed under the License is distributed on an\n" +
- "# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n" +
- "# KIND, either express or implied. See the License for the\n" +
- "# specific language governing permissions and limitations\n" +
- "# under the License. \n" +
- "# \n" +
- "#\n" +
- "#\n" +
- "# EXAMPLE.COM is freely and reserved for testing according to this RFC:\n" +
- "#\n" +
- "# http://www.rfc-editor.org/rfc/rfc2606.txt\n" +
- "#\n" +
- "#\n" +
- "\n" +
- "#\n" +
- "# This ACI allows brouse access to the root suffix and one level below that to anyone.\n" +
- "# At this level there is nothing critical exposed. Everything that matters is one or\n" +
- "# more levels below this.\n" +
- "#\n" +
- "\n" +
- "dn: cn=browseRootAci,dc=example,dc=com\n" +
- "objectClass: top\n" +
- "objectClass: subentry\n" +
- "objectClass: accessControlSubentry\n" +
- "subtreeSpecification: { maximum 1 }\n" +
- "prescriptiveACI: { identificationTag \"browseRoot\", precedence 100, authenticationLevel none, itemOrUserFirst userFirst: { userClasses { allUsers }, userPermissions { { protectedItems {entry}, grantsAndDenials { grantReturnDN, grantBrowse } } } } }\n";
+ String ldif =
+ "#\n"
+ +
+ "# Licensed to the Apache Software Foundation (ASF) under one\n"
+ +
+ "# or more contributor license agreements. See the NOTICE file\n"
+ +
+ "# distributed with this work for additional information\n"
+ +
+ "# regarding copyright ownership. The ASF licenses this file\n"
+ +
+ "# to you under the Apache License, Version 2.0 (the\n"
+ +
+ "# \"License\"); you may not use this file except in compliance\n"
+ +
+ "# with the License. You may obtain a copy of the License at\n"
+ +
+ "# \n"
+ +
+ "# http://www.apache.org/licenses/LICENSE-2.0\n"
+ +
+ "# \n"
+ +
+ "# Unless required by applicable law or agreed to in writing,\n"
+ +
+ "# software distributed under the License is distributed on an\n"
+ +
+ "# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n"
+ +
+ "# KIND, either express or implied. See the License for the\n"
+ +
+ "# specific language governing permissions and limitations\n"
+ +
+ "# under the License. \n"
+ +
+ "# \n"
+ +
+ "#\n"
+ +
+ "#\n"
+ +
+ "# EXAMPLE.COM is freely and reserved for testing according to this RFC:\n"
+ +
+ "#\n"
+ +
+ "# http://www.rfc-editor.org/rfc/rfc2606.txt\n"
+ +
+ "#\n"
+ +
+ "#\n"
+ +
+ "\n"
+ +
+ "#\n"
+ +
+ "# This ACI allows brouse access to the root suffix and one level below that to anyone.\n"
+ +
+ "# At this level there is nothing critical exposed. Everything that matters is one or\n"
+ +
+ "# more levels below this.\n"
+ +
+ "#\n"
+ +
+ "\n"
+ +
+ "dn: cn=browseRootAci,dc=example,dc=com\n"
+ +
+ "objectClass: top\n"
+ +
+ "objectClass: subentry\n"
+ +
+ "objectClass: accessControlSubentry\n"
+ +
+ "subtreeSpecification: { maximum 1 }\n"
+ +
+ "prescriptiveACI: { identificationTag \"browseRoot\", precedence 100, authenticationLevel none, itemOrUserFirst userFirst: { userClasses { allUsers }, userPermissions { { protectedItems {entry}, grantsAndDenials { grantReturnDN, grantBrowse } } } } }\n";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -1716,20 +1753,20 @@ public class LdifReaderTest
@Test
public void testRemoveAttribute() throws Exception
{
- String ldif =
- "version: 1\n" +
- "dn: cn=Horatio Jensen, ou=Product Testing, dc=airius, dc=com\n" +
- "objectclass: top\n" +
- "objectclass: person\n" +
- "objectclass: organizationalPerson\n" +
- "cn: Horatio Jensen\n" +
- "cn: Horatio N Jensen\n" +
- "sn: Jensen\n" +
- "uid: hjensen\n" +
- "telephonenumber: +1 408 555 1212\n" +
- "jpegphoto:< file:" +
- HJENSEN_JPEG_FILE.getAbsolutePath() +
- "\n";
+ String ldif =
+ "version: 1\n" +
+ "dn: cn=Horatio Jensen, ou=Product Testing, dc=airius, dc=com\n" +
+ "objectclass: top\n" +
+ "objectclass: person\n" +
+ "objectclass: organizationalPerson\n" +
+ "cn: Horatio Jensen\n" +
+ "cn: Horatio N Jensen\n" +
+ "sn: Jensen\n" +
+ "uid: hjensen\n" +
+ "telephonenumber: +1 408 555 1212\n" +
+ "jpegphoto:< file:" +
+ HJENSEN_JPEG_FILE.getAbsolutePath() +
+ "\n";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -1741,16 +1778,16 @@ public class LdifReaderTest
assertNotNull( entry.removeAttribute( "uid" ) );
assertNull( entry.get( "uid" ) );
}
-
-
+
+
@Test
public void testChangeTypeAdd() throws Exception
{
- String ldif =
- "version: 1\n" +
- "dn: dc=example,dc=com\n" +
- "changetype: add\n" +
- "attr1: ATTR1\n";
+ String ldif =
+ "version: 1\n" +
+ "dn: dc=example,dc=com\n" +
+ "changetype: add\n" +
+ "attr1: ATTR1\n";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -1771,17 +1808,17 @@ public class LdifReaderTest
Attribute attr = entry.get( "attr1" );
assertTrue( attr.contains( "ATTR1" ) );
}
-
-
+
+
@Test
public void testChangeTypeAddAttrs2Values() throws Exception
{
- String ldif =
- "version: 1\n" +
- "dn: dc=example,dc=com\n" +
- "changetype: add\n" +
- "attr1: ATTR1\n" +
- "attr1: ATTR2\n";
+ String ldif =
+ "version: 1\n" +
+ "dn: dc=example,dc=com\n" +
+ "changetype: add\n" +
+ "attr1: ATTR1\n" +
+ "attr1: ATTR2\n";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -1804,18 +1841,18 @@ public class LdifReaderTest
assertTrue( attr.contains( "ATTR1" ) );
assertTrue( attr.contains( "ATTR2" ) );
}
-
-
+
+
@Test
public void testChangeTypeAdd2Attrs2Values() throws Exception
{
- String ldif =
- "version: 1\n" +
- "dn: dc=example,dc=com\n" +
- "changetype: add\n" +
- "attr1: ATTR1\n" +
- "attr1: ATTR2\n" +
- "attr2: ATTR1\n";
+ String ldif =
+ "version: 1\n" +
+ "dn: dc=example,dc=com\n" +
+ "changetype: add\n" +
+ "attr1: ATTR1\n" +
+ "attr1: ATTR2\n" +
+ "attr2: ATTR1\n";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -1842,15 +1879,15 @@ public class LdifReaderTest
assertEquals( 1, attr2.size() );
assertTrue( attr2.contains( "ATTR1" ) );
}
-
-
+
+
@Test
public void testChangeTypeDelete() throws Exception
{
- String ldif =
- "version: 1\n" +
- "dn: dc=example,dc=com\n" +
- "changetype: delete\n";
+ String ldif =
+ "version: 1\n" +
+ "dn: dc=example,dc=com\n" +
+ "changetype: delete\n";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -1866,16 +1903,16 @@ public class LdifReaderTest
assertTrue( entry.isLdifChange() );
assertTrue( entry.isChangeDelete() );
}
-
-
+
+
@Test
public void testLdifChangeDeleteWithControl() throws Exception
{
- String ldif =
- "version: 1\n" +
- "dn: dc=example,dc=com\n" +
- "control: 1.1.1\n" +
- "changetype: delete\n";
+ String ldif =
+ "version: 1\n" +
+ "dn: dc=example,dc=com\n" +
+ "control: 1.1.1\n" +
+ "changetype: delete\n";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -1890,31 +1927,31 @@ public class LdifReaderTest
assertTrue( entry.isLdifChange() );
assertTrue( entry.isChangeDelete() );
-
+
assertTrue( entry.hasControls() );
assertEquals( 1, entry.getControls().size() );
-
+
LdifControl control = entry.getControl( "1.1.1" );
-
+
assertEquals( "1.1.1", control.getOid() );
assertFalse( control.isCritical() );
assertNull( control.getValue() );
}
-
-
+
+
@Test
public void testLdifChangeDeleteWithControls() throws Exception
{
- String ldif =
- "version: 1\n" +
- "dn: dc=example,dc=com\n" +
- "control: 1.1.1\n" +
- "control: 1.1.2 true\n" +
- "control: 1.1.3:ABCDEF\n" +
- "control: 1.1.4 true:ABCDEF\n" +
- "control: 1.1.5::RW1tYW51ZWwgTMOpY2hhcm55\n" +
- "control: 1.1.6 true::RW1tYW51ZWwgTMOpY2hhcm55\n" +
- "changetype: delete\n";
+ String ldif =
+ "version: 1\n" +
+ "dn: dc=example,dc=com\n" +
+ "control: 1.1.1\n" +
+ "control: 1.1.2 true\n" +
+ "control: 1.1.3:ABCDEF\n" +
+ "control: 1.1.4 true:ABCDEF\n" +
+ "control: 1.1.5::RW1tYW51ZWwgTMOpY2hhcm55\n" +
+ "control: 1.1.6 true::RW1tYW51ZWwgTMOpY2hhcm55\n" +
+ "changetype: delete\n";
LdifReader reader = new LdifReader();
List<LdifEntry> entries = reader.parseLdif( ldif );
@@ -1929,80 +1966,80 @@ public class LdifReaderTest
assertTrue( entry.isLdifChange() );
assertTrue( entry.isChangeDelete() );
-
+
assertTrue( entry.hasControls() );
assertEquals( 6, entry.getControls().size() );
-
+
// First control
LdifControl control = entry.getControl( "1.1.1" );
-
+
assertEquals( "1.1.1", control.getOid() );
assertFalse( control.isCritical() );
assertNull( control.getValue() );
-
+
// Second control
control = entry.getControl( "1.1.2" );
-
+
assertEquals( "1.1.2", control.getOid() );
assertTrue( control.isCritical() );
assertNull( control.getValue() );
-
+
// Third control
control = entry.getControl( "1.1.3" );
-
+
assertEquals( "1.1.3", control.getOid() );
assertFalse( control.isCritical() );
- assertEquals( "ABCDEF", Strings.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", Strings.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", Strings.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", Strings.utf8ToString(control.getValue()) );
+ assertEquals( "Emmanuel L\u00e9charny", Strings.utf8ToString( control.getValue() ) );
}
-
-
- @Test( expected=LdapLdifException.class )
+
+
+ @Test(expected = LdapLdifException.class)
public void testChangeTypeDeleteBadEntry() throws Exception
{
- String ldif =
- "version: 1\n" +
- "dn: dc=example,dc=com\n" +
- "changetype: delete\n" +
- "attr1: test";
+ String ldif =
+ "version: 1\n" +
+ "dn: dc=example,dc=com\n" +
+ "changetype: delete\n" +
+ "attr1: test";
LdifReader reader = new LdifReader();
-
+
reader.parseLdif( ldif );
}
-
-
- @Test( expected=LdapLdifException.class )
+
+
+ @Test(expected = LdapLdifException.class)
public void testLdifContentWithControl() throws Exception
{
- String ldif =
- "version: 1\n" +
- "dn: dc=example,dc=com\n" +
- "control: 1.1.1\n" +
- "attr1: test";
+ String ldif =
+ "version: 1\n" +
+ "dn: dc=example,dc=com\n" +
+ "control: 1.1.1\n" +
+ "attr1: test";
LdifReader reader = new LdifReader();
-
+
reader.parseLdif( ldif );
}
}