directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r179831 - /directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractCoreTest.java
Date Fri, 03 Jun 2005 16:33:38 GMT
Author: akarasulu
Date: Fri Jun  3 09:33:35 2005
New Revision: 179831

URL: http://svn.apache.org/viewcvs?rev=179831&view=rev
Log:
Added extra methods to set an LDIF file to load as a class relative resource
or as a file from disk.  Checks are made to test exactly what is implied.

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractCoreTest.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractCoreTest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractCoreTest.java?rev=179831&r1=179830&r2=179831&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractCoreTest.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/AbstractCoreTest.java
Fri Jun  3 09:33:35 2005
@@ -35,9 +35,7 @@
 import javax.naming.directory.Attributes;
 import javax.naming.ldap.InitialLdapContext;
 import javax.naming.ldap.LdapContext;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.util.Hashtable;
 import java.util.ArrayList;
 
@@ -80,13 +78,56 @@
     /** extra environment parameters that can be added before setUp to override values */
     protected Hashtable overrides = new Hashtable();
 
+    /** A testEntries of entries as Attributes to add to the DIT for testing */
+    protected ArrayList testEntries = new ArrayList();
 
-    private ArrayList list = null;
+    /** An optional LDIF file path if set and present is read to add more test entries */
+    private String ldifPath;
 
+    /** Load resources relative to this class */
+    private Class loadClass;
 
-    public AbstractCoreTest()
+
+    /**
+     * Sets the LDIF path as a relative resource path to use with the
+     * loadClass parameter to load the resource.
+     *
+     * @param ldifPath the relative resource path to the LDIF file
+     * @param loadClass the class used to load the LDIF as a resource stream
+     */
+    protected void setLdifPath( String ldifPath, Class loadClass )
     {
-        list = new ArrayList();
+        this.loadClass = loadClass;
+
+        this.ldifPath = ldifPath;
+    }
+
+
+    /**
+     * Sets the LDIF path to use.  If the path is relative to this class then it
+     * is first tested
+     *
+     * @param ldifPath the path to the LDIF file
+     */
+    protected void setLdifPath( String ldifPath )
+    {
+        this.ldifPath = ldifPath;
+    }
+
+
+    /**
+     * Get's the initial context factory for the provider's ou=system context
+     * root.
+     *
+     * @see junit.framework.TestCase#setUp()
+     */
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+
+        // -------------------------------------------------------------------
+        // Add a single test entry
+        // -------------------------------------------------------------------
 
         Attributes attributes = new LockableAttributesImpl();
 
@@ -103,21 +144,55 @@
             throw new NestableRuntimeException( e );
         }
 
-        list.add( attributes );
-    }
+        testEntries.add( attributes );
 
+        // -------------------------------------------------------------------
+        // Add more from an optional LDIF file if they exist
+        // -------------------------------------------------------------------
 
-    /**
-     * Get's the initial context factory for the provider's ou=system context
-     * root.
-     *
-     * @see junit.framework.TestCase#setUp()
-     */
-    protected void setUp() throws Exception
-    {
-        super.setUp();
+        InputStream in = null;
+
+        if ( loadClass == null && ldifPath != null )
+        {
+            File ldifFile = new File( ldifPath );
+
+            if ( ldifFile.exists() )
+            {
+                in = new FileInputStream( ldifPath );
+            }
+            else
+            {
+                in = getClass().getResourceAsStream( ldifPath );
+            }
+
+            throw new FileNotFoundException( ldifPath );
+        }
+        else if ( loadClass != null && ldifPath != null )
+        {
+            in = loadClass.getResourceAsStream( ldifPath );
+        }
+
+        if ( in != null )
+        {
+            LdifIterator list = new LdifIterator( in );
+
+            while ( list.hasNext() )
+            {
+                String ldif = ( String ) list.next();
 
-        extras.put( EnvKeys.TEST_ENTRIES, list );
+                attributes = new LockableAttributesImpl();
+
+                parser.parse( attributes, ldif );
+
+                testEntries.add( attributes );
+            }
+        }
+
+        // -------------------------------------------------------------------
+        // Add key for extra entries to the testEntries of extras
+        // -------------------------------------------------------------------
+
+        extras.put( EnvKeys.TEST_ENTRIES, testEntries );
         
         if ( overrides.containsKey( EnvKeys.WKDIR ) )
         {
@@ -229,6 +304,8 @@
         sysRoot = null;
 
         Runtime.getRuntime().gc();
+
+        testEntries.clear();
     }
 
 



Mime
View raw message