From 1694f7451022d1d876d67aac9c2a8dcb5aae2601 Mon Sep 17 00:00:00 2001 From: ToruNiina Date: Fri, 21 Jun 2019 14:43:13 +0900 Subject: [PATCH] chore: update boost test library usage (v2->v3) --- tests/test_datetime.cpp | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/tests/test_datetime.cpp b/tests/test_datetime.cpp index ae5ae51..395949e 100644 --- a/tests/test_datetime.cpp +++ b/tests/test_datetime.cpp @@ -11,47 +11,47 @@ BOOST_AUTO_TEST_CASE(test_local_date) { const toml::local_date date(2018, toml::month_t::Jan, 1); const toml::local_date date1(date); - BOOST_CHECK_EQUAL(date, date1); + BOOST_TEST(date == date1); const std::chrono::system_clock::time_point tp(date); const toml::local_date date2(tp); - BOOST_CHECK_EQUAL(date, date2); + BOOST_TEST(date == date2); const toml::local_date date3(2017, toml::month_t::Dec, 31); - BOOST_CHECK(date > date3); + BOOST_TEST(date > date3); std::ostringstream oss; oss << date; - BOOST_CHECK_EQUAL(oss.str(), std::string("2018-01-01")); + BOOST_TEST(oss.str() == std::string("2018-01-01")); } BOOST_AUTO_TEST_CASE(test_local_time) { const toml::local_time time(12, 30, 45); const toml::local_time time1(time); - BOOST_CHECK_EQUAL(time, time1); + BOOST_TEST(time == time1); const std::chrono::nanoseconds dur(time); std::chrono::nanoseconds ns(0); ns += std::chrono::hours (12); ns += std::chrono::minutes(30); ns += std::chrono::seconds(45); - BOOST_CHECK_EQUAL(dur.count(), ns.count()); + BOOST_TEST(dur.count() == ns.count()); const toml::local_time time3(12, 15, 45); - BOOST_CHECK(time > time3); + BOOST_TEST(time > time3); { std::ostringstream oss; oss << time; - BOOST_CHECK_EQUAL(oss.str(), std::string("12:30:45")); + BOOST_TEST(oss.str() == std::string("12:30:45")); } { const toml::local_time time4(12, 30, 45, 123, 456); std::ostringstream oss; oss << time4; - BOOST_CHECK_EQUAL(oss.str(), std::string("12:30:45.123456")); + BOOST_TEST(oss.str() == std::string("12:30:45.123456")); } } @@ -59,20 +59,20 @@ BOOST_AUTO_TEST_CASE(test_time_offset) { const toml::time_offset time(9, 30); const toml::time_offset time1(time); - BOOST_CHECK_EQUAL(time, time1); + BOOST_TEST(time == time1); const std::chrono::minutes dur(time); std::chrono::minutes m(0); m += std::chrono::hours (9); m += std::chrono::minutes(30); - BOOST_CHECK_EQUAL(dur.count(), m.count()); + BOOST_TEST(dur.count() == m.count()); const toml::time_offset time2(9, 0); - BOOST_CHECK(time2 < time); + BOOST_TEST(time2 < time); std::ostringstream oss; oss << time; - BOOST_CHECK_EQUAL(oss.str(), std::string("+09:30")); + BOOST_TEST(oss.str() == std::string("+09:30")); } BOOST_AUTO_TEST_CASE(test_local_datetime) @@ -80,15 +80,15 @@ BOOST_AUTO_TEST_CASE(test_local_datetime) const toml::local_datetime dt(toml::local_date(2018, toml::month_t::Jan, 1), toml::local_time(12, 30, 45)); const toml::local_datetime dt1(dt); - BOOST_CHECK_EQUAL(dt, dt1); + BOOST_TEST(dt == dt1); const std::chrono::system_clock::time_point tp(dt); const toml::local_datetime dt2(tp); - BOOST_CHECK_EQUAL(dt, dt2); + BOOST_TEST(dt == dt2); std::ostringstream oss; oss << dt; - BOOST_CHECK_EQUAL(oss.str(), std::string("2018-01-01T12:30:45")); + BOOST_TEST(oss.str() == std::string("2018-01-01T12:30:45")); } BOOST_AUTO_TEST_CASE(test_offset_datetime) @@ -97,17 +97,18 @@ BOOST_AUTO_TEST_CASE(test_offset_datetime) toml::local_time(12, 30, 45), toml::time_offset(9, 30)); const toml::offset_datetime dt1(dt); - BOOST_CHECK_EQUAL(dt, dt1); + BOOST_TEST(dt == dt1); const std::chrono::system_clock::time_point tp1(dt); const toml::offset_datetime dt2(tp1); const std::chrono::system_clock::time_point tp2(dt2); - BOOST_CHECK(tp1 == tp2); + const bool tp_same = (tp1 == tp2); + BOOST_TEST(tp_same); { std::ostringstream oss; oss << dt; - BOOST_CHECK_EQUAL(oss.str(), std::string("2018-01-01T12:30:45+09:30")); + BOOST_TEST(oss.str() == std::string("2018-01-01T12:30:45+09:30")); } { const toml::offset_datetime dt3( @@ -116,6 +117,6 @@ BOOST_AUTO_TEST_CASE(test_offset_datetime) toml::time_offset(0, 0)); std::ostringstream oss; oss << dt3; - BOOST_CHECK_EQUAL(oss.str(), std::string("2018-01-01T12:30:45Z")); + BOOST_TEST(oss.str() == std::string("2018-01-01T12:30:45Z")); } }