From 7b37d876ae66a4433a4650361c3203b7087e6edf Mon Sep 17 00:00:00 2001 From: ToruNiina Date: Fri, 21 Jun 2019 14:50:17 +0900 Subject: [PATCH] refactor: update Boost.Test v2 to v3 --- tests/test_extended_conversions.cpp | 145 ++++++++++++++-------------- 1 file changed, 72 insertions(+), 73 deletions(-) diff --git a/tests/test_extended_conversions.cpp b/tests/test_extended_conversions.cpp index 2b2f430..99adeea 100644 --- a/tests/test_extended_conversions.cpp +++ b/tests/test_extended_conversions.cpp @@ -115,24 +115,23 @@ BOOST_AUTO_TEST_CASE(test_conversion_by_member_methods) const toml::value v{{"a", 42}, {"b", "baz"}}; const auto foo = toml::get(v); - BOOST_CHECK_EQUAL(foo.a, 42); - BOOST_CHECK_EQUAL(foo.b, "baz"); + BOOST_TEST(foo.a == 42); + BOOST_TEST(foo.b == "baz"); const toml::value v2(foo); - BOOST_CHECK_EQUAL(v, v2); + BOOST_TEST(v == v2); } { const toml::value v{{"a", 42}, {"b", "baz"}}; const auto foo = toml::get(v); - BOOST_CHECK_EQUAL(foo.a, 42); - BOOST_CHECK_EQUAL(foo.b, "baz"); + BOOST_TEST(foo.a == 42); + BOOST_TEST(foo.b == "baz"); const toml::value v2(foo); - - BOOST_CHECK_EQUAL(v, v2); + BOOST_TEST(v == v2); } { @@ -140,13 +139,13 @@ BOOST_AUTO_TEST_CASE(test_conversion_by_member_methods) v{{"a", 42}, {"b", "baz"}}; const auto foo = toml::get(v); - BOOST_CHECK_EQUAL(foo.a, 42); - BOOST_CHECK_EQUAL(foo.b, "baz"); + BOOST_TEST(foo.a == 42); + BOOST_TEST(foo.b == "baz"); const toml::basic_value v2(foo); - BOOST_CHECK_EQUAL(v, v2); + BOOST_TEST(v == v2); } } @@ -156,36 +155,36 @@ BOOST_AUTO_TEST_CASE(test_conversion_by_specialization) const toml::value v{{"a", 42}, {"b", "baz"}}; const auto bar = toml::get(v); - BOOST_CHECK_EQUAL(bar.a, 42); - BOOST_CHECK_EQUAL(bar.b, "baz"); + BOOST_TEST(bar.a == 42); + BOOST_TEST(bar.b == "baz"); const toml::value v2(bar); - BOOST_CHECK_EQUAL(v, v2); + BOOST_TEST(v == v2); } { const toml::value v{{"a", 42}, {"b", "baz"}}; const auto bar = toml::get(v); - BOOST_CHECK_EQUAL(bar.a, 42); - BOOST_CHECK_EQUAL(bar.b, "baz"); + BOOST_TEST(bar.a == 42); + BOOST_TEST(bar.b == "baz"); const toml::value v2(bar); - BOOST_CHECK_EQUAL(v, v2); + BOOST_TEST(v == v2); } { const toml::basic_value v{{"a", 42}, {"b", "baz"}}; const auto bar = toml::get(v); - BOOST_CHECK_EQUAL(bar.a, 42); - BOOST_CHECK_EQUAL(bar.b, "baz"); + BOOST_TEST(bar.a == 42); + BOOST_TEST(bar.b == "baz"); const toml::basic_value v2(bar); - BOOST_CHECK_EQUAL(v, v2); + BOOST_TEST(v == v2); } } @@ -200,28 +199,28 @@ BOOST_AUTO_TEST_CASE(test_recursive_conversion) }; const auto foos = toml::get>(v); - BOOST_CHECK_EQUAL(foos.size() , 4ul); - BOOST_CHECK_EQUAL(foos.at(0).a , 42); - BOOST_CHECK_EQUAL(foos.at(1).a , 43); - BOOST_CHECK_EQUAL(foos.at(2).a , 44); - BOOST_CHECK_EQUAL(foos.at(3).a , 45); + BOOST_TEST(foos.size() == 4ul); + BOOST_TEST(foos.at(0).a == 42); + BOOST_TEST(foos.at(1).a == 43); + BOOST_TEST(foos.at(2).a == 44); + BOOST_TEST(foos.at(3).a == 45); - BOOST_CHECK_EQUAL(foos.at(0).b , "baz"); - BOOST_CHECK_EQUAL(foos.at(1).b , "qux"); - BOOST_CHECK_EQUAL(foos.at(2).b , "quux"); - BOOST_CHECK_EQUAL(foos.at(3).b , "foobar"); + BOOST_TEST(foos.at(0).b == "baz"); + BOOST_TEST(foos.at(1).b == "qux"); + BOOST_TEST(foos.at(2).b == "quux"); + BOOST_TEST(foos.at(3).b == "foobar"); const auto bars = toml::get>(v); - BOOST_CHECK_EQUAL(bars.size() , 4ul); - BOOST_CHECK_EQUAL(bars.at(0).a , 42); - BOOST_CHECK_EQUAL(bars.at(1).a , 43); - BOOST_CHECK_EQUAL(bars.at(2).a , 44); - BOOST_CHECK_EQUAL(bars.at(3).a , 45); + BOOST_TEST(bars.size() == 4ul); + BOOST_TEST(bars.at(0).a == 42); + BOOST_TEST(bars.at(1).a == 43); + BOOST_TEST(bars.at(2).a == 44); + BOOST_TEST(bars.at(3).a == 45); - BOOST_CHECK_EQUAL(bars.at(0).b , "baz"); - BOOST_CHECK_EQUAL(bars.at(1).b , "qux"); - BOOST_CHECK_EQUAL(bars.at(2).b , "quux"); - BOOST_CHECK_EQUAL(bars.at(3).b , "foobar"); + BOOST_TEST(bars.at(0).b == "baz"); + BOOST_TEST(bars.at(1).b == "qux"); + BOOST_TEST(bars.at(2).b == "quux"); + BOOST_TEST(bars.at(3).b == "foobar"); } { const toml::value v{ @@ -232,28 +231,28 @@ BOOST_AUTO_TEST_CASE(test_recursive_conversion) }; const auto foos = toml::get>(v); - BOOST_CHECK_EQUAL(foos.size() , 4ul); - BOOST_CHECK_EQUAL(foos.at(0).a , 42); - BOOST_CHECK_EQUAL(foos.at(1).a , 43); - BOOST_CHECK_EQUAL(foos.at(2).a , 44); - BOOST_CHECK_EQUAL(foos.at(3).a , 45); + BOOST_TEST(foos.size() == 4ul); + BOOST_TEST(foos.at(0).a == 42); + BOOST_TEST(foos.at(1).a == 43); + BOOST_TEST(foos.at(2).a == 44); + BOOST_TEST(foos.at(3).a == 45); - BOOST_CHECK_EQUAL(foos.at(0).b , "baz"); - BOOST_CHECK_EQUAL(foos.at(1).b , "qux"); - BOOST_CHECK_EQUAL(foos.at(2).b , "quux"); - BOOST_CHECK_EQUAL(foos.at(3).b , "foobar"); + BOOST_TEST(foos.at(0).b == "baz"); + BOOST_TEST(foos.at(1).b == "qux"); + BOOST_TEST(foos.at(2).b == "quux"); + BOOST_TEST(foos.at(3).b == "foobar"); const auto bars = toml::get>(v); - BOOST_CHECK_EQUAL(bars.size() , 4ul); - BOOST_CHECK_EQUAL(bars.at(0).a , 42); - BOOST_CHECK_EQUAL(bars.at(1).a , 43); - BOOST_CHECK_EQUAL(bars.at(2).a , 44); - BOOST_CHECK_EQUAL(bars.at(3).a , 45); + BOOST_TEST(bars.size() == 4ul); + BOOST_TEST(bars.at(0).a == 42); + BOOST_TEST(bars.at(1).a == 43); + BOOST_TEST(bars.at(2).a == 44); + BOOST_TEST(bars.at(3).a == 45); - BOOST_CHECK_EQUAL(bars.at(0).b , "baz"); - BOOST_CHECK_EQUAL(bars.at(1).b , "qux"); - BOOST_CHECK_EQUAL(bars.at(2).b , "quux"); - BOOST_CHECK_EQUAL(bars.at(3).b , "foobar"); + BOOST_TEST(bars.at(0).b == "baz"); + BOOST_TEST(bars.at(1).b == "qux"); + BOOST_TEST(bars.at(2).b == "quux"); + BOOST_TEST(bars.at(3).b == "foobar"); } { @@ -266,28 +265,28 @@ BOOST_AUTO_TEST_CASE(test_recursive_conversion) }; const auto foos = toml::get>(v); - BOOST_CHECK_EQUAL(foos.size() , 4ul); - BOOST_CHECK_EQUAL(foos.at(0).a , 42); - BOOST_CHECK_EQUAL(foos.at(1).a , 43); - BOOST_CHECK_EQUAL(foos.at(2).a , 44); - BOOST_CHECK_EQUAL(foos.at(3).a , 45); + BOOST_TEST(foos.size() == 4ul); + BOOST_TEST(foos.at(0).a == 42); + BOOST_TEST(foos.at(1).a == 43); + BOOST_TEST(foos.at(2).a == 44); + BOOST_TEST(foos.at(3).a == 45); - BOOST_CHECK_EQUAL(foos.at(0).b , "baz"); - BOOST_CHECK_EQUAL(foos.at(1).b , "qux"); - BOOST_CHECK_EQUAL(foos.at(2).b , "quux"); - BOOST_CHECK_EQUAL(foos.at(3).b , "foobar"); + BOOST_TEST(foos.at(0).b == "baz"); + BOOST_TEST(foos.at(1).b == "qux"); + BOOST_TEST(foos.at(2).b == "quux"); + BOOST_TEST(foos.at(3).b == "foobar"); const auto bars = toml::get>(v); - BOOST_CHECK_EQUAL(bars.size() , 4ul); - BOOST_CHECK_EQUAL(bars.at(0).a , 42); - BOOST_CHECK_EQUAL(bars.at(1).a , 43); - BOOST_CHECK_EQUAL(bars.at(2).a , 44); - BOOST_CHECK_EQUAL(bars.at(3).a , 45); + BOOST_TEST(bars.size() == 4ul); + BOOST_TEST(bars.at(0).a == 42); + BOOST_TEST(bars.at(1).a == 43); + BOOST_TEST(bars.at(2).a == 44); + BOOST_TEST(bars.at(3).a == 45); - BOOST_CHECK_EQUAL(bars.at(0).b , "baz"); - BOOST_CHECK_EQUAL(bars.at(1).b , "qux"); - BOOST_CHECK_EQUAL(bars.at(2).b , "quux"); - BOOST_CHECK_EQUAL(bars.at(3).b , "foobar"); + BOOST_TEST(bars.at(0).b == "baz"); + BOOST_TEST(bars.at(1).b == "qux"); + BOOST_TEST(bars.at(2).b == "quux"); + BOOST_TEST(bars.at(3).b == "foobar"); } }