commit 879a26f89df2303d5ef802921c7171dba29380ce
author Kiran Ayyagari <kayyagari@apache.org> Mon May 11 08:11:31 2015 +0000
committer Kiran Ayyagari <kayyagari@apache.org> Mon May 11 08:11:31 2015 +0000
tree 795fa93baea8a6d81186168925ee29cdae6d7067
parent cce0a5be725f6c3d64367ce1dfbed3fae828328e

fixed tests to pass on windows by closing the recordmanager first before deleting the files

mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeTransactionTest.java

diff --git a/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeTransactionTest.java b/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeTransactionTest.java
index 250e162..b8abe96 100644
--- a/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeTransactionTest.java
+++ b/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeTransactionTest.java
@@ -79,6 +79,12 @@
         btreeNoTransactions.close();
         btreeWithTransactions.close();
 
+        recordManagerNoTxn.close();
+        recordManagerTxn.close();
+        
+        assertTrue( recordManagerNoTxn.isContextOk() );
+        assertTrue( recordManagerTxn.isContextOk() );
+
         if ( dataDirNoTxn.exists() )
         {
             FileUtils.deleteDirectory( dataDirNoTxn );
@@ -88,12 +94,6 @@
         {
             FileUtils.deleteDirectory( dataDirWithTxn );
         }
-        
-        recordManagerNoTxn.close();
-        recordManagerTxn.close();
-        
-        assertTrue( recordManagerNoTxn.isContextOk() );
-        assertTrue( recordManagerTxn.isContextOk() );
     }
 
 

mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java

diff --git a/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java b/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java
index 3e0e1c1..314b768 100644
--- a/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java
+++ b/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java
@@ -84,14 +84,13 @@
 
         btree.close();
 
+        recordManager1.close();
+        assertTrue( recordManager1.isContextOk() );
+
         if ( dataDir.exists() )
         {
             FileUtils.deleteDirectory( dataDir );
         }
-
-        recordManager1.close();
-        
-        assertTrue( recordManager1.isContextOk() );
     }
 
 

mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java

diff --git a/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java b/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java
index 9891fbb..d2dd085 100644
--- a/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java
+++ b/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java
@@ -88,6 +88,8 @@
     {
         btree.close();
 
+        recordManager.close();
+        
         if ( dataDir.exists() )
         {
             FileUtils.deleteDirectory( dataDir );

mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerWithDuplicatesTest.java

diff --git a/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerWithDuplicatesTest.java b/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerWithDuplicatesTest.java
index 1bce2a1..cd83696 100644
--- a/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerWithDuplicatesTest.java
+++ b/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerWithDuplicatesTest.java
@@ -82,13 +82,13 @@
     {
         btree.close();
 
+        recordManager.close();
+        assertTrue( recordManager.isContextOk() );
+
         if ( dataDir.exists() )
         {
             FileUtils.deleteDirectory( dataDir );
         }
-
-        recordManager.close();
-        assertTrue( recordManager.isContextOk() );
     }