directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1519662 - /directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyDelIT.java
Date Tue, 03 Sep 2013 12:22:39 GMT
Author: elecharny
Date: Tue Sep  3 12:22:38 2013
New Revision: 1519662

URL: http://svn.apache.org/r1519662
Log:
Fixed the format

Modified:
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyDelIT.java

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyDelIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyDelIT.java?rev=1519662&r1=1519661&r2=1519662&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyDelIT.java
(original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyDelIT.java
Tue Sep  3 12:22:38 2013
@@ -166,412 +166,411 @@ import org.junit.runner.RunWith;
         "cn: singer",
         "sn: manager",
         "telephoneNumber: 1 801 555 1212 ",
-        "manager: cn=Heather Nova, dc=example,dc=com"
-})
+        "manager: cn=Heather Nova, dc=example,dc=com" })
 public class ModifyDelIT extends AbstractLdapTestUnit
 {
-private static final String RDN_HEATHER_NOVA = "cn=Heather Nova";
-private static final String RDN_KIM_WILDE = "cn=kim wilde";
+    private static final String RDN_HEATHER_NOVA = "cn=Heather Nova";
+    private static final String RDN_KIM_WILDE = "cn=kim wilde";
 
 
-/**
- * @param exampleCtx the system root to add entries to
- * @throws NamingException on errors
- */
-protected void createData( LdapContext exampleCtx ) throws Exception
-{
-    /*
-     * Check ou=testing00,dc=example,dc=com
+    /**
+     * @param exampleCtx the system root to add entries to
+     * @throws NamingException on errors
      */
-    DirContext ctx = ( DirContext ) exampleCtx.lookup( "ou=testing00" );
-    assertNotNull( ctx );
-    Attributes attributes = ctx.getAttributes( "" );
-    assertNotNull( attributes );
-    assertEquals( "testing00", attributes.get( "ou" ).get() );
-    Attribute attribute = attributes.get( "objectClass" );
-    assertNotNull( attribute );
-    assertTrue( attribute.contains( "top" ) );
-    assertTrue( attribute.contains( "organizationalUnit" ) );
-
-    /*
-     * check ou=testing01,dc=example,dc=com
-     */
-    ctx = ( DirContext ) exampleCtx.lookup( "ou=testing01" );
-    assertNotNull( ctx );
-    attributes = ctx.getAttributes( "" );
-    assertNotNull( attributes );
-    assertEquals( "testing01", attributes.get( "ou" ).get() );
-    attribute = attributes.get( "objectClass" );
-    assertNotNull( attribute );
-    assertTrue( attribute.contains( "top" ) );
-    assertTrue( attribute.contains( "organizationalUnit" ) );
-
-    /*
-     * Check ou=testing02,dc=example,dc=com
-     */
-    ctx = ( DirContext ) exampleCtx.lookup( "ou=testing02" );
-    assertNotNull( ctx );
-
-    attributes = ctx.getAttributes( "" );
-    assertNotNull( attributes );
-    assertEquals( "testing02", attributes.get( "ou" ).get() );
-
-    attribute = attributes.get( "objectClass" );
-    assertNotNull( attribute );
-    assertTrue( attribute.contains( "top" ) );
-    assertTrue( attribute.contains( "organizationalUnit" ) );
-
-    /*
-     * Check ou=subtest,ou=testing01,dc=example,dc=com
-     */
-    ctx = ( DirContext ) exampleCtx.lookup( "ou=subtest,ou=testing01" );
-    assertNotNull( ctx );
-
-    attributes = ctx.getAttributes( "" );
-    assertNotNull( attributes );
-    assertEquals( "subtest", attributes.get( "ou" ).get() );
-
-    attribute = attributes.get( "objectClass" );
-    assertNotNull( attribute );
-    assertTrue( attribute.contains( "top" ) );
-    assertTrue( attribute.contains( "organizationalUnit" ) );
-
-    /*
-     *  Check entry cn=Heather Nova, dc=example,dc=com
-     */
-    ctx = ( DirContext ) exampleCtx.lookup( RDN_HEATHER_NOVA );
-    assertNotNull( ctx );
-
-    // -------------------------------------------------------------------
-    // Enable the nis schema
-    // -------------------------------------------------------------------
-
-    // check if nis is disabled
-    LdapContext schemaRoot = getSchemaContext( getService() );
-    Attributes nisAttrs = schemaRoot.getAttributes( "cn=nis" );
-    boolean isNisDisabled = false;
-
-    if ( nisAttrs.get( "m-disabled" ) != null )
-    {
-        isNisDisabled = ( ( String ) nisAttrs.get( "m-disabled" ).get() ).equalsIgnoreCase(
"TRUE" );
-    }
-
-    // if nis is disabled then enable it
-    if ( isNisDisabled )
-    {
-        Attribute disabled = new BasicAttribute( "m-disabled" );
-        ModificationItem[] mods = new ModificationItem[]
-            {
-                new ModificationItem( DirContext.REMOVE_ATTRIBUTE, disabled ) };
-        schemaRoot.modifyAttributes( "cn=nis", mods );
-    }
-
-    // -------------------------------------------------------------------
-    // Add a bunch of nis groups
-    // -------------------------------------------------------------------
-    addNisPosixGroup( "testGroup0", 0 );
-    addNisPosixGroup( "testGroup1", 1 );
-    addNisPosixGroup( "testGroup2", 2 );
-    addNisPosixGroup( "testGroup4", 4 );
-    addNisPosixGroup( "testGroup5", 5 );
-
-    // Create a test account
-    Attributes test = new BasicAttributes( true );
-    Attribute oc = new BasicAttribute( "ObjectClass" );
-    oc.add( "top" );
-    oc.add( "account" );
-    oc.add( "posixAccount" );
-    test.put( oc );
-
-    test.put( "cn", "test" );
-    test.put( "uid", "1" );
-    test.put( "uidNumber", "1" );
-    test.put( "gidNumber", "1" );
-    test.put( "homeDirectory", "/" );
-    test.put( "description", "A test account" );
+    protected void createData( LdapContext exampleCtx ) throws Exception
+    {
+        /*
+         * Check ou=testing00,dc=example,dc=com
+         */
+        DirContext ctx = ( DirContext ) exampleCtx.lookup( "ou=testing00" );
+        assertNotNull( ctx );
+        Attributes attributes = ctx.getAttributes( "" );
+        assertNotNull( attributes );
+        assertEquals( "testing00", attributes.get( "ou" ).get() );
+        Attribute attribute = attributes.get( "objectClass" );
+        assertNotNull( attribute );
+        assertTrue( attribute.contains( "top" ) );
+        assertTrue( attribute.contains( "organizationalUnit" ) );
+
+        /*
+         * check ou=testing01,dc=example,dc=com
+         */
+        ctx = ( DirContext ) exampleCtx.lookup( "ou=testing01" );
+        assertNotNull( ctx );
+        attributes = ctx.getAttributes( "" );
+        assertNotNull( attributes );
+        assertEquals( "testing01", attributes.get( "ou" ).get() );
+        attribute = attributes.get( "objectClass" );
+        assertNotNull( attribute );
+        assertTrue( attribute.contains( "top" ) );
+        assertTrue( attribute.contains( "organizationalUnit" ) );
+
+        /*
+         * Check ou=testing02,dc=example,dc=com
+         */
+        ctx = ( DirContext ) exampleCtx.lookup( "ou=testing02" );
+        assertNotNull( ctx );
+
+        attributes = ctx.getAttributes( "" );
+        assertNotNull( attributes );
+        assertEquals( "testing02", attributes.get( "ou" ).get() );
+
+        attribute = attributes.get( "objectClass" );
+        assertNotNull( attribute );
+        assertTrue( attribute.contains( "top" ) );
+        assertTrue( attribute.contains( "organizationalUnit" ) );
+
+        /*
+         * Check ou=subtest,ou=testing01,dc=example,dc=com
+         */
+        ctx = ( DirContext ) exampleCtx.lookup( "ou=subtest,ou=testing01" );
+        assertNotNull( ctx );
+
+        attributes = ctx.getAttributes( "" );
+        assertNotNull( attributes );
+        assertEquals( "subtest", attributes.get( "ou" ).get() );
+
+        attribute = attributes.get( "objectClass" );
+        assertNotNull( attribute );
+        assertTrue( attribute.contains( "top" ) );
+        assertTrue( attribute.contains( "organizationalUnit" ) );
+
+        /*
+         *  Check entry cn=Heather Nova, dc=example,dc=com
+         */
+        ctx = ( DirContext ) exampleCtx.lookup( RDN_HEATHER_NOVA );
+        assertNotNull( ctx );
+
+        // -------------------------------------------------------------------
+        // Enable the nis schema
+        // -------------------------------------------------------------------
+
+        // check if nis is disabled
+        LdapContext schemaRoot = getSchemaContext( getService() );
+        Attributes nisAttrs = schemaRoot.getAttributes( "cn=nis" );
+        boolean isNisDisabled = false;
+
+        if ( nisAttrs.get( "m-disabled" ) != null )
+        {
+            isNisDisabled = ( ( String ) nisAttrs.get( "m-disabled" ).get() ).equalsIgnoreCase(
"TRUE" );
+        }
+
+        // if nis is disabled then enable it
+        if ( isNisDisabled )
+        {
+            Attribute disabled = new BasicAttribute( "m-disabled" );
+            ModificationItem[] mods = new ModificationItem[]
+                {
+                    new ModificationItem( DirContext.REMOVE_ATTRIBUTE, disabled ) };
+            schemaRoot.modifyAttributes( "cn=nis", mods );
+        }
+
+        // -------------------------------------------------------------------
+        // Add a bunch of nis groups
+        // -------------------------------------------------------------------
+        addNisPosixGroup( "testGroup0", 0 );
+        addNisPosixGroup( "testGroup1", 1 );
+        addNisPosixGroup( "testGroup2", 2 );
+        addNisPosixGroup( "testGroup4", 4 );
+        addNisPosixGroup( "testGroup5", 5 );
+
+        // Create a test account
+        Attributes test = new BasicAttributes( true );
+        Attribute oc = new BasicAttribute( "ObjectClass" );
+        oc.add( "top" );
+        oc.add( "account" );
+        oc.add( "posixAccount" );
+        test.put( oc );
+
+        test.put( "cn", "test" );
+        test.put( "uid", "1" );
+        test.put( "uidNumber", "1" );
+        test.put( "gidNumber", "1" );
+        test.put( "homeDirectory", "/" );
+        test.put( "description", "A test account" );
 
-    exampleCtx.createSubcontext( "cn=test", test );
-}
+        exampleCtx.createSubcontext( "cn=test", test );
+    }
 
 
-/**
- * Create a NIS group
- */
-private DirContext addNisPosixGroup( String name, int gid ) throws Exception
-{
-    Attributes attrs = new BasicAttributes( "objectClass", "top", true );
-    attrs.get( "objectClass" ).add( "posixGroup" );
-    attrs.put( "cn", name );
-    attrs.put( "gidNumber", String.valueOf( gid ) );
-    return getSystemContext( getService() ).createSubcontext( "cn=" + name + ",ou=groups",
attrs );
-}
+    /**
+     * Create a NIS group
+     */
+    private DirContext addNisPosixGroup( String name, int gid ) throws Exception
+    {
+        Attributes attrs = new BasicAttributes( "objectClass", "top", true );
+        attrs.get( "objectClass" ).add( "posixGroup" );
+        attrs.put( "cn", name );
+        attrs.put( "gidNumber", String.valueOf( gid ) );
+        return getSystemContext( getService() ).createSubcontext( "cn=" + name + ",ou=groups",
attrs );
+    }
 
 
-//---------------------------------------------------------------------------------------------
-// Del operation
-//---------------------------------------------------------------------------------------------
-// 1 Entry exists
-//  1.1 AT exists
-//   - The Value exists, it's not part of the Rdn, the AT is not singleValued
-//   - The Value exists, it's not part of the Rdn, the AT is singleValued, the AT is not
in MUST
-//   - The Value exists, it's not part of the Rdn, the AT is singleValued, the AT is in MUST
=> error
-//   - The Value exists, it's part of the Rdn => error
-//   - The Value does not exists => error
-//   - Delete all the values, AT is not in MUST => AT must be removed
-//   - Delete all the values, AT is in MUST => error
-//---------------------------------------------------------------------------------------------
-/**
- * Delete a value from an existing AT. There are more than one value
- */
-@Test
-public void testModifyDelExistingEntryExistingATNotInRdnNotSV() throws Exception
-{
-    LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
-    createData( exampleCtx );
+    //---------------------------------------------------------------------------------------------
+    // Del operation
+    //---------------------------------------------------------------------------------------------
+    // 1 Entry exists
+    //  1.1 AT exists
+    //   - The Value exists, it's not part of the Rdn, the AT is not singleValued
+    //   - The Value exists, it's not part of the Rdn, the AT is singleValued, the AT is
not in MUST
+    //   - The Value exists, it's not part of the Rdn, the AT is singleValued, the AT is
in MUST => error
+    //   - The Value exists, it's part of the Rdn => error
+    //   - The Value does not exists => error
+    //   - Delete all the values, AT is not in MUST => AT must be removed
+    //   - Delete all the values, AT is in MUST => error
+    //---------------------------------------------------------------------------------------------
+    /**
+     * Delete a value from an existing AT. There are more than one value
+     */
+    @Test
+    public void testModifyDelExistingEntryExistingATNotInRdnNotSV() throws Exception
+    {
+        LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
+        createData( exampleCtx );
 
-    // A new description attribute value
-    String deletedValue = "she has blond hair";
+        // A new description attribute value
+        String deletedValue = "she has blond hair";
 
-    Attributes attrs = new BasicAttributes( "description", deletedValue, true );
+        Attributes attrs = new BasicAttributes( "description", deletedValue, true );
 
-    exampleCtx.modifyAttributes( RDN_KIM_WILDE, DirContext.REMOVE_ATTRIBUTE, attrs );
-
-    // Verify that the attribute value has been removed
-    attrs = exampleCtx.getAttributes( RDN_KIM_WILDE );
-    Attribute attr = attrs.get( "description" );
-    assertNotNull( attr );
-    assertTrue( attr.contains( "an American singer-songwriter" ) );
-    assertFalse( attr.contains( deletedValue ) );
-    assertEquals( 1, attr.size() );
-}
+        exampleCtx.modifyAttributes( RDN_KIM_WILDE, DirContext.REMOVE_ATTRIBUTE, attrs );
+
+        // Verify that the attribute value has been removed
+        attrs = exampleCtx.getAttributes( RDN_KIM_WILDE );
+        Attribute attr = attrs.get( "description" );
+        assertNotNull( attr );
+        assertTrue( attr.contains( "an American singer-songwriter" ) );
+        assertFalse( attr.contains( deletedValue ) );
+        assertEquals( 1, attr.size() );
+    }
 
 
-/**
- * Delete all the values from an existing AT not in MUST
- */
-@Test
-public void testModifyDelExistingEntryExistingATNotInRdnNotInMustNotSVAllValues() throws
Exception
-{
-    LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
-    createData( exampleCtx );
+    /**
+     * Delete all the values from an existing AT not in MUST
+     */
+    @Test
+    public void testModifyDelExistingEntryExistingATNotInRdnNotInMustNotSVAllValues() throws
Exception
+    {
+        LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
+        createData( exampleCtx );
 
-    // A new description attribute value
-    Attributes attrs = new BasicAttributes( "description", true );
-    Attribute descr = new BasicAttribute( "description" );
-    descr.add( "an American singer-songwriter" );
-    descr.add( "she has blond hair" );
-    attrs.put( descr );
-
-    exampleCtx.modifyAttributes( RDN_KIM_WILDE, DirContext.REMOVE_ATTRIBUTE, attrs );
-
-    // Verify that the attribute value has been removed
-    attrs = exampleCtx.getAttributes( RDN_KIM_WILDE );
-    Attribute attr = attrs.get( "description" );
-    assertNull( attr );
-}
+        // A new description attribute value
+        Attributes attrs = new BasicAttributes( "description", true );
+        Attribute descr = new BasicAttribute( "description" );
+        descr.add( "an American singer-songwriter" );
+        descr.add( "she has blond hair" );
+        attrs.put( descr );
+
+        exampleCtx.modifyAttributes( RDN_KIM_WILDE, DirContext.REMOVE_ATTRIBUTE, attrs );
+
+        // Verify that the attribute value has been removed
+        attrs = exampleCtx.getAttributes( RDN_KIM_WILDE );
+        Attribute attr = attrs.get( "description" );
+        assertNull( attr );
+    }
 
 
-/**
- * Delete all the values from an existing AT in MUST
- */
-@Test(expected = SchemaViolationException.class)
-public void testModifyDelExistingEntryExistingATNotInRdnNotSVAllValues() throws Exception
-{
-    LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
-    createData( exampleCtx );
+    /**
+     * Delete all the values from an existing AT in MUST
+     */
+    @Test(expected = SchemaViolationException.class)
+    public void testModifyDelExistingEntryExistingATNotInRdnNotSVAllValues() throws Exception
+    {
+        LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
+        createData( exampleCtx );
 
-    Attributes sn = new BasicAttributes( "sn", "Wilde", true );
+        Attributes sn = new BasicAttributes( "sn", "Wilde", true );
 
-    exampleCtx.modifyAttributes( RDN_KIM_WILDE, DirContext.REMOVE_ATTRIBUTE, sn );
-}
+        exampleCtx.modifyAttributes( RDN_KIM_WILDE, DirContext.REMOVE_ATTRIBUTE, sn );
+    }
 
 
-//---------------------------------------------------------------------------------------------
-// 1 Entry exists
-//  1.2 AT does not exists.
-//---------------------------------------------------------------------------------------------
-/**
- * Remove a non existing AT from an entry, the AT is part of MAY/MUST
- */
-@Test(expected = NoSuchAttributeException.class)
-public void testModifyDelExistingEntryNonExistingATInMay() throws Exception
-{
-    LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
-    createData( exampleCtx );
+    //---------------------------------------------------------------------------------------------
+    // 1 Entry exists
+    //  1.2 AT does not exists.
+    //---------------------------------------------------------------------------------------------
+    /**
+     * Remove a non existing AT from an entry, the AT is part of MAY/MUST
+     */
+    @Test(expected = NoSuchAttributeException.class)
+    public void testModifyDelExistingEntryNonExistingATInMay() throws Exception
+    {
+        LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
+        createData( exampleCtx );
 
-    // A non existing AT 
-    Attributes attrs = new BasicAttributes( "seeAlso", "cn=test", true );
+        // A non existing AT 
+        Attributes attrs = new BasicAttributes( "seeAlso", "cn=test", true );
 
-    exampleCtx.modifyAttributes( RDN_HEATHER_NOVA, DirContext.REMOVE_ATTRIBUTE, attrs );
-}
+        exampleCtx.modifyAttributes( RDN_HEATHER_NOVA, DirContext.REMOVE_ATTRIBUTE, attrs
);
+    }
 
 
-/**
- * Remove a non existing AT from an entry, the AT is not part of MAY/MUST
- */
-@Test(expected = NoSuchAttributeException.class)
-public void testModifyDelExistingEntryNonExistingATNotInMayMust() throws Exception
-{
-    LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
-    createData( exampleCtx );
+    /**
+     * Remove a non existing AT from an entry, the AT is not part of MAY/MUST
+     */
+    @Test(expected = NoSuchAttributeException.class)
+    public void testModifyDelExistingEntryNonExistingATNotInMayMust() throws Exception
+    {
+        LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
+        createData( exampleCtx );
 
-    // A non existing AT 
-    Attributes attrs = new BasicAttributes( "c", "FR", true );
+        // A non existing AT 
+        Attributes attrs = new BasicAttributes( "c", "FR", true );
 
-    exampleCtx.modifyAttributes( RDN_HEATHER_NOVA, DirContext.REMOVE_ATTRIBUTE, attrs );
-}
+        exampleCtx.modifyAttributes( RDN_HEATHER_NOVA, DirContext.REMOVE_ATTRIBUTE, attrs
);
+    }
 
 
-/**
- * Delete a value from an existing SingleValued AT, not in MUST, not in Rdn
- */
-@Test
-public void testModifyDelExistingEntryExistingATNotInRdnSV() throws Exception
-{
-    LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
-    createData( exampleCtx );
+    /**
+     * Delete a value from an existing SingleValued AT, not in MUST, not in Rdn
+     */
+    @Test
+    public void testModifyDelExistingEntryExistingATNotInRdnSV() throws Exception
+    {
+        LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
+        createData( exampleCtx );
 
-    Attributes attrs = new BasicAttributes( "c", "FR", true );
+        Attributes attrs = new BasicAttributes( "c", "FR", true );
 
-    exampleCtx.modifyAttributes( "ou=testing02", DirContext.REMOVE_ATTRIBUTE, attrs );
+        exampleCtx.modifyAttributes( "ou=testing02", DirContext.REMOVE_ATTRIBUTE, attrs );
 
-    // Verify that the attribute value has been removed
-    attrs = exampleCtx.getAttributes( "ou=testing02" );
-    Attribute country = attrs.get( "c" );
-    assertNull( country );
-}
+        // Verify that the attribute value has been removed
+        attrs = exampleCtx.getAttributes( "ou=testing02" );
+        Attribute country = attrs.get( "c" );
+        assertNull( country );
+    }
 
 
-/**
- * Delete a value from an existing SingleValued AT, in MUST, not in Rdn
- */
-@Test(expected = SchemaViolationException.class)
-public void testModifyDelExistingEntryExistingATNotInRdnSVInMust() throws Exception
-{
-    LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
-    createData( exampleCtx );
+    /**
+     * Delete a value from an existing SingleValued AT, in MUST, not in Rdn
+     */
+    @Test(expected = SchemaViolationException.class)
+    public void testModifyDelExistingEntryExistingATNotInRdnSVInMust() throws Exception
+    {
+        LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
+        createData( exampleCtx );
 
-    Attributes attrs = new BasicAttributes( "uidNumber", "1", true );
+        Attributes attrs = new BasicAttributes( "uidNumber", "1", true );
 
-    exampleCtx.modifyAttributes( "cn=test", DirContext.REMOVE_ATTRIBUTE, attrs );
-}
+        exampleCtx.modifyAttributes( "cn=test", DirContext.REMOVE_ATTRIBUTE, attrs );
+    }
 
 
-/**
- * Delete a value part of the Rdn
- */
-@Test(expected = SchemaViolationException.class)
-public void testModifyDelExistingEntryExistingATPartOfRdn() throws Exception
-{
-    LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
-    createData( exampleCtx );
+    /**
+     * Delete a value part of the Rdn
+     */
+    @Test(expected = SchemaViolationException.class)
+    public void testModifyDelExistingEntryExistingATPartOfRdn() throws Exception
+    {
+        LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
+        createData( exampleCtx );
 
-    Attributes attrs = new BasicAttributes( "cn", "test", true );
+        Attributes attrs = new BasicAttributes( "cn", "test", true );
 
-    exampleCtx.modifyAttributes( "cn=test", DirContext.REMOVE_ATTRIBUTE, attrs );
-}
+        exampleCtx.modifyAttributes( "cn=test", DirContext.REMOVE_ATTRIBUTE, attrs );
+    }
 
 
-/**
- * Delete an existing AT not part of the Rdn, not in MUST
- */
-@Test
-public void testModifyDelExistingEntryExistingATNoInRdnNotInMust() throws Exception
-{
-    LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
-    createData( exampleCtx );
+    /**
+     * Delete an existing AT not part of the Rdn, not in MUST
+     */
+    @Test
+    public void testModifyDelExistingEntryExistingATNoInRdnNotInMust() throws Exception
+    {
+        LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
+        createData( exampleCtx );
 
-    Attributes attrs = new BasicAttributes( "description", null, true );
+        Attributes attrs = new BasicAttributes( "description", null, true );
 
-    exampleCtx.modifyAttributes( RDN_HEATHER_NOVA, DirContext.REMOVE_ATTRIBUTE, attrs );
+        exampleCtx.modifyAttributes( RDN_HEATHER_NOVA, DirContext.REMOVE_ATTRIBUTE, attrs
);
 
-    // Verify that the attribute has been removed
-    attrs = exampleCtx.getAttributes( RDN_HEATHER_NOVA );
-    Attribute descr = attrs.get( "description" );
-    assertNull( descr );
-}
+        // Verify that the attribute has been removed
+        attrs = exampleCtx.getAttributes( RDN_HEATHER_NOVA );
+        Attribute descr = attrs.get( "description" );
+        assertNull( descr );
+    }
 
 
-/**
- * Delete an existing AT not part of the Rdn, but in MUST
- */
-@Test(expected = SchemaViolationException.class)
-public void testModifyDelExistingEntryExistingATNoInRdnInMust() throws Exception
-{
-    LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
-    createData( exampleCtx );
+    /**
+     * Delete an existing AT not part of the Rdn, but in MUST
+     */
+    @Test(expected = SchemaViolationException.class)
+    public void testModifyDelExistingEntryExistingATNoInRdnInMust() throws Exception
+    {
+        LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
+        createData( exampleCtx );
 
-    Attributes attrs = new BasicAttributes( "sn", null, true );
+        Attributes attrs = new BasicAttributes( "sn", null, true );
 
-    exampleCtx.modifyAttributes( RDN_HEATHER_NOVA, DirContext.REMOVE_ATTRIBUTE, attrs );
-}
+        exampleCtx.modifyAttributes( RDN_HEATHER_NOVA, DirContext.REMOVE_ATTRIBUTE, attrs
);
+    }
 
 
-/**
- * Delete an existing AT part of the Rdn
- */
-@Test(expected = SchemaViolationException.class)
-public void testModifyDelExistingEntryExistingATInRdn() throws Exception
-{
-    LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
-    createData( exampleCtx );
+    /**
+     * Delete an existing AT part of the Rdn
+     */
+    @Test(expected = SchemaViolationException.class)
+    public void testModifyDelExistingEntryExistingATInRdn() throws Exception
+    {
+        LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
+        createData( exampleCtx );
 
-    Attributes attrs = new BasicAttributes( "cn", null, true );
+        Attributes attrs = new BasicAttributes( "cn", null, true );
 
-    exampleCtx.modifyAttributes( RDN_HEATHER_NOVA, DirContext.REMOVE_ATTRIBUTE, attrs );
-}
+        exampleCtx.modifyAttributes( RDN_HEATHER_NOVA, DirContext.REMOVE_ATTRIBUTE, attrs
);
+    }
 
 
-/**
- * Delete a value not present in an existing AT
- */
-@Test(expected = NoSuchAttributeException.class)
-public void testModifyDelExistingEntryValueNotPresentInExistingAT() throws Exception
-{
-    LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
-    createData( exampleCtx );
+    /**
+     * Delete a value not present in an existing AT
+     */
+    @Test(expected = NoSuchAttributeException.class)
+    public void testModifyDelExistingEntryValueNotPresentInExistingAT() throws Exception
+    {
+        LdapContext exampleCtx = IntegrationUtils.getContext( "uid=admin,ou=system", getService(),
"dc=example,dc=com" );
+        createData( exampleCtx );
 
-    Attributes attrs = new BasicAttributes( "description", "Not present", true );
+        Attributes attrs = new BasicAttributes( "description", "Not present", true );
 
-    exampleCtx.modifyAttributes( RDN_HEATHER_NOVA, DirContext.REMOVE_ATTRIBUTE, attrs );
-}
+        exampleCtx.modifyAttributes( RDN_HEATHER_NOVA, DirContext.REMOVE_ATTRIBUTE, attrs
);
+    }
 
 
-//---------------------------------------------------------------------------------------------
-// 1 Entry exists
-//  1.3 Entry is an alias
-//---------------------------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------------------------
-// 1 Entry exists
-//  1.4 Entry is a referral.
-//---------------------------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------------------------
-// 1 Entry exists
-//  1.2 Entry is a schema element.
-//---------------------------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------------------------
-// 1 Entry exists
-//  1.2 The added AT is ObjectClass.
-//---------------------------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------------------------
-// 2 Entry does not exist
-//---------------------------------------------------------------------------------------------
-/**
- * Del an AT in an entry which does not exist
- */
-@Test(expected = NameNotFoundException.class)
-public void testModifyDelNotExistingEntry() throws Exception
-{
-    LdapContext exampleCtx = getSystemContext( getService() );
-    createData( exampleCtx );
+    //---------------------------------------------------------------------------------------------
+    // 1 Entry exists
+    //  1.3 Entry is an alias
+    //---------------------------------------------------------------------------------------------
+
+    //---------------------------------------------------------------------------------------------
+    // 1 Entry exists
+    //  1.4 Entry is a referral.
+    //---------------------------------------------------------------------------------------------
+
+    //---------------------------------------------------------------------------------------------
+    // 1 Entry exists
+    //  1.2 Entry is a schema element.
+    //---------------------------------------------------------------------------------------------
+
+    //---------------------------------------------------------------------------------------------
+    // 1 Entry exists
+    //  1.2 The added AT is ObjectClass.
+    //---------------------------------------------------------------------------------------------
+
+    //---------------------------------------------------------------------------------------------
+    // 2 Entry does not exist
+    //---------------------------------------------------------------------------------------------
+    /**
+     * Del an AT in an entry which does not exist
+     */
+    @Test(expected = NameNotFoundException.class)
+    public void testModifyDelNotExistingEntry() throws Exception
+    {
+        LdapContext exampleCtx = getSystemContext( getService() );
+        createData( exampleCtx );
 
-    // An operational attribute
-    Attributes attrs = new BasicAttributes( "cn", "test", true );
+        // An operational attribute
+        Attributes attrs = new BasicAttributes( "cn", "test", true );
 
-    exampleCtx.modifyAttributes( "ou=absent", DirContext.REMOVE_ATTRIBUTE, attrs );
-}
+        exampleCtx.modifyAttributes( "ou=absent", DirContext.REMOVE_ATTRIBUTE, attrs );
+    }
 }



Mime
View raw message