2 files changed, 6 insertions, 12 deletions

diff --git a/tests/entitystoretest.cpp b/tests/entitystoretest.cpp
index 90575a5..03b940b 100644
--- a/tests/entitystoretest.cpp
+++ b/tests/entitystoretest.cpp
@@ -22,8 +22,7 @@ private slots:
 
     void cleanup()
     {
-        Sink::Storage::DataStore storage(Sink::storageLocation(), resourceInstanceIdentifier);
-        storage.removeFromDisk();
+        Sink::Storage::DataStore(Sink::storageLocation(), resourceInstanceIdentifier).removeFromDisk();
     }
 
     void testCleanup()
diff --git a/tests/storagetest.cpp b/tests/storagetest.cpp
index f4cf400..96368a7 100644
--- a/tests/storagetest.cpp
+++ b/tests/storagetest.cpp
@@ -63,21 +63,18 @@ private slots:
     {
         testDataPath = "./testdb";
         dbName = "test";
-        Sink::Storage::DataStore storage(testDataPath, {dbName, {{"default", 0}}});
-        storage.removeFromDisk();
+        Sink::Storage::DataStore{testDataPath, {dbName, {{"default", 0}}}}.removeFromDisk();
     }
 
     void cleanup()
     {
-        Sink::Storage::DataStore storage(testDataPath, {dbName, {{"default", 0}}});
-        storage.removeFromDisk();
+        Sink::Storage::DataStore{testDataPath, {dbName, {{"default", 0}}}}.removeFromDisk();
     }
 
     void testCleanup()
     {
         populate(1);
-        Sink::Storage::DataStore storage(testDataPath, {dbName, {{"default", 0}}});
-        storage.removeFromDisk();
+        Sink::Storage::DataStore{testDataPath, {dbName, {{"default", 0}}}}.removeFromDisk();
         QFileInfo info(testDataPath + "/" + dbName);
         QVERIFY(!info.exists());
     }
@@ -216,10 +213,8 @@ private slots:
         }
 
         {
-            Sink::Storage::DataStore storage(testDataPath, dbName);
-            storage.removeFromDisk();
-            Sink::Storage::DataStore storage2(testDataPath, dbName + "2");
-            storage2.removeFromDisk();
+            Sink::Storage::DataStore(testDataPath, dbName).removeFromDisk();
+            Sink::Storage::DataStore(testDataPath, dbName + "2").removeFromDisk();
         }
     }