directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1395158 - in /directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core: jndi/AddIT.java suites/MigratedStockCoreISuite.java suites/StockCoreISuite.java
Date Sat, 06 Oct 2012 19:41:46 GMT
Author: elecharny
Date: Sat Oct  6 19:41:45 2012
New Revision: 1395158

URL: http://svn.apache.org/viewvc?rev=1395158&view=rev
Log:
Migrated the tests to use the API instead of JNDI

Modified:
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/suites/MigratedStockCoreISuite.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/suites/StockCoreISuite.java

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java?rev=1395158&r1=1395157&r2=1395158&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java
(original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java
Sat Oct  6 19:41:45 2012
@@ -20,22 +20,21 @@
 package org.apache.directory.server.core.jndi;
 
 
-import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
+import static org.apache.directory.server.core.integ.IntegrationUtils.getAdminConnection;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.DirContext;
-import javax.naming.ldap.LdapContext;
-
+import org.apache.directory.ldap.client.api.LdapConnection;
 import org.apache.directory.server.core.annotations.CreateDS;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
-import org.apache.directory.shared.ldap.model.ldif.LdifUtils;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
+import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
+import org.apache.directory.shared.ldap.model.exception.LdapSchemaViolationException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -49,51 +48,30 @@ import org.junit.runner.RunWith;
 @CreateDS(name = "AddIT")
 public class AddIT extends AbstractLdapTestUnit
 {
-    //    /**
-    //     * Test that attribute name case is preserved after adding an entry
-    //     * in the case the user added them.  This is to test DIRSERVER-832.
-    //     */
-    //    public void testAddCasePreservedOnAttributeNames() throws Exception
-    //    {
-    //        Attributes attrs = new AttributesImpl( true );
-    //        Attribute oc = new AttributeImpl( "ObjectClass", "top" );
-    //        oc.add( "PERSON" );
-    //        oc.add( "organizationalPerson" );
-    //        oc.add( "inetORGperson" );
-    //        Attribute cn = new AttributeImpl( "Cn", "Kevin Spacey" );
-    //        Attribute dc = new AttributeImpl( "sN", "Spacey" );
-    //        attrs.put( oc );
-    //        attrs.put( cn );
-    //        attrs.put( dc);
-    //        sysRoot.createSubcontext( "uID=kevin", attrs );
-    //        Attributes returned = sysRoot.getObject( "UID=kevin" );
-    //        
-    //        NamingEnumeration attrList = returned.getAll();
-    //        while( attrList.hasMore() )
-    //        {
-    //            Attribute attr = ( Attribute ) attrList.next();
-    //            
-    //            if ( attr.getID().equalsIgnoreCase( "uid" ) )
-    //            {
-    //                assertEquals( "uID", attr.getID() );
-    //            }
-    //            
-    //            if ( attr.getID().equalsIgnoreCase( "objectClass" ) )
-    //            {
-    //                assertEquals( "ObjectClass", attr.getID() );
-    //            }
-    //            
-    //            if ( attr.getID().equalsIgnoreCase( "sn" ) )
-    //            {
-    //                assertEquals( "sN", attr.getID() );
-    //            }
-    //            
-    //            if ( attr.getID().equalsIgnoreCase( "cn" ) )
-    //            {
-    //                assertEquals( "Cn", attr.getID() );
-    //            }
-    //        }
-    //    }
+    /**
+     * Test that attribute name case is preserved after adding an entry
+     * in the case the user added them.  This is to test DIRSERVER-832.
+     */
+    @Test
+    public void testAddCasePreservedOnAttributeNames() throws Exception
+    {
+        LdapConnection sysRoot = getAdminConnection( getService() );
+
+        Entry entry = new DefaultEntry( "uID=kevin,ou=system",
+            "ObjectClass: top",
+            "ObjectClass: PERSON",
+            "ObjectClass: organizationalPerson",
+            "ObjectClass: inetORGperson",
+            "Cn: Kevin Spacey",
+            "sN: Spacey",
+            "uID: kevin" );
+            
+        sysRoot.add( entry );
+        
+        Entry returned = sysRoot.lookup( "uID=kevin,ou=system" );
+        
+        assertTrue( returned.containsAttribute( "uID", "ObjectClass", "sN", "Cn" ) );
+    }
 
     /**
      * Test that we can't add an entry with an attribute type not within
@@ -101,28 +79,21 @@ public class AddIT extends AbstractLdapT
      * 
      * @throws Exception on error
      */
-    @Test
+    @Test( expected=LdapSchemaViolationException.class )
     public void testAddAttributesNotInObjectClasses() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( getService() );
+        LdapConnection sysRoot = getAdminConnection( getService() );
 
-        Attributes attrs = LdifUtils.createJndiAttributes(
+        String base = "uid=kevin, ou=system";
+
+        Entry entry = new DefaultEntry( base,
             "ObjectClass: top",
             "cn: kevin Spacey",
             "dc: ke" );
 
-        String base = "uid=kevin";
-
         //create subcontext
-        try
-        {
-            sysRoot.createSubcontext( base, attrs );
-            fail( "Should not reach this state" );
-        }
-        catch ( NamingException e )
-        {
-            assertTrue( true );
-        }
+        sysRoot.add( entry );
+        fail( "Should not reach this state" );
     }
 
 
@@ -131,30 +102,22 @@ public class AddIT extends AbstractLdapT
      *
      * @throws Exception on error
      */
-    @Test
+    @Test( expected=LdapInvalidAttributeValueException.class )
     public void testAddAttributesBadSyntax() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( getService() );
+        LdapConnection sysRoot = getAdminConnection( getService() );
+
+        String base = "sn=kevin, ou=system";
 
-        Attributes attrs = LdifUtils.createJndiAttributes(
+        Entry entry = new DefaultEntry( base,
             "ObjectClass: top",
             "ObjectClass: person",
             "cn: kevin Spacey",
             "sn: ke",
             "telephoneNumber: 0123456abc" );
 
-        String base = "sn=kevin";
-
         // create subcontext
-        try
-        {
-            sysRoot.createSubcontext( base, attrs );
-            fail( "Should not reach this state" );
-        }
-        catch ( NamingException e )
-        {
-            assertTrue( true );
-        }
+        sysRoot.add( entry );
     }
 
 
@@ -164,22 +127,21 @@ public class AddIT extends AbstractLdapT
     @Test
     public void testAddAttributeWithEscapedPlusCharacter() throws Exception
     {
-        Attributes entry = LdifUtils.createJndiAttributes(
+        LdapConnection sysRoot = getAdminConnection( getService() );
+
+        String base = "cn=John\\+Doe, ou=system";
+
+        Entry entry = new DefaultEntry( base,
             "ObjectClass: top",
             "ObjectClass: inetorgperson",
             "cn: John+Doe",
             "sn: +Name+" );
 
-        LdapContext sysRoot = getSystemContext( getService() );
-        DirContext dc = sysRoot.createSubcontext( "cn=John\\+Doe", entry );
-
-        ServerLdapContext sc = ( ServerLdapContext ) dc;
-
-        assertTrue( sc.getDn().toString().contains( "+" ) );
+        sysRoot.add( entry );
 
         try
         {
-            Object obj = sysRoot.lookup( "cn=John\\+Doe" );
+            Entry obj = sysRoot.lookup( "cn=John\\+Doe,ou=system" );
             assertNotNull( obj );
         }
         catch ( Exception e )
@@ -187,18 +149,11 @@ public class AddIT extends AbstractLdapT
             fail( e.getMessage() );
         }
 
-        try
-        {
-            Attributes result = sysRoot.getAttributes( "cn=John\\+Doe" );
-            assertNotNull( result );
+        Entry result = sysRoot.lookup( "cn=John\\+Doe,ou=system" );
+        assertNotNull( result );
 
-            Attribute cn = result.get( "cn" );
-            assertNotNull( cn );
-            assertEquals( 1, cn.size() );
-        }
-        catch ( Exception e )
-        {
-            fail( e.getMessage() );
-        }
+        assertTrue( result.containsAttribute( "cn" ) );
+        Attribute cn = result.get( "cn" );
+        assertEquals( 1, cn.size() );
     }
 }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/suites/MigratedStockCoreISuite.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/suites/MigratedStockCoreISuite.java?rev=1395158&r1=1395157&r2=1395158&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/suites/MigratedStockCoreISuite.java
(original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/suites/MigratedStockCoreISuite.java
Sat Oct  6 19:41:45 2012
@@ -35,9 +35,11 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.authz.MoveRenameAuthorizationIT;
 import org.apache.directory.server.core.authz.SearchAuthorizationIT;
 import org.apache.directory.server.core.changelog.DefaultChangeLogIT;
+import org.apache.directory.server.core.collective.CollectiveAttributeServiceIT;
 import org.apache.directory.server.core.event.EventServiceIT;
 import org.apache.directory.server.core.exception.ExceptionServiceIT;
 import org.apache.directory.server.core.integ.FrameworkSuite;
+import org.apache.directory.server.core.jndi.AddIT;
 import org.apache.directory.server.core.operations.add.PasswordHashingInterceptorTest;
 import org.apache.directory.server.core.operations.move.MoveIT;
 import org.junit.runner.RunWith;
@@ -76,12 +78,18 @@ import org.junit.runners.Suite;
         // changelog
         DefaultChangeLogIT.class,
 
+        // collective
+        CollectiveAttributeServiceIT.class,
+
         // event
         EventServiceIT.class,
 
         // exception
         ExceptionServiceIT.class,
         
+        // jndi
+        AddIT.class,
+        
         // Operations
         MoveIT.class
 })

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/suites/StockCoreISuite.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/suites/StockCoreISuite.java?rev=1395158&r1=1395157&r2=1395158&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/suites/StockCoreISuite.java
(original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/suites/StockCoreISuite.java
Sat Oct  6 19:41:45 2012
@@ -19,10 +19,8 @@
 package org.apache.directory.server.core.suites;
 
 
-import org.apache.directory.server.core.collective.CollectiveAttributeServiceIT;
 import org.apache.directory.server.core.configuration.PartitionConfigurationIT;
 import org.apache.directory.server.core.integ.FrameworkSuite;
-import org.apache.directory.server.core.jndi.AddIT;
 import org.apache.directory.server.core.jndi.CreateContextIT;
 import org.apache.directory.server.core.jndi.DIRSERVER169IT;
 import org.apache.directory.server.core.jndi.DIRSERVER783IT;
@@ -98,14 +96,10 @@ import org.junit.runners.Suite;
         // ap
         //AdministrativePointServiceIT.class,
 
-        // collective
-        CollectiveAttributeServiceIT.class,
-
         // configuration
         PartitionConfigurationIT.class,
 
         // jndi
-        AddIT.class,
         CreateContextIT.class,
         DestroyContextIT.class,
         DIRSERVER169IT.class,



Mime
View raw message