~aleteoryx/muditaos

5ad8a9bc65fe9739a0b09eafff73961eb79faf01 — Jakub Pyszczak 5 years ago 9dea864 
[EGD-5145] Fix remove vfs include from UT

Deprecated vfs is no more accessible. Deleted old includes.
patch browse .tar.gz 
29 files changed, 4 insertions(+), 42 deletions(-)

M module-apps/application-calculator/tests/CalculatorUtility_tests.cpp
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/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/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/unittest.cpp
M module-gui/test/test-catch/test-gui.cpp
M module-services/service-db/test/main.cpp
M module-services/service-db/test/test-service-db-settings-api.cpp
M module-services/service-desktop/tests/unittest.cpp
M module-utils/test/test_time_conversion.cpp
M module-utils/test/unittest_duration.cpp
M module-utils/test/unittest_utils.cpp

M module-apps/application-calculator/tests/CalculatorUtility_tests.cpp => module-apps/application-calculator/tests/CalculatorUtility_tests.cpp +1 -2
@@ 1,4 1,4 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md

#define CATCH_CONFIG_MAIN


@@ 6,7 6,6 @@
#include "application-calculator/data/CalculatorUtility.hpp"
#include <i18n/i18n.hpp>
#include <cstring>
#include <vfs.hpp>


TEST_CASE("Calculator utilities")


M module-db/tests/AlarmsRecord_tests.cpp => module-db/tests/AlarmsRecord_tests.cpp +0 -2
@@ 1,8 1,6 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md

#include "vfs.hpp"

#include <catch2/catch.hpp>

#include "Database/Database.hpp"


M module-db/tests/AlarmsTable_tests.cpp => module-db/tests/AlarmsTable_tests.cpp +0 -1
@@ 1,7 1,6 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md

#include <vfs.hpp>
#include <filesystem>

#include <catch2/catch.hpp>


M module-db/tests/CalllogRecord_tests.cpp => module-db/tests/CalllogRecord_tests.cpp +0 -1
@@ 7,7 7,6 @@
#include "Database/Database.hpp"
#include "Databases/CalllogDB.hpp"

#include <vfs.hpp>

#include <stdint.h>
#include <stdio.h>


M module-db/tests/CalllogTable_tests.cpp => module-db/tests/CalllogTable_tests.cpp +0 -1
@@ 8,7 8,6 @@

#include "Tables/CalllogTable.hpp"

#include <vfs.hpp>
#include <stdint.h>
#include <string>
#include <algorithm>


M module-db/tests/ContactGroups_tests.cpp => module-db/tests/ContactGroups_tests.cpp +0 -1
@@ 7,7 7,6 @@
#include <Tables/ContactsTable.hpp>
#include <Tables/ContactsGroups.hpp>

#include <vfs.hpp>
#include <filesystem>

#include <iomanip>


M module-db/tests/ContactsAddressTable_tests.cpp => module-db/tests/ContactsAddressTable_tests.cpp +0 -1
@@ 4,7 4,6 @@
#include <catch2/catch.hpp>

#include "Databases/ContactsDB.hpp"
#include <vfs.hpp>
#include <filesystem>
#include <purefs/filesystem_paths.hpp>



M module-db/tests/ContactsNumberTable_tests.cpp => module-db/tests/ContactsNumberTable_tests.cpp +0 -2
@@ 1,8 1,6 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md

#include <vfs.hpp>

#include <catch2/catch.hpp>
#include <filesystem>



M module-db/tests/ContactsRecord_tests.cpp => module-db/tests/ContactsRecord_tests.cpp +0 -1
@@ 5,7 5,6 @@

#include "Interface/ContactRecord.hpp"
#include <i18n/i18n.hpp>
#include "vfs.hpp"
#include <purefs/filesystem_paths.hpp>

TEST_CASE("Contact Record db tests")


M module-db/tests/ContactsRingtonesTable_tests.cpp => module-db/tests/ContactsRingtonesTable_tests.cpp +0 -2
@@ 1,8 1,6 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md

#include <vfs.hpp>

#include <catch2/catch.hpp>

#include "Database/Database.hpp"


M module-db/tests/ContactsTable_tests.cpp => module-db/tests/ContactsTable_tests.cpp +0 -1
@@ 7,7 7,6 @@
#include "Databases/ContactsDB.hpp"
#include "Tables/ContactsTable.hpp"

#include <vfs.hpp>
#include <purefs/filesystem_paths.hpp>

TEST_CASE("Contacts Table tests")


M module-db/tests/EventsRecord_tests.cpp => module-db/tests/EventsRecord_tests.cpp +0 -1
@@ 17,7 17,6 @@
#include "module-db/queries/calendar/QueryEventsEditICS.hpp"
#include "module-db/queries/calendar/QueryEventsSelectFirstUpcoming.hpp"

#include <vfs.hpp>
#include <purefs/filesystem_paths.hpp>

#include <stdint.h>


M module-db/tests/EventsTable_tests.cpp => module-db/tests/EventsTable_tests.cpp +0 -1
@@ 7,7 7,6 @@
#include "Databases/EventsDB.hpp"
#include "Tables/EventsTable.hpp"

#include <vfs.hpp>
#include <stdint.h>
#include <string>
#include <algorithm>


