util: generalize and simplify time::{to,from}UnixTimestamp()
Change-Id: I1dc94365944b8efc03f32919d32d5df0a652b672
diff --git a/tests/unit/util/time.t.cpp b/tests/unit/util/time.t.cpp
index 9004700..84236d2 100644
--- a/tests/unit/util/time.t.cpp
+++ b/tests/unit/util/time.t.cpp
@@ -88,15 +88,18 @@
BOOST_TEST(value > referenceTime);
- BOOST_CHECK_EQUAL(toIsoString(referenceTime), "20140129T034247.032000");
- BOOST_CHECK_EQUAL(toIsoExtendedString(referenceTime), "2014-01-29T03:42:47.032000");
- BOOST_CHECK_EQUAL(toString(referenceTime), "2014-01-29 03:42:47");
+ BOOST_TEST(toUnixTimestamp(referenceTime) == 1390966967032_ms);
+ BOOST_TEST(toUnixTimestamp<nanoseconds>(referenceTime) == 1390966967032000000_ns);
+ BOOST_TEST(toUnixTimestamp<seconds>(referenceTime) == 1390966967_s);
+
+ BOOST_TEST(toIsoString(referenceTime) == "20140129T034247.032000");
+ BOOST_TEST(toIsoExtendedString(referenceTime) == "2014-01-29T03:42:47.032000");
+ BOOST_TEST(toString(referenceTime) == "2014-01-29 03:42:47");
// Unfortunately, not all systems has lv_LV locale installed :(
- // BOOST_CHECK_EQUAL(toString(referenceTime, "%Y. gada %d. %B", std::locale("lv_LV.UTF-8")),
- // "2014. gada 29. Janvāris");
- BOOST_CHECK_EQUAL(toString(referenceTime, "%Y -- %d -- %B", std::locale("C")),
- "2014 -- 29 -- January");
+ // BOOST_TEST(toString(referenceTime, "%Y. gada %d. %B", std::locale("lv_LV.UTF-8")) ==
+ // "2014. gada 29. Janvāris");
+ BOOST_TEST(toString(referenceTime, "%Y -- %d -- %B", std::locale("C")) == "2014 -- 29 -- January");
BOOST_TEST(fromIsoString("20140129T034247.032000") == referenceTime);
BOOST_TEST(fromIsoString("20140129T034247.032000Z") == referenceTime);
@@ -110,10 +113,10 @@
BOOST_TEST(fromString("2014-01-29 03:42:47") == fromUnixTimestamp(1390966967_s));
// Unfortunately, not all systems has lv_LV locale installed :(
- // BOOST_CHECK_EQUAL(fromString("2014. gada 29. Janvāris", "%Y. gada %d. %B", std::locale("lv_LV.UTF-8")),
- // fromUnixTimestamp(1390953600_s));
- BOOST_CHECK_EQUAL(fromString("2014 -- 29 -- January", "%Y -- %d -- %B", std::locale("C")),
- fromUnixTimestamp(1390953600_s));
+ // BOOST_TEST(fromString("2014. gada 29. Janvāris", "%Y. gada %d. %B", std::locale("lv_LV.UTF-8")) ==
+ // fromUnixTimestamp(1390953600_s));
+ BOOST_TEST(fromString("2014 -- 29 -- January", "%Y -- %d -- %B", std::locale("C")) ==
+ fromUnixTimestamp(1390953600_s));
}
BOOST_AUTO_TEST_CASE(SteadyClock)