[test] add ability to take the OnlineFileSource offline
This functionality is used for testing to ensure correct offline behavior when connectivity is missing.
This commit is contained in:
@@ -140,6 +140,7 @@ public:
|
||||
void resume();
|
||||
|
||||
// For testing only.
|
||||
void setOnlineStatus(bool);
|
||||
void put(const Resource&, const Response&);
|
||||
|
||||
class Impl;
|
||||
|
||||
@@ -24,6 +24,9 @@ public:
|
||||
|
||||
std::unique_ptr<AsyncRequest> request(const Resource&, Callback) override;
|
||||
|
||||
// For testing only.
|
||||
void setOnlineStatus(bool);
|
||||
|
||||
private:
|
||||
friend class OnlineFileRequest;
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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>(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<OnlineFileRequest*, std::list<OnlineFileRequest*>::iterator> pendingRequestsMap;
|
||||
std::unordered_set<OnlineFileRequest*> activeRequests;
|
||||
|
||||
bool online = true;
|
||||
HTTPFileSource httpFileSource;
|
||||
util::AsyncTask reachability { std::bind(&Impl::networkIsReachableAgain, this) };
|
||||
};
|
||||
@@ -389,4 +406,10 @@ ActorRef<OnlineFileRequest> OnlineFileRequest::actor() {
|
||||
return ActorRef<OnlineFileRequest>(*this, mailbox);
|
||||
}
|
||||
|
||||
// For testing only:
|
||||
|
||||
void OnlineFileSource::setOnlineStatus(const bool status) {
|
||||
impl->setOnlineStatus(status);
|
||||
}
|
||||
|
||||
} // namespace mbgl
|
||||
|
||||
Reference in New Issue
Block a user