summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/map/map.test.cpp10
-rw-r--r--test/storage/default_file_source.test.cpp20
-rw-r--r--test/storage/http_file_source.test.cpp2
-rw-r--r--test/storage/offline_database.test.cpp14
-rw-r--r--test/storage/online_file_source.test.cpp14
-rw-r--r--test/util/http_timeout.test.cpp6
6 files changed, 33 insertions, 33 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);
diff --git a/test/storage/default_file_source.test.cpp b/test/storage/default_file_source.test.cpp
index 38c7abb039..106785533f 100644
--- a/test/storage/default_file_source.test.cpp
+++ b/test/storage/default_file_source.test.cpp
@@ -258,7 +258,7 @@ TEST(DefaultFileSource, OptionalNonExpired) {
Response response;
response.data = std::make_shared<std::string>("Cached value");
- response.expires = util::now() + 1h;
+ response.expires = system_clock::now() + 1h;
fs.put(optionalResource, response);
std::unique_ptr<AsyncRequest> req;
@@ -288,7 +288,7 @@ TEST(DefaultFileSource, OptionalExpired) {
Response response;
response.data = std::make_shared<std::string>("Cached value");
- response.expires = util::now() - 1h;
+ response.expires = system_clock::now() - 1h;
fs.put(optionalResource, response);
std::unique_ptr<AsyncRequest> req;
@@ -363,7 +363,7 @@ TEST(DefaultFileSource, TEST_REQUIRES_SERVER(NoCacheRefreshEtagNotModified)) {
// Put a fake value into the cache to make sure we're not retrieving anything from the cache.
Response response;
response.data = std::make_shared<std::string>("Cached value");
- response.expires = util::now() + 1h;
+ response.expires = system_clock::now() + 1h;
fs.put(resource, response);
std::unique_ptr<AsyncRequest> req;
@@ -373,7 +373,7 @@ TEST(DefaultFileSource, TEST_REQUIRES_SERVER(NoCacheRefreshEtagNotModified)) {
EXPECT_TRUE(res.notModified);
EXPECT_FALSE(res.data.get());
ASSERT_TRUE(bool(res.expires));
- EXPECT_LT(util::now(), *res.expires);
+ EXPECT_LT(system_clock::now(), *res.expires);
EXPECT_TRUE(res.mustRevalidate);
EXPECT_FALSE(bool(res.modified));
ASSERT_TRUE(bool(res.etag));
@@ -398,7 +398,7 @@ TEST(DefaultFileSource, TEST_REQUIRES_SERVER(NoCacheRefreshEtagModified)) {
// Put a fake value into the cache to make sure we're not retrieving anything from the cache.
Response response;
response.data = std::make_shared<std::string>("Cached value");
- response.expires = util::now() + 1h;
+ response.expires = system_clock::now() + 1h;
fs.put(resource, response);
std::unique_ptr<AsyncRequest> req;
@@ -432,7 +432,7 @@ TEST(DefaultFileSource, TEST_REQUIRES_SERVER(NoCacheFull)) {
// Put a fake value into the cache to make sure we're not retrieving anything from the cache.
Response response;
response.data = std::make_shared<std::string>("Cached value");
- response.expires = util::now() + 1h;
+ response.expires = system_clock::now() + 1h;
fs.put(resource, response);
std::unique_ptr<AsyncRequest> req;
@@ -468,7 +468,7 @@ TEST(DefaultFileSource, TEST_REQUIRES_SERVER(NoCacheRefreshModifiedNotModified))
// Put a fake value into the cache to make sure we're not retrieving anything from the cache.
Response response;
response.data = std::make_shared<std::string>("Cached value");
- response.expires = util::now() + 1h;
+ response.expires = system_clock::now() + 1h;
fs.put(resource, response);
std::unique_ptr<AsyncRequest> req;
@@ -478,7 +478,7 @@ TEST(DefaultFileSource, TEST_REQUIRES_SERVER(NoCacheRefreshModifiedNotModified))
EXPECT_TRUE(res.notModified);
EXPECT_FALSE(res.data.get());
ASSERT_TRUE(bool(res.expires));
- EXPECT_LT(util::now(), *res.expires);
+ EXPECT_LT(system_clock::now(), *res.expires);
EXPECT_TRUE(res.mustRevalidate);
ASSERT_TRUE(bool(res.modified));
EXPECT_EQ(Timestamp{ Seconds(1420070400) }, *res.modified);
@@ -504,7 +504,7 @@ TEST(DefaultFileSource, TEST_REQUIRES_SERVER(NoCacheRefreshModifiedModified)) {
// Put a fake value into the cache to make sure we're not retrieving anything from the cache.
Response response;
response.data = std::make_shared<std::string>("Cached value");
- response.expires = util::now() + 1h;
+ response.expires = system_clock::now() + 1h;
fs.put(resource, response);
std::unique_ptr<AsyncRequest> req;
@@ -651,7 +651,7 @@ TEST(DefaultFileSource, TEST_REQUIRES_SERVER(RespondToStaleMustRevalidate)) {
// return new data, only a 304 Not Modified response.
EXPECT_EQ("Prior value", *res.data);
ASSERT_TRUE(res.expires);
- EXPECT_LE(util::now(), *res.expires);
+ EXPECT_LE(system_clock::now(), *res.expires);
EXPECT_TRUE(res.mustRevalidate);
ASSERT_TRUE(res.modified);
EXPECT_EQ(Timestamp{ Seconds(1417392000) }, *res.modified);
diff --git a/test/storage/http_file_source.test.cpp b/test/storage/http_file_source.test.cpp
index 42b4174e69..bea4bbbb48 100644
--- a/test/storage/http_file_source.test.cpp
+++ b/test/storage/http_file_source.test.cpp
@@ -155,7 +155,7 @@ TEST(HTTPFileSource, TEST_REQUIRES_SERVER(CacheControlParsing)) {
EXPECT_EQ(nullptr, res.error);
ASSERT_TRUE(res.data.get());
EXPECT_EQ("Hello World!", *res.data);
- EXPECT_GT(Seconds(2), util::abs(*res.expires - util::now() - Seconds(120))) << "Expiration date isn't about 120 seconds in the future";
+ EXPECT_GT(Seconds(2), util::abs(*res.expires - std::chrono::system_clock::now() - Seconds(120))) << "Expiration date isn't about 120 seconds in the future";
EXPECT_FALSE(res.mustRevalidate);
EXPECT_FALSE(bool(res.modified));
EXPECT_FALSE(bool(res.etag));
diff --git a/test/storage/offline_database.test.cpp b/test/storage/offline_database.test.cpp
index 3f6db527d4..a273ddbfd6 100644
--- a/test/storage/offline_database.test.cpp
+++ b/test/storage/offline_database.test.cpp
@@ -805,7 +805,7 @@ TEST(OfflineDatabase, Invalidate) {
Response response;
response.noContent = true;
response.mustRevalidate = false;
- response.expires = util::now() + 1h;
+ response.expires = std::chrono::system_clock::now() + 1h;
const Resource ambientTile = Resource::tile("mapbox://tile_ambient", 1, 0, 0, 0, Tileset::Scheme::XYZ);
db.put(ambientTile, response);
@@ -861,12 +861,12 @@ TEST(OfflineDatabase, Invalidate) {
EXPECT_TRUE(db.get(region2Style)->isUsable());
// Sanity check.
- EXPECT_TRUE(db.get(ambientTile)->expires < util::now());
- EXPECT_TRUE(db.get(ambientStyle)->expires < util::now());
- EXPECT_TRUE(db.get(region1Tile)->expires < util::now());
- EXPECT_TRUE(db.get(region1Style)->expires < util::now());
- EXPECT_TRUE(db.get(region2Tile)->expires > util::now());
- EXPECT_TRUE(db.get(region2Style)->expires > util::now());
+ EXPECT_TRUE(db.get(ambientTile)->expires < std::chrono::system_clock::now());
+ EXPECT_TRUE(db.get(ambientStyle)->expires < std::chrono::system_clock::now());
+ EXPECT_TRUE(db.get(region1Tile)->expires < std::chrono::system_clock::now());
+ EXPECT_TRUE(db.get(region1Style)->expires < std::chrono::system_clock::now());
+ EXPECT_TRUE(db.get(region2Tile)->expires > std::chrono::system_clock::now());
+ EXPECT_TRUE(db.get(region2Style)->expires > std::chrono::system_clock::now());
EXPECT_TRUE(db.get(ambientTile)->mustRevalidate);
EXPECT_TRUE(db.get(ambientStyle)->mustRevalidate);
diff --git a/test/storage/online_file_source.test.cpp b/test/storage/online_file_source.test.cpp
index 9d4b4fc190..08671b35a0 100644
--- a/test/storage/online_file_source.test.cpp
+++ b/test/storage/online_file_source.test.cpp
@@ -155,7 +155,7 @@ TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RetryDelayOnExpiredTile)) {
std::unique_ptr<AsyncRequest> req = fs.request(resource, [&](Response res) {
counter++;
EXPECT_EQ(nullptr, res.error);
- EXPECT_GT(util::now(), *res.expires);
+ EXPECT_GT(std::chrono::system_clock::now(), *res.expires);
EXPECT_FALSE(res.mustRevalidate);
});
@@ -181,12 +181,12 @@ TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RetryOnClockSkew)) {
switch (counter++) {
case 0: {
EXPECT_EQ(nullptr, res.error);
- EXPECT_GT(util::now(), *res.expires);
+ EXPECT_GT(std::chrono::system_clock::now(), *res.expires);
} break;
case 1: {
EXPECT_EQ(nullptr, res.error);
- auto now = util::now();
+ auto now = std::chrono::system_clock::now();
EXPECT_LT(now + Seconds(40), *res.expires) << "Expiration not interpolated to 60s";
EXPECT_GT(now + Seconds(80), *res.expires) << "Expiration not interpolated to 60s";
@@ -204,7 +204,7 @@ TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RespectPriorExpires)) {
// Very long expiration time, should never arrive.
Resource resource1{ Resource::Unknown, "http://127.0.0.1:3000/test" };
- resource1.priorExpires = util::now() + Seconds(100000);
+ resource1.priorExpires = std::chrono::system_clock::now() + Seconds(100000);
std::unique_ptr<AsyncRequest> req1 = fs.request(resource1, [&](Response) {
FAIL() << "Should never be called";
@@ -219,7 +219,7 @@ TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RespectPriorExpires)) {
// Very long expiration time, should never arrive.
Resource resource3{ Resource::Unknown, "http://127.0.0.1:3000/test" };
- resource3.priorExpires = util::now() + Seconds(100000);
+ resource3.priorExpires = std::chrono::system_clock::now() + Seconds(100000);
std::unique_ptr<AsyncRequest> req3 = fs.request(resource3, [&](Response) {
FAIL() << "Should never be called";
@@ -380,7 +380,7 @@ TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RateLimitStandard)) {
ASSERT_NE(nullptr, res.error);
EXPECT_EQ(Response::Error::Reason::RateLimit, res.error->reason);
ASSERT_EQ(true, bool(res.error->retryAfter));
- ASSERT_LT(util::now(), res.error->retryAfter);
+ ASSERT_LT(std::chrono::system_clock::now(), res.error->retryAfter);
loop.stop();
});
@@ -395,7 +395,7 @@ TEST(OnlineFileSource, TEST_REQUIRES_SERVER(RateLimitMBX)) {
ASSERT_NE(nullptr, res.error);
EXPECT_EQ(Response::Error::Reason::RateLimit, res.error->reason);
ASSERT_EQ(true, bool(res.error->retryAfter));
- ASSERT_LT(util::now(), res.error->retryAfter);
+ ASSERT_LT(std::chrono::system_clock::now(), res.error->retryAfter);
loop.stop();
});
diff --git a/test/util/http_timeout.test.cpp b/test/util/http_timeout.test.cpp
index e696cd1c9c..886b404b1d 100644
--- a/test/util/http_timeout.test.cpp
+++ b/test/util/http_timeout.test.cpp
@@ -34,7 +34,7 @@ TEST(HttpRetry, ConnectionError) {
TEST(HttpRetry, RateLimit) {
// Pre-set value from header
- ASSERT_EQ(Seconds(1), errorRetryTimeout(Response::Error::Reason::Server, 1, { util::now() + Seconds(1) }));
+ ASSERT_EQ(Seconds(1), errorRetryTimeout(Response::Error::Reason::Server, 1, { std::chrono::system_clock::now() + Seconds(1) }));
// Default
ASSERT_EQ(Seconds(5), errorRetryTimeout(Response::Error::Reason::RateLimit, 1, {}));
@@ -42,8 +42,8 @@ TEST(HttpRetry, RateLimit) {
TEST(HttpRetry, ExpiredInitial) {
// 1 sec timeout, will not be exactly 1 because of precision/rounding
- ASSERT_TRUE(Milliseconds(1000) >= expirationTimeout({ util::now() + Seconds(1) }, 0));
- ASSERT_TRUE(Milliseconds(990) < expirationTimeout({ util::now() + Seconds(1) }, 0));
+ ASSERT_TRUE(Milliseconds(1000) >= expirationTimeout({ std::chrono::system_clock::now() + Seconds(1) }, 0));
+ ASSERT_TRUE(Milliseconds(990) < expirationTimeout({ std::chrono::system_clock::now() + Seconds(1) }, 0));
}
TEST(HttpRetry, ExpiredSubsequent) {
View Lorry Controller Status