From bd553de7bc5899a8e4a3a9c5e1d27a9f4d10e90e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Tue, 25 Jul 2017 11:29:03 +0200 Subject: [test] add ability to take the OnlineFileSource offline This functionality is used for testing to ensure correct offline behavior when connectivity is missing. --- include/mbgl/storage/default_file_source.hpp | 1 + include/mbgl/storage/online_file_source.hpp | 3 +++ platform/default/default_file_source.cpp | 8 +++++++ platform/default/online_file_source.cpp | 31 ++++++++++++++++++++++++---- 4 files changed, 39 insertions(+), 4 deletions(-) diff --git a/include/mbgl/storage/default_file_source.hpp b/include/mbgl/storage/default_file_source.hpp index 9911e0ce67..91e442cf85 100644 --- a/include/mbgl/storage/default_file_source.hpp +++ b/include/mbgl/storage/default_file_source.hpp @@ -140,6 +140,7 @@ public: void resume(); // For testing only. + void setOnlineStatus(bool); void put(const Resource&, const Response&); class Impl; diff --git a/include/mbgl/storage/online_file_source.hpp b/include/mbgl/storage/online_file_source.hpp index ffd75662e6..28d70ce544 100644 --- a/include/mbgl/storage/online_file_source.hpp +++ b/include/mbgl/storage/online_file_source.hpp @@ -24,6 +24,9 @@ public: std::unique_ptr request(const Resource&, Callback) override; + // For testing only. + void setOnlineStatus(bool); + private: friend class OnlineFileRequest; diff --git a/platform/default/default_file_source.cpp b/platform/default/default_file_source.cpp index b9d35ae4ed..1e855dd9f7 100644 --- a/platform/default/default_file_source.cpp +++ b/platform/default/default_file_source.cpp @@ -177,6 +177,10 @@ public: offlineDatabase->setOfflineMapboxTileCountLimit(limit); } + void setOnlineStatus(const bool status) { + onlineFileSource.setOnlineStatus(status); + } + void put(const Resource& resource, const Response& response) { offlineDatabase->put(resource, response); } @@ -303,6 +307,10 @@ void DefaultFileSource::resume() { // For testing only: +void DefaultFileSource::setOnlineStatus(const bool status) { + impl->actor().invoke(&Impl::setOnlineStatus, status); +} + void DefaultFileSource::put(const Resource& resource, const Response& response) { impl->actor().invoke(&Impl::put, resource, response); } diff --git a/platform/default/online_file_source.cpp b/platform/default/online_file_source.cpp index 1c594f87a0..d685109b95 100644 --- a/platform/default/online_file_source.cpp +++ b/platform/default/online_file_source.cpp @@ -117,13 +117,24 @@ public: } void activateRequest(OnlineFileRequest* request) { - activeRequests.insert(request); - request->request = httpFileSource.request(request->resource, [=] (Response response) { + auto callback = [=](Response response) { activeRequests.erase(request); - activatePendingRequest(); request->request.reset(); request->completed(response); - }); + activatePendingRequest(); + }; + + activeRequests.insert(request); + + if (online) { + request->request = httpFileSource.request(request->resource, callback); + } else { + Response response; + response.error = std::make_unique(Response::Error::Reason::Connection, + "Online connectivity is disabled."); + callback(response); + } + assert(pendingRequestsMap.size() == pendingRequestsList.size()); } @@ -153,6 +164,11 @@ public: resourceTransform = std::move(transform); } + void setOnlineStatus(const bool status) { + online = status; + networkIsReachableAgain(); + } + private: void networkIsReachableAgain() { for (auto& request : allRequests) { @@ -178,6 +194,7 @@ private: std::unordered_map::iterator> pendingRequestsMap; std::unordered_set activeRequests; + bool online = true; HTTPFileSource httpFileSource; util::AsyncTask reachability { std::bind(&Impl::networkIsReachableAgain, this) }; }; @@ -389,4 +406,10 @@ ActorRef OnlineFileRequest::actor() { return ActorRef(*this, mailbox); } +// For testing only: + +void OnlineFileSource::setOnlineStatus(const bool status) { + impl->setOnlineStatus(status); +} + } // namespace mbgl -- cgit v1.2.1