~aleteoryx/muditaos: [EGD-5115] Fix dangling ptrs in module-db tests

23 files changed, 79 insertions(+), 77 deletions(-)

M module-db/tests/AlarmsRecord_tests.cpp
M module-db/tests/AlarmsTable_tests.cpp
M module-db/tests/CalllogRecord_tests.cpp
M module-db/tests/CalllogTable_tests.cpp
M module-db/tests/ContactGroups_tests.cpp
M module-db/tests/ContactsAddressTable_tests.cpp
M module-db/tests/ContactsNameTable_tests.cpp
M module-db/tests/ContactsNumberTable_tests.cpp
M module-db/tests/ContactsRecord_tests.cpp
M module-db/tests/ContactsRingtonesTable_tests.cpp
M module-db/tests/ContactsTable_tests.cpp
M module-db/tests/EventsRecord_tests.cpp
M module-db/tests/EventsTable_tests.cpp
M module-db/tests/NotesRecord_tests.cpp
M module-db/tests/NotesTable_tests.cpp
M module-db/tests/NotificationsRecord_tests.cpp
M module-db/tests/NotificationsTable_tests.cpp
M module-db/tests/SMSRecord_tests.cpp
M module-db/tests/SMSTable_tests.cpp
M module-db/tests/SMSTemplateRecord_tests.cpp
M module-db/tests/SMSTemplateTable_tests.cpp
M module-db/tests/ThreadRecord_tests.cpp
M module-db/tests/ThreadsTable_tests.cpp

M module-db/tests/AlarmsRecord_tests.cpp => module-db/tests/AlarmsRecord_tests.cpp +2 -2

