You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ka...@apache.org on 2015/05/11 10:11:32 UTC
svn commit: r1678688 - in
/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree:
PersistedBTreeTransactionTest.java RecordManagerFreePageTest.java
RecordManagerTest.java RecordManagerWithDuplicatesTest.java
Author: kayyagari
Date: Mon May 11 08:11:31 2015
New Revision: 1678688
URL: http://svn.apache.org/r1678688
Log:
fixed tests to pass on windows by closing the recordmanager first before deleting the files
Modified:
directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeTransactionTest.java
directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java
directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java
directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerWithDuplicatesTest.java
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeTransactionTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeTransactionTest.java?rev=1678688&r1=1678687&r2=1678688&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeTransactionTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeTransactionTest.java Mon May 11 08:11:31 2015
@@ -79,6 +79,12 @@ public class PersistedBTreeTransactionTe
btreeNoTransactions.close();
btreeWithTransactions.close();
+ recordManagerNoTxn.close();
+ recordManagerTxn.close();
+
+ assertTrue( recordManagerNoTxn.isContextOk() );
+ assertTrue( recordManagerTxn.isContextOk() );
+
if ( dataDirNoTxn.exists() )
{
FileUtils.deleteDirectory( dataDirNoTxn );
@@ -88,12 +94,6 @@ public class PersistedBTreeTransactionTe
{
FileUtils.deleteDirectory( dataDirWithTxn );
}
-
- recordManagerNoTxn.close();
- recordManagerTxn.close();
-
- assertTrue( recordManagerNoTxn.isContextOk() );
- assertTrue( recordManagerTxn.isContextOk() );
}
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java?rev=1678688&r1=1678687&r2=1678688&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java Mon May 11 08:11:31 2015
@@ -84,14 +84,13 @@ public class RecordManagerFreePageTest
btree.close();
+ recordManager1.close();
+ assertTrue( recordManager1.isContextOk() );
+
if ( dataDir.exists() )
{
FileUtils.deleteDirectory( dataDir );
}
-
- recordManager1.close();
-
- assertTrue( recordManager1.isContextOk() );
}
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java?rev=1678688&r1=1678687&r2=1678688&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java Mon May 11 08:11:31 2015
@@ -88,6 +88,8 @@ public class RecordManagerTest
{
btree.close();
+ recordManager.close();
+
if ( dataDir.exists() )
{
FileUtils.deleteDirectory( dataDir );
Modified: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerWithDuplicatesTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerWithDuplicatesTest.java?rev=1678688&r1=1678687&r2=1678688&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerWithDuplicatesTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerWithDuplicatesTest.java Mon May 11 08:11:31 2015
@@ -82,13 +82,13 @@ public class RecordManagerWithDuplicates
{
btree.close();
+ recordManager.close();
+ assertTrue( recordManager.isContextOk() );
+
if ( dataDir.exists() )
{
FileUtils.deleteDirectory( dataDir );
}
-
- recordManager.close();
- assertTrue( recordManager.isContextOk() );
}