diff --git a/tests/test_find.cpp b/tests/test_find.cpp index 28b076c..9fc95ca 100644 --- a/tests/test_find.cpp +++ b/tests/test_find.cpp @@ -102,20 +102,20 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_find_exact, value_type, test_value_types) } { value_type v{{"key", "foo"}}; - BOOST_CHECK_EQUAL(toml::string("foo", toml::string_t::basic), + BOOST_TEST(toml::string("foo", toml::string_t::basic) == toml::find(v, "key")); toml::find(v, "key").str += "bar"; - BOOST_CHECK_EQUAL(toml::string("foobar", toml::string_t::basic), + BOOST_TEST(toml::string("foobar", toml::string_t::basic) == toml::find(v, "key")); } { value_type v{{"key", value_type("foo", toml::string_t::literal)}}; - BOOST_CHECK_EQUAL(toml::string("foo", toml::string_t::literal), + BOOST_TEST(toml::string("foo", toml::string_t::literal) == toml::find(v, "key")); toml::find(v, "key").str += "bar"; - BOOST_CHECK_EQUAL(toml::string("foobar", toml::string_t::literal), + BOOST_TEST(toml::string("foobar", toml::string_t::literal) == toml::find(v, "key")); } { diff --git a/tests/test_get_related_func.cpp b/tests/test_get_related_func.cpp index 496b1b7..d3cf29b 100644 --- a/tests/test_get_related_func.cpp +++ b/tests/test_get_related_func.cpp @@ -20,8 +20,8 @@ BOOST_AUTO_TEST_CASE(test_get_or) { toml::value v1(42); toml::value v2(3.14); - BOOST_CHECK_EQUAL(42u, toml::get_or(v1, 0u)); - BOOST_CHECK_EQUAL(0u, toml::get_or(v2, 0u)); + BOOST_TEST(42u == toml::get_or(v1, 0u)); + BOOST_TEST(0u == toml::get_or(v2, 0u)); } // exact toml type @@ -30,14 +30,14 @@ BOOST_AUTO_TEST_CASE(test_get_or) toml::value v2(3.14); toml::integer opt(0); - BOOST_CHECK_EQUAL(42, toml::get_or(v1, opt)); - BOOST_CHECK_EQUAL(0, toml::get_or(v2, opt)); + BOOST_TEST(42 == toml::get_or(v1, opt)); + BOOST_TEST(0 == toml::get_or(v2, opt)); toml::value v3("foobar"); toml::string s("bazqux"); - BOOST_CHECK_EQUAL("foobar", toml::get_or(v3, s)); - BOOST_CHECK_EQUAL("bazqux", toml::get_or(v1, s)); + BOOST_TEST("foobar" == toml::get_or(v3, s)); + BOOST_TEST("bazqux" == toml::get_or(v1, s)); } @@ -49,20 +49,20 @@ BOOST_AUTO_TEST_CASE(test_get_or) std::string s1("bazqux"); const std::string s2("bazqux"); - BOOST_CHECK_EQUAL("foobar", toml::get_or(v1, s1)); - BOOST_CHECK_EQUAL("bazqux", toml::get_or(v2, s1)); + BOOST_TEST("foobar" == toml::get_or(v1, s1)); + BOOST_TEST("bazqux" == toml::get_or(v2, s1)); std::string& v1r = toml::get_or(v1, s1); std::string& s1r = toml::get_or(v2, s1); - BOOST_CHECK_EQUAL("foobar", v1r); - BOOST_CHECK_EQUAL("bazqux", s1r); + BOOST_TEST("foobar" == v1r); + BOOST_TEST("bazqux" == s1r); - BOOST_CHECK_EQUAL("foobar", toml::get_or(v1, s2)); - BOOST_CHECK_EQUAL("bazqux", toml::get_or(v2, s2)); + BOOST_TEST("foobar" == toml::get_or(v1, s2)); + BOOST_TEST("bazqux" == toml::get_or(v2, s2)); - BOOST_CHECK_EQUAL("foobar", toml::get_or(v1, std::move(s1))); - BOOST_CHECK_EQUAL("bazqux", toml::get_or(v2, std::move(s1))); + BOOST_TEST("foobar" == toml::get_or(v1, std::move(s1))); + BOOST_TEST("bazqux" == toml::get_or(v2, std::move(s1))); } // string literal @@ -70,12 +70,12 @@ BOOST_AUTO_TEST_CASE(test_get_or) toml::value v1("foobar"); toml::value v2(42); - BOOST_CHECK_EQUAL("foobar", toml::get_or(v1, "bazqux")); - BOOST_CHECK_EQUAL("bazqux", toml::get_or(v2, "bazqux")); + BOOST_TEST("foobar" == toml::get_or(v1, "bazqux")); + BOOST_TEST("bazqux" == toml::get_or(v2, "bazqux")); const char* lit = "bazqux"; - BOOST_CHECK_EQUAL("foobar", toml::get_or(v1, lit)); - BOOST_CHECK_EQUAL("bazqux", toml::get_or(v2, lit)); + BOOST_TEST("foobar" == toml::get_or(v1, lit)); + BOOST_TEST("bazqux" == toml::get_or(v2, lit)); } } @@ -84,8 +84,8 @@ BOOST_AUTO_TEST_CASE(test_find_or) // requires conversion int -> uint { toml::value v = toml::table{{"num", 42}}; - BOOST_CHECK_EQUAL(42u, toml::find_or(v, "num", 0u)); - BOOST_CHECK_EQUAL(0u, toml::find_or(v, "foo", 0u)); + BOOST_TEST(42u == toml::find_or(v, "num", 0u)); + BOOST_TEST(0u == toml::find_or(v, "foo", 0u)); } // exact toml type { @@ -93,15 +93,15 @@ BOOST_AUTO_TEST_CASE(test_find_or) toml::value v2 = toml::table{{"key", 3.14}}; toml::value v3 = toml::table{{"not", "key"}}; - BOOST_CHECK_EQUAL(42, toml::find_or(v1, "key", toml::integer(0))); - BOOST_CHECK_EQUAL( 0, toml::find_or(v2, "key", toml::integer(0))); - BOOST_CHECK_EQUAL( 0, toml::find_or(v3, "key", toml::integer(0))); + BOOST_TEST(42 == toml::find_or(v1, "key", toml::integer(0))); + BOOST_TEST( 0 == toml::find_or(v2, "key", toml::integer(0))); + BOOST_TEST( 0 == toml::find_or(v3, "key", toml::integer(0))); toml::value v4 = toml::table{{"str", "foobar"}}; toml::string s("bazqux"); - BOOST_CHECK_EQUAL("foobar", toml::find_or(v4, "str", s)); - BOOST_CHECK_EQUAL("bazqux", toml::find_or(v1, "str", s)); + BOOST_TEST("foobar" == toml::find_or(v4, "str", s)); + BOOST_TEST("bazqux" == toml::find_or(v1, "str", s)); } // std::string { @@ -111,33 +111,33 @@ BOOST_AUTO_TEST_CASE(test_find_or) std::string s1("bazqux"); const std::string s2("bazqux"); - BOOST_CHECK_EQUAL("foobar", toml::find_or(v1, "key", s1)); - BOOST_CHECK_EQUAL("bazqux", toml::find_or(v2, "key", s1)); + BOOST_TEST("foobar" == toml::find_or(v1, "key", s1)); + BOOST_TEST("bazqux" == toml::find_or(v2, "key", s1)); std::string& v1r = toml::find_or(v1, "key", s1); std::string& s1r = toml::find_or(v2, "key", s1); - BOOST_CHECK_EQUAL("foobar", v1r); - BOOST_CHECK_EQUAL("bazqux", s1r); + BOOST_TEST("foobar" == v1r); + BOOST_TEST("bazqux" == s1r); - BOOST_CHECK_EQUAL("foobar", toml::find_or(v1, "key", s2)); - BOOST_CHECK_EQUAL("bazqux", toml::find_or(v2, "key", s2)); + BOOST_TEST("foobar" == toml::find_or(v1, "key", s2)); + BOOST_TEST("bazqux" == toml::find_or(v2, "key", s2)); - BOOST_CHECK_EQUAL("foobar", toml::find_or(std::move(v1), "key", std::move(s1))); + BOOST_TEST("foobar" == toml::find_or(std::move(v1), "key", std::move(s1))); s1 = "bazqux"; // restoring moved value - BOOST_CHECK_EQUAL("bazqux", toml::find_or(std::move(v2), "key", std::move(s1))); + BOOST_TEST("bazqux" == toml::find_or(std::move(v2), "key", std::move(s1))); } // string literal { toml::value v1 = toml::table{{"key", "foobar"}}; toml::value v2 = toml::table{{"key",42}}; - BOOST_CHECK_EQUAL("foobar", toml::find_or(v1, "key", "bazqux")); - BOOST_CHECK_EQUAL("bazqux", toml::find_or(v2, "key", "bazqux")); + BOOST_TEST("foobar" == toml::find_or(v1, "key", "bazqux")); + BOOST_TEST("bazqux" == toml::find_or(v2, "key", "bazqux")); const char* lit = "bazqux"; - BOOST_CHECK_EQUAL("foobar", toml::find_or(v1, "key", lit)); - BOOST_CHECK_EQUAL("bazqux", toml::find_or(v2, "key", lit)); + BOOST_TEST("foobar" == toml::find_or(v1, "key", lit)); + BOOST_TEST("bazqux" == toml::find_or(v2, "key", lit)); } } @@ -148,12 +148,12 @@ BOOST_AUTO_TEST_CASE(test_expect) toml::value v2(3.14); const auto v1_or_0 = toml::expect(v1).unwrap_or(0); const auto v2_or_0 = toml::expect(v2).unwrap_or(0); - BOOST_CHECK_EQUAL(42, v1_or_0); - BOOST_CHECK_EQUAL( 0, v2_or_0); + BOOST_TEST(42 == v1_or_0); + BOOST_TEST( 0 == v2_or_0); const auto v1_or_none = toml::expect(v1).map([](int i){return std::to_string(i);}).unwrap_or(std::string("none")); const auto v2_or_none = toml::expect(v2).map([](int i){return std::to_string(i);}).unwrap_or(std::string("none")); - BOOST_CHECK_EQUAL("42", v1_or_none); - BOOST_CHECK_EQUAL("none", v2_or_none); + BOOST_TEST("42" == v1_or_none); + BOOST_TEST("none" == v2_or_none); } } diff --git a/tests/test_parse_file.cpp b/tests/test_parse_file.cpp index 0e8c781..7a3dc8f 100644 --- a/tests/test_parse_file.cpp +++ b/tests/test_parse_file.cpp @@ -31,8 +31,7 @@ BOOST_AUTO_TEST_CASE(test_example) { BOOST_TEST(toml::find(database, "server") == "192.168.1.1"); const std::vector expected_ports{8001, 8001, 8002}; - const bool result = toml::find>(database, "ports") == expected_ports; - BOOST_TEST(result); + BOOST_CHECK(toml::find>(database, "ports") == expected_ports); BOOST_TEST(toml::find(database, "connection_max") == 5000); BOOST_TEST(toml::find(database, "enabled") == true); } @@ -54,16 +53,13 @@ BOOST_AUTO_TEST_CASE(test_example) toml::array clients_data = toml::find(clients, "data"); std::vector expected_name{"gamma", "delta"}; - const bool result1 = toml::get>(clients_data.at(0)) == expected_name; - BOOST_TEST(reuslt1); + BOOST_CHECK(toml::get>(clients_data.at(0)) == expected_name); std::vector expected_number{1, 2}; - const bool result2 = toml::get>(clients_data.at(1)) == expected_number; - BOOST_TEST(reuslt2); + BOOST_CHECK(toml::get>(clients_data.at(1)) == expected_number); std::vector expected_hosts{"alpha", "omega"}; - const bool result3 = toml::find>(clients, "hosts") == expected_hosts; - BOOST_TEST(reuslt3); + BOOST_CHECK(toml::find>(clients, "hosts") == expected_hosts); } std::vector products = @@ -99,8 +95,7 @@ BOOST_AUTO_TEST_CASE(test_example_stream) { BOOST_TEST(toml::find(database, "server") == "192.168.1.1"); const std::vector expected_ports{8001, 8001, 8002}; - const bool result = (toml::find>(database, "ports") == expected_ports); - BOOST_TEST(result); + BOOST_CHECK(toml::find>(database, "ports") == expected_ports); BOOST_TEST(toml::find(database, "connection_max") == 5000); BOOST_TEST(toml::find(database, "enabled") == true); } @@ -121,16 +116,13 @@ BOOST_AUTO_TEST_CASE(test_example_stream) { toml::array clients_data = toml::find(clients, "data"); std::vector expected_name{"gamma", "delta"}; - const bool result1 = toml::get>(clients_data.at(0)) == expected_name; - BOOST_TEST(reuslt1); + BOOST_CHECK(toml::get>(clients_data.at(0)) == expected_name); std::vector expected_number{1, 2}; - const bool result2 = toml::get>(clients_data.at(1)) == expected_number; - BOOST_TEST(reuslt2); + BOOST_CHECK(toml::get>(clients_data.at(1)) == expected_number); std::vector expected_hosts{"alpha", "omega"}; - const bool result3 = toml::find>(clients, "hosts") == expected_hosts; - BOOST_TEST(reuslt3); + BOOST_CHECK(toml::find>(clients, "hosts") == expected_hosts); } std::vector products = diff --git a/tests/test_parse_table.cpp b/tests/test_parse_table.cpp index 6d95ef0..e30e257 100644 --- a/tests/test_parse_table.cpp +++ b/tests/test_parse_table.cpp @@ -22,12 +22,12 @@ BOOST_AUTO_TEST_CASE(test_normal_table) location loc("test", table); const auto result = toml::detail::parse_ml_table(loc); - BOOST_CHECK(result.is_ok()); + BOOST_TEST(result.is_ok()); const auto data = result.unwrap(); - BOOST_CHECK_EQUAL(toml::get(data.at("key1")), "value"); - BOOST_CHECK_EQUAL(toml::get(data.at("key2")), 42); - BOOST_CHECK_EQUAL(toml::get(data.at("key3")), 3.14); + BOOST_TEST(toml::get(data.at("key1")) == "value"); + BOOST_TEST(toml::get(data.at("key2")) == 42); + BOOST_TEST(toml::get(data.at("key3")) == 3.14); } BOOST_AUTO_TEST_CASE(test_nested_table) @@ -39,12 +39,12 @@ BOOST_AUTO_TEST_CASE(test_nested_table) location loc("test", table); const auto result = toml::detail::parse_ml_table(loc); - BOOST_CHECK(result.is_ok()); + BOOST_TEST(result.is_ok()); const auto data = result.unwrap(); const auto a = toml::get(data.at("a")); const auto c = toml::get(a.at("c")); - BOOST_CHECK_EQUAL(toml::get(a.at("b")), "value"); - BOOST_CHECK_EQUAL(toml::get(c.at("d")), 42); + BOOST_TEST(toml::get(a.at("b")) == "value"); + BOOST_TEST(toml::get(c.at("d")) == 42); } diff --git a/tests/test_parse_unicode.cpp b/tests/test_parse_unicode.cpp index 30d909a..dbfe601 100644 --- a/tests/test_parse_unicode.cpp +++ b/tests/test_parse_unicode.cpp @@ -15,7 +15,7 @@ BOOST_AUTO_TEST_CASE(test_hard_example_unicode) const auto data = toml::parse("toml/tests/hard_example_unicode.toml"); const auto the = toml::find(data, "the"); - BOOST_CHECK_EQUAL(toml::get(the.at("test_string")), + BOOST_TEST(toml::get(the.at("test_string")) == std::string("\xC3\x9D\xC3\xB4\xC3\xBA\x27\xE2\x84\x93\xE2\x84\x93\x20\xCE\xBB\xC3\xA1\xC6\xAD\xC3\xA8\x20\xE2\x82\xA5\xC3\xA8\x20\xC3\xA1\xC6\x92\xC6\xAD\xC3\xA8\xC5\x99\x20\xC6\xAD\xCE\xBB\xC3\xAF\xC6\xA8\x20\x2D\x20\x23")); const auto hard = toml::get(the.at("hard")); @@ -28,13 +28,13 @@ BOOST_AUTO_TEST_CASE(test_hard_example_unicode) }; BOOST_CHECK(toml::get>(hard.at("test_array2")) == expected_the_hard_test_array2); - BOOST_CHECK_EQUAL(toml::get(hard.at("another_test_string")), + BOOST_TEST(toml::get(hard.at("another_test_string")) == std::string("\xC2\xA7\xC3\xA1\xE2\x82\xA5\xC3\xA8\x20\xC6\xAD\xCE\xBB\xC3\xAF\xC3\xB1\xCF\xB1\x2C\x20\xCE\xB2\xC3\xBA\xC6\xAD\x20\xCF\x89\xC3\xAF\xC6\xAD\xCE\xBB\x20\xC3\xA1\x20\xC6\xA8\xC6\xAD\xC5\x99\xC3\xAF\xC3\xB1\xCF\xB1\x20\x23")); - BOOST_CHECK_EQUAL(toml::get(hard.at("harder_test_string")), + BOOST_TEST(toml::get(hard.at("harder_test_string")) == std::string("\x20\xC3\x82\xC3\xB1\xCE\xB4\x20\xCF\x89\xCE\xBB\xC3\xA8\xC3\xB1\x20\x22\x27\xC6\xA8\x20\xC3\xA1\xC5\x99\xC3\xA8\x20\xC3\xAF\xC3\xB1\x20\xC6\xAD\xCE\xBB\xC3\xA8\x20\xC6\xA8\xC6\xAD\xC5\x99\xC3\xAF\xC3\xB1\xCF\xB1\x2C\x20\xC3\xA1\xE2\x84\x93\xC3\xB4\xC3\xB1\xCF\xB1\x20\xCF\x89\xC3\xAF\xC6\xAD\xCE\xBB\x20\x23\x20\x22")); // const auto bit = toml::get(hard.at(std::string("\xCE\xB2\xC3\xAF\xC6\xAD\x23"))); - BOOST_CHECK_EQUAL(toml::get(bit.at(std::string("\xCF\x89\xCE\xBB\xC3\xA1\xC6\xAD\x3F"))), + BOOST_TEST(toml::get(bit.at(std::string("\xCF\x89\xCE\xBB\xC3\xA1\xC6\xAD\x3F"))) == std::string("\xC3\x9D\xC3\xB4\xC3\xBA\x20\xCE\xB4\xC3\xB4\xC3\xB1\x27\xC6\xAD\x20\xC6\xAD\xCE\xBB\xC3\xAF\xC3\xB1\xC6\x99\x20\xC6\xA8\xC3\xB4\xE2\x82\xA5\xC3\xA8\x20\xC3\xBA\xC6\xA8\xC3\xA8\xC5\x99\x20\xCF\x89\xC3\xB4\xC3\xB1\x27\xC6\xAD\x20\xCE\xB4\xC3\xB4\x20\xC6\xAD\xCE\xBB\xC3\xA1\xC6\xAD\x3F")); const std::vector expected_multi_line_array{"]"}; BOOST_CHECK(toml::get>(bit.at("multi_line_array")) == @@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE(test_hard_example_unicode) const auto data = toml::parse("toml/tests/hard_example_unicode.toml"); const auto the = toml::find(data, "the"); - BOOST_CHECK_EQUAL(toml::get(the.at("test_string")), + BOOST_TEST(toml::get(the.at("test_string")) == std::string(u8"Ýôú'ℓℓ λáƭè ₥è áƒƭèř ƭλïƨ - #")); const auto hard = toml::get(the.at("hard")); @@ -58,13 +58,13 @@ BOOST_AUTO_TEST_CASE(test_hard_example_unicode) std::string(u8"Éжƥèřï₥èñƭ #9 ωáƨ á ƨúççèƨƨ")}; BOOST_CHECK(toml::get>(hard.at("test_array2")) == expected_the_hard_test_array2); - BOOST_CHECK_EQUAL(toml::get(hard.at("another_test_string")), + BOOST_TEST(toml::get(hard.at("another_test_string")) == std::string(u8"§á₥è ƭλïñϱ, βúƭ ωïƭλ á ƨƭřïñϱ #")); - BOOST_CHECK_EQUAL(toml::get(hard.at("harder_test_string")), + BOOST_TEST(toml::get(hard.at("harder_test_string")) == std::string(u8" Âñδ ωλèñ \"'ƨ ářè ïñ ƭλè ƨƭřïñϱ, áℓôñϱ ωïƭλ # \"")); const auto bit = toml::get(hard.at(std::string(u8"βïƭ#"))); - BOOST_CHECK_EQUAL(toml::get(bit.at(std::string(u8"ωλáƭ?"))), + BOOST_TEST(toml::get(bit.at(std::string(u8"ωλáƭ?"))) == std::string(u8"Ýôú δôñ'ƭ ƭλïñƙ ƨô₥è úƨèř ωôñ'ƭ δô ƭλáƭ?")); const std::vector expected_multi_line_array{"]"}; BOOST_CHECK(toml::get>(bit.at("multi_line_array")) ==