@@ 26,10 26,10 @@ TEST_CASE("Alarms Record tests")
 {
     Database::initialize();
 
-    const auto alarmsPath = (purefs::dir::getUserDiskPath() / "alarms.db").c_str();
+    const auto alarmsPath = purefs::dir::getUserDiskPath() / "alarms.db";
     std::filesystem::remove(alarmsPath);
 
-    auto alarmsDB = AlarmsDB(alarmsPath);
+    AlarmsDB alarmsDB(alarmsPath.c_str());
     REQUIRE(alarmsDB.isInitialized());
 
     SECTION("Default Constructor")

M module-db/tests/AlarmsTable_tests.cpp => module-db/tests/AlarmsTable_tests.cpp +2 -2

@@ 21,10 21,10 @@ TEST_CASE("Alarms Table tests")
 {
     Database::initialize();
 
-    const auto alarmsPath = (purefs::dir::getUserDiskPath() / "alarms.db").c_str();
+    const auto alarmsPath = purefs::dir::getUserDiskPath() / "alarms.db";
     std::filesystem::remove(alarmsPath);
 
-    AlarmsDB alarmsDb(alarmsPath);
+    AlarmsDB alarmsDb(alarmsPath.c_str());
     REQUIRE(alarmsDb.isInitialized());
 
     auto &alarmsTbl = alarmsDb.alarms;

M module-db/tests/CalllogRecord_tests.cpp => module-db/tests/CalllogRecord_tests.cpp +4 -4

@@ 20,13 20,13 @@ TEST_CASE("Calllog Record tests")
 {
     Database::initialize();
 
-    const auto callogPath   = (purefs::dir::getUserDiskPath() / "callog.db").c_str();
-    const auto contactsPath = (purefs::dir::getUserDiskPath() / "contacts.db").c_str();
+    const auto callogPath   = purefs::dir::getUserDiskPath() / "callog.db";
+    const auto contactsPath = purefs::dir::getUserDiskPath() / "contacts.db";
     std::filesystem::remove(callogPath);
     std::filesystem::remove(contactsPath);
 
-    CalllogDB calllogDb(callogPath);
-    ContactsDB contactsDb(contactsPath);
+    CalllogDB calllogDb(callogPath.c_str());
+    ContactsDB contactsDb(contactsPath.c_str());
 
     REQUIRE(calllogDb.isInitialized());
     REQUIRE(contactsDb.isInitialized());

M module-db/tests/CalllogTable_tests.cpp => module-db/tests/CalllogTable_tests.cpp +2 -2

@@ 20,10 20,10 @@ TEST_CASE("Calllog Table tests")
 {
     Database::initialize();
 
-    const auto callogPath = (purefs::dir::getUserDiskPath() / "callog.db").c_str();
+    const auto callogPath = purefs::dir::getUserDiskPath() / "callog.db";
     std::filesystem::remove(callogPath);
 
-    CalllogDB calllogDb{callogPath};
+    CalllogDB calllogDb{callogPath.c_str()};
     REQUIRE(calllogDb.isInitialized());
 
     auto &callsTbl = calllogDb.calls;

M module-db/tests/ContactGroups_tests.cpp => module-db/tests/ContactGroups_tests.cpp +2 -2

@@ 28,9 28,9 @@ TEST_CASE("Contact Groups tests", "[Groups]")
 {
     INFO("sqlite Init");
     Database::initialize();
-    const auto callogPath = (purefs::dir::getUserDiskPath() / "contacts.db").c_str();
+    const auto callogPath = purefs::dir::getUserDiskPath() / "contacts.db";
     std::filesystem::remove(callogPath);
-    ContactsDB contactDb{callogPath};
+    ContactsDB contactDb{callogPath.c_str()};
     INFO("contactDB init");
     REQUIRE(contactDb.isInitialized());
     ContactsGroupsTable contactGroupsTable = ContactsGroupsTable(&contactDb);

M module-db/tests/ContactsAddressTable_tests.cpp => module-db/tests/ContactsAddressTable_tests.cpp +2 -2

@@ 12,10 12,10 @@ TEST_CASE("Contacts address Table tests")
 {
     Database::initialize();
 
-    const auto callogPath = (purefs::dir::getUserDiskPath() / "contacts.db").c_str();
+    const auto callogPath = purefs::dir::getUserDiskPath() / "contacts.db";
     std::filesystem::remove(callogPath);
 
-    ContactsDB contactsdb{callogPath};
+    ContactsDB contactsdb{callogPath.c_str()};
     REQUIRE(contactsdb.isInitialized());
 
     ContactsAddressTableRow testRow1 = {{.ID = DB_ID_NONE},

M module-db/tests/ContactsNameTable_tests.cpp => module-db/tests/ContactsNameTable_tests.cpp +3 -3

@@ 18,10 18,10 @@ TEST_CASE("Contacts Name Table tests")
 {
     Database::initialize();
 
-    const auto contactsPath = (purefs::dir::getUserDiskPath() / "contacts.db").c_str();
-    std::remove(contactsPath);
+    const auto contactsPath = purefs::dir::getUserDiskPath() / "contacts.db";
+    std::filesystem::remove(contactsPath);
 
-    ContactsDB contactsdb(contactsPath);
+    ContactsDB contactsdb(contactsPath.c_str());
     REQUIRE(contactsdb.isInitialized());
 
     ContactsNameTableRow testRow1 = {

M module-db/tests/ContactsNumberTable_tests.cpp => module-db/tests/ContactsNumberTable_tests.cpp +2 -2

@@ 20,10 20,10 @@ TEST_CASE("Contacts Number Table tests")
 {
     Database::initialize();
 
-    const auto contactsPath = (purefs::dir::getUserDiskPath() / "contacts.db").c_str();
+    const auto contactsPath = purefs::dir::getUserDiskPath() / "contacts.db";
     std::filesystem::remove(contactsPath);
 
-    ContactsDB contactsdb{contactsPath};
+    ContactsDB contactsdb{contactsPath.c_str()};
     REQUIRE(contactsdb.isInitialized());
 
     ContactsNumberTableRow testRow1 = {

M module-db/tests/ContactsRecord_tests.cpp => module-db/tests/ContactsRecord_tests.cpp +14 -14

@@ 12,11 12,11 @@ TEST_CASE("Contact Record db tests")
 {
     Database::initialize();
 
-    const auto contactsPath = (purefs::dir::getUserDiskPath() / "contacts.db").c_str();
+    const auto contactsPath = purefs::dir::getUserDiskPath() / "contacts.db";
     std::filesystem::remove(contactsPath);
 
-    auto contactDB = std::make_unique<ContactsDB>(contactsPath);
-    REQUIRE(contactDB->isInitialized());
+    ContactsDB contactDB(contactsPath.c_str());
+    REQUIRE(contactDB.isInitialized());
 
     const char *primaryNameTest                   = "PrimaryNameTest";
     const char *alternativeNameTest               = "AlternativeNameTest";


@@ 29,7 29,7 @@ TEST_CASE("Contact Record db tests")
     const char *speeddialTest                     = "100";
     const ContactNumberType contactNumberTypeTest = ContactNumberType ::PAGER;
 
-    ContactRecordInterface contRecInterface(contactDB.get());
+    ContactRecordInterface contRecInterface(&contactDB);
 
     ContactRecord recordIN;
 


@@ 261,13 261,13 @@ TEST_CASE("Test converting contact data to string")
 TEST_CASE("Contact record numbers update")
 {
     Database::initialize();
-    const auto contactsPath = (purefs::dir::getUserDiskPath() / "contacts.db").c_str();
+    const auto contactsPath = purefs::dir::getUserDiskPath() / "contacts.db";
     std::filesystem::remove(contactsPath);
 
-    auto contactDB = std::make_unique<ContactsDB>(contactsPath);
-    REQUIRE(contactDB->isInitialized());
+    ContactsDB contactDB(contactsPath.c_str());
+    REQUIRE(contactDB.isInitialized());
 
-    auto records = ContactRecordInterface(contactDB.get());
+    auto records = ContactRecordInterface(&contactDB);
 
     ContactRecord testRecord, otherRecord;
     std::array<std::string, 4> numbers = {{{"600100100"}, {"600100200"}, {"600100300"}, {"600100400"}}};


@@ 289,7 289,7 @@ TEST_CASE("Contact record numbers update")
         auto newRecord = records.GetByID(1);
         REQUIRE(newRecord.numbers.size() == 2);
         REQUIRE(records.Update(newRecord));
-        REQUIRE(contactDB->number.count() == 4);
+        REQUIRE(contactDB.number.count() == 4);
 
         auto validatationRecord = records.GetByID(1);
         REQUIRE(validatationRecord.numbers.size() == 2);


@@ 310,7 310,7 @@ TEST_CASE("Contact record numbers update")
         newRecord.numbers = std::vector<ContactRecord::Number>({ContactRecord::Number(numbers[1], std::string(""))});
         REQUIRE(records.Update(newRecord));
 
-        REQUIRE(contactDB->number.count() == 3);
+        REQUIRE(contactDB.number.count() == 3);
 
         auto validatationRecord = records.GetByID(1);
         REQUIRE(validatationRecord.numbers.size() == 1);


@@ 324,7 324,7 @@ TEST_CASE("Contact record numbers update")
         newRecord.numbers = std::vector<ContactRecord::Number>(
             {ContactRecord::Number(numbers[0], std::string("")), ContactRecord::Number(numbers[1], std::string(""))});
         REQUIRE(records.Update(newRecord));
-        REQUIRE(contactDB->number.count() == 4);
+        REQUIRE(contactDB.number.count() == 4);
 
         validatationRecord = records.GetByID(1);
         REQUIRE(validatationRecord.numbers.size() == 2);


@@ 349,7 349,7 @@ TEST_CASE("Contact record numbers update")
         REQUIRE(records.Update(newRecord));
 
         auto validatationRecord = records.GetByID(1);
-        REQUIRE(contactDB->number.count() == 4);
+        REQUIRE(contactDB.number.count() == 4);
         REQUIRE(validatationRecord.numbers.size() == 2);
         REQUIRE(validatationRecord.numbers[0].number.getEntered() == numbers[1]);
         REQUIRE(validatationRecord.numbers[1].number.getEntered() == numbers[0]);


@@ 363,7 363,7 @@ TEST_CASE("Contact record numbers update")
         newRecord.numbers = std::vector<ContactRecord::Number>(
             {ContactRecord::Number(numbers[2], std::string("")), ContactRecord::Number(numbers[1], std::string(""))});
         REQUIRE(records.Update(newRecord));
-        REQUIRE(contactDB->number.count() == 3);
+        REQUIRE(contactDB.number.count() == 3);
 
         auto validatationRecord = records.GetByID(1);
         REQUIRE(validatationRecord.numbers.size() == 2);


@@ 383,7 383,7 @@ TEST_CASE("Contact record numbers update")
         newRecord.numbers = std::vector<ContactRecord::Number>(
             {ContactRecord::Number(numbers[2], std::string("")), ContactRecord::Number(numbers[3], std::string(""))});
         REQUIRE(records.Update(newRecord));
-        REQUIRE(contactDB->number.count() == 2);
+        REQUIRE(contactDB.number.count() == 2);
 
         auto validatationRecord = records.GetByID(1);
         REQUIRE(validatationRecord.numbers.size() == 2);

M module-db/tests/ContactsRingtonesTable_tests.cpp => module-db/tests/ContactsRingtonesTable_tests.cpp +2 -2

@@ 20,10 20,10 @@ TEST_CASE("Contacts Ringtones Table tests")
 {
     Database::initialize();
 
-    const auto contactsPath = (purefs::dir::getUserDiskPath() / "contacts.db").c_str();
+    const auto contactsPath = purefs::dir::getUserDiskPath() / "contacts.db";
     std::filesystem::remove(contactsPath);
 
-    ContactsDB contactsdb{contactsPath};
+    ContactsDB contactsdb{contactsPath.c_str()};
     REQUIRE(contactsdb.isInitialized());
 
     ContactsRingtonesTableRow testRow1(DB_ID_NONE, DB_ID_NONE, "/test/assets/path/ringtone.wr");

M module-db/tests/ContactsTable_tests.cpp => module-db/tests/ContactsTable_tests.cpp +2 -2

@@ 14,10 14,10 @@ TEST_CASE("Contacts Table tests")
 {
     Database::initialize();
 
-    const auto contactsPath = (purefs::dir::getUserDiskPath() / "contacts.db").c_str();
+    const auto contactsPath = purefs::dir::getUserDiskPath() / "contacts.db";
     std::filesystem::remove(contactsPath);
 
-    ContactsDB contactsdb{contactsPath};
+    ContactsDB contactsdb{contactsPath.c_str()};
     REQUIRE(contactsdb.isInitialized());
 
     ContactsTableRow testRow1 = {{.ID = DB_ID_NONE},

M module-db/tests/EventsRecord_tests.cpp => module-db/tests/EventsRecord_tests.cpp +2 -2

@@ 41,10 41,10 @@ TEST_CASE("Events Record tests")
 {
     Database::initialize();
 
-    const auto eventsPath = (purefs::dir::getUserDiskPath() / "events.db").c_str();
+    const auto eventsPath = purefs::dir::getUserDiskPath() / "events.db";
     std::filesystem::remove(eventsPath);
 
-    EventsDB eventsDb{eventsPath};
+    EventsDB eventsDb{eventsPath.c_str()};
 
     REQUIRE(eventsDb.isInitialized());

M module-db/tests/EventsTable_tests.cpp => module-db/tests/EventsTable_tests.cpp +2 -2

@@ 33,10 33,10 @@ TEST_CASE("Events Table tests")
 
     Database::initialize();
 
-    const auto eventsPath = (purefs::dir::getUserDiskPath() / "events.db").c_str();
+    const auto eventsPath = purefs::dir::getUserDiskPath() / "events.db";
     // std::filesystem::remove(eventsPath);
 
-    EventsDB eventsDb{eventsPath};
+    EventsDB eventsDb{eventsPath.c_str()};
     REQUIRE(eventsDb.isInitialized());
 
     auto &eventsTbl = eventsDb.events;

M module-db/tests/NotesRecord_tests.cpp => module-db/tests/NotesRecord_tests.cpp +4 -3

@@ 17,10 17,11 @@ TEST_CASE("Notes Record tests")
 {
     Database::initialize();
 
-    auto notesDb = std::make_unique<NotesDB>((purefs::dir::getUserDiskPath() / "notes.db").c_str());
-    REQUIRE(notesDb->isInitialized());
+    const auto notesDbPath = purefs::dir::getUserDiskPath() / "notes.db";
+    NotesDB notesDb{notesDbPath.c_str()};
+    REQUIRE(notesDb.isInitialized());
 
-    NotesRecordInterface notesRecordInterface{notesDb.get()};
+    NotesRecordInterface notesRecordInterface{&notesDb};
     notesRecordInterface.RemoveAll(); // Empty the notes database.
 
     constexpr auto testSnippet = "TEST SNIPPET";

M module-db/tests/NotesTable_tests.cpp => module-db/tests/NotesTable_tests.cpp +4 -3

@@ 12,10 12,11 @@ TEST_CASE("Notes Table tests")
 {
     Database::initialize();
 
-    auto notesDb = std::make_unique<NotesDB>((purefs::dir::getUserDiskPath() / "notes.db").c_str());
-    REQUIRE(notesDb->isInitialized());
+    const auto notesDbPath = purefs::dir::getUserDiskPath() / "notes.db";
+    NotesDB notesDb{notesDbPath.c_str()};
+    REQUIRE(notesDb.isInitialized());
 
-    NotesTable table{notesDb.get()};
+    NotesTable table{&notesDb};
     table.removeAll();
     REQUIRE(table.count() == 0);

M module-db/tests/NotificationsRecord_tests.cpp => module-db/tests/NotificationsRecord_tests.cpp +2 -2

@@ 25,10 25,10 @@ TEST_CASE("Notifications Record tests")
 {
     Database::initialize();
 
-    const auto notificationsPath = (purefs::dir::getUserDiskPath() / "notifications.db").c_str();
+    const auto notificationsPath = purefs::dir::getUserDiskPath() / "notifications.db";
     std::filesystem::remove(notificationsPath);
 
-    NotificationsDB notificationsDb{notificationsPath};
+    NotificationsDB notificationsDb{notificationsPath.c_str()};
 
     REQUIRE(notificationsDb.isInitialized());

M module-db/tests/NotificationsTable_tests.cpp => module-db/tests/NotificationsTable_tests.cpp +2 -2

@@ 20,10 20,10 @@ TEST_CASE("Notifications Table tests")
 {
     Database::initialize();
 
-    const auto notificationsPath = (purefs::dir::getUserDiskPath() / "notifications.db").c_str();
+    const auto notificationsPath = purefs::dir::getUserDiskPath() / "notifications.db";
     std::filesystem::remove(notificationsPath);
 
-    NotificationsDB notificationsDb{notificationsPath};
+    NotificationsDB notificationsDb{notificationsPath.c_str()};
     REQUIRE(notificationsDb.isInitialized());
 
     auto &notificationsTbl = notificationsDb.notifications;

M module-db/tests/SMSRecord_tests.cpp => module-db/tests/SMSRecord_tests.cpp +8 -8

@@ 32,13 32,13 @@ TEST_CASE("SMS Record tests")
 {
     Database::initialize();
 
-    const auto contactsPath = (purefs::dir::getUserDiskPath() / "contacts.db").c_str();
-    const auto smsPath      = (purefs::dir::getUserDiskPath() / "sms.db").c_str();
+    const auto contactsPath = purefs::dir::getUserDiskPath() / "contacts.db";
+    const auto smsPath      = purefs::dir::getUserDiskPath() / "sms.db";
     std::filesystem::remove(contactsPath);
     std::filesystem::remove(smsPath);
 
-    auto contactsDB = std::make_unique<ContactsDB>(contactsPath);
-    auto smsDB      = std::make_unique<SmsDB>(smsPath);
+    ContactsDB contactsDB(contactsPath.c_str());
+    SmsDB smsDB(smsPath.c_str());
 
     const uint32_t dateTest      = 123456789;
     const uint32_t dateSentTest  = 987654321;


@@ 49,7 49,7 @@ TEST_CASE("SMS Record tests")
     const char *bodyTest2        = "Test SMS Body2";
     const SMSType typeTest       = SMSType ::DRAFT;
 
-    SMSRecordInterface smsRecInterface(smsDB.get(), contactsDB.get());
+    SMSRecordInterface smsRecInterface(&smsDB, &contactsDB);
 
     SMSRecord recordIN;
     recordIN.date      = dateTest;


@@ 160,7 160,7 @@ TEST_CASE("SMS Record tests")
         }
 
         // Remove sms records in order to check automatic management of threads and contact databases
-        ThreadRecordInterface threadRecordInterface(smsDB.get(), contactsDB.get());
+        ThreadRecordInterface threadRecordInterface(&smsDB, &contactsDB);
         REQUIRE(smsRecInterface.RemoveByID(1));
         records = smsRecInterface.GetLimitOffsetByField(0, 100, SMSRecordField::ContactID, "1");
         REQUIRE((*records).size() == 1);


@@ 178,7 178,7 @@ TEST_CASE("SMS Record tests")
 
         // Test removing a message which belongs to non-existent thread
         REQUIRE(smsRecInterface.Add(recordIN));
-        REQUIRE(smsDB->threads.removeById(1)); // stealthy thread remove
+        REQUIRE(smsDB.threads.removeById(1)); // stealthy thread remove
         REQUIRE(smsRecInterface.RemoveByID(1));
 
         // Test handling of missmatch in sms vs. thread tables


@@ 199,7 199,7 @@ TEST_CASE("SMS Record tests")
                                   .snippet        = threadRec.snippet,
                                   .type           = threadRec.type};
         threadRaw.msgCount = trueCount + 1; // break the DB
-        REQUIRE(smsDB->threads.update(threadRaw));
+        REQUIRE(smsDB.threads.update(threadRaw));
 
         REQUIRE(static_cast<int>(
                     smsRecInterface.GetLimitOffsetByField(0, 100, SMSRecordField::ThreadID, "1")->size()) == trueCount);

M module-db/tests/SMSTable_tests.cpp => module-db/tests/SMSTable_tests.cpp +2 -2

@@ 17,10 17,10 @@ TEST_CASE("SMS Table tests")
 {
     Database::initialize();
 
-    const auto smsPath = (purefs::dir::getUserDiskPath() / "sms.db").c_str();
+    const auto smsPath = purefs::dir::getUserDiskPath() / "sms.db";
     std::filesystem::remove(smsPath);
 
-    SmsDB smsdb(smsPath);
+    SmsDB smsdb(smsPath.c_str());
     REQUIRE(smsdb.isInitialized());
 
     SMSTableRow testRow1 = {{.ID = 0},

M module-db/tests/SMSTemplateRecord_tests.cpp => module-db/tests/SMSTemplateRecord_tests.cpp +4 -4

@@ 21,13 21,13 @@ TEST_CASE("SMS templates Record tests")
 {
     Database::initialize();
 
-    const auto smsPath = (purefs::dir::getUserDiskPath() / "sms.db").c_str();
+    const auto smsPath = purefs::dir::getUserDiskPath() / "sms.db";
     std::filesystem::remove(smsPath);
 
-    auto smsDB = std::make_unique<SmsDB>(smsPath);
-    REQUIRE(smsDB->isInitialized());
+    SmsDB smsDB(smsPath.c_str());
+    REQUIRE(smsDB.isInitialized());
 
-    SMSTemplateRecordInterface SMSTemplateRecordInterface(smsDB.get());
+    SMSTemplateRecordInterface SMSTemplateRecordInterface(&smsDB);
     SMSTemplateRecord testRec;
     testRec.text               = "Test text";
     testRec.lastUsageTimestamp = 100;

M module-db/tests/SMSTemplateTable_tests.cpp => module-db/tests/SMSTemplateTable_tests.cpp +2 -2

@@ 21,10 21,10 @@ TEST_CASE("SMS Templates Table tests")
 {
     Database::initialize();
 
-    const auto smsPath = (purefs::dir::getUserDiskPath() / "sms.db").c_str();
+    const auto smsPath = purefs::dir::getUserDiskPath() / "sms.db";
     std::filesystem::remove(smsPath);
 
-    SmsDB smsDb{smsPath};
+    SmsDB smsDb{smsPath.c_str()};
     REQUIRE(smsDb.isInitialized());
 
     auto &templatesTbl = smsDb.templates;

M module-db/tests/ThreadRecord_tests.cpp => module-db/tests/ThreadRecord_tests.cpp +8 -8

@@ 30,15 30,15 @@ TEST_CASE("Thread Record tests")
 {
     Database::initialize();
 
-    const auto contactsPath = (purefs::dir::getUserDiskPath() / "contacts.db").c_str();
-    const auto smsPath      = (purefs::dir::getUserDiskPath() / "sms.db").c_str();
+    const auto contactsPath = purefs::dir::getUserDiskPath() / "contacts.db";
+    const auto smsPath      = purefs::dir::getUserDiskPath() / "sms.db";
     std::filesystem::remove(contactsPath);
     std::filesystem::remove(smsPath);
 
-    auto smsDB = std::make_unique<SmsDB>(smsPath);
-    REQUIRE(smsDB->isInitialized());
-    auto contactsDB = std::make_unique<ContactsDB>(contactsPath);
-    REQUIRE(contactsDB->isInitialized());
+    SmsDB smsDB(smsPath.c_str());
+    REQUIRE(smsDB.isInitialized());
+    ContactsDB contactsDB(contactsPath.c_str());
+    REQUIRE(contactsDB.isInitialized());
 
     const uint32_t dateTest      = 123456789;
     const char *snippetTest      = "Test snippet";


@@ 46,7 46,7 @@ TEST_CASE("Thread Record tests")
     const SMSType typeTest       = SMSType ::UNKNOWN;
     const uint32_t contactIDTest = 100;
 
-    ThreadRecordInterface threadRecordInterface1(smsDB.get(), contactsDB.get());
+    ThreadRecordInterface threadRecordInterface1(&smsDB, &contactsDB);
 
     ThreadRecord recordIN;
     recordIN.date      = dateTest;


@@ 208,7 208,7 @@ TEST_CASE("Thread Record tests")
         const utils::PhoneNumber phoneNumber("+48600123456", utils::country::Id::UNKNOWN);
         const std::string lastSmsBody = "Ola";
 
-        SMSRecordInterface smsRecInterface(smsDB.get(), contactsDB.get());
+        SMSRecordInterface smsRecInterface(&smsDB, &contactsDB);
         SMSRecord recordIN;
         recordIN.date      = 123456789;
         recordIN.dateSent  = 987654321;

M module-db/tests/ThreadsTable_tests.cpp => module-db/tests/ThreadsTable_tests.cpp +2 -2

@@ 21,10 21,10 @@ TEST_CASE("Threads Table tests")
 {
     Database::initialize();
 
-    const auto smsPath = (purefs::dir::getUserDiskPath() / "sms.db").c_str();
+    const auto smsPath = purefs::dir::getUserDiskPath() / "sms.db";
     std::filesystem::remove(smsPath);
 
-    SmsDB smsdb{smsPath};
+    SmsDB smsdb{smsPath.c_str()};
     REQUIRE(smsdb.isInitialized());
 
     ThreadsTableRow testRow1 = {{.ID = 0},