4 files changed, 28 insertions(+), 6 deletions(-)

M module-db/tests/CMakeLists.txt
M module-db/tests/ContactsRecord_tests.cpp
A module-db/tests/common.cpp
A module-db/tests/common.hpp

@@ 32,6 32,7 @@ add_catch2_executable(
         ThreadRecord_tests.cpp
         ThreadsTable_tests.cpp
         tests-main.cpp
+        common.cpp
         
     LIBS
         module-db

@@ 1,6 1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+#include "common.hpp"
 #include <catch2/catch.hpp>
 
 #include "Interface/ContactRecord.hpp"


@@ 12,9 13,7 @@ TEST_CASE("Contact Record db tests")
     Database::initialize();
 
     const auto contactsPath = (std::filesystem::path{"sys/user"} / "contacts.db");
-    if (std::filesystem::exists(contactsPath)) {
-        REQUIRE(std::filesystem::remove(contactsPath));
-    }
+    RemoveDbFiles(contactsPath.stem());
 
     ContactsDB contactDB(contactsPath.c_str());
     REQUIRE(contactDB.isInitialized());


@@ 263,9 262,7 @@ TEST_CASE("Contact record numbers update")
 {
     Database::initialize();
     const auto contactsPath = (std::filesystem::path{"sys/user"} / "contacts.db");
-    if (std::filesystem::exists(contactsPath)) {
-        REQUIRE(std::filesystem::remove(contactsPath));
-    }
+    RemoveDbFiles(contactsPath.stem());
 
     ContactsDB contactDB(contactsPath.c_str());
     REQUIRE(contactDB.isInitialized());

@@ 0,0 1,16 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+#include "common.hpp"
+#include <vector>
+#include <filesystem>
+
+void RemoveDbFiles(const std::string &dbName)
+{
+    std::vector<std::string> dbFileExt = {".db", ".db-journal", ".db-wal"};
+    for (const auto &ext : dbFileExt) {
+        const auto dbPath = (std::filesystem::path{"sys/user"} / std::filesystem::path{dbName + ext});
+        if (std::filesystem::exists(dbPath)) {
+            std::filesystem::remove(dbPath.c_str());
+        }
+    }
+}

@@ 0,0 1,8 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+#include <string>
+
+void RemoveDbFiles(const std::string &dbName);