diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-08-20 15:52:58 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-08-20 15:54:13 +0300 |
| commit | bcca5d3ac57f17b8d4d34ca8c9172788c8da3dfd (patch) | |
| tree | d6c066f337e04d651f42c84619edbc0152ab9340 /test/map/map.test.cpp | |
| parent | c42b44197ffa012810c50dfa658cf979b08244d4 (diff) | |
| download | qtlocation-mapboxgl-upstream/tmpsantos-chrono_overflow.tar.gz | |
[core] Remove wrapper for std::chrono::system_clock::now()upstream/tmpsantos-chrono_overflow
Better make it explict now that we no longer cast to time_point<Seconds>
Diffstat (limited to 'test/map/map.test.cpp')
| -rw-r--r-- | test/map/map.test.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/map/map.test.cpp b/test/map/map.test.cpp index 8cb781c6df..e2f5f69f0d 100644 --- a/test/map/map.test.cpp +++ b/test/map/map.test.cpp @@ -433,7 +433,7 @@ TEST(Map, StyleExpired) { Response response; response.data = std::make_shared<std::string>(util::read_file("test/fixtures/api/empty.json")); - response.expires = util::now() - 1h; + response.expires = std::chrono::system_clock::now() - 1h; test.fileSource->respond(Resource::Style, response); EXPECT_EQ(1u, test.fileSource->requests.size()); @@ -451,7 +451,7 @@ TEST(Map, StyleExpired) { // Send a fresh response, and confirm that we didn't overwrite the style, but continue to wait // for a fresh response. - response.expires = util::now() + 1h; + response.expires = std::chrono::system_clock::now() + 1h; test.fileSource->respond(Resource::Style, response); EXPECT_EQ(1u, test.fileSource->requests.size()); EXPECT_NE(nullptr, test.map.getStyle().getLayer("bg")); @@ -469,7 +469,7 @@ TEST(Map, StyleExpiredWithAnnotations) { Response response; response.data = std::make_shared<std::string>(util::read_file("test/fixtures/api/empty.json")); - response.expires = util::now() - 1h; + response.expires = std::chrono::system_clock::now() - 1h; test.fileSource->respond(Resource::Style, response); EXPECT_EQ(1u, test.fileSource->requests.size()); @@ -493,7 +493,7 @@ TEST(Map, StyleExpiredWithRender) { Response response; response.data = std::make_shared<std::string>(util::read_file("test/fixtures/api/empty.json")); - response.expires = util::now() - 1h; + response.expires = std::chrono::system_clock::now() - 1h; test.fileSource->respond(Resource::Style, response); EXPECT_EQ(1u, test.fileSource->requests.size()); @@ -787,7 +787,7 @@ TEST(Map, NoContentTiles) { // Insert a 204 No Content response for the 0/0/0 tile Response response; response.noContent = true; - response.expires = util::now() + 1h; + response.expires = std::chrono::system_clock::now() + 1h; test.fileSource->put(Resource::tile("http://example.com/{z}-{x}-{y}.vector.pbf", 1.0, 0, 0, 0, Tileset::Scheme::XYZ), response); |