diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-11-25 13:30:32 +0200 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2015-11-27 17:47:02 +0200 |
commit | 31fd2822f516337f084f85db7e369d0633113b73 (patch) | |
tree | 9ad07f1bc0b3924f225ecfc628955bbd683e1d99 /test | |
parent | 4475f5486000bab8f1121f5cec6091bc04f165f1 (diff) | |
download | qtlocation-mapboxgl-31fd2822f516337f084f85db7e369d0633113b73.tar.gz |
[core] Replace time_t with std::chrono::seconds
Added aliases for std::chrono typedefs (eg. 'Seconds' for
std::chrono::seconds). These aliases are used together with templated
helper functions to replace time_t with std::chrono::seconds for most
cases, in particular for 'modified' and 'expires' values in Response.
Diffstat (limited to 'test')
-rw-r--r-- | test/storage/cache_response.cpp | 5 | ||||
-rw-r--r-- | test/storage/cache_revalidate.cpp | 25 | ||||
-rw-r--r-- | test/storage/directory_reading.cpp | 5 | ||||
-rw-r--r-- | test/storage/file_reading.cpp | 13 | ||||
-rw-r--r-- | test/storage/http_cancel.cpp | 5 | ||||
-rw-r--r-- | test/storage/http_coalescing.cpp | 21 | ||||
-rw-r--r-- | test/storage/http_error.cpp | 13 | ||||
-rw-r--r-- | test/storage/http_header_parsing.cpp | 11 | ||||
-rw-r--r-- | test/storage/http_issue_1369.cpp | 5 | ||||
-rw-r--r-- | test/storage/http_load.cpp | 5 | ||||
-rw-r--r-- | test/storage/http_other_loop.cpp | 5 | ||||
-rw-r--r-- | test/storage/http_reading.cpp | 13 | ||||
-rw-r--r-- | test/storage/http_retry_network_status.cpp | 10 | ||||
-rw-r--r-- | test/storage/http_timeout.cpp | 6 |
14 files changed, 76 insertions, 66 deletions
diff --git a/test/storage/cache_response.cpp b/test/storage/cache_response.cpp index d089659aeb..65a7208d94 100644 --- a/test/storage/cache_response.cpp +++ b/test/storage/cache_response.cpp @@ -4,6 +4,7 @@ #include <mbgl/storage/default_file_source.hpp> #include <mbgl/storage/sqlite_cache.hpp> +#include <mbgl/util/chrono.hpp> #include <mbgl/util/run_loop.hpp> TEST_F(Storage, CacheResponse) { @@ -27,8 +28,8 @@ TEST_F(Storage, CacheResponse) { EXPECT_EQ(false, res.stale); ASSERT_TRUE(res.data.get()); EXPECT_EQ("Response 1", *res.data); - EXPECT_LT(0, res.expires); - EXPECT_EQ(0, res.modified); + EXPECT_LT(Seconds::zero(), res.expires); + EXPECT_EQ(Seconds::zero(), res.modified); EXPECT_EQ("", res.etag); response = res; diff --git a/test/storage/cache_revalidate.cpp b/test/storage/cache_revalidate.cpp index 540a25acd6..4a553997db 100644 --- a/test/storage/cache_revalidate.cpp +++ b/test/storage/cache_revalidate.cpp @@ -4,6 +4,7 @@ #include <mbgl/storage/default_file_source.hpp> #include <mbgl/storage/sqlite_cache.hpp> +#include <mbgl/util/chrono.hpp> #include <mbgl/util/run_loop.hpp> TEST_F(Storage, CacheRevalidateSame) { @@ -31,8 +32,8 @@ TEST_F(Storage, CacheRevalidateSame) { EXPECT_EQ(false, res.stale); ASSERT_TRUE(res.data.get()); EXPECT_EQ("Response", *res.data); - EXPECT_EQ(0, res.expires); - EXPECT_EQ(0, res.modified); + EXPECT_EQ(Seconds::zero(), res.expires); + EXPECT_EQ(Seconds::zero(), res.modified); EXPECT_EQ("snowfall", res.etag); req2 = fs.request(revalidateSame, [&, res](Response res2) { @@ -53,8 +54,8 @@ TEST_F(Storage, CacheRevalidateSame) { EXPECT_EQ(res.data, res2.data); EXPECT_EQ("Response", *res2.data); // We use this to indicate that a 304 reply came back. - EXPECT_LT(0, res2.expires); - EXPECT_EQ(0, res2.modified); + EXPECT_LT(Seconds::zero(), res2.expires); + EXPECT_EQ(Seconds::zero(), res2.modified); // We're not sending the ETag in the 304 reply, but it should still be there. EXPECT_EQ("snowfall", res2.etag); @@ -92,8 +93,8 @@ TEST_F(Storage, CacheRevalidateModified) { EXPECT_EQ(false, res.stale); ASSERT_TRUE(res.data.get()); EXPECT_EQ("Response", *res.data); - EXPECT_EQ(0, res.expires); - EXPECT_EQ(1420070400, res.modified); + EXPECT_EQ(Seconds::zero(), res.expires); + EXPECT_EQ(1420070400, res.modified.count()); EXPECT_EQ("", res.etag); req2 = fs.request(revalidateModified, [&, res](Response res2) { @@ -114,8 +115,8 @@ TEST_F(Storage, CacheRevalidateModified) { EXPECT_EQ("Response", *res2.data); EXPECT_EQ(res.data, res2.data); // We use this to indicate that a 304 reply came back. - EXPECT_LT(0, res2.expires); - EXPECT_EQ(1420070400, res2.modified); + EXPECT_LT(Seconds::zero(), res2.expires); + EXPECT_EQ(1420070400, res2.modified.count()); EXPECT_EQ("", res2.etag); loop.stop(); @@ -151,8 +152,8 @@ TEST_F(Storage, CacheRevalidateEtag) { EXPECT_EQ(false, res.stale); ASSERT_TRUE(res.data.get()); EXPECT_EQ("Response 1", *res.data); - EXPECT_EQ(0, res.expires); - EXPECT_EQ(0, res.modified); + EXPECT_EQ(Seconds::zero(), res.expires); + EXPECT_EQ(Seconds::zero(), res.modified); EXPECT_EQ("response-1", res.etag); req2 = fs.request(revalidateEtag, [&, res](Response res2) { @@ -172,8 +173,8 @@ TEST_F(Storage, CacheRevalidateEtag) { ASSERT_TRUE(res2.data.get()); EXPECT_NE(res.data, res2.data); EXPECT_EQ("Response 2", *res2.data); - EXPECT_EQ(0, res2.expires); - EXPECT_EQ(0, res2.modified); + EXPECT_EQ(Seconds::zero(), res2.expires); + EXPECT_EQ(Seconds::zero(), res2.modified); EXPECT_EQ("response-2", res2.etag); loop.stop(); diff --git a/test/storage/directory_reading.cpp b/test/storage/directory_reading.cpp index fab52315fa..5754affe76 100644 --- a/test/storage/directory_reading.cpp +++ b/test/storage/directory_reading.cpp @@ -3,6 +3,7 @@ #include <uv.h> #include <mbgl/storage/default_file_source.hpp> +#include <mbgl/util/chrono.hpp> #include <mbgl/util/run_loop.hpp> TEST_F(Storage, AssetReadDirectory) { @@ -24,8 +25,8 @@ TEST_F(Storage, AssetReadDirectory) { EXPECT_EQ(Response::Error::Reason::NotFound, res.error->reason); EXPECT_EQ(false, res.stale); ASSERT_FALSE(res.data.get()); - EXPECT_EQ(0, res.expires); - EXPECT_EQ(0, res.modified); + EXPECT_EQ(Seconds::zero(), res.expires); + EXPECT_EQ(Seconds::zero(), res.modified); EXPECT_EQ("", res.etag); #ifdef MBGL_ASSET_ZIP EXPECT_EQ("No such file", res.error->message); diff --git a/test/storage/file_reading.cpp b/test/storage/file_reading.cpp index 3fc30df524..ceda7835f7 100644 --- a/test/storage/file_reading.cpp +++ b/test/storage/file_reading.cpp @@ -4,6 +4,7 @@ #include <mbgl/storage/default_file_source.hpp> #include <mbgl/platform/platform.hpp> +#include <mbgl/util/chrono.hpp> #include <mbgl/util/run_loop.hpp> TEST_F(Storage, AssetEmptyFile) { @@ -25,8 +26,8 @@ TEST_F(Storage, AssetEmptyFile) { EXPECT_EQ(false, res.stale); ASSERT_TRUE(res.data.get()); EXPECT_EQ("", *res.data); - EXPECT_EQ(0, res.expires); - EXPECT_LT(1420000000, res.modified); + EXPECT_EQ(Seconds::zero(), res.expires); + EXPECT_LT(1420000000, res.modified.count()); EXPECT_NE("", res.etag); loop.stop(); EmptyFile.finish(); @@ -54,8 +55,8 @@ TEST_F(Storage, AssetNonEmptyFile) { EXPECT_EQ(false, res.stale); ASSERT_TRUE(res.data.get()); EXPECT_EQ("content is here\n", *res.data); - EXPECT_EQ(0, res.expires); - EXPECT_LT(1420000000, res.modified); + EXPECT_EQ(Seconds::zero(), res.expires); + EXPECT_LT(1420000000, res.modified.count()); EXPECT_NE("", res.etag); ASSERT_TRUE(res.data.get()); EXPECT_EQ("content is here\n", *res.data); @@ -85,8 +86,8 @@ TEST_F(Storage, AssetNonExistentFile) { EXPECT_EQ(Response::Error::Reason::NotFound, res.error->reason); EXPECT_EQ(false, res.stale); ASSERT_FALSE(res.data.get()); - EXPECT_EQ(0, res.expires); - EXPECT_EQ(0, res.modified); + EXPECT_EQ(Seconds::zero(), res.expires); + EXPECT_EQ(Seconds::zero(), res.modified); EXPECT_EQ("", res.etag); #ifdef MBGL_ASSET_ZIP EXPECT_EQ("No such file", res.error->message); diff --git a/test/storage/http_cancel.cpp b/test/storage/http_cancel.cpp index eabc895902..52e23020be 100644 --- a/test/storage/http_cancel.cpp +++ b/test/storage/http_cancel.cpp @@ -4,6 +4,7 @@ #include <mbgl/storage/default_file_source.hpp> #include <mbgl/storage/network_status.hpp> +#include <mbgl/util/chrono.hpp> #include <mbgl/util/run_loop.hpp> #include <cmath> @@ -45,8 +46,8 @@ TEST_F(Storage, HTTPCancelMultiple) { EXPECT_EQ(false, res.stale); ASSERT_TRUE(res.data.get()); EXPECT_EQ("Hello World!", *res.data); - EXPECT_EQ(0, res.expires); - EXPECT_EQ(0, res.modified); + EXPECT_EQ(Seconds::zero(), res.expires); + EXPECT_EQ(Seconds::zero(), res.modified); EXPECT_EQ("", res.etag); loop.stop(); HTTPCancelMultiple.finish(); diff --git a/test/storage/http_coalescing.cpp b/test/storage/http_coalescing.cpp index 38fc0151a3..ab63260c1b 100644 --- a/test/storage/http_coalescing.cpp +++ b/test/storage/http_coalescing.cpp @@ -3,6 +3,7 @@ #include <uv.h> #include <mbgl/storage/default_file_source.hpp> +#include <mbgl/util/chrono.hpp> #include <mbgl/util/run_loop.hpp> TEST_F(Storage, HTTPCoalescing) { @@ -31,8 +32,8 @@ TEST_F(Storage, HTTPCoalescing) { EXPECT_EQ(nullptr, res.error); ASSERT_TRUE(res.data.get()); EXPECT_EQ("Hello World!", *res.data); - EXPECT_EQ(0, res.expires); - EXPECT_EQ(0, res.modified); + EXPECT_EQ(Seconds::zero(), res.expires); + EXPECT_EQ(Seconds::zero(), res.modified); EXPECT_EQ("", res.etag); if (counter >= total) { @@ -70,8 +71,8 @@ TEST_F(Storage, HTTPMultiple) { EXPECT_EQ(nullptr, res.error); ASSERT_TRUE(res.data.get()); EXPECT_EQ("Hello World!", *res.data); - EXPECT_EQ(2147483647, res.expires); - EXPECT_EQ(0, res.modified); + EXPECT_EQ(2147483647, res.expires.count()); + EXPECT_EQ(Seconds::zero(), res.modified); EXPECT_EQ("", res.etag); // Start a second request for the same resource after the first one has been completed. @@ -86,8 +87,8 @@ TEST_F(Storage, HTTPMultiple) { EXPECT_EQ(nullptr, res2.error); ASSERT_TRUE(res2.data.get()); EXPECT_EQ("Hello World!", *res2.data); - EXPECT_EQ(2147483647, res2.expires); - EXPECT_EQ(0, res2.modified); + EXPECT_EQ(2147483647, res2.expires.count()); + EXPECT_EQ(Seconds::zero(), res2.modified); EXPECT_EQ("", res2.etag); loop.stop(); @@ -119,8 +120,8 @@ TEST_F(Storage, HTTPStale) { ASSERT_TRUE(res.data.get()); EXPECT_EQ("Hello World!", *res.data); EXPECT_EQ(false, res.stale); - EXPECT_EQ(0, res.expires); - EXPECT_EQ(0, res.modified); + EXPECT_EQ(Seconds::zero(), res.expires); + EXPECT_EQ(Seconds::zero(), res.modified); EXPECT_EQ("", res.etag); // Don't start the request twice in case this callback gets fired multiple times. @@ -135,8 +136,8 @@ TEST_F(Storage, HTTPStale) { EXPECT_EQ(nullptr, res2.error); ASSERT_TRUE(res2.data.get()); EXPECT_EQ("Hello World!", *res2.data); - EXPECT_EQ(0, res2.expires); - EXPECT_EQ(0, res2.modified); + EXPECT_EQ(Seconds::zero(), res2.expires); + EXPECT_EQ(Seconds::zero(), res2.modified); EXPECT_EQ("", res2.etag); if (res2.stale) { diff --git a/test/storage/http_error.cpp b/test/storage/http_error.cpp index 276793b77f..7c9c19eb62 100644 --- a/test/storage/http_error.cpp +++ b/test/storage/http_error.cpp @@ -4,6 +4,7 @@ #include <mbgl/storage/default_file_source.hpp> #include <mbgl/storage/network_status.hpp> +#include <mbgl/util/chrono.hpp> #include <mbgl/util/run_loop.hpp> #include <cmath> @@ -30,8 +31,8 @@ TEST_F(Storage, HTTPTemporaryError) { EXPECT_EQ(false, res.stale); ASSERT_TRUE(res.data.get()); EXPECT_EQ("", *res.data); - EXPECT_EQ(0, res.expires); - EXPECT_EQ(0, res.modified); + EXPECT_EQ(Seconds::zero(), res.expires); + EXPECT_EQ(Seconds::zero(), res.modified); EXPECT_EQ("", res.etag); } break; case 1: { @@ -43,8 +44,8 @@ TEST_F(Storage, HTTPTemporaryError) { EXPECT_EQ(false, res.stale); ASSERT_TRUE(res.data.get()); EXPECT_EQ("Hello World!", *res.data); - EXPECT_EQ(0, res.expires); - EXPECT_EQ(0, res.modified); + EXPECT_EQ(Seconds::zero(), res.expires); + EXPECT_EQ(Seconds::zero(), res.modified); EXPECT_EQ("", res.etag); loop.stop(); HTTPTemporaryError.finish(); @@ -86,8 +87,8 @@ TEST_F(Storage, HTTPConnectionError) { #endif EXPECT_EQ(false, res.stale); ASSERT_FALSE(res.data.get()); - EXPECT_EQ(0, res.expires); - EXPECT_EQ(0, res.modified); + EXPECT_EQ(Seconds::zero(), res.expires); + EXPECT_EQ(Seconds::zero(), res.modified); EXPECT_EQ("", res.etag); if (counter == 2) { diff --git a/test/storage/http_header_parsing.cpp b/test/storage/http_header_parsing.cpp index 041b138b60..bb2dccc6e7 100644 --- a/test/storage/http_header_parsing.cpp +++ b/test/storage/http_header_parsing.cpp @@ -24,8 +24,8 @@ TEST_F(Storage, HTTPExpiresParsing) { EXPECT_EQ(false, res.stale); ASSERT_TRUE(res.data.get()); EXPECT_EQ("Hello World!", *res.data); - EXPECT_EQ(1420797926, res.expires); - EXPECT_EQ(1420794326, res.modified); + EXPECT_EQ(1420797926, res.expires.count()); + EXPECT_EQ(1420794326, res.modified.count()); EXPECT_EQ("foo", res.etag); loop.stop(); HTTPExpiresTest.finish(); @@ -42,8 +42,7 @@ TEST_F(Storage, HTTPCacheControlParsing) { 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(); + const Seconds now = toSeconds(SystemClock::now()); std::unique_ptr<FileRequest> req2 = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test?cachecontrol=max-age=120" }, [&](Response res) { @@ -52,8 +51,8 @@ TEST_F(Storage, HTTPCacheControlParsing) { EXPECT_EQ(false, res.stale); ASSERT_TRUE(res.data.get()); EXPECT_EQ("Hello World!", *res.data); - 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_GT(2, std::abs(res.expires.count() - now.count() - 120)) << "Expiration date isn't about 120 seconds in the future"; + EXPECT_EQ(Seconds::zero(), res.modified); EXPECT_EQ("", res.etag); loop.stop(); HTTPCacheControlTest.finish(); diff --git a/test/storage/http_issue_1369.cpp b/test/storage/http_issue_1369.cpp index 0fe0f5fb1b..99b8fac16f 100644 --- a/test/storage/http_issue_1369.cpp +++ b/test/storage/http_issue_1369.cpp @@ -4,6 +4,7 @@ #include <mbgl/storage/default_file_source.hpp> #include <mbgl/storage/sqlite_cache.hpp> +#include <mbgl/util/chrono.hpp> #include <mbgl/util/run_loop.hpp> // Test for https://github.com/mapbox/mapbox-gl-native/issue/1369 @@ -38,8 +39,8 @@ TEST_F(Storage, HTTPIssue1369) { EXPECT_EQ(false, res.stale); ASSERT_TRUE(res.data.get()); EXPECT_EQ("Hello World!", *res.data); - EXPECT_EQ(0, res.expires); - EXPECT_EQ(0, res.modified); + EXPECT_EQ(Seconds::zero(), res.expires); + EXPECT_EQ(Seconds::zero(), res.modified); EXPECT_EQ("", res.etag); loop.stop(); HTTPIssue1369.finish(); diff --git a/test/storage/http_load.cpp b/test/storage/http_load.cpp index 0a6b0ef653..1a494d24fa 100644 --- a/test/storage/http_load.cpp +++ b/test/storage/http_load.cpp @@ -3,6 +3,7 @@ #include <uv.h> #include <mbgl/storage/default_file_source.hpp> +#include <mbgl/util/chrono.hpp> #include <mbgl/util/run_loop.hpp> TEST_F(Storage, HTTPLoad) { @@ -29,8 +30,8 @@ TEST_F(Storage, HTTPLoad) { EXPECT_EQ(false, res.stale); ASSERT_TRUE(res.data.get()); EXPECT_EQ(std::string("Request ") + std::to_string(current), *res.data); - EXPECT_EQ(0, res.expires); - EXPECT_EQ(0, res.modified); + EXPECT_EQ(Seconds::zero(), res.expires); + EXPECT_EQ(Seconds::zero(), res.modified); EXPECT_EQ("", res.etag); if (number <= max) { diff --git a/test/storage/http_other_loop.cpp b/test/storage/http_other_loop.cpp index b432c39ac2..ec373a7221 100644 --- a/test/storage/http_other_loop.cpp +++ b/test/storage/http_other_loop.cpp @@ -3,6 +3,7 @@ #include <uv.h> #include <mbgl/storage/default_file_source.hpp> +#include <mbgl/util/chrono.hpp> #include <mbgl/util/run_loop.hpp> TEST_F(Storage, HTTPOtherLoop) { @@ -21,8 +22,8 @@ TEST_F(Storage, HTTPOtherLoop) { EXPECT_EQ(false, res.stale); ASSERT_TRUE(res.data.get()); EXPECT_EQ("Hello World!", *res.data); - EXPECT_EQ(0, res.expires); - EXPECT_EQ(0, res.modified); + EXPECT_EQ(Seconds::zero(), res.expires); + EXPECT_EQ(Seconds::zero(), res.modified); EXPECT_EQ("", res.etag); loop.stop(); HTTPOtherLoop.finish(); diff --git a/test/storage/http_reading.cpp b/test/storage/http_reading.cpp index b072a6eb53..6c78878384 100644 --- a/test/storage/http_reading.cpp +++ b/test/storage/http_reading.cpp @@ -4,6 +4,7 @@ #include <mbgl/storage/default_file_source.hpp> #include <mbgl/util/exception.hpp> +#include <mbgl/util/chrono.hpp> #include <mbgl/util/run_loop.hpp> #include <future> @@ -26,8 +27,8 @@ TEST_F(Storage, HTTPTest) { EXPECT_EQ(false, res.stale); ASSERT_TRUE(res.data.get()); EXPECT_EQ("Hello World!", *res.data); - EXPECT_EQ(0, res.expires); - EXPECT_EQ(0, res.modified); + EXPECT_EQ(Seconds::zero(), res.expires); + EXPECT_EQ(Seconds::zero(), res.modified); EXPECT_EQ("", res.etag); loop.stop(); HTTPTest.finish(); @@ -56,8 +57,8 @@ TEST_F(Storage, HTTP404) { ASSERT_TRUE(res.data.get()); EXPECT_EQ("Cannot GET /doesnotexist\n", *res.data); EXPECT_EQ("HTTP status code 404", res.error->message); - EXPECT_EQ(0, res.expires); - EXPECT_EQ(0, res.modified); + EXPECT_EQ(Seconds::zero(), res.expires); + EXPECT_EQ(Seconds::zero(), res.modified); EXPECT_EQ("", res.etag); loop.stop(); HTTP404.finish(); @@ -86,8 +87,8 @@ TEST_F(Storage, HTTP500) { ASSERT_TRUE(res.data.get()); EXPECT_EQ("Server Error!", *res.data); EXPECT_EQ("HTTP status code 500", res.error->message); - EXPECT_EQ(0, res.expires); - EXPECT_EQ(0, res.modified); + EXPECT_EQ(Seconds::zero(), res.expires); + EXPECT_EQ(Seconds::zero(), res.modified); EXPECT_EQ("", res.etag); loop.stop(); HTTP500.finish(); diff --git a/test/storage/http_retry_network_status.cpp b/test/storage/http_retry_network_status.cpp index 08e3be89ab..9f732b1859 100644 --- a/test/storage/http_retry_network_status.cpp +++ b/test/storage/http_retry_network_status.cpp @@ -4,9 +4,9 @@ #include <mbgl/storage/default_file_source.hpp> #include <mbgl/storage/network_status.hpp> +#include <mbgl/util/chrono.hpp> #include <mbgl/util/run_loop.hpp> - // Test for https://github.com/mapbox/mapbox-gl-native/issues/2123 // // A request is made. While the request is in progress, the network status changes. This should @@ -30,8 +30,8 @@ TEST_F(Storage, HTTPNetworkStatusChange) { EXPECT_EQ(false, res.stale); ASSERT_TRUE(res.data.get()); EXPECT_EQ("Response", *res.data); - EXPECT_EQ(0, res.expires); - EXPECT_EQ(0, res.modified); + EXPECT_EQ(Seconds::zero(), res.expires); + EXPECT_EQ(Seconds::zero(), res.modified); EXPECT_EQ("", res.etag); loop.stop(); HTTPNetworkStatusChange.finish(); @@ -90,8 +90,8 @@ TEST_F(Storage, HTTPNetworkStatusChangePreempt) { #endif EXPECT_EQ(false, res.stale); ASSERT_FALSE(res.data.get()); - EXPECT_EQ(0, res.expires); - EXPECT_EQ(0, res.modified); + EXPECT_EQ(Seconds::zero(), res.expires); + EXPECT_EQ(Seconds::zero(), res.modified); EXPECT_EQ("", res.etag); if (counter++ == 1) { diff --git a/test/storage/http_timeout.cpp b/test/storage/http_timeout.cpp index 2c1a1f1f60..92c6fe4919 100644 --- a/test/storage/http_timeout.cpp +++ b/test/storage/http_timeout.cpp @@ -4,9 +4,9 @@ #include <mbgl/storage/default_file_source.hpp> #include <mbgl/storage/network_status.hpp> +#include <mbgl/util/chrono.hpp> #include <mbgl/util/run_loop.hpp> - TEST_F(Storage, HTTPTimeout) { SCOPED_TEST(HTTPTimeout) @@ -24,8 +24,8 @@ TEST_F(Storage, HTTPTimeout) { EXPECT_EQ(false, res.stale); ASSERT_TRUE(res.data.get()); EXPECT_EQ("Hello World!", *res.data); - EXPECT_LT(0, res.expires); - EXPECT_EQ(0, res.modified); + EXPECT_LT(Seconds::zero(), res.expires); + EXPECT_EQ(Seconds::zero(), res.modified); EXPECT_EQ("", res.etag); if (counter == 4) { req.reset(); |