Fixed storage removal.

We have to remove any open environments as well.

1 files changed, 11 insertions, 10 deletions

diff --git a/tests/storagetest.cpp b/tests/storagetest.cpp
index 516fe85..5b4a0ba 100644
--- a/tests/storagetest.cpp
+++ b/tests/storagetest.cpp
@@ -63,12 +63,21 @@ private Q_SLOTS:
         storage.removeFromDisk();
     }
 
-    void cleanupTestCase()
+    void cleanup()
     {
         Akonadi2::Storage storage(testDataPath, dbName);
         storage.removeFromDisk();
     }
 
+    void testCleanup()
+    {
+        populate(1);
+        Akonadi2::Storage storage(testDataPath, dbName);
+        storage.removeFromDisk();
+        QFileInfo info(testDataPath + "/" + dbName);
+        QVERIFY(!info.exists());
+    }
+
     void testRead()
     {
         const int count = 100;
@@ -82,9 +91,6 @@ private Q_SLOTS:
                 QVERIFY(verify(storage, i));
             }
         }
-
-        Akonadi2::Storage storage(testDataPath, dbName);
-        storage.removeFromDisk();
     }
 
     void testScan()
@@ -120,9 +126,6 @@ private Q_SLOTS:
             QVERIFY(!foundInvalidValue);
             QCOMPARE(hit, 1);
         }
-
-        Akonadi2::Storage storage(testDataPath, dbName);
-        storage.removeFromDisk();
     }
 
     void testTurnReadToWrite()
@@ -135,14 +138,13 @@ private Q_SLOTS:
             });
             return false;
         });
-        store.removeFromDisk();
     }
 
     void testReadEmptyDb()
     {
         bool gotResult = false;
         bool gotError = false;
-        Akonadi2::Storage store(testDataPath, dbName, Akonadi2::Storage::ReadWrite);
+        Akonadi2::Storage store(testDataPath, dbName, Akonadi2::Storage::ReadOnly);
         store.scan(0, 0, [&](void *keyValue, int keySize, void *dataValue, int dataSize) -> bool {
             gotResult = true;
             return false;
@@ -152,7 +154,6 @@ private Q_SLOTS:
         });
         QVERIFY(!gotResult);
         QVERIFY(!gotError);
-        store.removeFromDisk();
     }
 
     void testConcurrentRead()