From c6a7ac6d09fc676fd8a0dd5edb31bad91824b2c6 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Tue, 7 Dec 2021 21:20:50 +0300 Subject: [PATCH] Removed obsolete ArchivalReporter test. Signed-off-by: Viktor Govako --- map/routing_manager.cpp | 2 -- map/routing_manager.hpp | 7 ++----- .../archival_reporter_tests.cpp | 9 ++++++--- routing/routing_session.cpp | 2 -- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp index 05ce8ae0e2..d259e941b1 100644 --- a/map/routing_manager.cpp +++ b/map/routing_manager.cpp @@ -12,8 +12,6 @@ #include "routing/routing_helpers.hpp" #include "routing/speed_camera.hpp" -#include "tracking/reporter.hpp" - #include "storage/country_info_getter.hpp" #include "storage/routing_helpers.hpp" #include "storage/storage.hpp" diff --git a/map/routing_manager.hpp b/map/routing_manager.hpp index a190bf1379..b127e84121 100644 --- a/map/routing_manager.hpp +++ b/map/routing_manager.hpp @@ -13,9 +13,6 @@ #include "routing/routing_session.hpp" #include "routing/speed_camera_manager.hpp" -#include "tracking/archival_reporter.hpp" -#include "tracking/reporter.hpp" - #include "storage/storage_defines.hpp" #include "drape_frontend/drape_engine_safe_ptr.hpp" @@ -158,12 +155,12 @@ public: { m_routeSpeedCamShowCallback = speedCamShowCallback; } - + void SetRouteSpeedCamsClearListener(RouteSpeedCamsClearCallback const & speedCamsClearCallback) { m_routeSpeedCamsClearCallback = speedCamsClearCallback; } - + /// See warning above. void SetRouteProgressListener(routing::ProgressCallback const & progressCallback) { diff --git a/routing/routing_integration_tests/archival_reporter_tests.cpp b/routing/routing_integration_tests/archival_reporter_tests.cpp index b347231ca3..44e2a3bef1 100644 --- a/routing/routing_integration_tests/archival_reporter_tests.cpp +++ b/routing/routing_integration_tests/archival_reporter_tests.cpp @@ -1,5 +1,7 @@ #include "testing/testing.hpp" +#include "tracking/archival_manager.hpp" + #include "routing/routing_integration_tests/routing_test_tools.hpp" #include "map/framework.hpp" @@ -108,7 +110,11 @@ protected: Route & m_route; std::string m_tracksDir; }; +} // namespace +/// @obsolete https://github.com/organicmaps/organicmaps/commit/04bc294c851bdfe3189d04391f7c3a7d6e601835 + +/* // Ordinary ArchivalReporter pipeline: periodically dump files. UNIT_CLASS_TEST(TestArchivalReporter, StraightPipeline) { @@ -158,7 +164,6 @@ UNIT_TEST(TestArchivalReporter_DeleteOldData) // ArchivalReporter pipeline with no dumping. // Checks behaviour if there is no free space on device. -/* UNIT_CLASS_TEST(TestArchivalReporter, FreeSpaceOnDisk) { tracking::ArchivingSettings settings; @@ -173,5 +178,3 @@ UNIT_CLASS_TEST(TestArchivalReporter, FreeSpaceOnDisk) } } */ - -} // namespace diff --git a/routing/routing_session.cpp b/routing/routing_session.cpp index 25c0dbe63c..94a2f2dbea 100644 --- a/routing/routing_session.cpp +++ b/routing/routing_session.cpp @@ -7,8 +7,6 @@ #include "platform/measurement_utils.hpp" #include "platform/platform.hpp" -#include "coding/internal/file_data.hpp" - #include "geometry/angles.hpp" #include "geometry/mercator.hpp"