diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-03-23 17:31:14 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-03-24 10:54:32 -0700 |
commit | 169755e89a72b103fab100ccd101013e8eef1481 (patch) | |
tree | 5716e13519fe2b7f5c91cccbdbf14635a1ef117d /test/storage | |
parent | 7ff074889e826f766028ba582beb677b39d16bec (diff) | |
download | qtlocation-mapboxgl-169755e89a72b103fab100ccd101013e8eef1481.tar.gz |
[core] Unify FileRequest and WorkRequest
Diffstat (limited to 'test/storage')
-rw-r--r-- | test/storage/asset_file_source.cpp | 14 | ||||
-rw-r--r-- | test/storage/default_file_source.cpp | 16 | ||||
-rw-r--r-- | test/storage/http_cancel.cpp | 4 | ||||
-rw-r--r-- | test/storage/http_error.cpp | 4 | ||||
-rw-r--r-- | test/storage/http_expires.cpp | 10 | ||||
-rw-r--r-- | test/storage/http_header_parsing.cpp | 4 | ||||
-rw-r--r-- | test/storage/http_load.cpp | 2 | ||||
-rw-r--r-- | test/storage/http_other_loop.cpp | 2 | ||||
-rw-r--r-- | test/storage/http_reading.cpp | 12 | ||||
-rw-r--r-- | test/storage/http_retry_network_status.cpp | 6 | ||||
-rw-r--r-- | test/storage/http_timeout.cpp | 2 |
11 files changed, 38 insertions, 38 deletions
diff --git a/test/storage/asset_file_source.cpp b/test/storage/asset_file_source.cpp index 2ff179f90e..c6a25f83dd 100644 --- a/test/storage/asset_file_source.cpp +++ b/test/storage/asset_file_source.cpp @@ -44,7 +44,7 @@ private: unsigned numRequests = 1000; mbgl::AssetFileSource* fs; - std::unique_ptr<mbgl::FileRequest> request; + std::unique_ptr<mbgl::AsyncRequest> request; std::function<void(mbgl::Response)> requestCallback; }; @@ -74,7 +74,7 @@ TEST_F(Storage, AssetStress) { }; std::vector<std::unique_ptr<util::Thread<TestWorker>>> threads; - std::vector<std::unique_ptr<mbgl::WorkRequest>> requests; + std::vector<std::unique_ptr<mbgl::AsyncRequest>> requests; util::ThreadContext context = { "Test", util::ThreadType::Map, util::ThreadPriority::Regular }; for (unsigned i = 0; i < numThreads; ++i) { @@ -101,7 +101,7 @@ TEST_F(Storage, AssetEmptyFile) { AssetFileSource fs(getFileSourceRoot()); - std::unique_ptr<FileRequest> req = fs.request({ Resource::Unknown, "asset://empty" }, [&](Response res) { + std::unique_ptr<AsyncRequest> req = fs.request({ Resource::Unknown, "asset://empty" }, [&](Response res) { req.reset(); EXPECT_EQ(nullptr, res.error); ASSERT_TRUE(res.data.get()); @@ -122,7 +122,7 @@ TEST_F(Storage, AssetNonEmptyFile) { AssetFileSource fs(getFileSourceRoot()); - std::unique_ptr<FileRequest> req = fs.request({ Resource::Unknown, "asset://nonempty" }, [&](Response res) { + std::unique_ptr<AsyncRequest> req = fs.request({ Resource::Unknown, "asset://nonempty" }, [&](Response res) { req.reset(); EXPECT_EQ(nullptr, res.error); ASSERT_TRUE(res.data.get()); @@ -143,7 +143,7 @@ TEST_F(Storage, AssetNonExistentFile) { AssetFileSource fs(getFileSourceRoot()); - std::unique_ptr<FileRequest> req = fs.request({ Resource::Unknown, "asset://does_not_exist" }, [&](Response res) { + std::unique_ptr<AsyncRequest> req = fs.request({ Resource::Unknown, "asset://does_not_exist" }, [&](Response res) { req.reset(); ASSERT_NE(nullptr, res.error); EXPECT_EQ(Response::Error::Reason::NotFound, res.error->reason); @@ -165,7 +165,7 @@ TEST_F(Storage, AssetReadDirectory) { AssetFileSource fs(getFileSourceRoot()); - std::unique_ptr<FileRequest> req = fs.request({ Resource::Unknown, "asset://directory" }, [&](Response res) { + std::unique_ptr<AsyncRequest> req = fs.request({ Resource::Unknown, "asset://directory" }, [&](Response res) { req.reset(); ASSERT_NE(nullptr, res.error); EXPECT_EQ(Response::Error::Reason::NotFound, res.error->reason); @@ -187,7 +187,7 @@ TEST_F(Storage, AssetURLEncoding) { AssetFileSource fs(getFileSourceRoot()); - std::unique_ptr<FileRequest> req = fs.request({ Resource::Unknown, "asset://%6eonempty" }, [&](Response res) { + std::unique_ptr<AsyncRequest> req = fs.request({ Resource::Unknown, "asset://%6eonempty" }, [&](Response res) { req.reset(); EXPECT_EQ(nullptr, res.error); ASSERT_TRUE(res.data.get()); diff --git a/test/storage/default_file_source.cpp b/test/storage/default_file_source.cpp index 57eb045660..a3453a83bc 100644 --- a/test/storage/default_file_source.cpp +++ b/test/storage/default_file_source.cpp @@ -16,8 +16,8 @@ TEST_F(DefaultFileSourceTest, TEST_REQUIRES_SERVER(CacheResponse)) { const Resource resource { Resource::Unknown, "http://127.0.0.1:3000/cache" }; Response response; - std::unique_ptr<FileRequest> req1; - std::unique_ptr<FileRequest> req2; + std::unique_ptr<AsyncRequest> req1; + std::unique_ptr<AsyncRequest> req2; req1 = fs.request(resource, [&](Response res) { req1.reset(); @@ -57,8 +57,8 @@ TEST_F(DefaultFileSourceTest, TEST_REQUIRES_SERVER(CacheRevalidateSame)) { DefaultFileSource fs(":memory:", "."); const Resource revalidateSame { Resource::Unknown, "http://127.0.0.1:3000/revalidate-same" }; - std::unique_ptr<FileRequest> req1; - std::unique_ptr<FileRequest> req2; + std::unique_ptr<AsyncRequest> req1; + std::unique_ptr<AsyncRequest> req2; uint16_t counter = 0; // First request causes the response to get cached. @@ -107,8 +107,8 @@ TEST_F(DefaultFileSourceTest, TEST_REQUIRES_SERVER(CacheRevalidateModified)) { const Resource revalidateModified{ Resource::Unknown, "http://127.0.0.1:3000/revalidate-modified" }; - std::unique_ptr<FileRequest> req1; - std::unique_ptr<FileRequest> req2; + std::unique_ptr<AsyncRequest> req1; + std::unique_ptr<AsyncRequest> req2; uint16_t counter = 0; // First request causes the response to get cached. @@ -155,8 +155,8 @@ TEST_F(DefaultFileSourceTest, TEST_REQUIRES_SERVER(CacheRevalidateEtag)) { DefaultFileSource fs(":memory:", "."); const Resource revalidateEtag { Resource::Unknown, "http://127.0.0.1:3000/revalidate-etag" }; - std::unique_ptr<FileRequest> req1; - std::unique_ptr<FileRequest> req2; + std::unique_ptr<AsyncRequest> req1; + std::unique_ptr<AsyncRequest> req2; uint16_t counter = 0; // First request causes the response to get cached. diff --git a/test/storage/http_cancel.cpp b/test/storage/http_cancel.cpp index 3b4db35940..bda274c547 100644 --- a/test/storage/http_cancel.cpp +++ b/test/storage/http_cancel.cpp @@ -35,10 +35,10 @@ TEST_F(Storage, TEST_REQUIRES_SERVER(HTTPCancelMultiple)) { const Resource resource { Resource::Unknown, "http://127.0.0.1:3000/test" }; - std::unique_ptr<FileRequest> req2 = fs.request(resource, [&](Response) { + std::unique_ptr<AsyncRequest> req2 = fs.request(resource, [&](Response) { ADD_FAILURE() << "Callback should not be called"; }); - std::unique_ptr<FileRequest> req = fs.request(resource, [&](Response res) { + std::unique_ptr<AsyncRequest> req = fs.request(resource, [&](Response res) { req.reset(); EXPECT_EQ(nullptr, res.error); ASSERT_TRUE(res.data.get()); diff --git a/test/storage/http_error.cpp b/test/storage/http_error.cpp index 1600178411..073f48b1b1 100644 --- a/test/storage/http_error.cpp +++ b/test/storage/http_error.cpp @@ -17,7 +17,7 @@ TEST_F(Storage, TEST_REQUIRES_SERVER(HTTPTemporaryError)) { const auto start = Clock::now(); - std::unique_ptr<FileRequest> req1 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/temporary-error" }, [&](Response res) { + std::unique_ptr<AsyncRequest> req1 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/temporary-error" }, [&](Response res) { static int counter = 0; switch (counter++) { case 0: { @@ -61,7 +61,7 @@ TEST_F(Storage, TEST_REQUIRES_SERVER(HTTPConnectionError)) { const auto start = Clock::now(); - std::unique_ptr<FileRequest> req2 = fs.request({ Resource::Unknown, "http://127.0.0.1:3001/" }, [&](Response res) { + std::unique_ptr<AsyncRequest> req2 = fs.request({ Resource::Unknown, "http://127.0.0.1:3001/" }, [&](Response res) { static int counter = 0; static int wait = 0; const auto duration = std::chrono::duration<const double>(Clock::now() - start).count(); diff --git a/test/storage/http_expires.cpp b/test/storage/http_expires.cpp index 0d64d31049..787d3e540b 100644 --- a/test/storage/http_expires.cpp +++ b/test/storage/http_expires.cpp @@ -17,7 +17,7 @@ TEST_F(Storage, TEST_REQUIRES_SERVER(HTTPRetryDelayOnExpiredTile)) { int counter = 0; const Resource resource { Resource::Unknown, "http://127.0.0.1:3000/test?expires=10000" }; - std::unique_ptr<FileRequest> req = fs.request(resource, [&](Response res) { + std::unique_ptr<AsyncRequest> req = fs.request(resource, [&](Response res) { counter++; EXPECT_EQ(nullptr, res.error); EXPECT_GT(SystemClock::now(), res.expires); @@ -46,7 +46,7 @@ TEST_F(Storage, TEST_REQUIRES_SERVER(HTTPRetryOnClockSkew)) { int counter = 0; const Resource resource { Resource::Unknown, "http://127.0.0.1:3000/clockskew" }; - std::unique_ptr<FileRequest> req1 = fs.request(resource, [&](Response res) { + std::unique_ptr<AsyncRequest> req1 = fs.request(resource, [&](Response res) { switch (counter++) { case 0: { EXPECT_EQ(nullptr, res.error); @@ -81,14 +81,14 @@ TEST_F(Storage, TEST_REQUIRES_SERVER(HTTPRespectPriorExpires)) { Resource resource1{ Resource::Unknown, "http://127.0.0.1:3000/test" }; resource1.priorExpires = SystemClock::now() + Seconds(100000); - std::unique_ptr<FileRequest> req1 = fs.request(resource1, [&](Response) { + std::unique_ptr<AsyncRequest> req1 = fs.request(resource1, [&](Response) { FAIL() << "Should never be called"; }); // No expiration time, should be requested immediately. Resource resource2{ Resource::Unknown, "http://127.0.0.1:3000/test" }; - std::unique_ptr<FileRequest> req2 = fs.request(resource2, [&](Response) { + std::unique_ptr<AsyncRequest> req2 = fs.request(resource2, [&](Response) { HTTPRespectPriorExpires.finish(); loop.stop(); }); @@ -97,7 +97,7 @@ TEST_F(Storage, TEST_REQUIRES_SERVER(HTTPRespectPriorExpires)) { Resource resource3{ Resource::Unknown, "http://127.0.0.1:3000/test" }; resource3.priorExpires = SystemClock::now() + Seconds(100000); - std::unique_ptr<FileRequest> req3 = fs.request(resource3, [&](Response) { + std::unique_ptr<AsyncRequest> req3 = fs.request(resource3, [&](Response) { FAIL() << "Should never be called"; }); diff --git a/test/storage/http_header_parsing.cpp b/test/storage/http_header_parsing.cpp index 163ef71899..cdebe8db5d 100644 --- a/test/storage/http_header_parsing.cpp +++ b/test/storage/http_header_parsing.cpp @@ -14,7 +14,7 @@ TEST_F(Storage, TEST_REQUIRES_SERVER(HTTPExpiresParsing)) { util::RunLoop loop; OnlineFileSource fs; - std::unique_ptr<FileRequest> req1 = fs.request({ Resource::Unknown, + std::unique_ptr<AsyncRequest> req1 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test?modified=1420794326&expires=1420797926&etag=foo" }, [&](Response res) { req1.reset(); @@ -39,7 +39,7 @@ TEST_F(Storage, TEST_REQUIRES_SERVER(HTTPCacheControlParsing)) { util::RunLoop loop; OnlineFileSource fs; - std::unique_ptr<FileRequest> req2 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test?cachecontrol=max-age=120" }, + std::unique_ptr<AsyncRequest> req2 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test?cachecontrol=max-age=120" }, [&](Response res) { req2.reset(); EXPECT_EQ(nullptr, res.error); diff --git a/test/storage/http_load.cpp b/test/storage/http_load.cpp index a518ec4be6..4feb790cbc 100644 --- a/test/storage/http_load.cpp +++ b/test/storage/http_load.cpp @@ -16,7 +16,7 @@ TEST_F(Storage, TEST_REQUIRES_SERVER(HTTPLoad)) { const int max = 10000; int number = 1; - std::unique_ptr<FileRequest> reqs[concurrency]; + std::unique_ptr<AsyncRequest> reqs[concurrency]; std::function<void(int)> req = [&](int i) { const auto current = number++; diff --git a/test/storage/http_other_loop.cpp b/test/storage/http_other_loop.cpp index ab22d65237..20e7e2356a 100644 --- a/test/storage/http_other_loop.cpp +++ b/test/storage/http_other_loop.cpp @@ -13,7 +13,7 @@ TEST_F(Storage, TEST_REQUIRES_SERVER(HTTPOtherLoop)) { util::RunLoop loop; OnlineFileSource fs; - std::unique_ptr<FileRequest> req = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, + std::unique_ptr<AsyncRequest> req = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, [&](Response res) { req.reset(); EXPECT_EQ(nullptr, res.error); diff --git a/test/storage/http_reading.cpp b/test/storage/http_reading.cpp index 607a5fd487..9682ec93cf 100644 --- a/test/storage/http_reading.cpp +++ b/test/storage/http_reading.cpp @@ -16,7 +16,7 @@ TEST_F(Storage, TEST_REQUIRES_SERVER(HTTPTest)) { util::RunLoop loop; OnlineFileSource fs; - std::unique_ptr<FileRequest> req1 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, + std::unique_ptr<AsyncRequest> req1 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, [&](Response res) { req1.reset(); EXPECT_TRUE(util::ThreadContext::currentlyOn(util::ThreadType::Main)); @@ -41,7 +41,7 @@ TEST_F(Storage, TEST_REQUIRES_SERVER(HTTP404)) { util::RunLoop loop; OnlineFileSource fs; - std::unique_ptr<FileRequest> req2 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/doesnotexist" }, + std::unique_ptr<AsyncRequest> req2 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/doesnotexist" }, [&](Response res) { req2.reset(); EXPECT_TRUE(util::ThreadContext::currentlyOn(util::ThreadType::Main)); @@ -67,7 +67,7 @@ TEST_F(Storage, TEST_REQUIRES_SERVER(HTTPTile404)) { util::RunLoop loop; OnlineFileSource fs; - std::unique_ptr<FileRequest> req2 = fs.request({ Resource::Tile, "http://127.0.0.1:3000/doesnotexist" }, + std::unique_ptr<AsyncRequest> req2 = fs.request({ Resource::Tile, "http://127.0.0.1:3000/doesnotexist" }, [&](Response res) { req2.reset(); EXPECT_TRUE(util::ThreadContext::currentlyOn(util::ThreadType::Main)); @@ -92,7 +92,7 @@ TEST_F(Storage, TEST_REQUIRES_SERVER(HTTP200EmptyData)) { util::RunLoop loop; OnlineFileSource fs; - std::unique_ptr<FileRequest> req = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/empty-data" }, + std::unique_ptr<AsyncRequest> req = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/empty-data" }, [&](Response res) { req.reset(); EXPECT_TRUE(util::ThreadContext::currentlyOn(util::ThreadType::Main)); @@ -117,7 +117,7 @@ TEST_F(Storage, TEST_REQUIRES_SERVER(HTTP204)) { util::RunLoop loop; OnlineFileSource fs; - std::unique_ptr<FileRequest> req2 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/no-content" }, + std::unique_ptr<AsyncRequest> req2 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/no-content" }, [&](Response res) { req2.reset(); EXPECT_TRUE(util::ThreadContext::currentlyOn(util::ThreadType::Main)); @@ -142,7 +142,7 @@ TEST_F(Storage, TEST_REQUIRES_SERVER(HTTP500)) { util::RunLoop loop; OnlineFileSource fs; - std::unique_ptr<FileRequest> req3 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/permanent-error" }, + std::unique_ptr<AsyncRequest> req3 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/permanent-error" }, [&](Response res) { req3.reset(); EXPECT_TRUE(util::ThreadContext::currentlyOn(util::ThreadType::Main)); diff --git a/test/storage/http_retry_network_status.cpp b/test/storage/http_retry_network_status.cpp index 34d0ecaf19..249f74c264 100644 --- a/test/storage/http_retry_network_status.cpp +++ b/test/storage/http_retry_network_status.cpp @@ -23,7 +23,7 @@ TEST_F(Storage, TEST_REQUIRES_SERVER(HTTPNetworkStatusChange)) { const Resource resource { Resource::Unknown, "http://127.0.0.1:3000/delayed" }; // This request takes 200 milliseconds to answer. - std::unique_ptr<FileRequest> req = fs.request(resource, [&](Response res) { + std::unique_ptr<AsyncRequest> req = fs.request(resource, [&](Response res) { req.reset(); EXPECT_EQ(nullptr, res.error); ASSERT_TRUE(res.data.get()); @@ -57,7 +57,7 @@ TEST_F(Storage, TEST_REQUIRES_SERVER(HTTPNetworkStatusChangePreempt)) { const auto start = Clock::now(); const Resource resource{ Resource::Unknown, "http://127.0.0.1:3001/test" }; - std::unique_ptr<FileRequest> req = fs.request(resource, [&](Response res) { + std::unique_ptr<AsyncRequest> req = fs.request(resource, [&](Response res) { static int counter = 0; const auto duration = std::chrono::duration<const double>(Clock::now() - start).count(); if (counter == 0) { @@ -120,7 +120,7 @@ TEST_F(Storage, TEST_REQUIRES_SERVER(HTTPNetworkStatusOnlineOffline)) { NetworkStatus::Set(NetworkStatus::Status::Online); }); - std::unique_ptr<FileRequest> req = fs.request(resource, [&](Response res) { + std::unique_ptr<AsyncRequest> req = fs.request(resource, [&](Response res) { req.reset(); EXPECT_EQ(nullptr, res.error); diff --git a/test/storage/http_timeout.cpp b/test/storage/http_timeout.cpp index b1df8c2fbb..42c7f39f56 100644 --- a/test/storage/http_timeout.cpp +++ b/test/storage/http_timeout.cpp @@ -16,7 +16,7 @@ TEST_F(Storage, TEST_REQUIRES_SERVER(HTTPTimeout)) { int counter = 0; const Resource resource { Resource::Unknown, "http://127.0.0.1:3000/test?cachecontrol=max-age=1" }; - std::unique_ptr<FileRequest> req = fs.request(resource, [&](Response res) { + std::unique_ptr<AsyncRequest> req = fs.request(resource, [&](Response res) { counter++; EXPECT_EQ(nullptr, res.error); ASSERT_TRUE(res.data.get()); |