~aleteoryx/muditaos: [EGD-3649] Fix paths in UT

31 files changed, 72 insertions(+), 58 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/QueryInterface.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-gui/test/test-catch-text/test-gui-Font.cpp
M module-gui/test/test-catch-text/test-gui-Text.cpp
M module-gui/test/test-catch/test-gui.cpp
M module-gui/test/test-google/test-gui-dom-dump.cpp
M module-utils/i18n/i18n.cpp
M module-utils/i18n/i18n.hpp
M module-utils/test/test_i18n.cpp

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

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


@@ 23,7 23,7 @@ TEST_CASE("Alarms Record tests")
 {
     Database::initialize();
 
-    const auto alarmsPath = (std::filesystem::path{"user"} / "alarms.db");
+    const auto alarmsPath = (std::filesystem::path{"sys/user"} / "alarms.db");
     if (std::filesystem::exists(alarmsPath)) {
         REQUIRE(std::filesystem::remove(alarmsPath));
     }

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

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


@@ 18,7 18,7 @@ TEST_CASE("Alarms Table tests")
 {
     Database::initialize();
 
-    const auto alarmsPath = (std::filesystem::path{"user"} / "alarms.db");
+    const auto alarmsPath = (std::filesystem::path{"sys/user"} / "alarms.db");
     if (std::filesystem::exists(alarmsPath)) {
         REQUIRE(std::filesystem::remove(alarmsPath));
     }

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

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


@@ 17,8 17,8 @@ TEST_CASE("Calllog Record tests")
 {
     Database::initialize();
 
-    const auto calllogPath  = (std::filesystem::path{"user"} / "calllog.db");
-    const auto contactsPath = (std::filesystem::path{"user"} / "contacts.db");
+    const auto calllogPath  = (std::filesystem::path{"sys/user"} / "calllog.db");
+    const auto contactsPath = (std::filesystem::path{"sys/user"} / "contacts.db");
     if (std::filesystem::exists(calllogPath)) {
         REQUIRE(std::filesystem::remove(calllogPath));
     }

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

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


@@ 17,7 17,7 @@ TEST_CASE("Calllog Table tests")
 {
     Database::initialize();
 
-    const auto calllogPath = (std::filesystem::path{"user"} / "calllog.db");
+    const auto calllogPath = (std::filesystem::path{"sys/user"} / "calllog.db");
     if (std::filesystem::exists(calllogPath)) {
         REQUIRE(std::filesystem::remove(calllogPath));
     }

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

@@ 26,7 26,7 @@ TEST_CASE("Contact Groups tests")
 {
     INFO("sqlite Init");
     Database::initialize();
-    const auto contactsPath = (std::filesystem::path{"user"} / "contacts.db");
+    const auto contactsPath = (std::filesystem::path{"sys/user"} / "contacts.db");
     if (std::filesystem::exists(contactsPath)) {
         REQUIRE(std::filesystem::remove(contactsPath));
     }

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

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


@@ 10,7 10,7 @@ TEST_CASE("Contacts address Table tests")
 {
     Database::initialize();
 
-    const auto callogPath = (std::filesystem::path{"user"} / "contacts.db");
+    const auto callogPath = (std::filesystem::path{"sys/user"} / "contacts.db");
     if (std::filesystem::exists(callogPath)) {
         REQUIRE(std::filesystem::remove(callogPath));
     }

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

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


@@ 18,7 17,7 @@ TEST_CASE("Contacts Name Table tests")
 {
     Database::initialize();
 
-    const auto contactsPath = (std::filesystem::path{"user"} / "contacts.db");
+    const auto contactsPath = (std::filesystem::path{"sys/user"} / "contacts.db");
     if (std::filesystem::exists(contactsPath)) {
         REQUIRE(std::filesystem::remove(contactsPath));
     }

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

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


@@ 17,7 17,7 @@ TEST_CASE("Contacts Number Table tests")
 {
     Database::initialize();
 
-    const auto contactsPath = (std::filesystem::path{"user"} / "contacts.db");
+    const auto contactsPath = (std::filesystem::path{"sys/user"} / "contacts.db");
     if (std::filesystem::exists(contactsPath)) {
         REQUIRE(std::filesystem::remove(contactsPath));
     }

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

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


@@ 11,7 11,7 @@ TEST_CASE("Contact Record db tests")
 {
     Database::initialize();
 
-    const auto contactsPath = (std::filesystem::path{"user"} / "contacts.db");
+    const auto contactsPath = (std::filesystem::path{"sys/user"} / "contacts.db");
     if (std::filesystem::exists(contactsPath)) {
         REQUIRE(std::filesystem::remove(contactsPath));
     }


@@ 262,7 262,7 @@ TEST_CASE("Test converting contact data to string")
 TEST_CASE("Contact record numbers update")
 {
     Database::initialize();
-    const auto contactsPath = (std::filesystem::path{"user"} / "contacts.db");
+    const auto contactsPath = (std::filesystem::path{"sys/user"} / "contacts.db");
     if (std::filesystem::exists(contactsPath)) {
         REQUIRE(std::filesystem::remove(contactsPath));
     }

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

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


@@ 17,7 17,7 @@ TEST_CASE("Contacts Ringtones Table tests")
 {
     Database::initialize();
 
-    const auto contactsPath = (std::filesystem::path{"user"} / "contacts.db");
+    const auto contactsPath = (std::filesystem::path{"sys/user"} / "contacts.db");
     if (std::filesystem::exists(contactsPath)) {
         REQUIRE(std::filesystem::remove(contactsPath));
     }

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

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


@@ 11,7 11,7 @@ TEST_CASE("Contacts Table tests")
 {
     Database::initialize();
 
-    const auto contactsPath = (std::filesystem::path{"user"} / "contacts.db");
+    const auto contactsPath = (std::filesystem::path{"sys/user"} / "contacts.db");
     if (std::filesystem::exists(contactsPath)) {
         REQUIRE(std::filesystem::remove(contactsPath));
     }

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

@@ 39,7 39,7 @@ TEST_CASE("Events Record tests")
 {
     Database::initialize();
 
-    const auto eventsPath = (std::filesystem::path{"user"} / "events.db");
+    const auto eventsPath = (std::filesystem::path{"sys/user"} / "events.db");
     if (std::filesystem::exists(eventsPath)) {
         REQUIRE(std::filesystem::remove(eventsPath));
     }

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

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


@@ 32,7 32,7 @@ TEST_CASE("Events Table tests")
 {
     Database::initialize();
 
-    const auto eventsPath = (std::filesystem::path{"user"} / "events.db");
+    const auto eventsPath = (std::filesystem::path{"sys/user"} / "events.db");
     if (std::filesystem::exists(eventsPath)) {
         REQUIRE(std::filesystem::remove(eventsPath));
     }

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

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


@@ 17,7 17,7 @@ TEST_CASE("Notes Record tests")
 {
     Database::initialize();
 
-    const auto notesDbPath = std::filesystem::path{"user"} / "notes.db";
+    const auto notesDbPath = std::filesystem::path{"sys/user"} / "notes.db";
     NotesDB notesDb{notesDbPath.c_str()};
     REQUIRE(notesDb.isInitialized());

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

@@ 12,7 12,7 @@ TEST_CASE("Notes Table tests")
 {
     Database::initialize();
 
-    const auto notesDbPath = std::filesystem::path{"user"} / "notes.db";
+    const auto notesDbPath = std::filesystem::path{"sys/user"} / "notes.db";
     NotesDB notesDb{notesDbPath.c_str()};
     REQUIRE(notesDb.isInitialized());

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

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


@@ 23,7 23,7 @@ TEST_CASE("Notifications Record tests")
 {
     Database::initialize();
 
-    const auto notificationsPath = (std::filesystem::path{"user"} / "notifications.db");
+    const auto notificationsPath = (std::filesystem::path{"sys/user"} / "notifications.db");
     if (std::filesystem::exists(notificationsPath)) {
         REQUIRE(std::filesystem::remove(notificationsPath));
     }

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

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


@@ 18,7 18,7 @@ TEST_CASE("Notifications Table tests")
 {
     Database::initialize();
 
-    const auto notificationsPath = (std::filesystem::path{"user"} / "notifications.db");
+    const auto notificationsPath = (std::filesystem::path{"sys/user"} / "notifications.db");
     if (std::filesystem::exists(notificationsPath)) {
         REQUIRE(std::filesystem::remove(notificationsPath));
     }

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

@@ 39,8 39,8 @@ TEST_CASE("Query interface")
 {
     Database::initialize();
 
-    auto contactsDB      = std::make_unique<ContactsDB>((std::filesystem::path{"user"} / "contacts.db").c_str());
-    auto smsDB           = std::make_unique<SmsDB>((std::filesystem::path{"user"} / "sms.db").c_str());
+    auto contactsDB      = std::make_unique<ContactsDB>((std::filesystem::path{"sys/user"} / "contacts.db").c_str());
+    auto smsDB           = std::make_unique<SmsDB>((std::filesystem::path{"sys/user"} / "sms.db").c_str());
     auto smsInterface    = std::make_unique<SMSRecordInterface>(smsDB.get(), contactsDB.get());
     auto threadInterface = std::make_unique<ThreadRecordInterface>(smsDB.get(), contactsDB.get());

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

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


@@ 30,8 30,8 @@ TEST_CASE("SMS Record tests")
 {
     Database::initialize();
 
-    const auto contactsPath = (std::filesystem::path{"user"} / "contacts.db");
-    const auto smsPath      = (std::filesystem::path{"user"} / "sms.db");
+    const auto contactsPath = (std::filesystem::path{"sys/user"} / "contacts.db");
+    const auto smsPath      = (std::filesystem::path{"sys/user"} / "sms.db");
     if (std::filesystem::exists(contactsPath)) {
         REQUIRE(std::filesystem::remove(contactsPath));
     }

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

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


@@ 15,7 15,7 @@ TEST_CASE("SMS Table tests")
 {
     Database::initialize();
 
-    const auto smsPath = (std::filesystem::path{"user"} / "sms.db");
+    const auto smsPath = (std::filesystem::path{"sys/user"} / "sms.db");
 
     if (std::filesystem::exists(smsPath)) {
         REQUIRE(std::filesystem::remove(smsPath));

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

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


@@ 18,7 18,7 @@ TEST_CASE("SMS templates Record tests")
 {
     Database::initialize();
 
-    const auto smsPath = (std::filesystem::path{"user"} / "sms.db");
+    const auto smsPath = (std::filesystem::path{"sys/user"} / "sms.db");
     if (std::filesystem::exists(smsPath)) {
         REQUIRE(std::filesystem::remove(smsPath));
     }

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

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


@@ 19,7 19,7 @@ TEST_CASE("SMS Templates Table tests")
 {
     Database::initialize();
 
-    const auto smsPath = (std::filesystem::path{"user"} / "sms.db");
+    const auto smsPath = (std::filesystem::path{"sys/user"} / "sms.db");
     if (std::filesystem::exists(smsPath)) {
         REQUIRE(std::filesystem::remove(smsPath));
     }

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

@@ 28,8 28,8 @@ TEST_CASE("Thread Record tests")
 {
     Database::initialize();
 
-    const auto contactsPath = (std::filesystem::path{"user"} / "contacts.db");
-    const auto smsPath      = (std::filesystem::path{"user"} / "sms.db");
+    const auto contactsPath = (std::filesystem::path{"sys/user"} / "contacts.db");
+    const auto smsPath      = (std::filesystem::path{"sys/user"} / "sms.db");
     if (std::filesystem::exists(contactsPath)) {
         REQUIRE(std::filesystem::remove(contactsPath));
     }

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

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


@@ 18,7 18,7 @@ TEST_CASE("Threads Table tests")
 {
     Database::initialize();
 
-    const auto smsPath = (std::filesystem::path{"user"} / "sms.db");
+    const auto smsPath = (std::filesystem::path{"sys/user"} / "sms.db");
     if (std::filesystem::exists(smsPath)) {
         REQUIRE(std::filesystem::remove(smsPath));
     }

M module-gui/test/test-catch-text/test-gui-Font.cpp => module-gui/test/test-catch-text/test-gui-Font.cpp +2 -2

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


@@ 10,7 10,7 @@ TEST_CASE("Testo Font")
 {
     using namespace gui;
     auto &fm = FontManager::getInstance();
-    fm.init("assets");
+    fm.init("sys/current/assets");
 
     SECTION("medium font")
     {

M module-gui/test/test-catch-text/test-gui-Text.cpp => module-gui/test/test-catch-text/test-gui-Text.cpp +1 -1

@@ 984,7 984,7 @@ TEST_CASE("Text addition bounds - multiple limits tests")
     std::string testStringTwoLines = "Test String 1\nTest String 2";
 
     std::string richTextTwoLines =
-        "<text font='gt_pressura' color='12' size='30'>Test </text><text size='25'>String </text><text size='20' "
+        "<text font='gt_pressura' color='12' size='30'>Test </text><text size='20'>String </text><text size='27' "
         "weight='bold'>1</text><br></br><text>Test String 2</text>";
 
     SECTION("Adding text to lower limit set to signs count and size and lines on higher limit")

M module-gui/test/test-catch/test-gui.cpp => module-gui/test/test-catch/test-gui.cpp +2 -2

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 /// These are random tests what could be salvaged from old tests


@@ 55,7 55,7 @@ TEST_CASE("Are fonts loaded")
     // this is because no fonts are loaded
     REQUIRE(fontmanager.getFont(0) == nullptr);
     // now initialize, from where is it taken? nobody knows from this foo
-    fontmanager.init("assets");
+    fontmanager.init("sys/current/assets");
     // check if there is at least default font
     REQUIRE(fontmanager.getFont(0) != nullptr);
 }

M module-gui/test/test-google/test-gui-dom-dump.cpp => module-gui/test/test-google/test-gui-dom-dump.cpp +2 -2

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "gtest/gtest.h"


@@ 21,7 21,7 @@ class Item2JsonSerializerTester : public ::testing::Test
     Item2JsonSerializerTester()
     {
         auto &fm = gui::FontManager::getInstance();
-        fm.init("assets");
+        fm.init("sys/current/assets");
 
         root.addWidget(new gui::Text(nullptr, 0, 0, 0, 0, testTextValue1));
         root.addWidget(new gui::Label(nullptr, 0, 0, 0, 0, testTextValue2));

M module-utils/i18n/i18n.cpp => module-utils/i18n/i18n.cpp +6 -0

@@ 66,6 66,12 @@ namespace utils
         return languageNames;
     }
 
+    void i18n::resetAssetsPath(const std::filesystem::path &assets)
+    {
+        DisplayLanguageDirPath = assets / "lang";
+        InputLanguageDirPath   = assets / "profiles";
+    }
+
     void i18n::setInputLanguage(const Language &lang)
     {
         if (lang.empty() || lang == inputLanguage) {

M module-utils/i18n/i18n.hpp => module-utils/i18n/i18n.hpp +3 -2

@@ 44,8 44,9 @@ namespace utils
 
       public:
         static constexpr auto DefaultLanguage              = "English";
-        const std::filesystem::path DisplayLanguageDirPath = "assets/lang";
-        const std::filesystem::path InputLanguageDirPath   = "assets/profiles";
+        std::filesystem::path DisplayLanguageDirPath       = "assets/lang";
+        std::filesystem::path InputLanguageDirPath         = "assets/profiles";
+        void resetAssetsPath(const std::filesystem::path &);
 
         virtual ~i18n() = default;
         void setInputLanguage(const Language &lang);

M module-utils/test/test_i18n.cpp => module-utils/test/test_i18n.cpp +8 -0

@@ 11,6 11,7 @@ using namespace std;
 
 TEST_CASE("Test set display language - empty display language string")
 {
+    utils::localize.resetAssetsPath("sys/current/assets");
     utils::localize.resetDisplayLanguages();
     REQUIRE(utils::localize.getDisplayLanguage() == "");
 


@@ 21,6 22,7 @@ TEST_CASE("Test set display language - empty display language string")
 
 TEST_CASE("Test set display language - invalid display language string")
 {
+    utils::localize.resetAssetsPath("sys/current/assets");
     utils::localize.resetDisplayLanguages();
     REQUIRE(utils::localize.getDisplayLanguage() == "");
 


@@ 31,6 33,7 @@ TEST_CASE("Test set display language - invalid display language string")
 
 TEST_CASE("Test set display language - double invalid display language string")
 {
+    utils::localize.resetAssetsPath("sys/current/assets");
     utils::localize.resetDisplayLanguages();
     REQUIRE(utils::localize.getDisplayLanguage() == "");
 


@@ 47,6 50,7 @@ TEST_CASE("Test set display language - set display language with valid string")
 {
     static constexpr auto languageToChange = "Polski";
 
+    utils::localize.resetAssetsPath("sys/current/assets");
     utils::localize.resetDisplayLanguages();
     REQUIRE(utils::localize.getDisplayLanguage() == "");
 


@@ 59,6 63,7 @@ TEST_CASE("Test set display language - set display language with valid string an
 {
     static constexpr auto languageToChange = "Polski";
 
+    utils::localize.resetAssetsPath("sys/current/assets");
     utils::localize.resetDisplayLanguages();
     REQUIRE(utils::localize.getDisplayLanguage() == "");
 


@@ 73,6 78,7 @@ TEST_CASE("Test set display language - set display language with valid string an
 
 TEST_CASE("Test get string method - no display language set")
 {
+    utils::localize.resetAssetsPath("sys/current/assets");
     utils::localize.resetDisplayLanguages();
     REQUIRE(utils::localize.getDisplayLanguage() == "");
 


@@ 82,6 88,7 @@ TEST_CASE("Test get string method - no display language set")
 
 TEST_CASE("Test get string method - invalid display language set")
 {
+    utils::localize.resetAssetsPath("sys/current/assets");
     utils::localize.resetDisplayLanguages();
     REQUIRE(utils::localize.getDisplayLanguage() == "");
 


@@ 97,6 104,7 @@ TEST_CASE("Test get string method - valid display language set")
 {
     static constexpr auto languageToChange = "Polski";
 
+    utils::localize.resetAssetsPath("sys/current/assets");
     utils::localize.resetDisplayLanguages();
     REQUIRE(utils::localize.getDisplayLanguage() == "");