Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifReaderTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifReaderTest.java?rev=617618&r1=617617&r2=617618&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifReaderTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifReaderTest.java Fri Feb 1 11:46:08 2008 @@ -90,7 +90,7 @@ String ldif = null; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); assertEquals( 0, entries.size() ); } @@ -100,7 +100,7 @@ String ldif = ""; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); assertEquals( 0, entries.size() ); } @@ -110,7 +110,7 @@ String ldif = "\n\n\r\r\n"; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); assertEquals( 0, entries.size() ); } @@ -125,7 +125,7 @@ "\n"; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); assertEquals( 0, entries.size() ); } @@ -143,7 +143,7 @@ "# end"; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); assertEquals( 0, entries.size() ); assertEquals( 1, reader.getVersion() ); @@ -165,12 +165,12 @@ LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); assertEquals( 1, reader.getVersion() ); assertNotNull( entries ); - Entry entry = (Entry) entries.get( 0 ); + LdifEntry entry = (LdifEntry) entries.get( 0 ); assertTrue( entry.isChangeAdd() ); @@ -195,7 +195,7 @@ "# end"; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); assertEquals( 0, entries.size() ); assertEquals( 1, reader.getVersion() ); @@ -220,10 +220,10 @@ LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); assertNotNull( entries ); - Entry entry = (Entry) entries.get( 0 ); + LdifEntry entry = (LdifEntry) entries.get( 0 ); assertTrue( entry.isChangeAdd() ); @@ -264,10 +264,10 @@ { LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); assertNotNull( entries ); - Entry entry = ( Entry ) entries.get( 0 ); + LdifEntry entry = ( LdifEntry ) entries.get( 0 ); assertTrue( entry.isChangeModify() ); @@ -443,11 +443,11 @@ "envVars:"; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); assertNotNull( entries ); - Entry entry = (Entry) entries.get( 0 ); + LdifEntry entry = (LdifEntry) entries.get( 0 ); assertTrue( entry.isChangeAdd() ); assertEquals( "cn=app1,ou=applications,ou=conf,dc=apache,dc=org", entry.getDn() ); @@ -486,11 +486,11 @@ "envVars:"; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); assertNotNull( entries ); - Entry entry = (Entry) entries.get( 0 ); + LdifEntry entry = (LdifEntry) entries.get( 0 ); assertTrue( entry.isChangeAdd() ); assertEquals( "cn=app1,ou=applications,ou=conf,dc=apache,dc=org", entry.getDn() ); @@ -529,11 +529,11 @@ "envVars:"; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); assertNotNull( entries ); - Entry entry = (Entry) entries.get( 0 ); + LdifEntry entry = (LdifEntry) entries.get( 0 ); assertTrue( entry.isChangeAdd() ); assertEquals( "cn=app1,ou=applications,ou=conf,dc=apache,dc=org", entry.getDn() ); @@ -571,11 +571,11 @@ "envVars:"; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); assertNotNull( entries ); - Entry entry = (Entry) entries.get( 0 ); + LdifEntry entry = (LdifEntry) entries.get( 0 ); assertTrue( entry.isChangeAdd() ); assertEquals( "cn=app1,ou=applications,ou=conf,dc=apache,dc=org", entry.getDn() ); @@ -614,11 +614,11 @@ "envVars:"; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); assertNotNull( entries ); - Entry entry = (Entry) entries.get( 0 ); + LdifEntry entry = (LdifEntry) entries.get( 0 ); assertTrue( entry.isChangeAdd() ); assertEquals( "cn=app1,ou=applications,ou=conf,dc=apache,dc=org", entry.getDn() ); @@ -665,12 +665,12 @@ "telephonenumber: +1 408 555 1212"; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); assertEquals( 2, entries.size() ); // Entry 1 - Entry entry = (Entry) entries.get( 0 ); + LdifEntry entry = (LdifEntry) entries.get( 0 ); assertTrue( entry.isChangeAdd() ); assertEquals( "cn=Barbara Jensen, ou=Product Development, dc=airius, dc=com", entry.getDn() ); @@ -698,7 +698,7 @@ assertTrue( attr.contains( "A big sailing fan." ) ); // Entry 2 - entry = (Entry) entries.get( 1 ); + entry = (LdifEntry) entries.get( 1 ); assertTrue( entry.isChangeAdd() ); attr = entry.get( "dn" ); @@ -738,12 +738,12 @@ "title:Product Manager, Rod and Reel Division"; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); assertEquals( 1, entries.size() ); // Entry 1 - Entry entry = (Entry) entries.get( 0 ); + LdifEntry entry = (LdifEntry) entries.get( 0 ); assertTrue( entry.isChangeAdd() ); assertEquals( "cn=Barbara Jensen, ou=Product Development, dc=airius, dc=com", entry.getDn() ); @@ -795,12 +795,12 @@ " b3V0IG1vcmUu"; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); assertEquals( 1, entries.size() ); // Entry 1 - Entry entry = (Entry) entries.get( 0 ); + LdifEntry entry = (LdifEntry) entries.get( 0 ); assertTrue( entry.isChangeAdd() ); assertEquals( "cn=Gern Jensen, ou=Product Testing, dc=airius, dc=com", entry.getDn() ); @@ -848,12 +848,12 @@ " b3V0IG1vcmUu "; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); assertEquals( 1, entries.size() ); // Entry 1 - Entry entry = (Entry) entries.get( 0 ); + LdifEntry entry = (LdifEntry) entries.get( 0 ); assertTrue( entry.isChangeAdd() ); assertEquals( "cn=Gern Jensen, ou=Product Testing, dc=airius, dc=com", entry.getDn() ); @@ -940,7 +940,7 @@ "title;lang-en: Sales, Director\n"; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); String[][][] values = { @@ -988,7 +988,7 @@ // Entry 1 for ( int i = 0; i < entries.size(); i++ ) { - Entry entry = (Entry) entries.get( i ); + LdifEntry entry = (LdifEntry) entries.get( i ); assertTrue( entry.isChangeAdd() ); for ( int j = 0; j < values[i].length; j++ ) @@ -1030,7 +1030,7 @@ "jpegphoto:< file:" + HJENSEN_JPEG_FILE.getAbsolutePath() + "\n"; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); String[][] values = { @@ -1049,7 +1049,7 @@ assertEquals( 1, entries.size() ); // Entry 1 - Entry entry = (Entry) entries.get( 0 ); + LdifEntry entry = (LdifEntry) entries.get( 0 ); assertTrue( entry.isChangeAdd() ); for ( int i = 0; i < values.length; i++ ) @@ -1180,7 +1180,7 @@ "-\n"; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); String[][][] values = { @@ -1233,7 +1233,7 @@ } }; - Entry entry = (Entry) entries.get( 0 ); + LdifEntry entry = (LdifEntry) entries.get( 0 ); assertTrue( entry.isChangeAdd() ); for ( int i = 0; i < values.length; i++ ) @@ -1263,19 +1263,19 @@ } // Second entry - entry = (Entry) entries.get( 1 ); + entry = (LdifEntry) entries.get( 1 ); assertTrue( entry.isChangeDelete() ); assertEquals( values[1][0][1], entry.getDn() ); // Third entry - entry = (Entry) entries.get( 2 ); + entry = (LdifEntry) entries.get( 2 ); assertTrue( entry.isChangeModRdn() ); assertEquals( values[2][0][1], entry.getDn() ); assertEquals( values[2][1][0], entry.getNewRdn() ); assertTrue( entry.isDeleteOldRdn() ); // Forth entry - entry = (Entry) entries.get( 3 ); + entry = (LdifEntry) entries.get( 3 ); assertTrue( entry.isChangeModDn() ); assertEquals( values[3][0][1], entry.getDn() ); assertEquals( values[3][1][0], entry.getNewRdn() ); @@ -1283,7 +1283,7 @@ assertEquals( values[3][2][0], entry.getNewSuperior() ); // Fifth entry - entry = (Entry) entries.get( 4 ); + entry = (LdifEntry) entries.get( 4 ); List modifs = entry.getModificationItems(); assertTrue( entry.isChangeModify() ); @@ -1318,7 +1318,7 @@ assertEquals( values[4][4][1], item.getAttribute().get( 0 ) ); // Sixth entry - entry = (Entry) entries.get( 5 ); + entry = (LdifEntry) entries.get( 5 ); modifs = entry.getModificationItems(); assertTrue( entry.isChangeModify() ); @@ -1348,9 +1348,9 @@ "changetype: delete\n"; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); - Entry entry = (Entry) entries.get( 0 ); + LdifEntry entry = (LdifEntry) entries.get( 0 ); assertEquals( "ou=Product Development, dc=airius, dc=com", entry.getDn() ); assertTrue( entry.isChangeDelete() ); @@ -1375,9 +1375,9 @@ "changetype: delete\n"; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); - Entry entry = (Entry) entries.get( 0 ); + LdifEntry entry = (LdifEntry) entries.get( 0 ); assertEquals( "ou=Product Development, dc=airius, dc=com", entry.getDn() ); assertTrue( entry.isChangeDelete() ); @@ -1402,9 +1402,9 @@ "changetype: delete\n"; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); - Entry entry = (Entry) entries.get( 0 ); + LdifEntry entry = (LdifEntry) entries.get( 0 ); assertEquals( "ou=Product Development, dc=airius, dc=com", entry.getDn() ); assertTrue( entry.isChangeDelete() ); @@ -1504,8 +1504,8 @@ LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); - Entry entry = (Entry) entries.get( 0 ); + List entries = reader.parseLdif( ldif ); + LdifEntry entry = (LdifEntry) entries.get( 0 ); assertEquals( "ou=Users, dc=example, dc=com", entry.getDn() ); @@ -1561,9 +1561,9 @@ "prescriptiveACI: { identificationTag \"browseRoot\", precedence 100, authenticationLevel none, itemOrUserFirst userFirst: { userClasses { allUsers }, userPermissions { { protectedItems {entry}, grantsAndDenials { grantReturnDN, grantBrowse } } } } }\n"; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( ldif ); + List entries = reader.parseLdif( ldif ); - Entry entry = (Entry) entries.get( 0 ); + LdifEntry entry = (LdifEntry) entries.get( 0 ); assertEquals( "cn=browseRootAci,dc=example,dc=com", entry.getDn() ); Attribute attr = entry.get( "objectClass" ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java?rev=617618&r1=617617&r2=617618&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java Fri Feb 1 11:46:08 2008 @@ -348,7 +348,7 @@ "objectClass: pe\n rson\n" + "objectClass: in\n etorgPerson\n\n"; - Entry entry = new Entry(); + LdifEntry entry = new LdifEntry(); entry.setDn( "cn=Saarbr\u00FCcken, dc=example, dc=com" ); entry.setChangeType( ChangeType.Add ); @@ -408,7 +408,7 @@ public void testReverseAdd() throws NamingException { LdapDN dn = new LdapDN( "dc=apache, dc=com" ); - Entry reversed = LdifUtils.reverseAdd( dn ); + LdifEntry reversed = LdifUtils.reverseAdd( dn ); assertNotNull( reversed ); assertEquals( dn.getUpName(), reversed.getDn() ); @@ -426,7 +426,7 @@ public void testReverseAddBase64DN() throws NamingException { LdapDN dn = new LdapDN( "dc=Emmanuel L\u00c9charny" ); - Entry reversed = LdifUtils.reverseAdd( dn ); + LdifEntry reversed = LdifUtils.reverseAdd( dn ); assertNotNull( reversed ); assertEquals( dn.getUpName(), reversed.getDn() ); assertEquals( ChangeType.Delete, reversed.getChangeType() ); @@ -456,7 +456,7 @@ deletedEntry.put( "sn", "apache" ); deletedEntry.put( "dc", "apache" ); - Entry reversed = LdifUtils.reverseDel( dn, deletedEntry ); + LdifEntry reversed = LdifUtils.reverseDel( dn, deletedEntry ); assertNotNull( reversed ); assertEquals( dn.getUpName(), reversed.getDn() ); @@ -484,7 +484,7 @@ attrs.put( "sn", "doe" ); attrs.put( "uid", "jdoe" ); - Entry reversed = LdifUtils.reverseModifyRdn( attrs, null, dn, new Rdn( "cn=jack doe" ) ); + LdifEntry reversed = LdifUtils.reverseModifyRdn( attrs, null, dn, new Rdn( "cn=jack doe" ) ); assertNotNull( reversed ); assertEquals( "cn=jack doe, dc=example, dc=com", reversed.getDn() ); @@ -515,7 +515,7 @@ attrs.put( "sn", "doe" ); attrs.put( "uid", "jdoe" ); - Entry reversed = LdifUtils.reverseModifyRdn( attrs, null, dn, new Rdn( "cn=jack doe" ) ); + LdifEntry reversed = LdifUtils.reverseModifyRdn( attrs, null, dn, new Rdn( "cn=jack doe" ) ); assertNotNull( reversed ); assertEquals( "cn=jack doe, dc=example, dc=com", reversed.getDn() ); @@ -547,7 +547,7 @@ attrs.put( "sn", "doe" ); attrs.put( "uid", "jdoe" ); - Entry reversed = LdifUtils.reverseModifyRdn( attrs, newSuperior, dn, new Rdn( "cn=jack doe" ) ); + LdifEntry reversed = LdifUtils.reverseModifyRdn( attrs, newSuperior, dn, new Rdn( "cn=jack doe" ) ); assertNotNull( reversed ); assertEquals( "cn=jack doe,ou=system", reversed.getDn() ); @@ -577,7 +577,7 @@ attrs.put( "sn", "doe" ); attrs.put( "uid", "jdoe" ); - Entry reversed = LdifUtils.reverseModifyRdn( attrs, newSuperior, dn, null ); + LdifEntry reversed = LdifUtils.reverseModifyRdn( attrs, newSuperior, dn, null ); assertNotNull( reversed ); assertEquals( "cn=john doe,ou=system", reversed.getDn() ); @@ -606,7 +606,7 @@ attrs.put( "sn", "doe" ); attrs.put( "uid", "jdoe" ); - Entry reversed = LdifUtils.reverseModifyRdn( attrs, newSuperior, dn, new Rdn( "cn=jack doe" ) ); + LdifEntry reversed = LdifUtils.reverseModifyRdn( attrs, newSuperior, dn, new Rdn( "cn=jack doe" ) ); assertNotNull( reversed ); assertEquals( "cn=jack doe,ou=system", reversed.getDn() ); @@ -637,7 +637,7 @@ DirContext.ADD_ATTRIBUTE, new AttributeImpl( "ou", "BigCompany inc." ) ); - Entry reversed = LdifUtils.reverseModify( dn, + LdifEntry reversed = LdifUtils.reverseModify( dn, Collections.singletonList( mod ), modifiedEntry ); assertNotNull( reversed ); @@ -674,7 +674,7 @@ DirContext.ADD_ATTRIBUTE, new AttributeImpl( "ou", "BigCompany inc." ) ); - Entry reversed = LdifUtils.reverseModify( dn, + LdifEntry reversed = LdifUtils.reverseModify( dn, Collections.singletonList( mod ), modifiedEntry ); assertNotNull( reversed ); @@ -712,7 +712,7 @@ DirContext.ADD_ATTRIBUTE, new AttributeImpl( "cn", "test" ) ); - Entry reversed = LdifUtils.reverseModify( dn, + LdifEntry reversed = LdifUtils.reverseModify( dn, Collections.singletonList( mod ), modifiedEntry ); assertNull( reversed ); @@ -738,7 +738,7 @@ DirContext.REMOVE_ATTRIBUTE, new AttributeImpl( "ou", "acme corp" ) ); - Entry reversed = LdifUtils.reverseModify( dn, + LdifEntry reversed = LdifUtils.reverseModify( dn, Collections.singletonList( mod ), modifiedEntry ); assertNotNull( reversed ); @@ -783,7 +783,7 @@ DirContext.REMOVE_ATTRIBUTE, new AttributeImpl( "ou" ) ); - Entry reversed = LdifUtils.reverseModify( dn, + LdifEntry reversed = LdifUtils.reverseModify( dn, Collections.singletonList( mod ), modifiedEntry ); @@ -828,7 +828,7 @@ ModificationItemImpl mod = new ModificationItemImpl( DirContext.REMOVE_ATTRIBUTE, ou ); - Entry reversed = LdifUtils.reverseModify( dn, + LdifEntry reversed = LdifUtils.reverseModify( dn, Collections.singletonList( mod ), modifiedEntry ); @@ -877,7 +877,7 @@ ModificationItemImpl mod = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, ouModified ); - Entry reversed = LdifUtils.reverseModify( dn, + LdifEntry reversed = LdifUtils.reverseModify( dn, Collections.singletonList( mod ), modifiedEntry ); @@ -921,7 +921,7 @@ ModificationItemImpl mod = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, newOu ); - Entry reversed = LdifUtils.reverseModify( dn, + LdifEntry reversed = LdifUtils.reverseModify( dn, Collections.singletonList( mod ), modifiedEntry ); assertNotNull( reversed ); @@ -965,7 +965,7 @@ ModificationItemImpl mod = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, new AttributeImpl( "ou" ) ); - Entry reversed = LdifUtils.reverseModify( dn, + LdifEntry reversed = LdifUtils.reverseModify( dn, Collections.singletonList( mod ), modifiedEntry ); assertNotNull( reversed ); @@ -1075,9 +1075,9 @@ "ou: acme corp\n"; LdifReader reader = new LdifReader(); - List entries = reader.parseLdif( initialEntryLdif ); + List entries = reader.parseLdif( initialEntryLdif ); - Entry initialEntry = entries.get( 0 ); + LdifEntry initialEntry = entries.get( 0 ); // We will : // - add an 'ou' value 'BigCompany inc.' @@ -1115,7 +1115,7 @@ DirContext.REPLACE_ATTRIBUTE, new AttributeImpl( "ou", "apache" ) ); modifications.add( mod ); - Entry reversedEntry = LdifUtils.reverseModify( dn, modifications, initialEntry.getAttributes() ); + LdifEntry reversedEntry = LdifUtils.reverseModify( dn, modifications, initialEntry.getAttributes() ); String expectedEntryLdif = "dn: cn=test, ou=system\n" + @@ -1140,7 +1140,7 @@ reader = new LdifReader(); entries = reader.parseLdif( expectedEntryLdif ); - Entry expectedEntry = entries.get( 0 ); + LdifEntry expectedEntry = entries.get( 0 ); assertEquals( expectedEntry, reversedEntry ); }