[core] Do not pass uv_loop_t around
This should be abstracted by util::RunLoop
This commit is contained in:
committed by
John Firebaugh
parent
2eb0203bf4
commit
36581f3d30
@@ -19,7 +19,7 @@ public:
|
||||
std::string getAccessToken() const { return accessToken; }
|
||||
|
||||
// FileSource API
|
||||
Request* request(const Resource&, uv_loop_t*, Callback) override;
|
||||
Request* request(const Resource&, Callback) override;
|
||||
void cancel(Request*) override;
|
||||
|
||||
public:
|
||||
|
||||
@@ -9,8 +9,6 @@
|
||||
|
||||
#include <functional>
|
||||
|
||||
typedef struct uv_loop_s uv_loop_t;
|
||||
|
||||
namespace mbgl {
|
||||
|
||||
class Request;
|
||||
@@ -26,7 +24,7 @@ public:
|
||||
|
||||
// These can be called from any thread. The callback will be invoked in the loop.
|
||||
// You can only cancel a request from the same thread it was created in.
|
||||
virtual Request* request(const Resource&, uv_loop_t*, Callback) = 0;
|
||||
virtual Request* request(const Resource&, Callback) = 0;
|
||||
virtual void cancel(Request*) = 0;
|
||||
};
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
#include "util/async_queue.hpp"
|
||||
|
||||
#include <mbgl/storage/request.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
|
||||
namespace node_mbgl {
|
||||
|
||||
@@ -33,8 +34,8 @@ NodeFileSource::~NodeFileSource() {
|
||||
options.Reset();
|
||||
}
|
||||
|
||||
mbgl::Request* NodeFileSource::request(const mbgl::Resource& resource, uv_loop_t* loop, Callback callback) {
|
||||
auto req = new mbgl::Request(resource, loop, std::move(callback));
|
||||
mbgl::Request* NodeFileSource::request(const mbgl::Resource& resource, Callback callback) {
|
||||
auto req = new mbgl::Request(resource, mbgl::util::RunLoop::getLoop(), std::move(callback));
|
||||
|
||||
std::lock_guard<std::mutex> lock(observersMutex);
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ public:
|
||||
NodeFileSource(v8::Local<v8::Object>);
|
||||
~NodeFileSource();
|
||||
|
||||
mbgl::Request* request(const mbgl::Resource&, uv_loop_t*, Callback);
|
||||
mbgl::Request* request(const mbgl::Resource&, Callback);
|
||||
void cancel(mbgl::Request*);
|
||||
|
||||
// visiblity?
|
||||
|
||||
@@ -105,7 +105,7 @@ void MapContext::setStyleURL(const std::string& url) {
|
||||
}
|
||||
|
||||
FileSource* fs = util::ThreadContext::getFileSource();
|
||||
styleRequest = fs->request({ Resource::Kind::Style, styleURL }, util::RunLoop::getLoop(), [this, base](const Response &res) {
|
||||
styleRequest = fs->request({ Resource::Kind::Style, styleURL }, [this, base](const Response &res) {
|
||||
if (res.stale) {
|
||||
// Only handle fresh responses.
|
||||
return;
|
||||
|
||||
@@ -30,7 +30,7 @@ void RasterTileData::request(float pixelRatio,
|
||||
state = State::loading;
|
||||
|
||||
FileSource* fs = util::ThreadContext::getFileSource();
|
||||
req = fs->request({ Resource::Kind::Tile, url }, util::RunLoop::getLoop(), [url, callback, this](const Response &res) {
|
||||
req = fs->request({ Resource::Kind::Tile, url }, [url, callback, this](const Response &res) {
|
||||
if (res.stale) {
|
||||
// Only handle fresh responses.
|
||||
return;
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
#include <mbgl/storage/file_source.hpp>
|
||||
#include <mbgl/style/style_layer.hpp>
|
||||
#include <mbgl/platform/log.hpp>
|
||||
#include <mbgl/util/uv_detail.hpp>
|
||||
#include <mbgl/util/std.hpp>
|
||||
#include <mbgl/util/token.hpp>
|
||||
#include <mbgl/util/string.hpp>
|
||||
@@ -148,7 +147,7 @@ void Source::load() {
|
||||
}
|
||||
|
||||
FileSource* fs = util::ThreadContext::getFileSource();
|
||||
req = fs->request({ Resource::Kind::Source, info.url }, util::RunLoop::getLoop(), [this](const Response &res) {
|
||||
req = fs->request({ Resource::Kind::Source, info.url }, [this](const Response &res) {
|
||||
if (res.stale) {
|
||||
// Only handle fresh responses.
|
||||
return;
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
#include <mbgl/storage/response.hpp>
|
||||
#include <mbgl/storage/file_source.hpp>
|
||||
#include <mbgl/util/thread_context.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
|
||||
#include <sstream>
|
||||
|
||||
@@ -183,7 +182,7 @@ VectorTileMonitor::VectorTileMonitor(const SourceInfo& source, const TileID& id,
|
||||
}
|
||||
|
||||
Request* VectorTileMonitor::monitorTile(std::function<void (std::exception_ptr, std::unique_ptr<GeometryTile>)> callback) {
|
||||
return util::ThreadContext::getFileSource()->request({ Resource::Kind::Tile, url }, util::RunLoop::getLoop(), [callback, this](const Response& res) {
|
||||
return util::ThreadContext::getFileSource()->request({ Resource::Kind::Tile, url }, [callback, this](const Response& res) {
|
||||
if (res.data && data == res.data) {
|
||||
// We got the same data again. Abort early.
|
||||
return;
|
||||
|
||||
@@ -40,7 +40,7 @@ void SpriteStore::setURL(const std::string& url) {
|
||||
loader = std::make_unique<Loader>();
|
||||
|
||||
FileSource* fs = util::ThreadContext::getFileSource();
|
||||
loader->jsonRequest = fs->request({ Resource::Kind::SpriteJSON, jsonURL }, util::RunLoop::getLoop(),
|
||||
loader->jsonRequest = fs->request({ Resource::Kind::SpriteJSON, jsonURL },
|
||||
[this, jsonURL](const Response& res) {
|
||||
if (res.stale) {
|
||||
// Only handle fresh responses.
|
||||
@@ -60,7 +60,7 @@ void SpriteStore::setURL(const std::string& url) {
|
||||
});
|
||||
|
||||
loader->spriteRequest =
|
||||
fs->request({ Resource::Kind::SpriteImage, spriteURL }, util::RunLoop::getLoop(),
|
||||
fs->request({ Resource::Kind::SpriteImage, spriteURL },
|
||||
[this, spriteURL](const Response& res) {
|
||||
if (res.stale) {
|
||||
// Only handle fresh responses.
|
||||
|
||||
@@ -39,9 +39,7 @@ DefaultFileSource::~DefaultFileSource() {
|
||||
MBGL_VERIFY_THREAD(tid);
|
||||
}
|
||||
|
||||
Request* DefaultFileSource::request(const Resource& resource, uv_loop_t* l, Callback callback) {
|
||||
assert(l);
|
||||
|
||||
Request* DefaultFileSource::request(const Resource& resource, Callback callback) {
|
||||
if (!callback) {
|
||||
throw util::MisuseException("FileSource callback can't be empty");
|
||||
}
|
||||
@@ -70,7 +68,7 @@ Request* DefaultFileSource::request(const Resource& resource, uv_loop_t* l, Call
|
||||
url = resource.url;
|
||||
}
|
||||
|
||||
auto req = new Request({ resource.kind, url }, l, std::move(callback));
|
||||
auto req = new Request({ resource.kind, url }, util::RunLoop::getLoop(), std::move(callback));
|
||||
thread->invoke(&Impl::add, req);
|
||||
return req;
|
||||
}
|
||||
|
||||
@@ -92,7 +92,7 @@ GlyphPBF::GlyphPBF(GlyphStore* store,
|
||||
};
|
||||
|
||||
FileSource* fs = util::ThreadContext::getFileSource();
|
||||
req = fs->request({ Resource::Kind::Glyphs, url }, util::RunLoop::getLoop(), requestCallback);
|
||||
req = fs->request({ Resource::Kind::Glyphs, url }, requestCallback);
|
||||
}
|
||||
|
||||
GlyphPBF::~GlyphPBF() = default;
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
#include <mbgl/text/glyph_pbf.hpp>
|
||||
#include <mbgl/util/exclusive.hpp>
|
||||
#include <mbgl/util/noncopyable.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
#include <mbgl/util/work_queue.hpp>
|
||||
|
||||
#include <exception>
|
||||
|
||||
4
test/fixtures/mock_file_source.cpp
vendored
4
test/fixtures/mock_file_source.cpp
vendored
@@ -145,8 +145,8 @@ void MockFileSource::setOnRequestDelayedCallback(std::function<void(void)> callb
|
||||
thread_->invokeSync(&Impl::setOnRequestDelayedCallback, callback);
|
||||
}
|
||||
|
||||
Request* MockFileSource::request(const Resource& resource, uv_loop_t* loop, Callback callback) {
|
||||
Request* req = new Request(resource, loop, std::move(callback));
|
||||
Request* MockFileSource::request(const Resource& resource, Callback callback) {
|
||||
Request* req = new Request(resource, util::RunLoop::getLoop(), std::move(callback));
|
||||
thread_->invoke(&Impl::handleRequest, req);
|
||||
|
||||
return req;
|
||||
|
||||
2
test/fixtures/mock_file_source.hpp
vendored
2
test/fixtures/mock_file_source.hpp
vendored
@@ -47,7 +47,7 @@ public:
|
||||
void setOnRequestDelayedCallback(std::function<void(void)> callback);
|
||||
|
||||
// FileSource implementation.
|
||||
Request* request(const Resource&, uv_loop_t*, Callback) override;
|
||||
Request* request(const Resource&, Callback) override;
|
||||
void cancel(Request*) override;
|
||||
|
||||
private:
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
#include <mbgl/storage/default_file_source.hpp>
|
||||
#include <mbgl/storage/sqlite_cache.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
|
||||
TEST_F(Storage, CacheResponse) {
|
||||
SCOPED_TEST(CacheResponse);
|
||||
@@ -12,12 +13,16 @@ TEST_F(Storage, CacheResponse) {
|
||||
|
||||
SQLiteCache cache(":memory:");
|
||||
DefaultFileSource fs(&cache);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
const Resource resource { Resource::Unknown, "http://127.0.0.1:3000/cache" };
|
||||
Response response;
|
||||
|
||||
Request* req = fs.request(resource, uv_default_loop(), [&](const Response &res) {
|
||||
fs.cancel(req);
|
||||
Request* req1 = nullptr;
|
||||
Request* req2 = nullptr;
|
||||
|
||||
req1 = fs.request(resource, [&](const Response &res) {
|
||||
fs.cancel(req1);
|
||||
EXPECT_EQ(nullptr, res.error);
|
||||
EXPECT_EQ(false, res.stale);
|
||||
ASSERT_TRUE(res.data.get());
|
||||
@@ -26,23 +31,22 @@ TEST_F(Storage, CacheResponse) {
|
||||
EXPECT_EQ(0, res.modified);
|
||||
EXPECT_EQ("", res.etag);
|
||||
response = res;
|
||||
});
|
||||
|
||||
uv_run(uv_default_loop(), UV_RUN_DEFAULT);
|
||||
// Now test that we get the same values as in the previous request. If we'd go to the server
|
||||
// again, we'd get different values.
|
||||
req2 = fs.request(resource, [&](const Response &res2) {
|
||||
fs.cancel(req2);
|
||||
EXPECT_EQ(response.error, res2.error);
|
||||
EXPECT_EQ(response.stale, res2.stale);
|
||||
ASSERT_TRUE(res2.data.get());
|
||||
EXPECT_EQ(*response.data, *res2.data);
|
||||
EXPECT_EQ(response.expires, res2.expires);
|
||||
EXPECT_EQ(response.modified, res2.modified);
|
||||
EXPECT_EQ(response.etag, res2.etag);
|
||||
|
||||
// Now test that we get the same values as in the previous request. If we'd go to the server
|
||||
// again, we'd get different values.
|
||||
req = fs.request(resource, uv_default_loop(), [&](const Response &res) {
|
||||
fs.cancel(req);
|
||||
EXPECT_EQ(response.error, res.error);
|
||||
EXPECT_EQ(response.stale, res.stale);
|
||||
ASSERT_TRUE(res.data.get());
|
||||
EXPECT_EQ(*response.data, *res.data);
|
||||
EXPECT_EQ(response.expires, res.expires);
|
||||
EXPECT_EQ(response.modified, res.modified);
|
||||
EXPECT_EQ(response.etag, res.etag);
|
||||
|
||||
CacheResponse.finish();
|
||||
loop.stop();
|
||||
CacheResponse.finish();
|
||||
});
|
||||
});
|
||||
|
||||
uv_run(uv_default_loop(), UV_RUN_DEFAULT);
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
#include <mbgl/storage/default_file_source.hpp>
|
||||
#include <mbgl/storage/sqlite_cache.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
|
||||
TEST_F(Storage, CacheRevalidateSame) {
|
||||
SCOPED_TEST(CacheRevalidateSame)
|
||||
@@ -12,11 +13,12 @@ TEST_F(Storage, CacheRevalidateSame) {
|
||||
|
||||
SQLiteCache cache(":memory:");
|
||||
DefaultFileSource fs(&cache);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
const Resource revalidateSame { Resource::Unknown, "http://127.0.0.1:3000/revalidate-same" };
|
||||
Request* req1 = nullptr;
|
||||
Request* req2 = nullptr;
|
||||
req1 = fs.request(revalidateSame, uv_default_loop(), [&](const Response &res) {
|
||||
req1 = fs.request(revalidateSame, [&](const Response &res) {
|
||||
// This callback can get triggered multiple times. We only care about the first invocation.
|
||||
// It will get triggered again when refreshing the req2 (see below).
|
||||
static bool first = true;
|
||||
@@ -33,7 +35,7 @@ TEST_F(Storage, CacheRevalidateSame) {
|
||||
EXPECT_EQ(0, res.modified);
|
||||
EXPECT_EQ("snowfall", res.etag);
|
||||
|
||||
req2 = fs.request(revalidateSame, uv_default_loop(), [&, res](const Response &res2) {
|
||||
req2 = fs.request(revalidateSame, [&, res](const Response &res2) {
|
||||
if (res2.stale) {
|
||||
// Discard stale responses, if any.
|
||||
return;
|
||||
@@ -58,6 +60,7 @@ TEST_F(Storage, CacheRevalidateSame) {
|
||||
// We're not sending the ETag in the 304 reply, but it should still be there.
|
||||
EXPECT_EQ("snowfall", res2.etag);
|
||||
|
||||
loop.stop();
|
||||
CacheRevalidateSame.finish();
|
||||
});
|
||||
});
|
||||
@@ -72,12 +75,13 @@ TEST_F(Storage, CacheRevalidateModified) {
|
||||
|
||||
SQLiteCache cache(":memory:");
|
||||
DefaultFileSource fs(&cache);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
const Resource revalidateModified{ Resource::Unknown,
|
||||
"http://127.0.0.1:3000/revalidate-modified" };
|
||||
Request* req1 = nullptr;
|
||||
Request* req2 = nullptr;
|
||||
req1 = fs.request(revalidateModified, uv_default_loop(), [&](const Response& res) {
|
||||
req1 = fs.request(revalidateModified, [&](const Response& res) {
|
||||
// This callback can get triggered multiple times. We only care about the first invocation.
|
||||
// It will get triggered again when refreshing the req2 (see below).
|
||||
static bool first = true;
|
||||
@@ -94,7 +98,7 @@ TEST_F(Storage, CacheRevalidateModified) {
|
||||
EXPECT_EQ(1420070400, res.modified);
|
||||
EXPECT_EQ("", res.etag);
|
||||
|
||||
req2 = fs.request(revalidateModified, uv_default_loop(), [&, res](const Response &res2) {
|
||||
req2 = fs.request(revalidateModified, [&, res](const Response &res2) {
|
||||
if (res2.stale) {
|
||||
// Discard stale responses, if any.
|
||||
return;
|
||||
@@ -118,6 +122,7 @@ TEST_F(Storage, CacheRevalidateModified) {
|
||||
EXPECT_EQ(1420070400, res2.modified);
|
||||
EXPECT_EQ("", res2.etag);
|
||||
|
||||
loop.stop();
|
||||
CacheRevalidateModified.finish();
|
||||
});
|
||||
});
|
||||
@@ -132,11 +137,12 @@ TEST_F(Storage, CacheRevalidateEtag) {
|
||||
|
||||
SQLiteCache cache(":memory:");
|
||||
DefaultFileSource fs(&cache);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
const Resource revalidateEtag { Resource::Unknown, "http://127.0.0.1:3000/revalidate-etag" };
|
||||
Request* req1 = nullptr;
|
||||
Request* req2 = nullptr;
|
||||
req1 = fs.request(revalidateEtag, uv_default_loop(), [&](const Response &res) {
|
||||
req1 = fs.request(revalidateEtag, [&](const Response &res) {
|
||||
// This callback can get triggered multiple times. We only care about the first invocation.
|
||||
// It will get triggered again when refreshing the req2 (see below).
|
||||
static bool first = true;
|
||||
@@ -153,7 +159,7 @@ TEST_F(Storage, CacheRevalidateEtag) {
|
||||
EXPECT_EQ(0, res.modified);
|
||||
EXPECT_EQ("response-1", res.etag);
|
||||
|
||||
req2 = fs.request(revalidateEtag, uv_default_loop(), [&, res](const Response &res2) {
|
||||
req2 = fs.request(revalidateEtag, [&, res](const Response &res2) {
|
||||
if (res2.stale) {
|
||||
// Discard stale responses, if any.
|
||||
return;
|
||||
@@ -176,6 +182,7 @@ TEST_F(Storage, CacheRevalidateEtag) {
|
||||
EXPECT_EQ(0, res2.modified);
|
||||
EXPECT_EQ("response-2", res2.etag);
|
||||
|
||||
loop.stop();
|
||||
CacheRevalidateEtag.finish();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
#include <uv.h>
|
||||
|
||||
#include <mbgl/storage/default_file_source.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
|
||||
TEST_F(Storage, AssetReadDirectory) {
|
||||
SCOPED_TEST(ReadDirectory)
|
||||
@@ -15,7 +16,9 @@ TEST_F(Storage, AssetReadDirectory) {
|
||||
DefaultFileSource fs(nullptr);
|
||||
#endif
|
||||
|
||||
Request* req = fs.request({ Resource::Unknown, "asset://TEST_DATA/fixtures/storage" }, uv_default_loop(),
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
Request* req = fs.request({ Resource::Unknown, "asset://TEST_DATA/fixtures/storage" },
|
||||
[&](const Response &res) {
|
||||
fs.cancel(req);
|
||||
ASSERT_NE(nullptr, res.error);
|
||||
@@ -30,6 +33,8 @@ TEST_F(Storage, AssetReadDirectory) {
|
||||
#elif MBGL_ASSET_FS
|
||||
EXPECT_EQ("illegal operation on a directory", res.error->message);
|
||||
#endif
|
||||
|
||||
loop.stop();
|
||||
ReadDirectory.finish();
|
||||
});
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
#include <mbgl/storage/default_file_source.hpp>
|
||||
#include <mbgl/platform/platform.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
|
||||
TEST_F(Storage, AssetEmptyFile) {
|
||||
SCOPED_TEST(EmptyFile)
|
||||
@@ -16,7 +17,9 @@ TEST_F(Storage, AssetEmptyFile) {
|
||||
DefaultFileSource fs(nullptr);
|
||||
#endif
|
||||
|
||||
Request* req = fs.request({ Resource::Unknown, "asset://TEST_DATA/fixtures/storage/empty" }, uv_default_loop(),
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
Request* req = fs.request({ Resource::Unknown, "asset://TEST_DATA/fixtures/storage/empty" },
|
||||
[&](const Response &res) {
|
||||
fs.cancel(req);
|
||||
EXPECT_EQ(nullptr, res.error);
|
||||
@@ -26,6 +29,7 @@ TEST_F(Storage, AssetEmptyFile) {
|
||||
EXPECT_EQ(0, res.expires);
|
||||
EXPECT_LT(1420000000, res.modified);
|
||||
EXPECT_NE("", res.etag);
|
||||
loop.stop();
|
||||
EmptyFile.finish();
|
||||
});
|
||||
|
||||
@@ -43,8 +47,10 @@ TEST_F(Storage, AssetNonEmptyFile) {
|
||||
DefaultFileSource fs(nullptr);
|
||||
#endif
|
||||
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
Request* req = fs.request({ Resource::Unknown, "asset://TEST_DATA/fixtures/storage/nonempty" },
|
||||
uv_default_loop(), [&](const Response &res) {
|
||||
[&](const Response &res) {
|
||||
fs.cancel(req);
|
||||
EXPECT_EQ(nullptr, res.error);
|
||||
EXPECT_EQ(false, res.stale);
|
||||
@@ -55,6 +61,7 @@ TEST_F(Storage, AssetNonEmptyFile) {
|
||||
EXPECT_NE("", res.etag);
|
||||
ASSERT_TRUE(res.data.get());
|
||||
EXPECT_EQ("content is here\n", *res.data);
|
||||
loop.stop();
|
||||
NonEmptyFile.finish();
|
||||
});
|
||||
|
||||
@@ -72,8 +79,10 @@ TEST_F(Storage, AssetNonExistentFile) {
|
||||
DefaultFileSource fs(nullptr);
|
||||
#endif
|
||||
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
Request* req = fs.request({ Resource::Unknown, "asset://TEST_DATA/fixtures/storage/does_not_exist" },
|
||||
uv_default_loop(), [&](const Response &res) {
|
||||
[&](const Response &res) {
|
||||
fs.cancel(req);
|
||||
ASSERT_NE(nullptr, res.error);
|
||||
EXPECT_EQ(Response::Error::Reason::NotFound, res.error->reason);
|
||||
@@ -87,6 +96,7 @@ TEST_F(Storage, AssetNonExistentFile) {
|
||||
#elif MBGL_ASSET_FS
|
||||
EXPECT_EQ("no such file or directory", res.error->message);
|
||||
#endif
|
||||
loop.stop();
|
||||
NonExistentFile.finish();
|
||||
});
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
#include <mbgl/storage/default_file_source.hpp>
|
||||
#include <mbgl/storage/network_status.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
|
||||
#include <cmath>
|
||||
|
||||
@@ -13,15 +14,16 @@ TEST_F(Storage, HTTPCancel) {
|
||||
using namespace mbgl;
|
||||
|
||||
DefaultFileSource fs(nullptr);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
auto req =
|
||||
fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, uv_default_loop(),
|
||||
fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" },
|
||||
[&](const Response &) { ADD_FAILURE() << "Callback should not be called"; });
|
||||
|
||||
fs.cancel(req);
|
||||
HTTPCancel.finish();
|
||||
|
||||
uv_run(uv_default_loop(), UV_RUN_DEFAULT);
|
||||
uv_run(uv_default_loop(), UV_RUN_ONCE);
|
||||
}
|
||||
|
||||
TEST_F(Storage, HTTPCancelMultiple) {
|
||||
@@ -30,13 +32,14 @@ TEST_F(Storage, HTTPCancelMultiple) {
|
||||
using namespace mbgl;
|
||||
|
||||
DefaultFileSource fs(nullptr);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
const Resource resource { Resource::Unknown, "http://127.0.0.1:3000/test" };
|
||||
|
||||
auto req2 = fs.request(resource, uv_default_loop(), [&](const Response &) {
|
||||
auto req2 = fs.request(resource, [&](const Response &) {
|
||||
ADD_FAILURE() << "Callback should not be called";
|
||||
});
|
||||
Request* req = fs.request(resource, uv_default_loop(), [&](const Response &res) {
|
||||
Request* req = fs.request(resource, [&](const Response &res) {
|
||||
fs.cancel(req);
|
||||
EXPECT_EQ(nullptr, res.error);
|
||||
EXPECT_EQ(false, res.stale);
|
||||
@@ -45,6 +48,7 @@ TEST_F(Storage, HTTPCancelMultiple) {
|
||||
EXPECT_EQ(0, res.expires);
|
||||
EXPECT_EQ(0, res.modified);
|
||||
EXPECT_EQ("", res.etag);
|
||||
loop.stop();
|
||||
HTTPCancelMultiple.finish();
|
||||
});
|
||||
fs.cancel(req2);
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
#include <uv.h>
|
||||
|
||||
#include <mbgl/storage/default_file_source.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
|
||||
TEST_F(Storage, HTTPCoalescing) {
|
||||
SCOPED_TEST(HTTPCoalescing)
|
||||
@@ -13,6 +14,7 @@ TEST_F(Storage, HTTPCoalescing) {
|
||||
using namespace mbgl;
|
||||
|
||||
DefaultFileSource fs(nullptr);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
static const Response *reference = nullptr;
|
||||
|
||||
@@ -34,6 +36,7 @@ TEST_F(Storage, HTTPCoalescing) {
|
||||
EXPECT_EQ("", res.etag);
|
||||
|
||||
if (counter >= total) {
|
||||
loop.stop();
|
||||
HTTPCoalescing.finish();
|
||||
}
|
||||
};
|
||||
@@ -42,7 +45,7 @@ TEST_F(Storage, HTTPCoalescing) {
|
||||
|
||||
Request* reqs[total];
|
||||
for (int i = 0; i < total; i++) {
|
||||
reqs[i] = fs.request(resource, uv_default_loop(), [&complete, &fs, &reqs, i] (const Response &res) {
|
||||
reqs[i] = fs.request(resource, [&complete, &fs, &reqs, i] (const Response &res) {
|
||||
fs.cancel(reqs[i]);
|
||||
complete(res);
|
||||
});
|
||||
@@ -57,13 +60,14 @@ TEST_F(Storage, HTTPMultiple) {
|
||||
using namespace mbgl;
|
||||
|
||||
DefaultFileSource fs(nullptr);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
const Response *reference = nullptr;
|
||||
|
||||
const Resource resource { Resource::Unknown, "http://127.0.0.1:3000/test?expires=2147483647" };
|
||||
Request* req1 = nullptr;
|
||||
Request* req2 = nullptr;
|
||||
req1 = fs.request(resource, uv_default_loop(), [&] (const Response &res) {
|
||||
req1 = fs.request(resource, [&] (const Response &res) {
|
||||
EXPECT_EQ(nullptr, reference);
|
||||
reference = &res;
|
||||
|
||||
@@ -76,7 +80,7 @@ TEST_F(Storage, HTTPMultiple) {
|
||||
EXPECT_EQ("", res.etag);
|
||||
|
||||
// Start a second request for the same resource after the first one has been completed.
|
||||
req2 = fs.request(resource, uv_default_loop(), [&] (const Response &res2) {
|
||||
req2 = fs.request(resource, [&] (const Response &res2) {
|
||||
// Make sure we get the same object ID as before.
|
||||
EXPECT_EQ(reference, &res2);
|
||||
|
||||
@@ -91,6 +95,7 @@ TEST_F(Storage, HTTPMultiple) {
|
||||
EXPECT_EQ(0, res2.modified);
|
||||
EXPECT_EQ("", res2.etag);
|
||||
|
||||
loop.stop();
|
||||
HTTPMultiple.finish();
|
||||
});
|
||||
});
|
||||
@@ -105,6 +110,7 @@ TEST_F(Storage, HTTPStale) {
|
||||
using namespace mbgl;
|
||||
|
||||
DefaultFileSource fs(nullptr);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
int updates = 0;
|
||||
int stale = 0;
|
||||
@@ -112,7 +118,7 @@ TEST_F(Storage, HTTPStale) {
|
||||
const Resource resource { Resource::Unknown, "http://127.0.0.1:3000/test" };
|
||||
Request* req1 = nullptr;
|
||||
Request* req2 = nullptr;
|
||||
req1 = fs.request(resource, uv_default_loop(), [&] (const Response &res) {
|
||||
req1 = fs.request(resource, [&] (const Response &res) {
|
||||
// Do not cancel the request right away.
|
||||
EXPECT_EQ(nullptr, res.error);
|
||||
ASSERT_TRUE(res.data.get());
|
||||
@@ -130,7 +136,7 @@ TEST_F(Storage, HTTPStale) {
|
||||
updates++;
|
||||
|
||||
// Start a second request for the same resource after the first one has been completed.
|
||||
req2 = fs.request(resource, uv_default_loop(), [&] (const Response &res2) {
|
||||
req2 = fs.request(resource, [&] (const Response &res2) {
|
||||
EXPECT_EQ(nullptr, res2.error);
|
||||
ASSERT_TRUE(res2.data.get());
|
||||
EXPECT_EQ("Hello World!", *res2.data);
|
||||
@@ -145,6 +151,7 @@ TEST_F(Storage, HTTPStale) {
|
||||
// Now cancel both requests after both have been notified.
|
||||
fs.cancel(req1);
|
||||
fs.cancel(req2);
|
||||
loop.stop();
|
||||
HTTPStale.finish();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -4,26 +4,21 @@
|
||||
|
||||
#include <mbgl/storage/default_file_source.hpp>
|
||||
#include <mbgl/storage/network_status.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
|
||||
#include <cmath>
|
||||
|
||||
#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10
|
||||
#define UV_TIMER_PARAMS uv_timer_t*, int
|
||||
#else
|
||||
#define UV_TIMER_PARAMS uv_timer_t*
|
||||
#endif
|
||||
|
||||
TEST_F(Storage, HTTPError) {
|
||||
TEST_F(Storage, HTTPTemporaryError) {
|
||||
SCOPED_TEST(HTTPTemporaryError)
|
||||
SCOPED_TEST(HTTPConnectionError)
|
||||
|
||||
using namespace mbgl;
|
||||
|
||||
DefaultFileSource fs(nullptr);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
const auto start = uv_hrtime();
|
||||
|
||||
Request* req1 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/temporary-error" }, uv_default_loop(),
|
||||
Request* req1 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/temporary-error" },
|
||||
[&](const Response &res) {
|
||||
static int counter = 0;
|
||||
switch (counter++) {
|
||||
@@ -52,12 +47,26 @@ TEST_F(Storage, HTTPError) {
|
||||
EXPECT_EQ(0, res.expires);
|
||||
EXPECT_EQ(0, res.modified);
|
||||
EXPECT_EQ("", res.etag);
|
||||
loop.stop();
|
||||
HTTPTemporaryError.finish();
|
||||
} break;
|
||||
}
|
||||
});
|
||||
|
||||
Request* req2 = fs.request({ Resource::Unknown, "http://127.0.0.1:3001/" }, uv_default_loop(),
|
||||
uv_run(uv_default_loop(), UV_RUN_DEFAULT);
|
||||
}
|
||||
|
||||
TEST_F(Storage, HTTPConnectionError) {
|
||||
SCOPED_TEST(HTTPConnectionError)
|
||||
|
||||
using namespace mbgl;
|
||||
|
||||
DefaultFileSource fs(nullptr);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
const auto start = uv_hrtime();
|
||||
|
||||
Request* req2 = fs.request({ Resource::Unknown, "http://127.0.0.1:3001/" },
|
||||
[&](const Response &res) {
|
||||
static int counter = 0;
|
||||
static int wait = 0;
|
||||
@@ -85,6 +94,7 @@ TEST_F(Storage, HTTPError) {
|
||||
|
||||
if (counter == 2) {
|
||||
fs.cancel(req2);
|
||||
loop.stop();
|
||||
HTTPConnectionError.finish();
|
||||
}
|
||||
wait += (1 << counter);
|
||||
|
||||
@@ -4,20 +4,21 @@
|
||||
|
||||
#include <mbgl/storage/default_file_source.hpp>
|
||||
#include <mbgl/util/chrono.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
|
||||
#include <cmath>
|
||||
|
||||
TEST_F(Storage, HTTPHeaderParsing) {
|
||||
TEST_F(Storage, HTTPExpiresParsing) {
|
||||
SCOPED_TEST(HTTPExpiresTest)
|
||||
SCOPED_TEST(HTTPCacheControlTest)
|
||||
|
||||
using namespace mbgl;
|
||||
|
||||
DefaultFileSource fs(nullptr);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
Request* req1 = fs.request({ Resource::Unknown,
|
||||
"http://127.0.0.1:3000/test?modified=1420794326&expires=1420797926&etag=foo" },
|
||||
uv_default_loop(), [&](const Response &res) {
|
||||
[&](const Response &res) {
|
||||
fs.cancel(req1);
|
||||
EXPECT_EQ(nullptr, res.error);
|
||||
EXPECT_EQ(false, res.stale);
|
||||
@@ -26,14 +27,26 @@ TEST_F(Storage, HTTPHeaderParsing) {
|
||||
EXPECT_EQ(1420797926, res.expires);
|
||||
EXPECT_EQ(1420794326, res.modified);
|
||||
EXPECT_EQ("foo", res.etag);
|
||||
loop.stop();
|
||||
HTTPExpiresTest.finish();
|
||||
});
|
||||
|
||||
uv_run(uv_default_loop(), UV_RUN_DEFAULT);
|
||||
}
|
||||
|
||||
TEST_F(Storage, HTTPCacheControlParsing) {
|
||||
SCOPED_TEST(HTTPCacheControlTest)
|
||||
|
||||
using namespace mbgl;
|
||||
|
||||
DefaultFileSource fs(nullptr);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
int64_t now = std::chrono::duration_cast<std::chrono::seconds>(
|
||||
SystemClock::now().time_since_epoch()).count();
|
||||
|
||||
Request* req2 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test?cachecontrol=max-age=120" },
|
||||
uv_default_loop(), [&](const Response &res) {
|
||||
[&](const Response &res) {
|
||||
fs.cancel(req2);
|
||||
EXPECT_EQ(nullptr, res.error);
|
||||
EXPECT_EQ(false, res.stale);
|
||||
@@ -42,6 +55,7 @@ TEST_F(Storage, HTTPHeaderParsing) {
|
||||
EXPECT_GT(2, std::abs(res.expires - now - 120)) << "Expiration date isn't about 120 seconds in the future";
|
||||
EXPECT_EQ(0, res.modified);
|
||||
EXPECT_EQ("", res.etag);
|
||||
loop.stop();
|
||||
HTTPCacheControlTest.finish();
|
||||
});
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
#include <mbgl/storage/default_file_source.hpp>
|
||||
#include <mbgl/storage/sqlite_cache.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
|
||||
// Test for https://github.com/mapbox/mapbox-gl-native/issue/1369
|
||||
//
|
||||
@@ -23,14 +24,15 @@ TEST_F(Storage, HTTPIssue1369) {
|
||||
|
||||
SQLiteCache cache;
|
||||
DefaultFileSource fs(&cache);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
const Resource resource { Resource::Unknown, "http://127.0.0.1:3000/test" };
|
||||
|
||||
auto req = fs.request(resource, uv_default_loop(), [&](const Response&) {
|
||||
auto req = fs.request(resource, [&](const Response&) {
|
||||
ADD_FAILURE() << "Callback should not be called";
|
||||
});
|
||||
fs.cancel(req);
|
||||
req = fs.request(resource, uv_default_loop(), [&](const Response &res) {
|
||||
req = fs.request(resource, [&](const Response &res) {
|
||||
fs.cancel(req);
|
||||
EXPECT_EQ(nullptr, res.error);
|
||||
EXPECT_EQ(false, res.stale);
|
||||
@@ -39,6 +41,7 @@ TEST_F(Storage, HTTPIssue1369) {
|
||||
EXPECT_EQ(0, res.expires);
|
||||
EXPECT_EQ(0, res.modified);
|
||||
EXPECT_EQ("", res.etag);
|
||||
loop.stop();
|
||||
HTTPIssue1369.finish();
|
||||
});
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
#include <uv.h>
|
||||
|
||||
#include <mbgl/storage/default_file_source.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
|
||||
TEST_F(Storage, HTTPLoad) {
|
||||
SCOPED_TEST(HTTPLoad)
|
||||
@@ -10,6 +11,7 @@ TEST_F(Storage, HTTPLoad) {
|
||||
using namespace mbgl;
|
||||
|
||||
DefaultFileSource fs(nullptr);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
const int concurrency = 50;
|
||||
const int max = 10000;
|
||||
@@ -21,7 +23,7 @@ TEST_F(Storage, HTTPLoad) {
|
||||
const auto current = number++;
|
||||
reqs[i] = fs.request({ Resource::Unknown,
|
||||
std::string("http://127.0.0.1:3000/load/") + std::to_string(current) },
|
||||
uv_default_loop(), [&, i, current](const Response &res) {
|
||||
[&, i, current](const Response &res) {
|
||||
fs.cancel(reqs[i]);
|
||||
reqs[i] = nullptr;
|
||||
EXPECT_EQ(nullptr, res.error);
|
||||
@@ -35,6 +37,7 @@ TEST_F(Storage, HTTPLoad) {
|
||||
if (number <= max) {
|
||||
req(i);
|
||||
} else if (current == max) {
|
||||
loop.stop();
|
||||
HTTPLoad.finish();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
#include <uv.h>
|
||||
|
||||
#include <mbgl/storage/default_file_source.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
|
||||
TEST_F(Storage, HTTPOtherLoop) {
|
||||
SCOPED_TEST(HTTPOtherLoop)
|
||||
@@ -11,8 +12,9 @@ TEST_F(Storage, HTTPOtherLoop) {
|
||||
|
||||
// This file source launches a separate thread to do the processing.
|
||||
DefaultFileSource fs(nullptr);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
Request* req = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, uv_default_loop(),
|
||||
Request* req = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" },
|
||||
[&](const Response &res) {
|
||||
fs.cancel(req);
|
||||
EXPECT_EQ(nullptr, res.error);
|
||||
@@ -22,6 +24,7 @@ TEST_F(Storage, HTTPOtherLoop) {
|
||||
EXPECT_EQ(0, res.expires);
|
||||
EXPECT_EQ(0, res.modified);
|
||||
EXPECT_EQ("", res.etag);
|
||||
loop.stop();
|
||||
HTTPOtherLoop.finish();
|
||||
});
|
||||
|
||||
|
||||
@@ -4,21 +4,21 @@
|
||||
|
||||
#include <mbgl/storage/default_file_source.hpp>
|
||||
#include <mbgl/util/exception.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
|
||||
#include <future>
|
||||
|
||||
TEST_F(Storage, HTTPReading) {
|
||||
TEST_F(Storage, HTTPTest) {
|
||||
SCOPED_TEST(HTTPTest)
|
||||
SCOPED_TEST(HTTP404)
|
||||
SCOPED_TEST(HTTP500)
|
||||
|
||||
using namespace mbgl;
|
||||
|
||||
DefaultFileSource fs(nullptr);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
const auto mainThread = uv_thread_self();
|
||||
|
||||
Request* req1 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, uv_default_loop(),
|
||||
Request* req1 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" },
|
||||
[&](const Response &res) {
|
||||
fs.cancel(req1);
|
||||
EXPECT_EQ(uv_thread_self(), mainThread);
|
||||
@@ -29,10 +29,24 @@ TEST_F(Storage, HTTPReading) {
|
||||
EXPECT_EQ(0, res.expires);
|
||||
EXPECT_EQ(0, res.modified);
|
||||
EXPECT_EQ("", res.etag);
|
||||
loop.stop();
|
||||
HTTPTest.finish();
|
||||
});
|
||||
|
||||
Request* req2 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/doesnotexist" }, uv_default_loop(),
|
||||
uv_run(uv_default_loop(), UV_RUN_DEFAULT);
|
||||
}
|
||||
|
||||
TEST_F(Storage, HTTP404) {
|
||||
SCOPED_TEST(HTTP404)
|
||||
|
||||
using namespace mbgl;
|
||||
|
||||
DefaultFileSource fs(nullptr);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
const auto mainThread = uv_thread_self();
|
||||
|
||||
Request* req2 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/doesnotexist" },
|
||||
[&](const Response &res) {
|
||||
fs.cancel(req2);
|
||||
EXPECT_EQ(uv_thread_self(), mainThread);
|
||||
@@ -45,10 +59,24 @@ TEST_F(Storage, HTTPReading) {
|
||||
EXPECT_EQ(0, res.expires);
|
||||
EXPECT_EQ(0, res.modified);
|
||||
EXPECT_EQ("", res.etag);
|
||||
loop.stop();
|
||||
HTTP404.finish();
|
||||
});
|
||||
|
||||
Request* req3 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/permanent-error" }, uv_default_loop(),
|
||||
uv_run(uv_default_loop(), UV_RUN_DEFAULT);
|
||||
}
|
||||
|
||||
TEST_F(Storage, HTTP500) {
|
||||
SCOPED_TEST(HTTP500)
|
||||
|
||||
using namespace mbgl;
|
||||
|
||||
DefaultFileSource fs(nullptr);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
const auto mainThread = uv_thread_self();
|
||||
|
||||
Request* req3 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/permanent-error" },
|
||||
[&](const Response &res) {
|
||||
fs.cancel(req3);
|
||||
EXPECT_EQ(uv_thread_self(), mainThread);
|
||||
@@ -61,6 +89,7 @@ TEST_F(Storage, HTTPReading) {
|
||||
EXPECT_EQ(0, res.expires);
|
||||
EXPECT_EQ(0, res.modified);
|
||||
EXPECT_EQ("", res.etag);
|
||||
loop.stop();
|
||||
HTTP500.finish();
|
||||
});
|
||||
|
||||
@@ -68,14 +97,15 @@ TEST_F(Storage, HTTPReading) {
|
||||
}
|
||||
|
||||
TEST_F(Storage, HTTPNoCallback) {
|
||||
SCOPED_TEST(HTTPTest)
|
||||
SCOPED_TEST(HTTPNoCallback)
|
||||
|
||||
using namespace mbgl;
|
||||
|
||||
DefaultFileSource fs(nullptr);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
try {
|
||||
fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, uv_default_loop(),
|
||||
fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" },
|
||||
nullptr);
|
||||
} catch (const util::MisuseException& ex) {
|
||||
EXPECT_EQ(std::string(ex.what()), "FileSource callback can't be empty");
|
||||
@@ -83,5 +113,5 @@ TEST_F(Storage, HTTPNoCallback) {
|
||||
EXPECT_TRUE(false) << "Unhandled exception.";
|
||||
}
|
||||
|
||||
HTTPTest.finish();
|
||||
HTTPNoCallback.finish();
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
#include <mbgl/storage/default_file_source.hpp>
|
||||
#include <mbgl/storage/network_status.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
|
||||
|
||||
// Test for https://github.com/mapbox/mapbox-gl-native/issues/2123
|
||||
@@ -18,11 +19,12 @@ TEST_F(Storage, HTTPNetworkStatusChange) {
|
||||
using namespace mbgl;
|
||||
|
||||
DefaultFileSource fs(nullptr);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
const Resource resource { Resource::Unknown, "http://127.0.0.1:3000/delayed" };
|
||||
|
||||
// This request takes 200 milliseconds to answer.
|
||||
Request* req = fs.request(resource, uv_default_loop(), [&](const Response& res) {
|
||||
Request* req = fs.request(resource, [&](const Response& res) {
|
||||
fs.cancel(req);
|
||||
EXPECT_EQ(nullptr, res.error);
|
||||
EXPECT_EQ(false, res.stale);
|
||||
@@ -31,6 +33,7 @@ TEST_F(Storage, HTTPNetworkStatusChange) {
|
||||
EXPECT_EQ(0, res.expires);
|
||||
EXPECT_EQ(0, res.modified);
|
||||
EXPECT_EQ("", res.etag);
|
||||
loop.stop();
|
||||
HTTPNetworkStatusChange.finish();
|
||||
});
|
||||
|
||||
@@ -56,11 +59,12 @@ TEST_F(Storage, HTTPNetworkStatusChangePreempt) {
|
||||
using namespace mbgl;
|
||||
|
||||
DefaultFileSource fs(nullptr);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
const auto start = uv_hrtime();
|
||||
|
||||
const Resource resource{ Resource::Unknown, "http://127.0.0.1:3001/test" };
|
||||
Request* req = fs.request(resource, uv_default_loop(), [&](const Response& res) {
|
||||
Request* req = fs.request(resource, [&](const Response& res) {
|
||||
static int counter = 0;
|
||||
const auto duration = double(uv_hrtime() - start) / 1e9;
|
||||
if (counter == 0) {
|
||||
@@ -92,6 +96,7 @@ TEST_F(Storage, HTTPNetworkStatusChangePreempt) {
|
||||
|
||||
if (counter++ == 1) {
|
||||
fs.cancel(req);
|
||||
loop.stop();
|
||||
HTTPNetworkStatusChangePreempt.finish();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
#include <mbgl/storage/default_file_source.hpp>
|
||||
#include <mbgl/storage/network_status.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
|
||||
|
||||
TEST_F(Storage, HTTPTimeout) {
|
||||
@@ -12,11 +13,12 @@ TEST_F(Storage, HTTPTimeout) {
|
||||
using namespace mbgl;
|
||||
|
||||
DefaultFileSource fs(nullptr);
|
||||
util::RunLoop loop(uv_default_loop());
|
||||
|
||||
int counter = 0;
|
||||
|
||||
const Resource resource { Resource::Unknown, "http://127.0.0.1:3000/test?cachecontrol=max-age=1" };
|
||||
Request* req = fs.request(resource, uv_default_loop(), [&](const Response &res) {
|
||||
Request* req = fs.request(resource, [&](const Response &res) {
|
||||
counter++;
|
||||
EXPECT_EQ(nullptr, res.error);
|
||||
EXPECT_EQ(false, res.stale);
|
||||
@@ -27,6 +29,7 @@ TEST_F(Storage, HTTPTimeout) {
|
||||
EXPECT_EQ("", res.etag);
|
||||
if (counter == 4) {
|
||||
fs.cancel(req);
|
||||
loop.stop();
|
||||
HTTPTimeout.finish();
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user