Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 91644 invoked from network); 25 Jul 2008 00:49:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Jul 2008 00:49:42 -0000 Received: (qmail 27830 invoked by uid 500); 25 Jul 2008 00:49:42 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 27784 invoked by uid 500); 25 Jul 2008 00:49:42 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 27775 invoked by uid 99); 25 Jul 2008 00:49:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Jul 2008 17:49:42 -0700 X-ASF-Spam-Status: No, hits=-1999.6 required=10.0 tests=ALL_TRUSTED,SUBJECT_FUZZY_TION X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Jul 2008 00:48:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E07D423889C0; Thu, 24 Jul 2008 17:49:21 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r679639 - /directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ Date: Fri, 25 Jul 2008 00:49:21 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080725004921.E07D423889C0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Thu Jul 24 17:49:21 2008 New Revision: 679639 URL: http://svn.apache.org/viewvc?rev=679639&view=rev Log: More file cleaning when tests are done. Removed useless imports Modified: directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmBrowserBugTest.java directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java Modified: directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmBrowserBugTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmBrowserBugTest.java?rev=679639&r1=679638&r2=679639&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmBrowserBugTest.java (original) +++ directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmBrowserBugTest.java Thu Jul 24 17:49:21 2008 @@ -87,13 +87,13 @@ recman = null; bt = null; - String fileToDelete = dbFile.getAbsolutePath(); - new File( fileToDelete ).delete(); - new File( fileToDelete + ".db" ).delete(); - new File( fileToDelete + ".lg" ).delete(); - if ( dbFile.exists() ) { + String fileToDelete = dbFile.getAbsolutePath(); + new File( fileToDelete ).delete(); + new File( fileToDelete + ".db" ).delete(); + new File( fileToDelete + ".lg" ).delete(); + dbFile.delete(); } Modified: directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java?rev=679639&r1=679638&r2=679639&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java (original) +++ directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java Thu Jul 24 17:49:21 2008 @@ -100,6 +100,11 @@ recman.close(); recman = null; dbFile.deleteOnExit(); + + String fileToDelete = dbFile.getAbsolutePath(); + new File( fileToDelete + ".db" ).delete(); + new File( fileToDelete + ".lg" ).delete(); + dbFile = null; } Modified: directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java?rev=679639&r1=679638&r2=679639&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java (original) +++ directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java Thu Jul 24 17:49:21 2008 @@ -100,6 +100,11 @@ recman.close(); recman = null; dbFile.deleteOnExit(); + + String fileToDelete = dbFile.getAbsolutePath(); + new File( fileToDelete + ".db" ).delete(); + new File( fileToDelete + ".lg" ).delete(); + dbFile = null; } Modified: directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java?rev=679639&r1=679638&r2=679639&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java (original) +++ directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java Thu Jul 24 17:49:21 2008 @@ -39,6 +39,7 @@ import org.apache.directory.server.schema.registries.ComparatorRegistry; import org.apache.directory.server.xdbm.Tuple; import org.apache.directory.shared.ldap.schema.syntax.ComparatorDescription; +import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -55,6 +56,8 @@ JdbmTable table; Comparator comparator; KeyTupleBTreeCursor cursor; + File dbFile; + RecordManager recman; private static final Integer KEY = 1; private static final String TEST_OUTPUT_PATH = "test.output.path"; @@ -78,8 +81,8 @@ tmpDir = new File( System.getProperty( TEST_OUTPUT_PATH ) ); } - File dbFile = File.createTempFile( getClass().getSimpleName(), "db", tmpDir ); - RecordManager recman = new BaseRecordManager( dbFile.getAbsolutePath() ); + dbFile = File.createTempFile( getClass().getSimpleName(), "db", tmpDir ); + recman = new BaseRecordManager( dbFile.getAbsolutePath() ); SerializableComparator.setRegistry( new MockComparatorRegistry() ); @@ -92,6 +95,21 @@ } + @After + public void destroytable() throws Exception + { + recman.close(); + recman = null; + dbFile.deleteOnExit(); + + String fileToDelete = dbFile.getAbsolutePath(); + new File( fileToDelete + ".db" ).delete(); + new File( fileToDelete + ".lg" ).delete(); + + dbFile = null; + } + + @Test( expected = InvalidCursorPositionException.class ) public void testEmptyCursor() throws Exception { Modified: directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java?rev=679639&r1=679638&r2=679639&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java (original) +++ directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java Thu Jul 24 17:49:21 2008 @@ -88,6 +88,9 @@ recman.close(); recman = null; dbFile.deleteOnExit(); + String fileToDelete = dbFile.getAbsolutePath(); + new File( fileToDelete + ".db" ).delete(); + new File( fileToDelete + ".lg" ).delete(); dbFile = null; }