M module-db/tests/NotificationsRecord_tests.cpp => module-db/tests/NotificationsRecord_tests.cpp +0 -1
@@ 11,7 11,6 @@
#include "module-db/queries/notifications/QueryNotificationsClear.hpp"
#include "module-db/queries/notifications/QueryNotificationsGetAll.hpp"

#include <vfs.hpp>
#include <filesystem>

#include <stdint.h>


M module-db/tests/NotificationsTable_tests.cpp => module-db/tests/NotificationsTable_tests.cpp +0 -1
@@ 8,7 8,6 @@

#include "Tables/NotificationsTable.hpp"

#include <vfs.hpp>
#include <stdint.h>
#include <string>
#include <algorithm>


M module-db/tests/SMSRecord_tests.cpp => module-db/tests/SMSRecord_tests.cpp +0 -1
@@ 12,7 12,6 @@

#include <country.hpp>
#include <PhoneNumber.hpp>
#include <vfs.hpp>

#include <algorithm>
#include <filesystem>


M module-db/tests/SMSTable_tests.cpp => module-db/tests/SMSTable_tests.cpp +0 -2
@@ 1,8 1,6 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md

#include <vfs.hpp>

#include <catch2/catch.hpp>

#include "Database/Database.hpp"


M module-db/tests/SMSTemplateRecord_tests.cpp => module-db/tests/SMSTemplateRecord_tests.cpp +0 -1
@@ 7,7 7,6 @@
#include "Database/Database.hpp"
#include "Databases/SmsDB.hpp"

#include <vfs.hpp>
#include <purefs/filesystem_paths.hpp>

#include <algorithm>


M module-db/tests/SMSTemplateTable_tests.cpp => module-db/tests/SMSTemplateTable_tests.cpp +0 -1
@@ 8,7 8,6 @@

#include "Tables/SMSTemplateTable.hpp"

#include <vfs.hpp>
#include <filesystem>
#include <purefs/filesystem_paths.hpp>



M module-db/tests/ThreadRecord_tests.cpp => module-db/tests/ThreadRecord_tests.cpp +0 -1
@@ 17,7 17,6 @@
#include "queries/messages/threads/QueryThreadRemove.hpp"
#include "queries/messages/threads/QueryThreadsGet.hpp"
#include "queries/messages/sms/QuerySMSGetLastByThreadID.hpp"
#include <vfs.hpp>
#include <purefs/filesystem_paths.hpp>

#include <algorithm>


M module-db/tests/ThreadsTable_tests.cpp => module-db/tests/ThreadsTable_tests.cpp +0 -2
@@ 1,8 1,6 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md

#include <vfs.hpp>

#include <catch2/catch.hpp>

#include "Database/Database.hpp"


M module-db/tests/unittest.cpp => module-db/tests/unittest.cpp +1 -3
@@ 1,8 1,6 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md

#include <vfs.hpp>

#include <catch2/catch.hpp>

#include "Database/Database.hpp"


M module-gui/test/test-catch/test-gui.cpp => module-gui/test/test-catch/test-gui.cpp +1 -2
@@ 1,4 1,4 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// Copyright (c) 2017-2020, 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


@@ 6,7 6,6 @@
#include "mock/InitializedFontManager.hpp"
#define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one cpp file

#include <vfs.hpp>
#include <memory>
#include <functional>
#include <iostream>


M module-services/service-db/test/main.cpp => module-services/service-db/test/main.cpp +0 -3
@@ 3,6 3,3 @@

#define CATCH_CONFIG_MAIN
#include <catch2/catch.hpp>
#include <vfs.hpp>

class vfs vfs; // needed for compilation, our vfs is global


M module-services/service-db/test/test-service-db-settings-api.cpp => module-services/service-db/test/test-service-db-settings-api.cpp +0 -1
@@ 18,7 18,6 @@
#include "test-service-db-settings-testmsgs.hpp"
#include "test-service-db-settings-testservices.hpp"
#include "test-service-db-settings-testapps.hpp"
#include <vfs.hpp>

TEST_CASE("SettingsApi")
{


M module-services/service-desktop/tests/unittest.cpp => module-services/service-desktop/tests/unittest.cpp +0 -2
@@ 20,8 20,6 @@
#include <json/json11.hpp>
#include <purefs/filesystem_paths.hpp>
#include <utf8/UTF8.hpp>
#include <vfs.hpp>

#include <memory>
#include <filesystem>
#include <string>


M module-utils/test/test_time_conversion.cpp => module-utils/test/test_time_conversion.cpp +0 -1
@@ 5,7 5,6 @@
#include <time/time_conversion.hpp>
#include <algorithm>
#include <thread.hpp>
#include <vfs.hpp>
#include "i18n/i18n.hpp"

namespace


M module-utils/test/unittest_duration.cpp => module-utils/test/unittest_duration.cpp +0 -1
@@ 4,7 4,6 @@
#include <cstring>
#include <iostream>
#include <memory>
#include <vfs.hpp>
#include <unistd.h>

#include "time/time_conversion.hpp"


M module-utils/test/unittest_utils.cpp => module-utils/test/unittest_utils.cpp +1 -2
@@ 1,4 1,4 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md

#include <cstring>


@@ 11,7 11,6 @@
#include <catch2/catch.hpp>

#include "Utils.hpp"
#include <vfs.hpp>


TEST_CASE("Split tests")