svn commit: r600816 - in /directory/apacheds/branches/bigbang: core-integ/src/test/java/org/apache/directory/server/core/ core-integ/src/test/java/org/apache/directory/server/core/jndi/ core-unit/src/test/java/org/apache/directory/server/core/jndi/

[ak...@apache.org]

Author: akarasulu
Date: Mon Dec  3 23:32:40 2007
New Revision: 600816

URL: http://svn.apache.org/viewvc?rev=600816&view=rev
Log:
convert another itest to new framework

Added:
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestoryContextIT.java
      - copied, changed from r600772, directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/DestroyContextITest.java
Removed:
    directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/DestroyContextITest.java
Modified:
    directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/StockCoreISuite.java

Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/StockCoreISuite.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/StockCoreISuite.java?rev=600816&r1=600815&r2=600816&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/StockCoreISuite.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/StockCoreISuite.java Mon Dec  3 23:32:40 2007
@@ -30,6 +30,7 @@
 import org.apache.directory.server.core.integ.annotations.Scope;
 import org.apache.directory.server.core.jndi.AddIT;
 import org.apache.directory.server.core.jndi.CreateContextIT;
+import org.apache.directory.server.core.jndi.DestoryContextIT;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
@@ -48,6 +49,7 @@
         EventServiceIT.class,
         AddIT.class,
         CreateContextIT.class,
+        DestoryContextIT.class,
         PartitionConfigurationIT.class  // Leaves the server in a bad state (partition removal is incomplete)
         } )
 @Scope ( ServiceScope.TESTSUITE )

Copied: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestoryContextIT.java (from r600772, directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/DestroyContextITest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestoryContextIT.java?p2=directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestoryContextIT.java&p1=directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/DestroyContextITest.java&r1=600772&r2=600816&rev=600816&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/jndi/DestroyContextITest.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestoryContextIT.java Mon Dec  3 23:32:40 2007
@@ -20,15 +20,21 @@
 package org.apache.directory.server.core.jndi;
 
 
+import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.integ.CiRunner;
+import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
+import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
+import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
-
-import org.apache.directory.server.core.unit.AbstractAdminTestCase;
-import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import javax.naming.ldap.LdapContext;
 
 
 /**
@@ -37,11 +43,20 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class DestroyContextITest extends AbstractAdminTestCase
+@RunWith ( CiRunner.class )
+public class DestoryContextIT
 {
-    protected void setUp() throws Exception
+    public static DirectoryService service;
+
+    
+    /**
+     * @todo Replace this with an LDIF directive!!!!!!
+     *
+     * @throws NamingException on error
+     */
+    public void createEntries() throws NamingException
     {
-        super.setUp();
+        LdapContext sysRoot = getSystemContext( service );
 
         /*
          * create ou=testing00,ou=system
@@ -145,8 +160,13 @@
      *
      * @throws NamingException if there are failures
      */
+    @Test
     public void testDestroyContext() throws NamingException
     {
+        LdapContext sysRoot = getSystemContext( service );
+
+        createEntries();
+
         /*
          * delete ou=testing00,ou=system
          */