[core] Use better types for modified / expires / etag

14 files changed, 81 insertions, 81 deletions

diff --git a/test/storage/cache_response.cpp b/test/storage/cache_response.cpp
index 511403e840..aa5e5dbfcf 100644
--- a/test/storage/cache_response.cpp
+++ b/test/storage/cache_response.cpp
@@ -25,9 +25,9 @@ TEST_F(Storage, CacheResponse) {
         EXPECT_EQ(nullptr, res.error);
         ASSERT_TRUE(res.data.get());
         EXPECT_EQ("Response 1", *res.data);
-        EXPECT_LT(Seconds::zero(), res.expires);
-        EXPECT_EQ(Seconds::zero(), res.modified);
-        EXPECT_EQ("", res.etag);
+        EXPECT_TRUE(bool(res.expires));
+        EXPECT_FALSE(bool(res.modified));
+        EXPECT_FALSE(bool(res.etag));
         response = res;
 
         // Now test that we get the same values as in the previous request. If we'd go to the server
@@ -78,9 +78,9 @@ TEST_F(Storage, CacheNotFound) {
             EXPECT_EQ(nullptr, res.error);
             ASSERT_TRUE(res.data.get());
             EXPECT_EQ("existing data", *res.data);
-            EXPECT_EQ(Seconds::zero(), res.expires);
-            EXPECT_EQ(Seconds::zero(), res.modified);
-            EXPECT_EQ("", res.etag);
+            EXPECT_FALSE(bool(res.expires));
+            EXPECT_FALSE(bool(res.modified));
+            EXPECT_FALSE(bool(res.etag));
         } else if (counter == 1) {
             EXPECT_NE(nullptr, res.error);
             EXPECT_EQ(Response::Error::Reason::NotFound, res.error->reason);
@@ -135,9 +135,9 @@ TEST_F(Storage, DontCacheConnectionErrors) {
             EXPECT_EQ(nullptr, res.error);
             ASSERT_TRUE(res.data.get());
             EXPECT_EQ("existing data", *res.data);
-            EXPECT_EQ(Seconds::zero(), res.expires);
-            EXPECT_EQ(Seconds::zero(), res.modified);
-            EXPECT_EQ("", res.etag);
+            EXPECT_FALSE(bool(res.expires));
+            EXPECT_FALSE(bool(res.modified));
+            EXPECT_FALSE(bool(res.etag));
         } else if (counter == 1) {
             EXPECT_NE(nullptr, res.error);
             EXPECT_EQ(Response::Error::Reason::Connection, res.error->reason);
@@ -190,9 +190,9 @@ TEST_F(Storage, DontCacheServerErrors) {
             EXPECT_EQ(nullptr, res.error);
             ASSERT_TRUE(res.data.get());
             EXPECT_EQ("existing data", *res.data);
-            EXPECT_EQ(Seconds::zero(), res.expires);
-            EXPECT_EQ(Seconds::zero(), res.modified);
-            EXPECT_EQ("", res.etag);
+            EXPECT_FALSE(bool(res.expires));
+            EXPECT_FALSE(bool(res.modified));
+            EXPECT_FALSE(bool(res.etag));
         } else if (counter == 1) {
             EXPECT_NE(nullptr, res.error);
             EXPECT_EQ(Response::Error::Reason::Server, res.error->reason);
diff --git a/test/storage/cache_revalidate.cpp b/test/storage/cache_revalidate.cpp
index 483a7edc74..d46f95801e 100644
--- a/test/storage/cache_revalidate.cpp
+++ b/test/storage/cache_revalidate.cpp
@@ -26,9 +26,9 @@ TEST_F(Storage, CacheRevalidateSame) {
         EXPECT_EQ(nullptr, res.error);
         ASSERT_TRUE(res.data.get());
         EXPECT_EQ("Response", *res.data);
-        EXPECT_EQ(Seconds::zero(), res.expires);
-        EXPECT_EQ(Seconds::zero(), res.modified);
-        EXPECT_EQ("snowfall", res.etag);
+        EXPECT_FALSE(bool(res.expires));
+        EXPECT_FALSE(bool(res.modified));
+        EXPECT_EQ("snowfall", *res.etag);
 
         // Second request returns the cached response, then immediately revalidates.
         req2 = fs.request(revalidateSame, [&, res](Response res2) {
@@ -42,10 +42,10 @@ TEST_F(Storage, CacheRevalidateSame) {
                 EXPECT_TRUE(res2.notModified);
                 ASSERT_TRUE(res2.data.get());
                 EXPECT_EQ("Response", *res2.data);
-                EXPECT_LT(Seconds::zero(), res2.expires);
-                EXPECT_EQ(Seconds::zero(), res2.modified);
+                EXPECT_TRUE(bool(res2.expires));
+                EXPECT_FALSE(bool(res2.modified));
                 // We're not sending the ETag in the 304 reply, but it should still be there.
-                EXPECT_EQ("snowfall", res2.etag);
+                EXPECT_EQ("snowfall", *res2.etag);
 
                 loop.stop();
                 CacheRevalidateSame.finish();
@@ -78,9 +78,9 @@ TEST_F(Storage, CacheRevalidateModified) {
         EXPECT_EQ(nullptr, res.error);
         ASSERT_TRUE(res.data.get());
         EXPECT_EQ("Response", *res.data);
-        EXPECT_EQ(Seconds::zero(), res.expires);
-        EXPECT_EQ(1420070400, res.modified.count());
-        EXPECT_EQ("", res.etag);
+        EXPECT_FALSE(bool(res.expires));
+        EXPECT_EQ(SystemClock::from_time_t(1420070400), *res.modified);
+        EXPECT_FALSE(res.etag);
 
         // Second request returns the cached response, then immediately revalidates.
         req2 = fs.request(revalidateModified, [&, res](Response res2) {
@@ -94,9 +94,9 @@ TEST_F(Storage, CacheRevalidateModified) {
                 EXPECT_TRUE(res2.notModified);
                 ASSERT_TRUE(res2.data.get());
                 EXPECT_EQ("Response", *res2.data);
-                EXPECT_LT(Seconds::zero(), res2.expires);
-                EXPECT_EQ(1420070400, res2.modified.count());
-                EXPECT_EQ("", res2.etag);
+                EXPECT_TRUE(bool(res2.expires));
+                EXPECT_EQ(SystemClock::from_time_t(1420070400), *res2.modified);
+                EXPECT_FALSE(res2.etag);
 
                 loop.stop();
                 CacheRevalidateModified.finish();
@@ -128,9 +128,9 @@ TEST_F(Storage, CacheRevalidateEtag) {
         EXPECT_EQ(nullptr, res.error);
         ASSERT_TRUE(res.data.get());
         EXPECT_EQ("Response 1", *res.data);
-        EXPECT_EQ(Seconds::zero(), res.expires);
-        EXPECT_EQ(Seconds::zero(), res.modified);
-        EXPECT_EQ("response-1", res.etag);
+        EXPECT_FALSE(bool(res.expires));
+        EXPECT_FALSE(bool(res.modified));
+        EXPECT_EQ("response-1", *res.etag);
 
         // Second request returns the cached response, then immediately revalidates.
         req2 = fs.request(revalidateEtag, [&, res](Response res2) {
@@ -144,9 +144,9 @@ TEST_F(Storage, CacheRevalidateEtag) {
                 ASSERT_TRUE(res2.data.get());
                 EXPECT_NE(res.data, res2.data);
                 EXPECT_EQ("Response 2", *res2.data);
-                EXPECT_EQ(Seconds::zero(), res2.expires);
-                EXPECT_EQ(Seconds::zero(), res2.modified);
-                EXPECT_EQ("response-2", res2.etag);
+                EXPECT_FALSE(bool(res2.expires));
+                EXPECT_FALSE(bool(res2.modified));
+                EXPECT_EQ("response-2", *res2.etag);
 
                 loop.stop();
                 CacheRevalidateEtag.finish();
diff --git a/test/storage/cache_size.cpp b/test/storage/cache_size.cpp
index 4ef4371e98..78e3697790 100644
--- a/test/storage/cache_size.cpp
+++ b/test/storage/cache_size.cpp
@@ -39,8 +39,8 @@ void insertTile(mbgl::SQLiteCache* cache, unsigned id, uint64_t size) {
     auto url = std::string("http://tile") + mbgl::util::toString(id);
 
     Response response;
-    response.modified = toSeconds(SystemClock::now());
-    response.expires = toSeconds(SystemClock::now()) + Seconds(5000);
+    response.modified = SystemClock::now();
+    response.expires = SystemClock::now() + Seconds(5000);
     response.etag = url;
 
     auto data = std::make_shared<std::string>(size, 0);
@@ -62,8 +62,8 @@ void refreshTile(mbgl::SQLiteCache* cache, unsigned id) {
     auto url = std::string("http://tile") + mbgl::util::toString(id);
 
     Response response;
-    response.modified = toSeconds(SystemClock::now());
-    response.expires = toSeconds(SystemClock::now()) + Seconds(5000);
+    response.modified = SystemClock::now();
+    response.expires = SystemClock::now() + Seconds(5000);
     response.notModified = true;
 
     Resource resource{ Resource::Kind::Tile, url };
diff --git a/test/storage/cache_stale.cpp b/test/storage/cache_stale.cpp
index 96fd9bbbcd..9ad0d1c06e 100644
--- a/test/storage/cache_stale.cpp
+++ b/test/storage/cache_stale.cpp
@@ -27,7 +27,7 @@ void checkRendering(Map& map,
 Response expiredItem(const std::string& path) {
     Response response;
     response.data = std::make_shared<std::string>(util::read_file("test/fixtures/"s + path));
-    response.expires = 0s;
+    response.expires = SystemClock::from_time_t(0);
     return response;
 }
 
diff --git a/test/storage/database.cpp b/test/storage/database.cpp
index 700b58ed24..19b46763b9 100644
--- a/test/storage/database.cpp
+++ b/test/storage/database.cpp
@@ -257,7 +257,7 @@ TEST_F(Storage, DatabaseLockedRefresh) {
         // Then, try to refresh it.
         Log::setObserver(std::make_unique<FixtureLogObserver>());
 
-        cache.refresh({ Resource::Unknown, "mapbox://test" }, Seconds::zero());
+        cache.refresh({ Resource::Unknown, "mapbox://test" }, {});
         cache.get({ Resource::Unknown, "mapbox://test" }, [] (std::unique_ptr<Response> res) {
             EXPECT_EQ(nullptr, res.get());
         });
diff --git a/test/storage/http_cancel.cpp b/test/storage/http_cancel.cpp
index 4b6ff75381..4d816c5095 100644
--- a/test/storage/http_cancel.cpp
+++ b/test/storage/http_cancel.cpp
@@ -43,9 +43,9 @@ TEST_F(Storage, HTTPCancelMultiple) {
         EXPECT_EQ(nullptr, res.error);
         ASSERT_TRUE(res.data.get());
         EXPECT_EQ("Hello World!", *res.data);
-        EXPECT_EQ(Seconds::zero(), res.expires);
-        EXPECT_EQ(Seconds::zero(), res.modified);
-        EXPECT_EQ("", res.etag);
+        EXPECT_FALSE(bool(res.expires));
+        EXPECT_FALSE(bool(res.modified));
+        EXPECT_FALSE(bool(res.etag));
         loop.stop();
         HTTPCancelMultiple.finish();
     });
diff --git a/test/storage/http_error.cpp b/test/storage/http_error.cpp
index 159e5a17a1..28e8573a2c 100644
--- a/test/storage/http_error.cpp
+++ b/test/storage/http_error.cpp
@@ -28,9 +28,9 @@ TEST_F(Storage, HTTPTemporaryError) {
             EXPECT_EQ("HTTP status code 500", res.error->message);
             ASSERT_TRUE(res.data.get());
             EXPECT_EQ("", *res.data);
-            EXPECT_EQ(Seconds::zero(), res.expires);
-            EXPECT_EQ(Seconds::zero(), res.modified);
-            EXPECT_EQ("", res.etag);
+            EXPECT_FALSE(bool(res.expires));
+            EXPECT_FALSE(bool(res.modified));
+            EXPECT_FALSE(bool(res.etag));
         } break;
         case 1: {
             req1.reset();
@@ -40,9 +40,9 @@ TEST_F(Storage, HTTPTemporaryError) {
             EXPECT_EQ(nullptr, res.error);
             ASSERT_TRUE(res.data.get());
             EXPECT_EQ("Hello World!", *res.data);
-            EXPECT_EQ(Seconds::zero(), res.expires);
-            EXPECT_EQ(Seconds::zero(), res.modified);
-            EXPECT_EQ("", res.etag);
+            EXPECT_FALSE(bool(res.expires));
+            EXPECT_FALSE(bool(res.modified));
+            EXPECT_FALSE(bool(res.etag));
             loop.stop();
             HTTPTemporaryError.finish();
         } break;
@@ -82,9 +82,9 @@ TEST_F(Storage, HTTPConnectionError) {
         FAIL();
 #endif
         ASSERT_FALSE(res.data.get());
-        EXPECT_EQ(Seconds::zero(), res.expires);
-        EXPECT_EQ(Seconds::zero(), res.modified);
-        EXPECT_EQ("", res.etag);
+        EXPECT_FALSE(bool(res.expires));
+        EXPECT_FALSE(bool(res.modified));
+        EXPECT_FALSE(bool(res.etag));
 
         if (counter == 2) {
             req2.reset();
diff --git a/test/storage/http_header_parsing.cpp b/test/storage/http_header_parsing.cpp
index 14bd99bdb3..827aa70abc 100644
--- a/test/storage/http_header_parsing.cpp
+++ b/test/storage/http_header_parsing.cpp
@@ -21,9 +21,9 @@ TEST_F(Storage, HTTPExpiresParsing) {
         EXPECT_EQ(nullptr, res.error);
         ASSERT_TRUE(res.data.get());
         EXPECT_EQ("Hello World!", *res.data);
-        EXPECT_EQ(1420797926, res.expires.count());
-        EXPECT_EQ(1420794326, res.modified.count());
-        EXPECT_EQ("foo", res.etag);
+        EXPECT_EQ(SystemClock::from_time_t(1420797926), res.expires);
+        EXPECT_EQ(SystemClock::from_time_t(1420794326), res.modified);
+        EXPECT_EQ("foo", *res.etag);
         loop.stop();
         HTTPExpiresTest.finish();
     });
@@ -47,9 +47,9 @@ TEST_F(Storage, HTTPCacheControlParsing) {
         EXPECT_EQ(nullptr, res.error);
         ASSERT_TRUE(res.data.get());
         EXPECT_EQ("Hello World!", *res.data);
-        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);
+        EXPECT_GT(2, std::abs(toSeconds(*res.expires).count() - now.count() - 120)) << "Expiration date isn't about 120 seconds in the future";
+        EXPECT_FALSE(bool(res.modified));
+        EXPECT_FALSE(bool(res.etag));
         loop.stop();
         HTTPCacheControlTest.finish();
     });
diff --git a/test/storage/http_issue_1369.cpp b/test/storage/http_issue_1369.cpp
index bf67da0da1..17c6f86f74 100644
--- a/test/storage/http_issue_1369.cpp
+++ b/test/storage/http_issue_1369.cpp
@@ -36,9 +36,9 @@ TEST_F(Storage, HTTPIssue1369) {
         EXPECT_EQ(nullptr, res.error);
         ASSERT_TRUE(res.data.get());
         EXPECT_EQ("Hello World!", *res.data);
-        EXPECT_EQ(Seconds::zero(), res.expires);
-        EXPECT_EQ(Seconds::zero(), res.modified);
-        EXPECT_EQ("", res.etag);
+        EXPECT_FALSE(bool(res.expires));
+        EXPECT_FALSE(bool(res.modified));
+        EXPECT_FALSE(bool(res.etag));
         loop.stop();
         HTTPIssue1369.finish();
     });
diff --git a/test/storage/http_load.cpp b/test/storage/http_load.cpp
index 0750e04cf4..8088bb5e34 100644
--- a/test/storage/http_load.cpp
+++ b/test/storage/http_load.cpp
@@ -27,9 +27,9 @@ TEST_F(Storage, HTTPLoad) {
             EXPECT_EQ(nullptr, res.error);
             ASSERT_TRUE(res.data.get());
             EXPECT_EQ(std::string("Request ") +  std::to_string(current), *res.data);
-            EXPECT_EQ(Seconds::zero(), res.expires);
-            EXPECT_EQ(Seconds::zero(), res.modified);
-            EXPECT_EQ("", res.etag);
+            EXPECT_FALSE(bool(res.expires));
+            EXPECT_FALSE(bool(res.modified));
+            EXPECT_FALSE(bool(res.etag));
 
             if (number <= max) {
                 req(i);
diff --git a/test/storage/http_other_loop.cpp b/test/storage/http_other_loop.cpp
index 0fbe43b3d3..fda51c3cf3 100644
--- a/test/storage/http_other_loop.cpp
+++ b/test/storage/http_other_loop.cpp
@@ -19,9 +19,9 @@ TEST_F(Storage, HTTPOtherLoop) {
         EXPECT_EQ(nullptr, res.error);
         ASSERT_TRUE(res.data.get());
         EXPECT_EQ("Hello World!", *res.data);
-        EXPECT_EQ(Seconds::zero(), res.expires);
-        EXPECT_EQ(Seconds::zero(), res.modified);
-        EXPECT_EQ("", res.etag);
+        EXPECT_FALSE(bool(res.expires));
+        EXPECT_FALSE(bool(res.modified));
+        EXPECT_FALSE(bool(res.etag));
         loop.stop();
         HTTPOtherLoop.finish();
     });
diff --git a/test/storage/http_reading.cpp b/test/storage/http_reading.cpp
index ba3907eb3a..4d8d510615 100644
--- a/test/storage/http_reading.cpp
+++ b/test/storage/http_reading.cpp
@@ -23,9 +23,9 @@ TEST_F(Storage, HTTPTest) {
         EXPECT_EQ(nullptr, res.error);
         ASSERT_TRUE(res.data.get());
         EXPECT_EQ("Hello World!", *res.data);
-        EXPECT_EQ(Seconds::zero(), res.expires);
-        EXPECT_EQ(Seconds::zero(), res.modified);
-        EXPECT_EQ("", res.etag);
+        EXPECT_FALSE(bool(res.expires));
+        EXPECT_FALSE(bool(res.modified));
+        EXPECT_FALSE(bool(res.etag));
         loop.stop();
         HTTPTest.finish();
     });
@@ -50,9 +50,9 @@ 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(Seconds::zero(), res.expires);
-        EXPECT_EQ(Seconds::zero(), res.modified);
-        EXPECT_EQ("", res.etag);
+        EXPECT_FALSE(bool(res.expires));
+        EXPECT_FALSE(bool(res.modified));
+        EXPECT_FALSE(bool(res.etag));
         loop.stop();
         HTTP404.finish();
     });
@@ -77,9 +77,9 @@ 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(Seconds::zero(), res.expires);
-        EXPECT_EQ(Seconds::zero(), res.modified);
-        EXPECT_EQ("", res.etag);
+        EXPECT_FALSE(bool(res.expires));
+        EXPECT_FALSE(bool(res.modified));
+        EXPECT_FALSE(bool(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 1925e714d4..4598b8e402 100644
--- a/test/storage/http_retry_network_status.cpp
+++ b/test/storage/http_retry_network_status.cpp
@@ -28,9 +28,9 @@ TEST_F(Storage, HTTPNetworkStatusChange) {
          EXPECT_EQ(nullptr, res.error);
          ASSERT_TRUE(res.data.get());
          EXPECT_EQ("Response", *res.data);
-         EXPECT_EQ(Seconds::zero(), res.expires);
-         EXPECT_EQ(Seconds::zero(), res.modified);
-         EXPECT_EQ("", res.etag);
+         EXPECT_FALSE(bool(res.expires));
+         EXPECT_FALSE(bool(res.modified));
+         EXPECT_FALSE(bool(res.etag));
          loop.stop();
          HTTPNetworkStatusChange.finish();
     });
@@ -87,9 +87,9 @@ TEST_F(Storage, HTTPNetworkStatusChangePreempt) {
         FAIL();
 #endif
         ASSERT_FALSE(res.data.get());
-        EXPECT_EQ(Seconds::zero(), res.expires);
-        EXPECT_EQ(Seconds::zero(), res.modified);
-        EXPECT_EQ("", res.etag);
+        EXPECT_FALSE(bool(res.expires));
+        EXPECT_FALSE(bool(res.modified));
+        EXPECT_FALSE(bool(res.etag));
 
         if (counter++ == 1) {
             req.reset();
diff --git a/test/storage/http_timeout.cpp b/test/storage/http_timeout.cpp
index c736dbe05f..8f8a5e2633 100644
--- a/test/storage/http_timeout.cpp
+++ b/test/storage/http_timeout.cpp
@@ -21,9 +21,9 @@ TEST_F(Storage, HTTPTimeout) {
         EXPECT_EQ(nullptr, res.error);
         ASSERT_TRUE(res.data.get());
         EXPECT_EQ("Hello World!", *res.data);
-        EXPECT_LT(Seconds::zero(), res.expires);
-        EXPECT_EQ(Seconds::zero(), res.modified);
-        EXPECT_EQ("", res.etag);
+        EXPECT_TRUE(bool(res.expires));
+        EXPECT_FALSE(bool(res.modified));
+        EXPECT_FALSE(bool(res.etag));
         if (counter == 4) {
             req.reset();
             loop.stop();