From 999dbe147be213da73891ff71bfda0a290199aad Mon Sep 17 00:00:00 2001 From: alandefreitas Date: Wed, 16 Mar 2022 16:21:05 -0300 Subject: [PATCH] BOOST_TEST_EQ fix #69 --- extra/include/test_suite.hpp | 334 +++++++++++++++++++++++++ test/unit/authority_view.cpp | 161 ++++++------ test/unit/const_string.cpp | 72 +++--- test/unit/error.cpp | 10 +- test/unit/grammar/ascii.cpp | 2 +- test/unit/grammar/charset.cpp | 4 +- test/unit/grammar/elements.cpp | 6 +- test/unit/grammar/error.cpp | 10 +- test/unit/grammar/optional.cpp | 4 +- test/unit/grammar/unsigned_decimal.cpp | 4 +- test/unit/ipv4_address.cpp | 28 +-- test/unit/ipv6_address.cpp | 28 +-- test/unit/params.cpp | 178 ++++++------- test/unit/params_encoded.cpp | 186 +++++++------- test/unit/params_encoded_view.cpp | 70 +++--- test/unit/params_view.cpp | 70 +++--- test/unit/pct_encoding.cpp | 26 +- test/unit/rfc/authority_rule.cpp | 8 +- test/unit/rfc/hier_part_rule.cpp | 4 +- test/unit/rfc/port_rule.cpp | 4 +- test/unit/rfc/relative_part_rule.cpp | 4 +- test/unit/rfc/userinfo_rule.cpp | 2 +- test/unit/scheme.cpp | 2 +- test/unit/segments.cpp | 304 +++++++++++----------- test/unit/segments_encoded.cpp | 250 +++++++++--------- test/unit/segments_encoded_view.cpp | 76 +++--- test/unit/segments_view.cpp | 76 +++--- test/unit/static_pool.cpp | 2 +- test/unit/static_url.cpp | 66 ++--- test/unit/test_rule.hpp | 2 +- test/unit/url.cpp | 317 ++++++++++++----------- test/unit/url_view.cpp | 213 ++++++++-------- 32 files changed, 1427 insertions(+), 1096 deletions(-) diff --git a/extra/include/test_suite.hpp b/extra/include/test_suite.hpp index fc289852..713d94cd 100644 --- a/extra/include/test_suite.hpp +++ b/extra/include/test_suite.hpp @@ -10,11 +10,14 @@ #ifndef TEST_SUITE_HPP #define TEST_SUITE_HPP +#include + #include #include #include #include #include +#include #include #include #include @@ -217,6 +220,221 @@ private: //---------------------------------------------------------- +template +char const * +predicate_name( T const& ) = delete; + +struct predicate_eq +{ + template + bool + operator()(const T& t, const U& u) const + { + return t == u; + } +}; + +inline +char const * +predicate_name( predicate_eq const& ) +{ + return "=="; +} + +struct predicate_ne +{ + template + bool + operator()(const T& t, const U& u) const + { + return t != u; + } +}; + +inline +char const * +predicate_name( predicate_ne const& ) +{ + return "!="; +} + +struct predicate_lt +{ + template + bool operator()(const T& t, const U& u) const + { + return t < u; + } +}; + +inline +char const * predicate_name( predicate_lt const& ) +{ + return "<"; +} + +struct predicate_le +{ + template + bool operator()(const T& t, const U& u) const + { + return t <= u; + } +}; + +inline +char const * predicate_name( predicate_le const& ) +{ + return "<="; +} + +struct predicate_gt +{ + template + bool + operator()(const T& t, const U& u) const + { + return t > u; + } +}; + +inline +char const * predicate_name( predicate_gt const& ) +{ + return ">"; +} + +struct predicate_ge +{ + template + bool + operator()(const T& t, const U& u) const + { + return t >= u; + } +}; + +inline +char const * predicate_name( predicate_ge const& ) +{ + return ">="; +} + +//---------------------------------------------------------- + +template +struct has_stream_operator : std::false_type +{}; + +template +struct has_stream_operator< + T, + boost::void_t< + decltype(std::declval() << std::declval()) + >> : std::true_type +{}; + +template +inline +typename std::enable_if::value, std::string>::type +test_output_impl(const T& v) +{ + std::stringstream ss; + ss << v; + return ss.str(); +} + +template +inline +typename std::enable_if::value, std::string>::type +test_output_impl(const T&) +{ + return "{}"; +} + +#if !defined( BOOST_NO_CXX11_NULLPTR ) +inline +std::string +test_output_impl(std::nullptr_t) +{ + return "nullptr"; +} +#endif + +inline +std::string +test_output_impl( signed char const& v ) +{ + std::stringstream ss; + ss << v << " (" << int(v) << ")"; + return ss.str(); +} + +inline +std::string +test_output_impl( unsigned char const& v ) +{ + std::stringstream ss; + ss << v << " (" << int(v) << ")"; + return ss.str(); +} + +inline +std::string +test_output_impl( wchar_t& v ) +{ + std::stringstream ss; + ss << "wchar_t (" << int(v) << ")"; + return ss.str(); +} + +#if !defined( BOOST_NO_CXX11_CHAR16_T ) +inline +std::string +test_output_impl( char16_t const& v ) +{ + std::stringstream ss; + ss << "char16_t (" << int(v) << ")"; + return ss.str(); +} +#endif + +#if !defined( BOOST_NO_CXX11_CHAR32_T ) +inline +std::string +test_output_impl( char32_t const& v ) +{ + std::stringstream ss; + ss << "char32_t (" << int(v) << ")"; + return ss.str(); +} +#endif + +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable: 4996) +#endif + +inline std::string test_output_impl( char const& v ) +{ + if( std::isprint( static_cast( v ) ) ) + { + return std::string( 1, v ); + } + else + { + char buffer[ 8 ]; + std::sprintf( buffer, "\\x%02X", static_cast( v ) ); + return buffer; + } +} + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif + +//---------------------------------------------------------- + class runner { runner* saved_; @@ -239,7 +457,9 @@ public: virtual void note(char const* msg) = 0; virtual void pass(char const* expr, char const* file, int line, char const* func) = 0; + virtual void pass(char const* cond, char const* expr1, char const* expr2, std::string const& out1, std::string const& out2, char const* file, int line, char const* func) = 0; virtual void fail(char const* expr, char const* file, int line, char const* func) = 0; + virtual void fail(char const* cond, char const* expr1, char const* expr2, std::string const& out1, std::string const& out2, char const* file, int line, char const* func) = 0; template + bool + maybe_fail( + BinaryPredicate cond, + T const & t, + U const & u, + char const* expr1, + char const* expr2, + char const* file, + int line, + char const* func) + { + if(!!cond(t,u)) + { + pass( + predicate_name(cond), + expr1, + expr2, + test_output_impl(t), + test_output_impl(u), + file, + line, + func); + return true; + } + fail( + predicate_name(cond), + expr1, + expr2, + test_output_impl(t), + test_output_impl(u), + file, + line, + func); + return false; + } + void run(suite_info const& si) { @@ -430,6 +687,21 @@ public: ++v_.back().total; } + void + pass( + char const*, + char const*, + char const*, + std::string const&, + std::string const&, + char const*, + int, + char const*) override + { + ++all_.total; + ++v_.back().total; + } + void fail( char const* expr, @@ -457,6 +729,44 @@ public: "(" << line << ") " "failed: " << expr << "\n"; } + + void + fail( + char const* cond, + char const* expr1, + char const* expr2, + std::string const& out1, + std::string const& out2, + char const* file, + int line, + char const*) override + { + ++all_.failed; + ++v_.back().total; + ++v_.back().failed; + auto const id = ++all_.total; + auto const cp = + checkpoint::current(); + if(cp) + log_ << + "case " << cp->id << + "(#" << id << ") " << + filename(cp->file) << + "(" << cp->line << ") " + "failed: '" << expr1 << " " << + cond << " " << expr2 << "' ('" << + out1 << "' " << cond << " '" << + out2 << "')\n"; + else + log_ << + "#" << id << + " " << filename(file) << + "(" << line << ") " + "failed: '" << expr1 << " " << + cond << " " << expr2 << "' ('" << + out1 << "' " << cond << " '" << + out2 << "')\n"; + } }; //---------------------------------------------------------- @@ -638,6 +948,30 @@ using log_type = detail::log_ostream; ::test_suite::detail::current()->fail( \ msg, __FILE__, __LINE__, TEST_SUITE_FUNCTION) +#define BOOST_TEST_EQ(expr1,expr2) \ + ::test_suite::detail::current()->maybe_fail( \ + ::test_suite::detail::predicate_eq(), (expr1), (expr2), #expr1, #expr2, __FILE__, __LINE__, TEST_SUITE_FUNCTION) + +#define BOOST_TEST_NE(expr1,expr2) \ + ::test_suite::detail::current()->maybe_fail( \ + ::test_suite::detail::predicate_ne(), (expr1), (expr2), #expr1, #expr2, __FILE__, __LINE__, TEST_SUITE_FUNCTION) + +#define BOOST_TEST_LT(expr1,expr2) \ + ::test_suite::detail::current()->maybe_fail( \ + ::test_suite::detail::predicate_lt(), (expr1), (expr2), #expr1, #expr2, __FILE__, __LINE__, TEST_SUITE_FUNCTION) + +#define BOOST_TEST_LE(expr1,expr2) \ + ::test_suite::detail::current()->maybe_fail( \ + ::test_suite::detail::predicate_le(), (expr1), (expr2), #expr1, #expr2, __FILE__, __LINE__, TEST_SUITE_FUNCTION) + +#define BOOST_TEST_GT(expr1,expr2) \ + ::test_suite::detail::current()->maybe_fail( \ + ::test_suite::detail::predicate_gt(), (expr1), (expr2), #expr1, #expr2, __FILE__, __LINE__, TEST_SUITE_FUNCTION) + +#define BOOST_TEST_GE(expr1,expr2) \ + ::test_suite::detail::current()->maybe_fail( \ + ::test_suite::detail::predicate_ge(), (expr1), (expr2), #expr1, #expr2, __FILE__, __LINE__, TEST_SUITE_FUNCTION) + #define BOOST_TEST_PASS() \ ::test_suite::detail::current()->pass( \ "", __FILE__, __LINE__, TEST_SUITE_FUNCTION) diff --git a/test/unit/authority_view.cpp b/test/unit/authority_view.cpp index 04d25aea..4756be2b 100644 --- a/test/unit/authority_view.cpp +++ b/test/unit/authority_view.cpp @@ -30,7 +30,7 @@ public: { authority_view a; BOOST_TEST(a.empty()); - BOOST_TEST(a.size() == 0); + BOOST_TEST_EQ(a.size(), 0u); } } @@ -39,19 +39,18 @@ public: { // max_size() { - BOOST_TEST( - authority_view::max_size() > 0); + BOOST_TEST_GT(authority_view::max_size(), 0u); authority_view a; - BOOST_TEST(a.max_size() > 0); + BOOST_TEST_GT(a.max_size(), 0u); } // size() { authority_view a; - BOOST_TEST(a.size() == 0); + BOOST_TEST_EQ(a.size(), 0u); a = parse_authority("x").value(); - BOOST_TEST(a.size() == 1); + BOOST_TEST_EQ(a.size(), 1u); } // empty() @@ -66,16 +65,16 @@ public: { string_view s = "x"; authority_view a = parse_authority(s).value(); - BOOST_TEST(a.data() != nullptr); - BOOST_TEST(a.data() == s.data()); + BOOST_TEST_NE(a.data(), nullptr); + BOOST_TEST_EQ(a.data(), s.data()); } // at(std::size_t) { string_view s = "xy"; authority_view a = parse_authority(s).value(); - BOOST_TEST(a.at(0) == 'x'); - BOOST_TEST(a.at(1) == 'y'); + BOOST_TEST_EQ(a.at(0), 'x'); + BOOST_TEST_EQ(a.at(1), 'y'); BOOST_TEST_THROWS(a.at(2), std::out_of_range); } @@ -84,9 +83,9 @@ public: { string_view s = "xyz"; authority_view a = parse_authority(s).value(); - BOOST_TEST(a[0] == 'x'); - BOOST_TEST(a[1] == 'y'); - BOOST_TEST(&a[2] == &s[2]); + BOOST_TEST_EQ(a[0], 'x'); + BOOST_TEST_EQ(a[1], 'y'); + BOOST_TEST_EQ(&a[2], &s[2]); } // begin() @@ -94,18 +93,18 @@ public: { string_view s = "xyz"; authority_view a = parse_authority(s).value(); - BOOST_TEST(a.begin() == s.data()); - BOOST_TEST(a.begin() == a.data()); - BOOST_TEST(a.end() != a.begin()); - BOOST_TEST(a.end()[-1] == 'z'); + BOOST_TEST_EQ(a.begin(), s.data()); + BOOST_TEST_EQ(a.begin(), a.data()); + BOOST_TEST_NE(a.end(), a.begin()); + BOOST_TEST_EQ(a.end()[-1], 'z'); } // encoded_authority() { string_view s = "xyz"; authority_view a = parse_authority(s).value(); - BOOST_TEST(a.encoded_authority() == s); - BOOST_TEST(a.encoded_authority().data() == s.data()); + BOOST_TEST_EQ(a.encoded_authority(), s); + BOOST_TEST_EQ(a.encoded_authority().data(), s.data()); } // collect() @@ -158,74 +157,74 @@ public: { auto a = parse_authority("@").value(); BOOST_TEST(a.has_userinfo()); - BOOST_TEST(a.encoded_userinfo() == ""); - BOOST_TEST(a.userinfo() == ""); - BOOST_TEST(a.encoded_user() == ""); - BOOST_TEST(a.user() == ""); - BOOST_TEST(a.has_password() == false); - BOOST_TEST(a.encoded_password() == ""); - BOOST_TEST(a.password() == ""); + BOOST_TEST_EQ(a.encoded_userinfo(), ""); + BOOST_TEST_EQ(a.userinfo(), ""); + BOOST_TEST_EQ(a.encoded_user(), ""); + BOOST_TEST_EQ(a.user(), ""); + BOOST_TEST_EQ(a.has_password(), false); + BOOST_TEST_EQ(a.encoded_password(), ""); + BOOST_TEST_EQ(a.password(), ""); } { auto a = parse_authority(":@").value(); BOOST_TEST(a.has_userinfo()); - BOOST_TEST(a.encoded_userinfo() == ":"); - BOOST_TEST(a.userinfo() == ":"); - BOOST_TEST(a.encoded_user() == ""); - BOOST_TEST(a.user() == ""); - BOOST_TEST(a.has_password() == true); - BOOST_TEST(a.encoded_password() == ""); - BOOST_TEST(a.password() == ""); + BOOST_TEST_EQ(a.encoded_userinfo(), ":"); + BOOST_TEST_EQ(a.userinfo(), ":"); + BOOST_TEST_EQ(a.encoded_user(), ""); + BOOST_TEST_EQ(a.user(), ""); + BOOST_TEST_EQ(a.has_password(), true); + BOOST_TEST_EQ(a.encoded_password(), ""); + BOOST_TEST_EQ(a.password(), ""); } { auto a = parse_authority("a%41:@").value(); BOOST_TEST(a.has_userinfo()); - BOOST_TEST(a.encoded_userinfo() == "a%41:"); - BOOST_TEST(a.encoded_user() == "a%41"); - BOOST_TEST(a.user() == "aA"); - BOOST_TEST(a.has_password() == true); - BOOST_TEST(a.encoded_password() == ""); - BOOST_TEST(a.password() == ""); + BOOST_TEST_EQ(a.encoded_userinfo(), "a%41:"); + BOOST_TEST_EQ(a.encoded_user(), "a%41"); + BOOST_TEST_EQ(a.user(), "aA"); + BOOST_TEST_EQ(a.has_password(), true); + BOOST_TEST_EQ(a.encoded_password(), ""); + BOOST_TEST_EQ(a.password(), ""); } { auto a = parse_authority(":b%42@").value(); BOOST_TEST(a.has_userinfo()); - BOOST_TEST(a.encoded_userinfo() == ":b%42"); - BOOST_TEST(a.encoded_user() == ""); - BOOST_TEST(a.user() == ""); - BOOST_TEST(a.has_password() == true); - BOOST_TEST(a.encoded_password() == "b%42"); - BOOST_TEST(a.password() == "bB"); + BOOST_TEST_EQ(a.encoded_userinfo(), ":b%42"); + BOOST_TEST_EQ(a.encoded_user(), ""); + BOOST_TEST_EQ(a.user(), ""); + BOOST_TEST_EQ(a.has_password(), true); + BOOST_TEST_EQ(a.encoded_password(), "b%42"); + BOOST_TEST_EQ(a.password(), "bB"); } { auto a = parse_authority("a:b@").value(); BOOST_TEST(a.has_userinfo()); - BOOST_TEST(a.encoded_userinfo() == "a:b"); - BOOST_TEST(a.encoded_user() == "a"); - BOOST_TEST(a.has_password() == true); - BOOST_TEST(a.encoded_password() == "b"); + BOOST_TEST_EQ(a.encoded_userinfo(), "a:b"); + BOOST_TEST_EQ(a.encoded_user(), "a"); + BOOST_TEST_EQ(a.has_password(), true); + BOOST_TEST_EQ(a.encoded_password(), "b"); } { auto a = parse_authority("%3a:%3a@").value(); BOOST_TEST(a.has_userinfo()); - BOOST_TEST(a.encoded_userinfo() == "%3a:%3a"); - BOOST_TEST(a.userinfo() == ":::"); - BOOST_TEST(a.encoded_user() == "%3a"); - BOOST_TEST(a.user() == ":"); - BOOST_TEST(a.has_password() == true); - BOOST_TEST(a.encoded_password() == "%3a"); - BOOST_TEST(a.password() == ":"); + BOOST_TEST_EQ(a.encoded_userinfo(), "%3a:%3a"); + BOOST_TEST_EQ(a.userinfo(), ":::"); + BOOST_TEST_EQ(a.encoded_user(), "%3a"); + BOOST_TEST_EQ(a.user(), ":"); + BOOST_TEST_EQ(a.has_password(), true); + BOOST_TEST_EQ(a.encoded_password(), "%3a"); + BOOST_TEST_EQ(a.password(), ":"); } { auto a = parse_authority("%2525@").value(); BOOST_TEST(a.has_userinfo()); - BOOST_TEST(a.encoded_userinfo() == "%2525"); - BOOST_TEST(a.userinfo() == "%25"); - BOOST_TEST(a.encoded_user() == "%2525"); - BOOST_TEST(a.user() == "%25"); - BOOST_TEST(a.has_password() == false); - BOOST_TEST(a.encoded_password() == ""); - BOOST_TEST(a.password() == ""); + BOOST_TEST_EQ(a.encoded_userinfo(), "%2525"); + BOOST_TEST_EQ(a.userinfo(), "%25"); + BOOST_TEST_EQ(a.encoded_user(), "%2525"); + BOOST_TEST_EQ(a.user(), "%25"); + BOOST_TEST_EQ(a.has_password(), false); + BOOST_TEST_EQ(a.encoded_password(), ""); + BOOST_TEST_EQ(a.password(), ""); } } @@ -312,56 +311,56 @@ public: { auto a = parse_authority("").value(); BOOST_TEST(! a.has_port()); - BOOST_TEST(a.port() == ""); - BOOST_TEST(a.port_number() == 0); + BOOST_TEST_EQ(a.port(), ""); + BOOST_TEST_EQ(a.port_number(), 0); } { auto a = parse_authority("www").value(); BOOST_TEST(! a.has_port()); - BOOST_TEST(a.port() == ""); - BOOST_TEST(a.port_number() == 0); + BOOST_TEST_EQ(a.port(), ""); + BOOST_TEST_EQ(a.port_number(), 0); } { auto a = parse_authority(":").value(); BOOST_TEST(a.has_port()); - BOOST_TEST(a.port() == ""); - BOOST_TEST(a.port_number() == 0); + BOOST_TEST_EQ(a.port(), ""); + BOOST_TEST_EQ(a.port_number(), 0); } { auto a = parse_authority(":0").value(); BOOST_TEST(a.has_port()); - BOOST_TEST(a.port() == "0"); - BOOST_TEST(a.port_number() == 0); + BOOST_TEST_EQ(a.port(), "0"); + BOOST_TEST_EQ(a.port_number(), 0); } { auto a = parse_authority(":42").value(); BOOST_TEST(a.has_port()); - BOOST_TEST(a.port() == "42"); - BOOST_TEST(a.port_number() == 42); + BOOST_TEST_EQ(a.port(), "42"); + BOOST_TEST_EQ(a.port_number(), 42); } { auto a = parse_authority(":00000").value(); BOOST_TEST(a.has_port()); - BOOST_TEST(a.port() == "00000"); - BOOST_TEST(a.port_number() == 0); + BOOST_TEST_EQ(a.port(), "00000"); + BOOST_TEST_EQ(a.port_number(), 0); } { auto a = parse_authority(":000001").value(); BOOST_TEST(a.has_port()); - BOOST_TEST(a.port() == "000001"); - BOOST_TEST(a.port_number() == 1); + BOOST_TEST_EQ(a.port(), "000001"); + BOOST_TEST_EQ(a.port_number(), 1); } { auto a = parse_authority(":65535").value(); BOOST_TEST(a.has_port()); - BOOST_TEST(a.port() == "65535"); - BOOST_TEST(a.port_number() == 65535); + BOOST_TEST_EQ(a.port(), "65535"); + BOOST_TEST_EQ(a.port_number(), 65535); } { auto a = parse_authority(":65536").value(); BOOST_TEST(a.has_port()); - BOOST_TEST(a.port() == "65536"); - BOOST_TEST(a.port_number() == 0); + BOOST_TEST_EQ(a.port(), "65536"); + BOOST_TEST_EQ(a.port_number(), 0); } } diff --git a/test/unit/const_string.cpp b/test/unit/const_string.cpp index 1bf4b6ef..a149cc72 100644 --- a/test/unit/const_string.cpp +++ b/test/unit/const_string.cpp @@ -38,7 +38,7 @@ struct const_string_test small_ = big_.substr(0, C); BOOST_TEST(big_.size() > C); BOOST_TEST(small_.size() <= C); - BOOST_TEST(C > 3); + BOOST_TEST(C > 3u); } void @@ -48,7 +48,7 @@ struct const_string_test // ~const_string() { const_string s; - BOOST_TEST(s == ""); + BOOST_TEST_EQ(s, ""); BOOST_TEST(s.empty()); // same buffer @@ -66,7 +66,7 @@ struct const_string_test { small_.copy(dest, n, 0); }); - BOOST_TEST(s == small_); + BOOST_TEST_EQ(s, small_); } // const_string(string_view, Allocator) @@ -74,7 +74,7 @@ struct const_string_test { char const* const x = "x"; const_string s(x, A{}); - BOOST_TEST(s == "x"); + BOOST_TEST_EQ(s, "x"); BOOST_TEST(! s.empty()); // different buffer @@ -89,9 +89,9 @@ struct const_string_test auto c = small_; const_string s1(c, A{}); const_string s2(s1); - BOOST_TEST(s1 == c); - BOOST_TEST(s2 == c); - BOOST_TEST(s2 == s1); + BOOST_TEST_EQ(s1, c); + BOOST_TEST_EQ(s2, c); + BOOST_TEST_EQ(s2, s1); // different buffer BOOST_TEST(s1.size() <= C); @@ -102,9 +102,9 @@ struct const_string_test { const_string s1(big_, A{}); const_string s2(s1); - BOOST_TEST(s1 == big_); - BOOST_TEST(s2 == big_); - BOOST_TEST(s2 == s1); + BOOST_TEST_EQ(s1, big_); + BOOST_TEST_EQ(s2, big_); + BOOST_TEST_EQ(s2, s1); // same buffer BOOST_TEST(s1.size() > C); @@ -118,12 +118,12 @@ struct const_string_test { const_string s1("abc", A{}); const_string s2; - BOOST_TEST(s1 == "abc"); + BOOST_TEST_EQ(s1, "abc"); BOOST_TEST(s2.empty()); s2 = s1; - BOOST_TEST(s1 == "abc"); - BOOST_TEST(s2 == "abc"); - BOOST_TEST(s2 == s1); + BOOST_TEST_EQ(s1, "abc"); + BOOST_TEST_EQ(s2, "abc"); + BOOST_TEST_EQ(s2, s1); // different buffer BOOST_TEST(s1.size() <= C); @@ -134,12 +134,12 @@ struct const_string_test { const_string s1(big_, A{}); const_string s2; - BOOST_TEST(s1 == big_); + BOOST_TEST_EQ(s1, big_); BOOST_TEST(s2.empty()); s2 = s1; - BOOST_TEST(s1 == big_); - BOOST_TEST(s2 == big_); - BOOST_TEST(s2 == s1); + BOOST_TEST_EQ(s1, big_); + BOOST_TEST_EQ(s2, big_); + BOOST_TEST_EQ(s2, s1); // same buffer BOOST_TEST(s1.size() > C); @@ -150,12 +150,12 @@ struct const_string_test { const_string s1(small_, A{}); const_string s2(big_, A{}); - BOOST_TEST(s1 == small_); - BOOST_TEST(s2 == big_); + BOOST_TEST_EQ(s1, small_); + BOOST_TEST_EQ(s2, big_); s1 = s2; - BOOST_TEST(s1 == big_); - BOOST_TEST(s2 == big_); - BOOST_TEST(s2 == s1); + BOOST_TEST_EQ(s1, big_); + BOOST_TEST_EQ(s2, big_); + BOOST_TEST_EQ(s2, s1); // same buffer BOOST_TEST(s1.size() > C); @@ -166,12 +166,12 @@ struct const_string_test { const_string s1(big_, A{}); const_string s2(big2_, A{}); - BOOST_TEST(s1 == big_); - BOOST_TEST(s2 == big2_); + BOOST_TEST_EQ(s1, big_); + BOOST_TEST_EQ(s2, big2_); s1 = s2; - BOOST_TEST(s1 == big2_); - BOOST_TEST(s2 == big2_); - BOOST_TEST(s2 == s1); + BOOST_TEST_EQ(s1, big2_); + BOOST_TEST_EQ(s2, big2_); + BOOST_TEST_EQ(s2, s1); // same buffer BOOST_TEST(s1.size() > C); @@ -183,7 +183,7 @@ struct const_string_test const_string s1(big_, A{}); const_string s2(small_, A{}); s1 = s2; - BOOST_TEST(s1 == s2); + BOOST_TEST_EQ(s1, s2); } // operator= (self-assignment) @@ -191,7 +191,7 @@ struct const_string_test const_string s(small_, A{}); const_string const& cs(s); s = cs; - BOOST_TEST(s == small_); + BOOST_TEST_EQ(s, small_); } } } @@ -234,7 +234,7 @@ struct const_string_test small_.copy(dest, n, 0); }); } - BOOST_TEST(s == small_); + BOOST_TEST_EQ(s, small_); BOOST_TEST(! s.empty()); } { @@ -247,7 +247,7 @@ struct const_string_test big_.copy(dest, n, 0); }); } - BOOST_TEST(s == big_); + BOOST_TEST_EQ(s, big_); BOOST_TEST(! s.empty()); } { @@ -263,7 +263,7 @@ struct const_string_test small_.copy(dest, n, 0); }); } - BOOST_TEST(s == small_); + BOOST_TEST_EQ(s, small_); BOOST_TEST(! s.empty()); } { @@ -279,7 +279,7 @@ struct const_string_test big_.copy(dest, n, 0); }); } - BOOST_TEST(s == big_); + BOOST_TEST_EQ(s, big_); BOOST_TEST(! s.empty()); } } @@ -294,7 +294,7 @@ struct const_string_test factory a; s = a(abc); } - BOOST_TEST(s == "abc"); + BOOST_TEST_EQ(s, "abc"); BOOST_TEST(! s.empty()); // different buffer @@ -307,7 +307,7 @@ struct const_string_test factory a(sp.allocator()); s = a(abc); } - BOOST_TEST(s == "abc"); + BOOST_TEST_EQ(s, "abc"); BOOST_TEST(! s.empty()); // different buffer diff --git a/test/unit/error.cpp b/test/unit/error.cpp index 60f3dc47..49ea66aa 100644 --- a/test/unit/error.cpp +++ b/test/unit/error.cpp @@ -24,7 +24,7 @@ public: void check(error e) { auto const ec = BOOST_URL_ERR(e); - BOOST_TEST(ec.category().name() != nullptr); + BOOST_TEST_NE(ec.category().name(), nullptr); BOOST_TEST(! ec.message().empty()); BOOST_TEST(ec.category().default_error_condition( static_cast(e)).category() == ec.category()); @@ -34,15 +34,15 @@ public: { { auto const ec = BOOST_URL_ERR(e); - BOOST_TEST(ec.category().name() != nullptr); + BOOST_TEST_NE(ec.category().name(), nullptr); BOOST_TEST(! ec.message().empty()); - BOOST_TEST(ec == c); + BOOST_TEST_EQ(ec, c); } { auto ec = make_error_condition(c); - BOOST_TEST(ec.category().name() != nullptr); + BOOST_TEST_NE(ec.category().name(), nullptr); BOOST_TEST(! ec.message().empty()); - BOOST_TEST(ec == c); + BOOST_TEST_EQ(ec, c); } } diff --git a/test/unit/grammar/ascii.cpp b/test/unit/grammar/ascii.cpp index 7d480619..45b0ec4d 100644 --- a/test/unit/grammar/ascii.cpp +++ b/test/unit/grammar/ascii.cpp @@ -37,7 +37,7 @@ public: auto it0 = s0.data(); auto it1 = s1.data(); auto const end = it0 + s0.size(); - BOOST_TEST(s0.size() == s1.size()); + BOOST_TEST_EQ(s0.size(), s1.size()); while(it0 != end) BOOST_TEST(ascii_tolower( *it0++) == *it1++); diff --git a/test/unit/grammar/charset.cpp b/test/unit/grammar/charset.cpp index 51dad67e..fb7294f2 100644 --- a/test/unit/grammar/charset.cpp +++ b/test/unit/grammar/charset.cpp @@ -93,8 +93,8 @@ public: std::size_t n1 = 0; test_char_set( test_chars{n0, n1}, "x"); - BOOST_TEST(n0 > 0); - BOOST_TEST(n1 > 0); + BOOST_TEST_GT(n0, 0u); + BOOST_TEST_GT(n1, 0u); { for(std::size_t i = 0; diff --git a/test/unit/grammar/elements.cpp b/test/unit/grammar/elements.cpp index 53cd32c7..0b1150fc 100644 --- a/test/unit/grammar/elements.cpp +++ b/test/unit/grammar/elements.cpp @@ -31,14 +31,14 @@ struct elements_test char_literal<'y'>> t; BOOST_TEST_NO_THROW( parse_string("xy", t)); - BOOST_TEST(*get<0>(t).p == 'x'); - BOOST_TEST(*get<1>(t).p == 'y'); + BOOST_TEST_EQ(*get<0>(t).p, 'x'); + BOOST_TEST_EQ(*get<1>(t).p, 'y'); } { elements> t; BOOST_TEST_NO_THROW( parse_string("token", t)); - BOOST_TEST(get<0>(t).s == "token"); + BOOST_TEST_EQ(get<0>(t).s, "token"); } } diff --git a/test/unit/grammar/error.cpp b/test/unit/grammar/error.cpp index e5a229ca..cb14dfd4 100644 --- a/test/unit/grammar/error.cpp +++ b/test/unit/grammar/error.cpp @@ -24,7 +24,7 @@ public: void check(error e) { auto const ec = BOOST_URL_ERR(e); - BOOST_TEST(ec.category().name() != nullptr); + BOOST_TEST_NE(ec.category().name(), nullptr); BOOST_TEST(! ec.message().empty()); BOOST_TEST(ec.category().default_error_condition( static_cast(e)).category() == ec.category()); @@ -34,15 +34,15 @@ public: { { auto const ec = BOOST_URL_ERR(e); - BOOST_TEST(ec.category().name() != nullptr); + BOOST_TEST_NE(ec.category().name(), nullptr); BOOST_TEST(! ec.message().empty()); - BOOST_TEST(ec == c); + BOOST_TEST_EQ(ec, c); } { auto ec = make_error_condition(c); - BOOST_TEST(ec.category().name() != nullptr); + BOOST_TEST_NE(ec.category().name(), nullptr); BOOST_TEST(! ec.message().empty()); - BOOST_TEST(ec == c); + BOOST_TEST_EQ(ec, c); } } diff --git a/test/unit/grammar/optional.cpp b/test/unit/grammar/optional.cpp index da74a9f5..8472f018 100644 --- a/test/unit/grammar/optional.cpp +++ b/test/unit/grammar/optional.cpp @@ -37,7 +37,7 @@ struct optional_test BOOST_TEST_NO_THROW( parse_string("xy ", t)); BOOST_TEST(get<0>(t).has_value); - BOOST_TEST(*get<1>(t).p == ' '); + BOOST_TEST_EQ(*get<1>(t).p, ' '); } { elements< @@ -46,7 +46,7 @@ struct optional_test BOOST_TEST_NO_THROW( parse_string(" ", t)); BOOST_TEST(! get<0>(t).has_value); - BOOST_TEST(*get<1>(t).p == ' '); + BOOST_TEST_EQ(*get<1>(t).p, ' '); } } diff --git a/test/unit/grammar/unsigned_decimal.cpp b/test/unit/grammar/unsigned_decimal.cpp index f9bde57a..0c40ad7f 100644 --- a/test/unit/grammar/unsigned_decimal.cpp +++ b/test/unit/grammar/unsigned_decimal.cpp @@ -37,8 +37,8 @@ struct unsigned_decimal_test unsigned_decimal t; BOOST_TEST_NO_THROW( parse_string(s, t)); - BOOST_TEST(t.u == u); - BOOST_TEST(t.s == s); + BOOST_TEST_EQ(t.u, u); + BOOST_TEST_EQ(t.s, s); } void diff --git a/test/unit/ipv4_address.cpp b/test/unit/ipv4_address.cpp index 921cbb4a..cc9a51c3 100644 --- a/test/unit/ipv4_address.cpp +++ b/test/unit/ipv4_address.cpp @@ -26,36 +26,36 @@ public: { ipv4_address a; BOOST_TEST(a.is_unspecified()); - BOOST_TEST(a == ipv4_address()); + BOOST_TEST_EQ(a, ipv4_address()); } // ipv4_address(ipv4_address const&) { ipv4_address a1(1); ipv4_address a2(a1); - BOOST_TEST(a2 == a1); + BOOST_TEST_EQ(a2, a1); } // operator=(ipv4_address const&) { ipv4_address a1(1); ipv4_address a2; - BOOST_TEST(a2 != a1); + BOOST_TEST_NE(a2, a1); a2 = a1; - BOOST_TEST(a2 == a1); + BOOST_TEST_EQ(a2, a1); } // ipv4_address(array) { { - ipv4_address a({1,2,3,4}); + ipv4_address a{{1,2,3,4}}; BOOST_TEST( a.to_uint()==0x01020304); } { ipv4_address a( - ipv4_address::bytes_type( - {1,2,3,4})); + ipv4_address::bytes_type{ + {1,2,3,4}}); BOOST_TEST( a.to_uint()==0x01020304); } @@ -82,7 +82,7 @@ public: { ipv4_address a(0x01020304); ipv4_address::bytes_type b = - {1, 2, 3, 4}; + {{1, 2, 3, 4}}; BOOST_TEST(a.to_bytes() == b); } @@ -140,10 +140,10 @@ public: ipv4_address a1(1); ipv4_address a2(2); ipv4_address a3(1); - BOOST_TEST(a1 == a1); - BOOST_TEST(a1 != a2); - BOOST_TEST(a1 == a3); - BOOST_TEST(a2 != a3); + BOOST_TEST_EQ(a1, a1); + BOOST_TEST_NE(a1, a2); + BOOST_TEST_EQ(a1, a3); + BOOST_TEST_NE(a2, a3); } // static any() @@ -180,7 +180,7 @@ public: { std::stringstream ss; ss << ipv4_address(0x01020304); - BOOST_TEST(ss.str() == "1.2.3.4"); + BOOST_TEST_EQ(ss.str(), "1.2.3.4"); } } @@ -208,7 +208,7 @@ public: auto r = parse_ipv4_address(s); if(! BOOST_TEST(r.has_value())) return; - BOOST_TEST(r->to_uint() == v); + BOOST_TEST_EQ(r->to_uint(), v); }; bad("0"); diff --git a/test/unit/ipv6_address.cpp b/test/unit/ipv6_address.cpp index a31e3d47..96343651 100644 --- a/test/unit/ipv6_address.cpp +++ b/test/unit/ipv6_address.cpp @@ -30,7 +30,7 @@ public: BOOST_TEST( a == ipv6_address()); ipv6_address::bytes_type b{}; - BOOST_TEST(a.to_bytes() == b); + BOOST_TEST_EQ(a.to_bytes(), b); } // ipv6_address(ipv6_address const&) @@ -41,9 +41,9 @@ public: ipv6_address a1(b); ipv6_address a2(a1); ipv6_address a3; - BOOST_TEST(a1 == a2); - BOOST_TEST(a1 != a3); - BOOST_TEST(a2 != a3); + BOOST_TEST_EQ(a1, a2); + BOOST_TEST_NE(a1, a3); + BOOST_TEST_NE(a2, a3); } // operator=(ipv6_address const&) @@ -54,7 +54,7 @@ public: ipv6_address a1(b); ipv6_address a2; a2 = a1; - BOOST_TEST(a2 == a1); + BOOST_TEST_EQ(a2, a1); } // ipv6_address(bytes_type) @@ -63,7 +63,7 @@ public: 1, 0, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0, 8, 0 } }; ipv6_address a(b); - BOOST_TEST(a.to_bytes() == b); + BOOST_TEST_EQ(a.to_bytes(), b); } // ipv6_address(ipv4_address) @@ -78,7 +78,7 @@ public: // ipv6_address(string_view) { ipv6_address a("::"); - BOOST_TEST(a == ipv6_address()); + BOOST_TEST_EQ(a, ipv6_address()); BOOST_TEST_THROWS(ipv6_address("x"), std::invalid_argument); } @@ -90,7 +90,7 @@ public: 5, 0, 6, 0, 7, 0, 8, 0 } }; ipv6_address a; a = b; - BOOST_TEST(a.to_bytes() == b); + BOOST_TEST_EQ(a.to_bytes(), b); } // to_string @@ -145,9 +145,9 @@ public: ipv6_address a1("1::"); ipv6_address a2("2::"); ipv6_address a3("1::"); - BOOST_TEST(a1 != a2); - BOOST_TEST(a1 == a3); - BOOST_TEST(a2 != a3); + BOOST_TEST_NE(a1, a2); + BOOST_TEST_EQ(a1, a3); + BOOST_TEST_NE(a2, a3); } // static loopback() @@ -162,7 +162,7 @@ public: { std::stringstream ss; ss << ipv6_address("1:0:0:0:0:0:0:1"); - BOOST_TEST(ss.str() == "1::1"); + BOOST_TEST_EQ(ss.str(), "1::1"); } } @@ -187,11 +187,11 @@ public: trip(string_view s0, string_view s1) { auto ip0 = ipv6_address(s0); - BOOST_TEST(ip0.to_string() == s1); + BOOST_TEST_EQ(ip0.to_string(), s1); // round-trip auto ip1 = ipv6_address( ip0.to_string()); - BOOST_TEST(ip1 == ip0); + BOOST_TEST_EQ(ip1, ip0); } static diff --git a/test/unit/params.cpp b/test/unit/params.cpp index b6d85f7e..a58d9ffe 100644 --- a/test/unit/params.cpp +++ b/test/unit/params.cpp @@ -33,7 +33,7 @@ public: params p1 = u1.params(); params p2 = u2.params(); p2 = p1; - BOOST_TEST(p1.begin() == p2.begin()); + BOOST_TEST_EQ(p1.begin(), p2.begin()); } // operator= @@ -56,8 +56,8 @@ public: { url u = parse_uri_reference("/?x#f").value(); u.params(pa_.allocator()) = {}; - BOOST_TEST(u.encoded_query() == ""); - BOOST_TEST(u.string() == "/?#f"); + BOOST_TEST_EQ(u.encoded_query(), ""); + BOOST_TEST_EQ(u.string(), "/?#f"); } } @@ -72,23 +72,23 @@ public: url u = parse_uri_reference( "?k0=0&k1=1&k2=&k3&k4=4444#f").value(); params p = u.params(pa_.allocator()); - BOOST_TEST(p.at(0).key == "k0"); - BOOST_TEST(p.at(0).value == "0"); + BOOST_TEST_EQ(p.at(0).key, "k0"); + BOOST_TEST_EQ(p.at(0).value, "0"); BOOST_TEST(p.at(0).has_value); - BOOST_TEST(p.at(2).key == "k2"); - BOOST_TEST(p.at(2).value == ""); + BOOST_TEST_EQ(p.at(2).key, "k2"); + BOOST_TEST_EQ(p.at(2).value, ""); BOOST_TEST(p.at(2).has_value); - BOOST_TEST(p.at(3).key == "k3"); - BOOST_TEST(p.at(3).has_value == false); + BOOST_TEST_EQ(p.at(3).key, "k3"); + BOOST_TEST_EQ(p.at(3).has_value, false); BOOST_TEST_THROWS( p.at(5), std::out_of_range); - BOOST_TEST(p.front().key == "k0"); - BOOST_TEST(p.front().value == "0"); + BOOST_TEST_EQ(p.front().key, "k0"); + BOOST_TEST_EQ(p.front().value, "0"); BOOST_TEST(p.front().has_value); - BOOST_TEST(p.back().key == "k4"); - BOOST_TEST(p.back().value == "4444"); + BOOST_TEST_EQ(p.back().key, "k4"); + BOOST_TEST_EQ(p.back().value, "4444"); BOOST_TEST(p.back().has_value); } @@ -98,12 +98,12 @@ public: url u = parse_uri_reference( "?k0=0&k1=1&k2=&k3&k4=4444#f").value(); params p = u.params(pa_.allocator()); - BOOST_TEST(p.at("k0") == "0"); - BOOST_TEST(p.at("k1") == "1"); - BOOST_TEST(p.at("k2") == ""); + BOOST_TEST_EQ(p.at("k0"), "0"); + BOOST_TEST_EQ(p.at("k1"), "1"); + BOOST_TEST_EQ(p.at("k2"), ""); BOOST_TEST_THROWS(p.at("k3") == "0", std::out_of_range); - BOOST_TEST(p.at("k4") == "4444"); + BOOST_TEST_EQ(p.at("k4"), "4444"); BOOST_TEST_THROWS(p.at("k5"), std::out_of_range); } @@ -119,13 +119,13 @@ public: "?k0=0&k1=1&k2=&k3&k4=4444#f").value(); params p = u.params(pa_.allocator()); BOOST_TEST(! p.empty()); - BOOST_TEST(p.size() == 5); + BOOST_TEST_EQ(p.size(), 5u); } { url u; params p = u.params(pa_.allocator()); BOOST_TEST(p.empty()); - BOOST_TEST(p.size() == 0); + BOOST_TEST_EQ(p.size(), 0u); } } @@ -138,8 +138,8 @@ public: "/?k0=0&k1=1&k2=&k3&k4=4444#f").value(); params p = u.params(pa_.allocator()); p.clear(); - BOOST_TEST(u.encoded_query() == ""); - BOOST_TEST(u.string() == "/?#f"); + BOOST_TEST_EQ(u.encoded_query(), ""); + BOOST_TEST_EQ(u.string(), "/?#f"); } // insert(iterator, value_type) @@ -149,8 +149,8 @@ public: params p = u.params(pa_.allocator()); auto it = p.insert(p.begin() + 1, {"k1", "1", true}); - BOOST_TEST(it == p.begin() + 1); - BOOST_TEST((*it).key == "k1"); + BOOST_TEST_EQ(it, p.begin() + 1); + BOOST_TEST_EQ((*it).key, "k1"); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2="); BOOST_TEST(u.string() == @@ -166,7 +166,7 @@ public: auto it = p.insert(p.begin() + 1,{ {"k1", "1", true}, {"k2", "", true}}); - BOOST_TEST(it == p.begin() + 1); + BOOST_TEST_EQ(it, p.begin() + 1); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2=&k3"); BOOST_TEST(u.string() == @@ -181,7 +181,7 @@ public: auto it = p.replace( p.end() - 1, {"k2", "", true}); - BOOST_TEST(it == p.end() - 1); + BOOST_TEST_EQ(it, p.end() - 1); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2="); BOOST_TEST(u.string() == @@ -199,7 +199,7 @@ public: {"a","aa",true}, {"b","bbb",true}, {"c","ccccc",true}}); - BOOST_TEST(it == p.begin() + 1); + BOOST_TEST_EQ(it, p.begin() + 1); BOOST_TEST(u.encoded_query() == "k0=0&a=aa&b=bbb&c=ccccc&k3&k4=4444"); BOOST_TEST(u.string() == @@ -211,9 +211,9 @@ public: url u = parse_uri_reference( "/?k0=0&k%31=1&k2=#f").value(); params p = u.params(pa_.allocator()); - BOOST_TEST(p.at(1).key == "k1"); + BOOST_TEST_EQ(p.at(1).key, "k1"); auto it = p.remove_value(p.begin() + 1); - BOOST_TEST(u.encoded_query() == "k0=0&k%31&k2="); + BOOST_TEST_EQ(u.encoded_query(), "k0=0&k%31&k2="); BOOST_TEST(u.string() == "/?k0=0&k%31&k2=#f"); } @@ -233,7 +233,7 @@ public: auto it = p.emplace_at( p.begin() + 1, "k1", "1"); - BOOST_TEST(it == p.begin() + 1); + BOOST_TEST_EQ(it, p.begin() + 1); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2="); BOOST_TEST(u.string() == @@ -249,7 +249,7 @@ public: auto it = p.emplace_at( p.begin() + 2, "hello_world"); - BOOST_TEST(it == p.begin() + 2); + BOOST_TEST_EQ(it, p.begin() + 2); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&hello_world&k3"); BOOST_TEST(u.string() == @@ -264,7 +264,7 @@ public: params p = u.params(pa_.allocator()); auto it = p.emplace_before( p.begin() + 1, "k1", "1"); - BOOST_TEST(it == p.begin() + 1); + BOOST_TEST_EQ(it, p.begin() + 1); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2=&k3"); BOOST_TEST(u.string() == @@ -279,7 +279,7 @@ public: params p = u.params(pa_.allocator()); auto it = p.emplace_before( p.begin() + 1, "k1"); - BOOST_TEST(it == p.begin() + 1); + BOOST_TEST_EQ(it, p.begin() + 1); BOOST_TEST(u.encoded_query() == "k0=0&k1&k2=&k3"); BOOST_TEST(u.string() == @@ -311,22 +311,22 @@ public: url u = parse_uri_reference( "/?a=1&%62=2&c=3&c=4&c=5&d=6&e=7&d=8&f=9#f").value(); params p = u.params(pa_.allocator()); - BOOST_TEST(p.erase("c") == 3); + BOOST_TEST_EQ(p.erase("c"), 3u); BOOST_TEST(u.encoded_query() == "a=1&%62=2&d=6&e=7&d=8&f=9"); BOOST_TEST(u.string() == "/?a=1&%62=2&d=6&e=7&d=8&f=9#f"); - BOOST_TEST(p.erase("b") == 1); + BOOST_TEST_EQ(p.erase("b"), 1u); BOOST_TEST(u.encoded_query() == "a=1&d=6&e=7&d=8&f=9"); BOOST_TEST(u.string() == "/?a=1&d=6&e=7&d=8&f=9#f"); - BOOST_TEST(p.erase("d") == 2); + BOOST_TEST_EQ(p.erase("d"), 2u); BOOST_TEST(u.encoded_query() == "a=1&e=7&f=9"); BOOST_TEST(u.string() == "/?a=1&e=7&f=9#f"); - BOOST_TEST(p.erase("g") == 0); + BOOST_TEST_EQ(p.erase("g"), 0u); } // emplace_back(Key, Value) @@ -335,33 +335,33 @@ public: url u = parse_uri_reference("/#f").value(); params p = u.params(pa_.allocator()); p.emplace_back("k0", "0"); - BOOST_TEST(u.encoded_query() == "k0=0"); - BOOST_TEST(u.string() == "/?k0=0#f"); - BOOST_TEST(u.encoded_params().size() == 1); + BOOST_TEST_EQ(u.encoded_query(), "k0=0"); + BOOST_TEST_EQ(u.string(), "/?k0=0#f"); + BOOST_TEST_EQ(u.encoded_params().size(), 1u); p.emplace_back("k1", "1"); BOOST_TEST(u.encoded_query() == "k0=0&k1=1"); BOOST_TEST(u.string() == "/?k0=0&k1=1#f"); - BOOST_TEST(u.encoded_params().size() == 2); + BOOST_TEST_EQ(u.encoded_params().size(), 2u); p.emplace_back("k2", ""); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2="); BOOST_TEST(u.string() == "/?k0=0&k1=1&k2=#f"); - BOOST_TEST(u.encoded_params().size() == 3); + BOOST_TEST_EQ(u.encoded_params().size(), 3u); p.emplace_back("k3"); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2=&k3"); BOOST_TEST(u.string() == "/?k0=0&k1=1&k2=&k3#f"); - BOOST_TEST(u.encoded_params().size() == 4); + BOOST_TEST_EQ(u.encoded_params().size(), 4u); p.emplace_back("", "4444"); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2=&k3&=4444"); BOOST_TEST(u.string() == "/?k0=0&k1=1&k2=&k3&=4444#f"); - BOOST_TEST(u.encoded_params().size() == 5); + BOOST_TEST_EQ(u.encoded_params().size(), 5u); } // push_back(value_type) @@ -371,68 +371,68 @@ public: params p = u.params(pa_.allocator()); p.push_back({"k0", "0", true}); - BOOST_TEST(u.encoded_query() == "k0=0"); - BOOST_TEST(u.string() == "/?k0=0#f"); - BOOST_TEST(u.encoded_params().size() == 1); + BOOST_TEST_EQ(u.encoded_query(), "k0=0"); + BOOST_TEST_EQ(u.string(), "/?k0=0#f"); + BOOST_TEST_EQ(u.encoded_params().size(), 1u); p.push_back({"k1", "1", true}); BOOST_TEST(u.encoded_query() == "k0=0&k1=1"); BOOST_TEST(u.string() == "/?k0=0&k1=1#f"); - BOOST_TEST(u.encoded_params().size() == 2); + BOOST_TEST_EQ(u.encoded_params().size(), 2u); p.push_back({"k2", "", true}); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2="); BOOST_TEST(u.string() == "/?k0=0&k1=1&k2=#f"); - BOOST_TEST(u.encoded_params().size() == 3); + BOOST_TEST_EQ(u.encoded_params().size(), 3u); p.push_back({"k3", "", false}); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2=&k3"); BOOST_TEST(u.string() == "/?k0=0&k1=1&k2=&k3#f"); - BOOST_TEST(u.encoded_params().size() == 4); + BOOST_TEST_EQ(u.encoded_params().size(), 4u); p.push_back({"", "4444", true}); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2=&k3&=4444"); BOOST_TEST(u.string() == "/?k0=0&k1=1&k2=&k3&=4444#f"); - BOOST_TEST(u.encoded_params().size() == 5); + BOOST_TEST_EQ(u.encoded_params().size(), 5u); p.pop_back(); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2=&k3"); BOOST_TEST(u.string() == "/?k0=0&k1=1&k2=&k3#f"); - BOOST_TEST(u.encoded_params().size() == 4); + BOOST_TEST_EQ(u.encoded_params().size(), 4u); p.pop_back(); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2="); BOOST_TEST(u.string() == "/?k0=0&k1=1&k2=#f"); - BOOST_TEST(u.encoded_params().size() == 3); + BOOST_TEST_EQ(u.encoded_params().size(), 3u); p.pop_back(); BOOST_TEST(u.encoded_query() == "k0=0&k1=1"); BOOST_TEST(u.string() == "/?k0=0&k1=1#f"); - BOOST_TEST(u.encoded_params().size() == 2); + BOOST_TEST_EQ(u.encoded_params().size(), 2u); p.pop_back(); - BOOST_TEST(u.encoded_query() == "k0=0"); - BOOST_TEST(u.string() == "/?k0=0#f"); - BOOST_TEST(u.encoded_params().size() == 1); + BOOST_TEST_EQ(u.encoded_query(), "k0=0"); + BOOST_TEST_EQ(u.string(), "/?k0=0#f"); + BOOST_TEST_EQ(u.encoded_params().size(), 1u); p.pop_back(); - BOOST_TEST(u.encoded_query() == ""); - BOOST_TEST(u.string() == "/?#f"); - BOOST_TEST(u.encoded_params().size() == 0); + BOOST_TEST_EQ(u.encoded_query(), ""); + BOOST_TEST_EQ(u.string(), "/?#f"); + BOOST_TEST_EQ(u.encoded_params().size(), 0u); } } @@ -451,15 +451,15 @@ public: url u = parse_uri_reference( "/?a=1&%62=2&c=3&c=4&c=5&d=6&e=7&d=8&f=9#f").value(); params p = u.params(pa_.allocator()); - BOOST_TEST(p.count("a") == 1); - BOOST_TEST(p.count("b") == 1); - BOOST_TEST(p.count("c") == 3); - BOOST_TEST(p.count("d") == 2); - BOOST_TEST(p.count("e") == 1); - BOOST_TEST(p.count("f") == 1); - BOOST_TEST(p.count("g") == 0); + BOOST_TEST_EQ(p.count("a"), 1u); + BOOST_TEST_EQ(p.count("b"), 1u); + BOOST_TEST_EQ(p.count("c"), 3u); + BOOST_TEST_EQ(p.count("d"), 2u); + BOOST_TEST_EQ(p.count("e"), 1u); + BOOST_TEST_EQ(p.count("f"), 1u); + BOOST_TEST_EQ(p.count("g"), 0u); - BOOST_TEST(p.find("b") == p.begin() + 1); + BOOST_TEST_EQ(p.find("b"), p.begin() + 1); BOOST_TEST(p.find(p.begin() + 6, "d") == p.begin() + 7); @@ -480,30 +480,30 @@ public: "/?a=1&bb=22&ccc=333&dddd=4444#f").value(); params p = u.params(pa_.allocator()); auto it = p.begin(); - BOOST_TEST((*it).key == "a"); - BOOST_TEST((*++it).key == "bb"); - BOOST_TEST((*it++).key == "bb"); - BOOST_TEST((*it).key == "ccc"); - BOOST_TEST((*--it).key == "bb"); - BOOST_TEST((*it--).key == "bb"); - BOOST_TEST((*it).key == "a"); + BOOST_TEST_EQ((*it).key, "a"); + BOOST_TEST_EQ((*++it).key, "bb"); + BOOST_TEST_EQ((*it++).key, "bb"); + BOOST_TEST_EQ((*it).key, "ccc"); + BOOST_TEST_EQ((*--it).key, "bb"); + BOOST_TEST_EQ((*it--).key, "bb"); + BOOST_TEST_EQ((*it).key, "a"); auto it2 = p.end(); - BOOST_TEST(it == p.begin()); - BOOST_TEST(it != it2); - BOOST_TEST((*(it += 1)).key == "bb"); - BOOST_TEST((*(it + 1)).value == "333"); - BOOST_TEST((*(1 + it)).value == "333"); - BOOST_TEST((*it).value == "22"); - BOOST_TEST((*(it2 -= 1)).value == "4444"); - BOOST_TEST((*(it2 - 1)).value == "333"); - BOOST_TEST((*it2).value == "4444"); - BOOST_TEST(it2 - it == 2); - BOOST_TEST(it[1].value == "333"); + BOOST_TEST_EQ(it, p.begin()); + BOOST_TEST_NE(it, it2); + BOOST_TEST_EQ((*(it += 1)).key, "bb"); + BOOST_TEST_EQ((*(it + 1)).value, "333"); + BOOST_TEST_EQ((*(1 + it)).value, "333"); + BOOST_TEST_EQ((*it).value, "22"); + BOOST_TEST_EQ((*(it2 -= 1)).value, "4444"); + BOOST_TEST_EQ((*(it2 - 1)).value, "333"); + BOOST_TEST_EQ((*it2).value, "4444"); + BOOST_TEST_EQ(it2 - it, 2); + BOOST_TEST_EQ(it[1].value, "333"); - BOOST_TEST(it < it2); - BOOST_TEST(it <= it2); - BOOST_TEST(it2 > it); - BOOST_TEST(it2 >= it); + BOOST_TEST_LT(it, it2); + BOOST_TEST_LE(it, it2); + BOOST_TEST_GT(it2, it); + BOOST_TEST_GE(it2, it); } void diff --git a/test/unit/params_encoded.cpp b/test/unit/params_encoded.cpp index 6903f123..9d85bfc0 100644 --- a/test/unit/params_encoded.cpp +++ b/test/unit/params_encoded.cpp @@ -29,7 +29,7 @@ public: params_encoded p1 = u1.encoded_params(); params_encoded p2 = u2.encoded_params(); p2 = p1; - BOOST_TEST(p1.begin() == p2.begin()); + BOOST_TEST_EQ(p1.begin(), p2.begin()); } // operator= @@ -52,8 +52,8 @@ public: { url u = parse_uri_reference("/?x#f").value(); u.encoded_params() = {}; - BOOST_TEST(u.encoded_query() == ""); - BOOST_TEST(u.string() == "/?#f"); + BOOST_TEST_EQ(u.encoded_query(), ""); + BOOST_TEST_EQ(u.string(), "/?#f"); } } @@ -68,23 +68,23 @@ public: url u = parse_uri_reference( "?k0=0&k1=1&k2=&k3&k4=4444#f").value(); params_encoded p = u.encoded_params(); - BOOST_TEST(p.at(0).key == "k0"); - BOOST_TEST(p.at(0).value == "0"); + BOOST_TEST_EQ(p.at(0).key, "k0"); + BOOST_TEST_EQ(p.at(0).value, "0"); BOOST_TEST(p.at(0).has_value); - BOOST_TEST(p.at(2).key == "k2"); - BOOST_TEST(p.at(2).value == ""); + BOOST_TEST_EQ(p.at(2).key, "k2"); + BOOST_TEST_EQ(p.at(2).value, ""); BOOST_TEST(p.at(2).has_value); - BOOST_TEST(p.at(3).key == "k3"); - BOOST_TEST(p.at(3).has_value == false); + BOOST_TEST_EQ(p.at(3).key, "k3"); + BOOST_TEST_EQ(p.at(3).has_value, false); BOOST_TEST_THROWS( p.at(5), std::out_of_range); - BOOST_TEST(p.front().key == "k0"); - BOOST_TEST(p.front().value == "0"); + BOOST_TEST_EQ(p.front().key, "k0"); + BOOST_TEST_EQ(p.front().value, "0"); BOOST_TEST(p.front().has_value); - BOOST_TEST(p.back().key == "k4"); - BOOST_TEST(p.back().value == "4444"); + BOOST_TEST_EQ(p.back().key, "k4"); + BOOST_TEST_EQ(p.back().value, "4444"); BOOST_TEST(p.back().has_value); } @@ -94,12 +94,12 @@ public: url u = parse_uri_reference( "?k0=0&k1=1&k2=&k3&k4=4444#f").value(); params_encoded p = u.encoded_params(); - BOOST_TEST(p.at("k0") == "0"); - BOOST_TEST(p.at("k1") == "1"); - BOOST_TEST(p.at("k2") == ""); + BOOST_TEST_EQ(p.at("k0"), "0"); + BOOST_TEST_EQ(p.at("k1"), "1"); + BOOST_TEST_EQ(p.at("k2"), ""); BOOST_TEST_THROWS(p.at("k3") == "0", std::out_of_range); - BOOST_TEST(p.at("k4") == "4444"); + BOOST_TEST_EQ(p.at("k4"), "4444"); BOOST_TEST_THROWS(p.at("k5"), std::out_of_range); } @@ -115,13 +115,13 @@ public: "?k0=0&k1=1&k2=&k3&k4=4444#f").value(); params_encoded p = u.encoded_params(); BOOST_TEST(! p.empty()); - BOOST_TEST(p.size() == 5); + BOOST_TEST_EQ(p.size(), 5u); } { url u; params_encoded p = u.encoded_params(); BOOST_TEST(p.empty()); - BOOST_TEST(p.size() == 0); + BOOST_TEST_EQ(p.size(), 0u); } } @@ -134,8 +134,8 @@ public: "/?k0=0&k1=1&k2=&k3&k4=4444#f").value(); params_encoded p = u.encoded_params(); p.clear(); - BOOST_TEST(u.encoded_query() == ""); - BOOST_TEST(u.string() == "/?#f"); + BOOST_TEST_EQ(u.encoded_query(), ""); + BOOST_TEST_EQ(u.string(), "/?#f"); } // insert(iterator, value_type) @@ -145,8 +145,8 @@ public: params_encoded p = u.encoded_params(); auto it = p.insert(p.begin() + 1, {"k1", "1", true}); - BOOST_TEST(it == p.begin() + 1); - BOOST_TEST((*it).key == "k1"); + BOOST_TEST_EQ(it, p.begin() + 1); + BOOST_TEST_EQ((*it).key, "k1"); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2="); BOOST_TEST(u.string() == @@ -162,7 +162,7 @@ public: auto it = p.insert(p.begin() + 1,{ {"k1", "1", true}, {"k2", "", true}}); - BOOST_TEST(it == p.begin() + 1); + BOOST_TEST_EQ(it, p.begin() + 1); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2=&k3"); BOOST_TEST(u.string() == @@ -177,7 +177,7 @@ public: auto it = p.replace( p.end() - 1, {"k2", "", true}); - BOOST_TEST(it == p.end() - 1); + BOOST_TEST_EQ(it, p.end() - 1); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2="); BOOST_TEST(u.string() == @@ -195,7 +195,7 @@ public: {"a","aa",true}, {"b","bbb",true}, {"c","ccccc",true}}); - BOOST_TEST(it == p.begin() + 1); + BOOST_TEST_EQ(it, p.begin() + 1); BOOST_TEST(u.encoded_query() == "k0=0&a=aa&b=bbb&c=ccccc&k3&k4=4444"); BOOST_TEST(u.string() == @@ -207,12 +207,12 @@ public: url u = parse_uri_reference( "/?k0=0&k%31=1&k2=#f").value(); params_encoded p = u.encoded_params(); - BOOST_TEST(p.at(1).key == "k%31"); + BOOST_TEST_EQ(p.at(1).key, "k%31"); auto it = p.remove_value(p.begin() + 1); - BOOST_TEST(u.encoded_query() == "k0=0&k%31&k2="); + BOOST_TEST_EQ(u.encoded_query(), "k0=0&k%31&k2="); BOOST_TEST(u.string() == "/?k0=0&k%31&k2=#f"); - BOOST_TEST(it == p.begin() + 1); + BOOST_TEST_EQ(it, p.begin() + 1); } // replace_value(iterator, string_view) @@ -230,7 +230,7 @@ public: auto it = p.emplace_at( p.begin() + 1, "k1", "1"); - BOOST_TEST(it == p.begin() + 1); + BOOST_TEST_EQ(it, p.begin() + 1); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2="); BOOST_TEST(u.string() == @@ -246,7 +246,7 @@ public: auto it = p.emplace_at( p.begin() + 2, "hello_world"); - BOOST_TEST(it == p.begin() + 2); + BOOST_TEST_EQ(it, p.begin() + 2); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&hello_world&k3"); BOOST_TEST(u.string() == @@ -261,7 +261,7 @@ public: params_encoded p = u.encoded_params(); auto it = p.emplace_before( p.begin() + 1, "k1", "1"); - BOOST_TEST(it == p.begin() + 1); + BOOST_TEST_EQ(it, p.begin() + 1); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2=&k3"); BOOST_TEST(u.string() == @@ -276,7 +276,7 @@ public: params_encoded p = u.encoded_params(); auto it = p.emplace_before( p.begin() + 1, "k1"); - BOOST_TEST(it == p.begin() + 1); + BOOST_TEST_EQ(it, p.begin() + 1); BOOST_TEST(u.encoded_query() == "k0=0&k1&k2=&k3"); BOOST_TEST(u.string() == @@ -308,22 +308,22 @@ public: url u = parse_uri_reference( "/?a=1&%62=2&c=3&c=4&c=5&d=6&e=7&d=8&f=9#f").value(); params_encoded p = u.encoded_params(); - BOOST_TEST(p.erase("c") == 3); + BOOST_TEST_EQ(p.erase("c"), 3u); BOOST_TEST(u.encoded_query() == "a=1&%62=2&d=6&e=7&d=8&f=9"); BOOST_TEST(u.string() == "/?a=1&%62=2&d=6&e=7&d=8&f=9#f"); - BOOST_TEST(p.erase("b") == 1); + BOOST_TEST_EQ(p.erase("b"), 1u); BOOST_TEST(u.encoded_query() == "a=1&d=6&e=7&d=8&f=9"); BOOST_TEST(u.string() == "/?a=1&d=6&e=7&d=8&f=9#f"); - BOOST_TEST(p.erase("d") == 2); + BOOST_TEST_EQ(p.erase("d"), 2u); BOOST_TEST(u.encoded_query() == "a=1&e=7&f=9"); BOOST_TEST(u.string() == "/?a=1&e=7&f=9#f"); - BOOST_TEST(p.erase("g") == 0); + BOOST_TEST_EQ(p.erase("g"), 0u); } // emplace_back(Key, Value) @@ -332,33 +332,33 @@ public: url u = parse_uri_reference("/#f").value(); params_encoded p = u.encoded_params(); p.emplace_back("k0", "0"); - BOOST_TEST(u.encoded_query() == "k0=0"); - BOOST_TEST(u.string() == "/?k0=0#f"); - BOOST_TEST(u.encoded_params().size() == 1); + BOOST_TEST_EQ(u.encoded_query(), "k0=0"); + BOOST_TEST_EQ(u.string(), "/?k0=0#f"); + BOOST_TEST_EQ(u.encoded_params().size(), 1u); p.emplace_back("k1", "1"); BOOST_TEST(u.encoded_query() == "k0=0&k1=1"); BOOST_TEST(u.string() == "/?k0=0&k1=1#f"); - BOOST_TEST(u.encoded_params().size() == 2); + BOOST_TEST_EQ(u.encoded_params().size(), 2u); p.emplace_back("k2", ""); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2="); BOOST_TEST(u.string() == "/?k0=0&k1=1&k2=#f"); - BOOST_TEST(u.encoded_params().size() == 3); + BOOST_TEST_EQ(u.encoded_params().size(), 3u); p.emplace_back("k3"); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2=&k3"); BOOST_TEST(u.string() == "/?k0=0&k1=1&k2=&k3#f"); - BOOST_TEST(u.encoded_params().size() == 4); + BOOST_TEST_EQ(u.encoded_params().size(), 4u); p.emplace_back("", "4444"); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2=&k3&=4444"); BOOST_TEST(u.string() == "/?k0=0&k1=1&k2=&k3&=4444#f"); - BOOST_TEST(u.encoded_params().size() == 5); + BOOST_TEST_EQ(u.encoded_params().size(), 5u); } // push_back(value_type) @@ -368,68 +368,68 @@ public: params_encoded p = u.encoded_params(); p.push_back({"k0", "0", true}); - BOOST_TEST(u.encoded_query() == "k0=0"); - BOOST_TEST(u.string() == "/?k0=0#f"); - BOOST_TEST(u.encoded_params().size() == 1); + BOOST_TEST_EQ(u.encoded_query(), "k0=0"); + BOOST_TEST_EQ(u.string(), "/?k0=0#f"); + BOOST_TEST_EQ(u.encoded_params().size(), 1u); p.push_back({"k1", "1", true}); BOOST_TEST(u.encoded_query() == "k0=0&k1=1"); BOOST_TEST(u.string() == "/?k0=0&k1=1#f"); - BOOST_TEST(u.encoded_params().size() == 2); + BOOST_TEST_EQ(u.encoded_params().size(), 2u); p.push_back({"k2", "", true}); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2="); BOOST_TEST(u.string() == "/?k0=0&k1=1&k2=#f"); - BOOST_TEST(u.encoded_params().size() == 3); + BOOST_TEST_EQ(u.encoded_params().size(), 3u); p.push_back({"k3", "", false}); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2=&k3"); BOOST_TEST(u.string() == "/?k0=0&k1=1&k2=&k3#f"); - BOOST_TEST(u.encoded_params().size() == 4); + BOOST_TEST_EQ(u.encoded_params().size(), 4u); p.push_back({"", "4444", true}); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2=&k3&=4444"); BOOST_TEST(u.string() == "/?k0=0&k1=1&k2=&k3&=4444#f"); - BOOST_TEST(u.encoded_params().size() == 5); + BOOST_TEST_EQ(u.encoded_params().size(), 5u); p.pop_back(); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2=&k3"); BOOST_TEST(u.string() == "/?k0=0&k1=1&k2=&k3#f"); - BOOST_TEST(u.encoded_params().size() == 4); + BOOST_TEST_EQ(u.encoded_params().size(), 4u); p.pop_back(); BOOST_TEST(u.encoded_query() == "k0=0&k1=1&k2="); BOOST_TEST(u.string() == "/?k0=0&k1=1&k2=#f"); - BOOST_TEST(u.encoded_params().size() == 3); + BOOST_TEST_EQ(u.encoded_params().size(), 3u); p.pop_back(); BOOST_TEST(u.encoded_query() == "k0=0&k1=1"); BOOST_TEST(u.string() == "/?k0=0&k1=1#f"); - BOOST_TEST(u.encoded_params().size() == 2); + BOOST_TEST_EQ(u.encoded_params().size(), 2u); p.pop_back(); - BOOST_TEST(u.encoded_query() == "k0=0"); - BOOST_TEST(u.string() == "/?k0=0#f"); - BOOST_TEST(u.encoded_params().size() == 1); + BOOST_TEST_EQ(u.encoded_query(), "k0=0"); + BOOST_TEST_EQ(u.string(), "/?k0=0#f"); + BOOST_TEST_EQ(u.encoded_params().size(), 1u); p.pop_back(); - BOOST_TEST(u.encoded_query() == ""); - BOOST_TEST(u.string() == "/?#f"); - BOOST_TEST(u.encoded_params().size() == 0); + BOOST_TEST_EQ(u.encoded_query(), ""); + BOOST_TEST_EQ(u.string(), "/?#f"); + BOOST_TEST_EQ(u.encoded_params().size(), 0u); } } @@ -448,15 +448,15 @@ public: url u = parse_uri_reference( "/?a=1&%62=2&c=3&c=4&c=5&d=6&e=7&d=8&f=9#f").value(); params_encoded p = u.encoded_params(); - BOOST_TEST(p.count("a") == 1); - BOOST_TEST(p.count("b") == 1); - BOOST_TEST(p.count("c") == 3); - BOOST_TEST(p.count("d") == 2); - BOOST_TEST(p.count("e") == 1); - BOOST_TEST(p.count("f") == 1); - BOOST_TEST(p.count("g") == 0); + BOOST_TEST_EQ(p.count("a"), 1u); + BOOST_TEST_EQ(p.count("b"), 1u); + BOOST_TEST_EQ(p.count("c"), 3u); + BOOST_TEST_EQ(p.count("d"), 2u); + BOOST_TEST_EQ(p.count("e"), 1u); + BOOST_TEST_EQ(p.count("f"), 1u); + BOOST_TEST_EQ(p.count("g"), 0u); - BOOST_TEST(p.find("b") == p.begin() + 1); + BOOST_TEST_EQ(p.find("b"), p.begin() + 1); BOOST_TEST(p.find(p.begin() + 6, "d") == p.begin() + 7); @@ -478,30 +478,30 @@ public: "/?a=1&bb=22&ccc=333&dddd=4444#f").value(); params_encoded p = u.encoded_params(); auto it = p.begin(); - BOOST_TEST((*it).key == "a"); - BOOST_TEST((*++it).key == "bb"); - BOOST_TEST((*it++).key == "bb"); - BOOST_TEST((*it).key == "ccc"); - BOOST_TEST((*--it).key == "bb"); - BOOST_TEST((*it--).key == "bb"); - BOOST_TEST((*it).key == "a"); + BOOST_TEST_EQ((*it).key, "a"); + BOOST_TEST_EQ((*++it).key, "bb"); + BOOST_TEST_EQ((*it++).key, "bb"); + BOOST_TEST_EQ((*it).key, "ccc"); + BOOST_TEST_EQ((*--it).key, "bb"); + BOOST_TEST_EQ((*it--).key, "bb"); + BOOST_TEST_EQ((*it).key, "a"); auto it2 = p.end(); - BOOST_TEST(it == p.begin()); - BOOST_TEST(it != it2); - BOOST_TEST((*(it += 1)).key == "bb"); - BOOST_TEST((*(it + 1)).value == "333"); - BOOST_TEST((*(1 + it)).value == "333"); - BOOST_TEST((*it).value == "22"); - BOOST_TEST((*(it2 -= 1)).value == "4444"); - BOOST_TEST((*(it2 - 1)).value == "333"); - BOOST_TEST((*it2).value == "4444"); - BOOST_TEST(it2 - it == 2); - BOOST_TEST(it[1].value == "333"); + BOOST_TEST_EQ(it, p.begin()); + BOOST_TEST_NE(it, it2); + BOOST_TEST_EQ((*(it += 1)).key, "bb"); + BOOST_TEST_EQ((*(it + 1)).value, "333"); + BOOST_TEST_EQ((*(1 + it)).value, "333"); + BOOST_TEST_EQ((*it).value, "22"); + BOOST_TEST_EQ((*(it2 -= 1)).value, "4444"); + BOOST_TEST_EQ((*(it2 - 1)).value, "333"); + BOOST_TEST_EQ((*it2).value, "4444"); + BOOST_TEST_EQ(it2 - it, 2); + BOOST_TEST_EQ(it[1].value, "333"); - BOOST_TEST(it < it2); - BOOST_TEST(it <= it2); - BOOST_TEST(it2 > it); - BOOST_TEST(it2 >= it); + BOOST_TEST_LT(it, it2); + BOOST_TEST_LE(it, it2); + BOOST_TEST_GT(it2, it); + BOOST_TEST_GE(it2, it); } // operator* @@ -510,9 +510,9 @@ public: "/?a&b=&c=3#f").value(); params_encoded p = u.encoded_params(); auto it = p.begin(); - BOOST_TEST((*it).has_value == false); - BOOST_TEST((*++it).has_value == true); - BOOST_TEST((*++it).value == "3"); + BOOST_TEST_EQ((*it).has_value, false); + BOOST_TEST_EQ((*++it).has_value, true); + BOOST_TEST_EQ((*++it).value, "3"); } } diff --git a/test/unit/params_encoded_view.cpp b/test/unit/params_encoded_view.cpp index bb95cdb0..793d9a75 100644 --- a/test/unit/params_encoded_view.cpp +++ b/test/unit/params_encoded_view.cpp @@ -30,7 +30,7 @@ public: params_encoded_view p1 = u1.encoded_params(); params_encoded_view p2 = u2.encoded_params(); p2 = p1; - BOOST_TEST(p1.begin() == p2.begin()); + BOOST_TEST_EQ(p1.begin(), p2.begin()); } } @@ -43,12 +43,12 @@ public: url_view u = parse_uri_reference( "?k0=0&k1=1&k2=&k3&k4=4444#f").value(); params_encoded_view p = u.encoded_params(); - BOOST_TEST(p.at("k0") == "0"); - BOOST_TEST(p.at("k1") == "1"); - BOOST_TEST(p.at("k2") == ""); + BOOST_TEST_EQ(p.at("k0"), "0"); + BOOST_TEST_EQ(p.at("k1"), "1"); + BOOST_TEST_EQ(p.at("k2"), ""); BOOST_TEST_THROWS(p.at("k3") == "0", std::out_of_range); - BOOST_TEST(p.at("k4") == "4444"); + BOOST_TEST_EQ(p.at("k4"), "4444"); BOOST_TEST_THROWS(p.at("k5"), std::out_of_range); } @@ -64,13 +64,13 @@ public: "?k0=0&k1=1&k2=&k3&k4=4444#f").value(); params_encoded_view p = u.encoded_params(); BOOST_TEST(! p.empty()); - BOOST_TEST(p.size() == 5); + BOOST_TEST_EQ(p.size(), 5u); } { url_view u; params_encoded_view p = u.encoded_params(); BOOST_TEST(p.empty()); - BOOST_TEST(p.size() == 0); + BOOST_TEST_EQ(p.size(), 0u); } } @@ -89,13 +89,13 @@ public: url_view u = parse_uri_reference( "/?a=1&%62=2&c=3&c=4&c=5&d=6&e=7&d=8&f=9#f").value(); params_encoded_view p = u.encoded_params(); - BOOST_TEST(p.count("a") == 1); - BOOST_TEST(p.count("%62") == 1); // pct-encoded - BOOST_TEST(p.count("c") == 3); - BOOST_TEST(p.count("d") == 2); - BOOST_TEST(p.count("e") == 1); - BOOST_TEST(p.count("f") == 1); - BOOST_TEST(p.count("g") == 0); + BOOST_TEST_EQ(p.count("a"), 1u); + BOOST_TEST_EQ(p.count("%62"), 1u); // pct-encoded + BOOST_TEST_EQ(p.count("c"), 3u); + BOOST_TEST_EQ(p.count("d"), 2u); + BOOST_TEST_EQ(p.count("e"), 1u); + BOOST_TEST_EQ(p.count("f"), 1u); + BOOST_TEST_EQ(p.count("g"), 0u); BOOST_TEST(p.find("%62") == std::next(p.begin())); @@ -124,13 +124,13 @@ public: "/?a=1&bb=22&ccc=333&dddd=4444#f").value(); params_encoded_view p = u.encoded_params(); auto it = p.begin(); - BOOST_TEST((*it).key == "a"); - BOOST_TEST((*++it).key == "bb"); - BOOST_TEST((*it++).key == "bb"); - BOOST_TEST((*it).key == "ccc"); + BOOST_TEST_EQ((*it).key, "a"); + BOOST_TEST_EQ((*++it).key, "bb"); + BOOST_TEST_EQ((*it++).key, "bb"); + BOOST_TEST_EQ((*it).key, "ccc"); auto it2 = p.end(); - BOOST_TEST(it2 == p.end()); - BOOST_TEST(it != it2); + BOOST_TEST_EQ(it2, p.end()); + BOOST_TEST_NE(it, it2); } // operator* @@ -139,35 +139,35 @@ public: "/?&x&y=&z=3#f").value(); params_encoded_view p = u.encoded_params(); - BOOST_TEST(p.size() == 4); + BOOST_TEST_EQ(p.size(), 4u); auto it = p.begin(); { auto v = *it++; - BOOST_TEST(v.key == ""); - BOOST_TEST(v.value == ""); - BOOST_TEST(v.has_value == false); + BOOST_TEST_EQ(v.key, ""); + BOOST_TEST_EQ(v.value, ""); + BOOST_TEST_EQ(v.has_value, false); } { auto v = *it++; - BOOST_TEST(v.key == "x"); - BOOST_TEST(v.value == ""); - BOOST_TEST(v.has_value == false); + BOOST_TEST_EQ(v.key, "x"); + BOOST_TEST_EQ(v.value, ""); + BOOST_TEST_EQ(v.has_value, false); } { auto v = *it++; - BOOST_TEST(v.key == "y"); - BOOST_TEST(v.value == ""); - BOOST_TEST(v.has_value == true); + BOOST_TEST_EQ(v.key, "y"); + BOOST_TEST_EQ(v.value, ""); + BOOST_TEST_EQ(v.has_value, true); } { auto v = *it++; - BOOST_TEST(v.key == "z"); - BOOST_TEST(v.value == "3"); - BOOST_TEST(v.has_value == true); + BOOST_TEST_EQ(v.key, "z"); + BOOST_TEST_EQ(v.value, "3"); + BOOST_TEST_EQ(v.has_value, true); } } } @@ -179,8 +179,8 @@ public: { params_view u = parse_query_params( "a=1&b=2+2&c=%61%70%70%6c%65").value().decoded(); - BOOST_TEST(u.at("b") == "2 2"); - BOOST_TEST(u.at("c") == "apple"); + BOOST_TEST_EQ(u.at("b"), "2 2"); + BOOST_TEST_EQ(u.at("c"), "apple"); BOOST_TEST_THROWS(parse_query_params("#a").value(), std::exception); diff --git a/test/unit/params_view.cpp b/test/unit/params_view.cpp index 88dde321..304326db 100644 --- a/test/unit/params_view.cpp +++ b/test/unit/params_view.cpp @@ -33,7 +33,7 @@ public: params_view p1 = u1.params(); params_view p2 = u2.params(); p2 = p1; - BOOST_TEST(p1.begin() == p2.begin()); + BOOST_TEST_EQ(p1.begin(), p2.begin()); } } @@ -46,12 +46,12 @@ public: url_view u = parse_uri_reference( "?k0=0&k1=1&k2=&k3&k4=4444#f").value(); params_view p = u.params(pa.allocator()); - BOOST_TEST(p.at("k0") == "0"); - BOOST_TEST(p.at("k1") == "1"); - BOOST_TEST(p.at("k2") == ""); + BOOST_TEST_EQ(p.at("k0"), "0"); + BOOST_TEST_EQ(p.at("k1"), "1"); + BOOST_TEST_EQ(p.at("k2"), ""); BOOST_TEST_THROWS(p.at("k3") == "0", std::out_of_range); - BOOST_TEST(p.at("k4") == "4444"); + BOOST_TEST_EQ(p.at("k4"), "4444"); BOOST_TEST_THROWS(p.at("k5"), std::out_of_range); } @@ -67,13 +67,13 @@ public: "?k0=0&k1=1&k2=&k3&k4=4444#f").value(); params_view p = u.params(pa.allocator()); BOOST_TEST(! p.empty()); - BOOST_TEST(p.size() == 5); + BOOST_TEST_EQ(p.size(), 5u); } { url_view u; params_view p = u.params(pa.allocator()); BOOST_TEST(p.empty()); - BOOST_TEST(p.size() == 0); + BOOST_TEST_EQ(p.size(), 0u); } } @@ -92,13 +92,13 @@ public: url_view u = parse_uri_reference( "/?a=1&%62=2&c=3&c=4&c=5&d=6&e=7&d=8&f=9#f").value(); params_view p = u.params(pa.allocator()); - BOOST_TEST(p.count("a") == 1); - BOOST_TEST(p.count("b") == 1); - BOOST_TEST(p.count("c") == 3); - BOOST_TEST(p.count("d") == 2); - BOOST_TEST(p.count("e") == 1); - BOOST_TEST(p.count("f") == 1); - BOOST_TEST(p.count("g") == 0); + BOOST_TEST_EQ(p.count("a"), 1u); + BOOST_TEST_EQ(p.count("b"), 1u); + BOOST_TEST_EQ(p.count("c"), 3u); + BOOST_TEST_EQ(p.count("d"), 2u); + BOOST_TEST_EQ(p.count("e"), 1u); + BOOST_TEST_EQ(p.count("f"), 1u); + BOOST_TEST_EQ(p.count("g"), 0u); BOOST_TEST(p.find("b") == std::next(p.begin())); @@ -126,13 +126,13 @@ public: "/?a=1&bb=22&ccc=333&dddd=4444#f").value(); params_view p = u.params(pa.allocator()); auto it = p.begin(); - BOOST_TEST((*it).key == "a"); - BOOST_TEST((*++it).key == "bb"); - BOOST_TEST((*it++).key == "bb"); - BOOST_TEST((*it).key == "ccc"); + BOOST_TEST_EQ((*it).key, "a"); + BOOST_TEST_EQ((*++it).key, "bb"); + BOOST_TEST_EQ((*it++).key, "bb"); + BOOST_TEST_EQ((*it).key, "ccc"); auto it2 = p.end(); - BOOST_TEST(it2 == p.end()); - BOOST_TEST(it != it2); + BOOST_TEST_EQ(it2, p.end()); + BOOST_TEST_NE(it, it2); } // operator* @@ -140,30 +140,30 @@ public: url_view u = parse_uri_reference( "/?&x&y=&z=3#f").value(); params_view p = u.params(); - BOOST_TEST(p.size() == 4); + BOOST_TEST_EQ(p.size(), 4u); auto it = p.begin(); params_view::value_type v; v = *it++; - BOOST_TEST(v.key == ""); - BOOST_TEST(v.value == ""); - BOOST_TEST(v.has_value == false); + BOOST_TEST_EQ(v.key, ""); + BOOST_TEST_EQ(v.value, ""); + BOOST_TEST_EQ(v.has_value, false); v = *it++; - BOOST_TEST(v.key == "x"); - BOOST_TEST(v.value == ""); - BOOST_TEST(v.has_value == false); + BOOST_TEST_EQ(v.key, "x"); + BOOST_TEST_EQ(v.value, ""); + BOOST_TEST_EQ(v.has_value, false); v = *it++; - BOOST_TEST(v.key == "y"); - BOOST_TEST(v.value == ""); - BOOST_TEST(v.has_value == true); + BOOST_TEST_EQ(v.key, "y"); + BOOST_TEST_EQ(v.value, ""); + BOOST_TEST_EQ(v.has_value, true); v = *it++; - BOOST_TEST(v.key == "z"); - BOOST_TEST(v.value == "3"); - BOOST_TEST(v.has_value == true); + BOOST_TEST_EQ(v.key, "z"); + BOOST_TEST_EQ(v.value, "3"); + BOOST_TEST_EQ(v.has_value, true); } } @@ -173,8 +173,8 @@ public: { params_view u = parse_query_params( "a=1&b=2+2&c=%61%70%70%6c%65").value().decoded(); - BOOST_TEST(u.at("b") == "2 2"); - BOOST_TEST(u.at("c") == "apple"); + BOOST_TEST_EQ(u.at("b"), "2 2"); + BOOST_TEST_EQ(u.at("c"), "apple"); } } diff --git a/test/unit/pct_encoding.cpp b/test/unit/pct_encoding.cpp index edfe2fa9..49e33744 100644 --- a/test/unit/pct_encoding.cpp +++ b/test/unit/pct_encoding.cpp @@ -72,7 +72,7 @@ public: s0, ec, opt, *pcs); if(! BOOST_TEST(! ec.failed())) return; - BOOST_TEST(n == s1.size()); + BOOST_TEST_EQ(n, s1.size()); } // pct_decode to buffer { @@ -88,12 +88,12 @@ public: { BOOST_TEST( ec == error::no_space); - BOOST_TEST(n < s1.size()); - BOOST_TEST(n <= i); + BOOST_TEST_LT(n, s1.size()); + BOOST_TEST_LE(n, i); continue; } BOOST_TEST(! ec.failed()); - BOOST_TEST(n == s1.size()); + BOOST_TEST_EQ(n, s1.size()); BOOST_TEST( string_view(buf, n) == s1); break; @@ -103,7 +103,7 @@ public: { std::string s = pct_decode( s0, opt, *pcs); - BOOST_TEST(s == s1); + BOOST_TEST_EQ(s, s1); } // pct_decode() -> std::basic_string { @@ -113,14 +113,14 @@ public: std::char_traits, A> s = pct_decode(s0, opt, *pcs, p.allocator()); - BOOST_TEST(s == s1); + BOOST_TEST_EQ(s, s1); } // pct_decode_to_value() { const_string s = pct_decode_to_value( s0, opt, *pcs); - BOOST_TEST(s == s1); + BOOST_TEST_EQ(s, s1); } // pct_decode_to_value(Allocator) { @@ -129,13 +129,13 @@ public: pct_decode_to_value( s0, opt, *pcs, p.allocator()); - BOOST_TEST(s == s1); + BOOST_TEST_EQ(s, s1); } // pct_decode_bytes_unchecked { auto const n = pct_decode_bytes_unchecked(s0); - BOOST_TEST(n == s1.size()); + BOOST_TEST_EQ(n, s1.size()); } // pct_decode_unchecked { @@ -144,7 +144,7 @@ public: pct_decode_unchecked( buf, buf + sizeof(buf), s0, opt); - BOOST_TEST(n == s1.size()); + BOOST_TEST_EQ(n, s1.size()); BOOST_TEST( string_view(buf, n) == s1); } @@ -425,8 +425,8 @@ public: string_view r(buf, n); if(n == m.size()) { - BOOST_TEST(i == m.size()); - BOOST_TEST(r == m); + BOOST_TEST_EQ(i, m.size()); + BOOST_TEST_EQ(r, m); break; } BOOST_TEST( @@ -461,7 +461,7 @@ public: BOOST_TEST(pct_encode_to_value( " ", {}, test_chars{}) == "%20"); pct_encode_opts opt; - BOOST_TEST(opt.space_to_plus == false); + BOOST_TEST_EQ(opt.space_to_plus, false); BOOST_TEST(pct_encode_to_value( " ", opt, test_chars{}) == "%20"); BOOST_TEST(pct_encode_to_value( diff --git a/test/unit/rfc/authority_rule.cpp b/test/unit/rfc/authority_rule.cpp index 1e14983b..9b2ce47f 100644 --- a/test/unit/rfc/authority_rule.cpp +++ b/test/unit/rfc/authority_rule.cpp @@ -70,15 +70,15 @@ public: == "e.com"); if(BOOST_TEST(p.port.has_port)) { - BOOST_TEST(p.port.port == "8080"); + BOOST_TEST_EQ(p.port.port, "8080"); BOOST_TEST(p.port.has_number); - BOOST_TEST(p.port.port_number == 8080); + BOOST_TEST_EQ(p.port.port_number, 8080); } if(BOOST_TEST(p.has_userinfo)) { - BOOST_TEST(p.userinfo.user.str == "x"); + BOOST_TEST_EQ(p.userinfo.user.str, "x"); if(BOOST_TEST(p.userinfo.has_password)) - BOOST_TEST(p.userinfo.password.str == "y"); + BOOST_TEST_EQ(p.userinfo.password.str, "y"); } } } diff --git a/test/unit/rfc/hier_part_rule.cpp b/test/unit/rfc/hier_part_rule.cpp index 71eb8ac4..573c1397 100644 --- a/test/unit/rfc/hier_part_rule.cpp +++ b/test/unit/rfc/hier_part_rule.cpp @@ -49,8 +49,8 @@ public: hier_part_rule t; grammar::parse_string( "/1/2/3/4/5", ec, t); - BOOST_TEST(t.path.path == "/1/2/3/4/5"); - BOOST_TEST(t.path.count == 5); + BOOST_TEST_EQ(t.path.path, "/1/2/3/4/5"); + BOOST_TEST_EQ(t.path.count, 5u); } }; diff --git a/test/unit/rfc/port_rule.cpp b/test/unit/rfc/port_rule.cpp index 6a9bf49b..05d16025 100644 --- a/test/unit/rfc/port_rule.cpp +++ b/test/unit/rfc/port_rule.cpp @@ -35,9 +35,9 @@ public: return; BOOST_TEST( t.has_number == has_number); - BOOST_TEST(t.str == s); + BOOST_TEST_EQ(t.str, s); if(t.has_number) - BOOST_TEST(t.number == v); + BOOST_TEST_EQ(t.number, v); } void diff --git a/test/unit/rfc/relative_part_rule.cpp b/test/unit/rfc/relative_part_rule.cpp index 46084aea..35ba6926 100644 --- a/test/unit/rfc/relative_part_rule.cpp +++ b/test/unit/rfc/relative_part_rule.cpp @@ -165,8 +165,8 @@ public: relative_part_rule t; grammar::parse_string( "/1/2/3/4/5", ec, t); - BOOST_TEST(t.path.path == "/1/2/3/4/5"); - BOOST_TEST(t.path.count == 5); + BOOST_TEST_EQ(t.path.path, "/1/2/3/4/5"); + BOOST_TEST_EQ(t.path.count, 5u); } } diff --git a/test/unit/rfc/userinfo_rule.cpp b/test/unit/rfc/userinfo_rule.cpp index eba2db3f..4c64b9c9 100644 --- a/test/unit/rfc/userinfo_rule.cpp +++ b/test/unit/rfc/userinfo_rule.cpp @@ -34,7 +34,7 @@ public: return; if(! BOOST_TEST(! ec)) return; - BOOST_TEST(t.user.str == s1); + BOOST_TEST_EQ(t.user.str, s1); if(check_s2) { BOOST_TEST( diff --git a/test/unit/scheme.cpp b/test/unit/scheme.cpp index 2476c776..237c5ada 100644 --- a/test/unit/scheme.cpp +++ b/test/unit/scheme.cpp @@ -33,7 +33,7 @@ public: auto s1 = to_string(sc1); for(auto& c : s0) c = grammar::ascii_tolower(c); - BOOST_TEST(s1 == s0); + BOOST_TEST_EQ(s1, s0); BOOST_TEST(s1 != to_string( scheme::unknown)); } diff --git a/test/unit/segments.cpp b/test/unit/segments.cpp index 51737df3..6643e3dd 100644 --- a/test/unit/segments.cpp +++ b/test/unit/segments.cpp @@ -52,7 +52,7 @@ public: segments p1 = u1.segments(); segments p2 = u2.segments(); p2 = p1; - BOOST_TEST(p1.begin() == p2.begin()); + BOOST_TEST_EQ(p1.begin(), p2.begin()); } url_view const u0 = parse_uri( @@ -61,8 +61,8 @@ public: { url u = u0; u.segments(p_.allocator()) = { "etc", "index.htm" }; - BOOST_TEST(u.encoded_path() == "/etc/index.htm"); - BOOST_TEST(u.string() == "x://y/etc/index.htm?q#f"); + BOOST_TEST_EQ(u.encoded_path(), "/etc/index.htm"); + BOOST_TEST_EQ(u.string(), "x://y/etc/index.htm?q#f"); } } @@ -78,24 +78,24 @@ public: auto se = u.segments(p_.allocator()); auto const& cs = se; - BOOST_TEST(se.at(0) == "path"); - BOOST_TEST(se.at(1) == "to"); - BOOST_TEST(se.at(2) == "the"); - BOOST_TEST(se.at(3) == "file.txt"); + BOOST_TEST_EQ(se.at(0), "path"); + BOOST_TEST_EQ(se.at(1), "to"); + BOOST_TEST_EQ(se.at(2), "the"); + BOOST_TEST_EQ(se.at(3), "file.txt"); BOOST_TEST_THROWS(se.at(4), std::out_of_range); - BOOST_TEST(cs.at(0) == "path"); - BOOST_TEST(cs.at(1) == "to"); - BOOST_TEST(cs.at(2) == "the"); - BOOST_TEST(cs.at(3) == "file.txt"); + BOOST_TEST_EQ(cs.at(0), "path"); + BOOST_TEST_EQ(cs.at(1), "to"); + BOOST_TEST_EQ(cs.at(2), "the"); + BOOST_TEST_EQ(cs.at(3), "file.txt"); BOOST_TEST_THROWS(cs.at(4), std::out_of_range); se.replace(se.begin() + 1, "from"); // comparison - BOOST_TEST(se.at(1) == "from"); - BOOST_TEST(cs.at(1) == "from"); - BOOST_TEST(se.at(1) != "path"); - BOOST_TEST(cs.at(1) != "path"); + BOOST_TEST_EQ(se.at(1), "from"); + BOOST_TEST_EQ(cs.at(1), "from"); + BOOST_TEST_NE(se.at(1), "path"); + BOOST_TEST_NE(cs.at(1), "path"); } // operator[] @@ -104,23 +104,23 @@ public: auto se = u.segments(p_.allocator()); auto const& cs = se; - BOOST_TEST(se[0] == "path"); - BOOST_TEST(se[1] == "to"); - BOOST_TEST(se[2] == "the"); - BOOST_TEST(se[3] == "file.txt"); + BOOST_TEST_EQ(se[0], "path"); + BOOST_TEST_EQ(se[1], "to"); + BOOST_TEST_EQ(se[2], "the"); + BOOST_TEST_EQ(se[3], "file.txt"); - BOOST_TEST(cs[0] == "path"); - BOOST_TEST(cs[1] == "to"); - BOOST_TEST(cs[2] == "the"); - BOOST_TEST(cs[3] == "file.txt"); + BOOST_TEST_EQ(cs[0], "path"); + BOOST_TEST_EQ(cs[1], "to"); + BOOST_TEST_EQ(cs[2], "the"); + BOOST_TEST_EQ(cs[3], "file.txt"); // assign se.replace(se.begin() + 1, "from"); // comparison - BOOST_TEST(se[1] == "from"); - BOOST_TEST(cs[1] == "from"); - BOOST_TEST(se[1] != "path"); - BOOST_TEST(cs[1] != "path"); + BOOST_TEST_EQ(se[1], "from"); + BOOST_TEST_EQ(cs[1], "from"); + BOOST_TEST_NE(se[1], "path"); + BOOST_TEST_NE(cs[1], "path"); } // front @@ -129,16 +129,16 @@ public: auto se = u.segments(p_.allocator()); auto const& cs = se; - BOOST_TEST(se.front() == "path"); - BOOST_TEST(cs.front() == "path"); + BOOST_TEST_EQ(se.front(), "path"); + BOOST_TEST_EQ(cs.front(), "path"); // assign se.replace(se.begin(), "etc"); // comparison - BOOST_TEST(se.front() == "etc"); - BOOST_TEST(cs.front() == "etc"); - BOOST_TEST(se.front() != "path"); - BOOST_TEST(cs.front() != "path"); + BOOST_TEST_EQ(se.front(), "etc"); + BOOST_TEST_EQ(cs.front(), "etc"); + BOOST_TEST_NE(se.front(), "path"); + BOOST_TEST_NE(cs.front(), "path"); } // back @@ -147,16 +147,16 @@ public: auto se = u.segments(p_.allocator()); auto const& cs = se; - BOOST_TEST(se.back() == "file.txt"); - BOOST_TEST(cs.back() == "file.txt"); + BOOST_TEST_EQ(se.back(), "file.txt"); + BOOST_TEST_EQ(cs.back(), "file.txt"); // assign se.replace(se.end() - 1, "index.htm"); // comparison - BOOST_TEST(se.back() == "index.htm"); - BOOST_TEST(cs.back() == "index.htm"); - BOOST_TEST(se.back() != "file.txt"); - BOOST_TEST(cs.back() != "file.txt"); + BOOST_TEST_EQ(se.back(), "index.htm"); + BOOST_TEST_EQ(cs.back(), "index.htm"); + BOOST_TEST_NE(se.back(), "file.txt"); + BOOST_TEST_NE(cs.back(), "file.txt"); } } @@ -177,8 +177,8 @@ public: auto se = u.segments(p_.allocator()); auto const& cs = se; - BOOST_TEST(se.begin() == cs.begin()); - BOOST_TEST(se.end() != se.begin()); + BOOST_TEST_EQ(se.begin(), cs.begin()); + BOOST_TEST_NE(se.end(), se.begin()); } // end @@ -187,8 +187,8 @@ public: auto se = u.segments(p_.allocator()); auto const& cs = se; - BOOST_TEST(se.end() == cs.end()); - BOOST_TEST(se.begin() != se.end()); + BOOST_TEST_EQ(se.end(), cs.end()); + BOOST_TEST_NE(se.begin(), se.end()); } // @@ -201,38 +201,38 @@ public: auto const& cs(se); segments::iterator it = se.begin(); - BOOST_TEST(*it == "path"); - BOOST_TEST(*++it == "to"); - BOOST_TEST(*it++ == "to"); - BOOST_TEST(*it-- == "the"); - BOOST_TEST(*it == "to"); - BOOST_TEST(*--it == "path"); - BOOST_TEST(it == se.begin()); - BOOST_TEST(it != se.end()); + BOOST_TEST_EQ(*it, "path"); + BOOST_TEST_EQ(*++it, "to"); + BOOST_TEST_EQ(*it++, "to"); + BOOST_TEST_EQ(*it--, "the"); + BOOST_TEST_EQ(*it, "to"); + BOOST_TEST_EQ(*--it, "path"); + BOOST_TEST_EQ(it, se.begin()); + BOOST_TEST_NE(it, se.end()); - BOOST_TEST(*(it += 1) == "to"); - BOOST_TEST(*(it + 1) == "the"); - BOOST_TEST(*(1 + it) == "the"); - BOOST_TEST(*(it -= 1) == "path"); + BOOST_TEST_EQ(*(it += 1), "to"); + BOOST_TEST_EQ(*(it + 1), "the"); + BOOST_TEST_EQ(*(1 + it), "the"); + BOOST_TEST_EQ(*(it -= 1), "path"); it += 2; - BOOST_TEST(*(it - 1) == "to"); + BOOST_TEST_EQ(*(it - 1), "to"); --it; - BOOST_TEST(it - se.begin() == 1); - BOOST_TEST(se.end() - it == 3); + BOOST_TEST_EQ(it - se.begin(), 1); + BOOST_TEST_EQ(se.end() - it, 3); - BOOST_TEST(it[0] == "to"); + BOOST_TEST_EQ(it[0], "to"); BOOST_TEST(it[1] == "the") ; - BOOST_TEST(it < se.end()); - BOOST_TEST(it < cs.end()); - BOOST_TEST(it <= se.end()); - BOOST_TEST(it <= cs.end()); - BOOST_TEST(it > se.begin()); - BOOST_TEST(it > cs.begin()); - BOOST_TEST(it >= se.begin()); - BOOST_TEST(it >= cs.begin()); - BOOST_TEST(it != se.begin()); - BOOST_TEST(it != cs.begin()); + BOOST_TEST_LT(it, se.end()); + BOOST_TEST_LT(it, cs.end()); + BOOST_TEST_LE(it, se.end()); + BOOST_TEST_LE(it, cs.end()); + BOOST_TEST_GT(it, se.begin()); + BOOST_TEST_GT(it, cs.begin()); + BOOST_TEST_GE(it, se.begin()); + BOOST_TEST_GE(it, cs.begin()); + BOOST_TEST_NE(it, se.begin()); + BOOST_TEST_NE(it, cs.begin()); } @@ -260,8 +260,8 @@ public: auto se = u.segments(p_.allocator()); auto const& cs = se; - BOOST_TEST(se.size() == 4); - BOOST_TEST(cs.size() == 4); + BOOST_TEST_EQ(se.size(), 4u); + BOOST_TEST_EQ(cs.size(), 4u); } } @@ -274,12 +274,12 @@ public: auto se = u.segments(p_.allocator()); BOOST_TEST(! se.empty()); - BOOST_TEST(se.size() == 4); + BOOST_TEST_EQ(se.size(), 4u); se.clear(); BOOST_TEST(se.empty()); - BOOST_TEST(se.size() == 0); - BOOST_TEST(u.encoded_path() == "/"); - BOOST_TEST(u.string() == "x://y/"); + BOOST_TEST_EQ(se.size(), 0u); + BOOST_TEST_EQ(u.encoded_path(), "/"); + BOOST_TEST_EQ(u.string(), "x://y/"); } // insert( const_iterator, string_view ) @@ -288,26 +288,26 @@ public: auto se = u.segments(p_.allocator()); auto const& cs(se); - BOOST_TEST(se.size() == 2); + BOOST_TEST_EQ(se.size(), 2u); auto it = se.insert(se.begin() + 1, "to"); - BOOST_TEST(se.size() == 3); - BOOST_TEST(u.encoded_path() == "/path/to/file.txt"); - BOOST_TEST(u.string() == "x://y/path/to/file.txt?q#f"); - BOOST_TEST(*it == "to"); + BOOST_TEST_EQ(se.size(), 3u); + BOOST_TEST_EQ(u.encoded_path(), "/path/to/file.txt"); + BOOST_TEST_EQ(u.string(), "x://y/path/to/file.txt?q#f"); + BOOST_TEST_EQ(*it, "to"); it = se.insert(cs.end(), ""); - BOOST_TEST(se.size() == 4); - BOOST_TEST(u.encoded_path() == "/path/to/file.txt/"); - BOOST_TEST(u.string() == "x://y/path/to/file.txt/?q#f"); - BOOST_TEST(*it == ""); - BOOST_TEST(it[-1] == "file.txt"); + BOOST_TEST_EQ(se.size(), 4u); + BOOST_TEST_EQ(u.encoded_path(), "/path/to/file.txt/"); + BOOST_TEST_EQ(u.string(), "x://y/path/to/file.txt/?q#f"); + BOOST_TEST_EQ(*it, ""); + BOOST_TEST_EQ(it[-1], "file.txt"); it = se.insert(se.begin(), "etc"); - BOOST_TEST(se.size() == 5); - BOOST_TEST(u.encoded_path() == "/etc/path/to/file.txt/"); - BOOST_TEST(u.string() == "x://y/etc/path/to/file.txt/?q#f"); - BOOST_TEST(*it == "etc"); + BOOST_TEST_EQ(se.size(), 5u); + BOOST_TEST_EQ(u.encoded_path(), "/etc/path/to/file.txt/"); + BOOST_TEST_EQ(u.string(), "x://y/etc/path/to/file.txt/?q#f"); + BOOST_TEST_EQ(*it, "etc"); } { @@ -316,26 +316,26 @@ public: auto se = u.segments(p_.allocator()); auto const& cs(se); - BOOST_TEST(se.size() == 2); + BOOST_TEST_EQ(se.size(), 2u); auto it = se.insert(se.begin() + 1, "to"); - BOOST_TEST(se.size() == 3); - BOOST_TEST(u.encoded_path() == "path/to/file.txt"); - BOOST_TEST(u.string() == "x:path/to/file.txt?q#f"); - BOOST_TEST(*it == "to"); + BOOST_TEST_EQ(se.size(), 3u); + BOOST_TEST_EQ(u.encoded_path(), "path/to/file.txt"); + BOOST_TEST_EQ(u.string(), "x:path/to/file.txt?q#f"); + BOOST_TEST_EQ(*it, "to"); it = se.insert(cs.end(), ""); - BOOST_TEST(se.size() == 4); - BOOST_TEST(u.encoded_path() == "path/to/file.txt/"); - BOOST_TEST(u.string() == "x:path/to/file.txt/?q#f"); - BOOST_TEST(*it == ""); - BOOST_TEST(it[-1] == "file.txt"); + BOOST_TEST_EQ(se.size(), 4u); + BOOST_TEST_EQ(u.encoded_path(), "path/to/file.txt/"); + BOOST_TEST_EQ(u.string(), "x:path/to/file.txt/?q#f"); + BOOST_TEST_EQ(*it, ""); + BOOST_TEST_EQ(it[-1], "file.txt"); it = se.insert(se.begin(), "etc"); - BOOST_TEST(se.size() == 5); - BOOST_TEST(u.encoded_path() == "etc/path/to/file.txt/"); - BOOST_TEST(u.string() == "x:etc/path/to/file.txt/?q#f"); - BOOST_TEST(*it == "etc"); + BOOST_TEST_EQ(se.size(), 5u); + BOOST_TEST_EQ(u.encoded_path(), "etc/path/to/file.txt/"); + BOOST_TEST_EQ(u.string(), "x:etc/path/to/file.txt/?q#f"); + BOOST_TEST_EQ(*it, "etc"); } // insert( const_iterator, FwdIt, FwdIt ) @@ -347,16 +347,16 @@ public: std::initializer_list init = {"to", "the" }; auto it = se.insert( se.begin() + 1, init.begin(), init.end()); - BOOST_TEST(cs.size() == 4); - BOOST_TEST(*it == "to"); - BOOST_TEST(u.encoded_path() == "/path/to/the/file.txt"); - BOOST_TEST(u.string() == "x://y/path/to/the/file.txt?q#f"); + BOOST_TEST_EQ(cs.size(), 4u); + BOOST_TEST_EQ(*it, "to"); + BOOST_TEST_EQ(u.encoded_path(), "/path/to/the/file.txt"); + BOOST_TEST_EQ(u.string(), "x://y/path/to/the/file.txt?q#f"); // empty range it = se.insert(se.begin() + 1, init.begin(), init.begin()); - BOOST_TEST(u.encoded_path() == "/path/to/the/file.txt"); - BOOST_TEST(it == se.begin() + 1); + BOOST_TEST_EQ(u.encoded_path(), "/path/to/the/file.txt"); + BOOST_TEST_EQ(it, se.begin() + 1); } { // rootless @@ -367,16 +367,16 @@ public: std::initializer_list init = {"path", "to" }; auto it = se.insert( se.begin(), init.begin(), init.end()); - BOOST_TEST(cs.size() == 4); - BOOST_TEST(*it == "path"); - BOOST_TEST(u.encoded_path() == "path/to/the/file.txt"); - BOOST_TEST(u.string() == "x:path/to/the/file.txt?q#f"); + BOOST_TEST_EQ(cs.size(), 4u); + BOOST_TEST_EQ(*it, "path"); + BOOST_TEST_EQ(u.encoded_path(), "path/to/the/file.txt"); + BOOST_TEST_EQ(u.string(), "x:path/to/the/file.txt?q#f"); // empty range it = se.insert(se.begin() + 1, init.begin(), init.begin()); - BOOST_TEST(u.encoded_path() == "path/to/the/file.txt"); - BOOST_TEST(it == se.begin() + 1); + BOOST_TEST_EQ(u.encoded_path(), "path/to/the/file.txt"); + BOOST_TEST_EQ(it, se.begin() + 1); } // insert( const_iterator, initializer_list ) @@ -389,10 +389,10 @@ public: string_view> init = { "to", "the" }; auto it = se.insert(se.begin() + 1, init); - BOOST_TEST(cs.size() == 4); - BOOST_TEST(*it == "to"); - BOOST_TEST(u.encoded_path() == "/path/to/the/file.txt"); - BOOST_TEST(u.string() == "x://y/path/to/the/file.txt?q#f"); + BOOST_TEST_EQ(cs.size(), 4u); + BOOST_TEST_EQ(*it, "to"); + BOOST_TEST_EQ(u.encoded_path(), "/path/to/the/file.txt"); + BOOST_TEST_EQ(u.string(), "x://y/path/to/the/file.txt?q#f"); } // erase( const_iterator ) @@ -401,24 +401,24 @@ public: auto se = u.segments(p_.allocator()); se.erase(se.begin() + 1); - BOOST_TEST(se.size() == 3); - BOOST_TEST(u.encoded_path() == "/path/the/file.txt"); - BOOST_TEST(u.string() == "x://y/path/the/file.txt?q#f"); + BOOST_TEST_EQ(se.size(), 3u); + BOOST_TEST_EQ(u.encoded_path(), "/path/the/file.txt"); + BOOST_TEST_EQ(u.string(), "x://y/path/the/file.txt?q#f"); se.erase(se.begin()); - BOOST_TEST(se.size() == 2); - BOOST_TEST(u.encoded_path() == "/the/file.txt"); - BOOST_TEST(u.string() == "x://y/the/file.txt?q#f"); + BOOST_TEST_EQ(se.size(), 2u); + BOOST_TEST_EQ(u.encoded_path(), "/the/file.txt"); + BOOST_TEST_EQ(u.string(), "x://y/the/file.txt?q#f"); se.erase(se.end() - 1); - BOOST_TEST(se.size() == 1); - BOOST_TEST(u.encoded_path() == "/the"); - BOOST_TEST(u.string() == "x://y/the?q#f"); + BOOST_TEST_EQ(se.size(), 1u); + BOOST_TEST_EQ(u.encoded_path(), "/the"); + BOOST_TEST_EQ(u.string(), "x://y/the?q#f"); se.erase(se.begin()); BOOST_TEST(se.empty()); - BOOST_TEST(u.encoded_path() == "/"); - BOOST_TEST(u.string() == "x://y/?q#f"); + BOOST_TEST_EQ(u.encoded_path(), "/"); + BOOST_TEST_EQ(u.string(), "x://y/?q#f"); } // erase( const_iterator, const_iterator ) @@ -428,12 +428,12 @@ public: auto se = u.segments(p_.allocator()); se.erase(se.begin(), se.begin() + 2); - BOOST_TEST(u.encoded_path() == "/path/to/the/file.txt"); - BOOST_TEST(u.string() == "x://y/path/to/the/file.txt?q#f"); + BOOST_TEST_EQ(u.encoded_path(), "/path/to/the/file.txt"); + BOOST_TEST_EQ(u.string(), "x://y/path/to/the/file.txt?q#f"); se.erase(se.begin(), se.end()); - BOOST_TEST(u.encoded_path() == "/"); - BOOST_TEST(u.string() == "x://y/?q#f"); + BOOST_TEST_EQ(u.encoded_path(), "/"); + BOOST_TEST_EQ(u.string(), "x://y/?q#f"); } // replace(iterator, iterator, initializer-list) @@ -446,7 +446,7 @@ public: ss.begin() + 1, ss.begin() + 3, { "x", "y", "z" }); - BOOST_TEST(it == ss.begin() + 1); + BOOST_TEST_EQ(it, ss.begin() + 1); BOOST_TEST(u.encoded_path() == "/a/x/y/z/d/e/f/g"); } @@ -461,7 +461,7 @@ public: string_view("x"), string_view("y"), string_view("z") }); - BOOST_TEST(it == ss.begin() + 1); + BOOST_TEST_EQ(it, ss.begin() + 1); BOOST_TEST(u.encoded_path() == "/a/x/y/z/d/e/f/g"); } @@ -473,22 +473,22 @@ public: url u; auto se = u.segments(p_.allocator()); se.push_back("path"); - BOOST_TEST(u.encoded_path() == "path"); + BOOST_TEST_EQ(u.encoded_path(), "path"); se.push_back("to"); - BOOST_TEST(u.encoded_path() == "path/to"); + BOOST_TEST_EQ(u.encoded_path(), "path/to"); se.push_back("file.txt"); - BOOST_TEST(u.encoded_path() == "path/to/file.txt"); + BOOST_TEST_EQ(u.encoded_path(), "path/to/file.txt"); } { url u; auto se = u.segments(p_.allocator()); u.set_path_absolute(true); se.push_back("path"); - BOOST_TEST(u.encoded_path() == "/path"); + BOOST_TEST_EQ(u.encoded_path(), "/path"); se.push_back("to"); - BOOST_TEST(u.encoded_path() == "/path/to"); + BOOST_TEST_EQ(u.encoded_path(), "/path/to"); se.push_back("file.txt"); - BOOST_TEST(u.encoded_path() == "/path/to/file.txt"); + BOOST_TEST_EQ(u.encoded_path(), "/path/to/file.txt"); } #endif @@ -498,19 +498,19 @@ public: "x://y/path/to/file.txt?q#f").value(); auto se = u.segments(p_.allocator()); - BOOST_TEST(se.size() == 3); + BOOST_TEST_EQ(se.size(), 3u); se.pop_back(); - BOOST_TEST(se.size() == 2); - BOOST_TEST(u.encoded_path() == "/path/to"); - BOOST_TEST(u.string() == "x://y/path/to?q#f"); + BOOST_TEST_EQ(se.size(), 2u); + BOOST_TEST_EQ(u.encoded_path(), "/path/to"); + BOOST_TEST_EQ(u.string(), "x://y/path/to?q#f"); se.pop_back(); - BOOST_TEST(se.size() == 1); - BOOST_TEST(u.encoded_path() == "/path"); - BOOST_TEST(u.string() == "x://y/path?q#f"); + BOOST_TEST_EQ(se.size(), 1u); + BOOST_TEST_EQ(u.encoded_path(), "/path"); + BOOST_TEST_EQ(u.string(), "x://y/path?q#f"); se.pop_back(); - BOOST_TEST(se.size() == 0); - BOOST_TEST(u.encoded_path() == "/"); - BOOST_TEST(u.string() == "x://y/?q#f"); + BOOST_TEST_EQ(se.size(), 0u); + BOOST_TEST_EQ(u.encoded_path(), "/"); + BOOST_TEST_EQ(u.string(), "x://y/?q#f"); } } diff --git a/test/unit/segments_encoded.cpp b/test/unit/segments_encoded.cpp index f949b758..24e73f97 100644 --- a/test/unit/segments_encoded.cpp +++ b/test/unit/segments_encoded.cpp @@ -47,7 +47,7 @@ public: segments_encoded p1 = u1.encoded_segments(); segments_encoded p2 = u2.encoded_segments(); p2 = p1; - BOOST_TEST(p1.begin() == p2.begin()); + BOOST_TEST_EQ(p1.begin(), p2.begin()); } url_view const u0 = parse_uri( @@ -56,8 +56,8 @@ public: { url u = u0; u.encoded_segments() = { "etc", "index.htm" }; - BOOST_TEST(u.encoded_path() == "/etc/index.htm"); - BOOST_TEST(u.string() == "x://y/etc/index.htm?q#f"); + BOOST_TEST_EQ(u.encoded_path(), "/etc/index.htm"); + BOOST_TEST_EQ(u.string(), "x://y/etc/index.htm?q#f"); } } @@ -72,17 +72,17 @@ public: url u = u0; segments_encoded se = u.encoded_segments(); - BOOST_TEST(se.at(0) == "path"); - BOOST_TEST(se.at(1) == "to"); - BOOST_TEST(se.at(2) == "the"); - BOOST_TEST(se.at(3) == "file.txt"); + BOOST_TEST_EQ(se.at(0), "path"); + BOOST_TEST_EQ(se.at(1), "to"); + BOOST_TEST_EQ(se.at(2), "the"); + BOOST_TEST_EQ(se.at(3), "file.txt"); BOOST_TEST_THROWS(se.at(4), std::out_of_range); // assign se.replace(se.begin() + 1, "from"); // comparison - BOOST_TEST(se.at(1) == "from"); - BOOST_TEST(se.at(1) != "path"); + BOOST_TEST_EQ(se.at(1), "from"); + BOOST_TEST_NE(se.at(1), "path"); } // operator[] @@ -90,16 +90,16 @@ public: url u = u0; segments_encoded se = u.encoded_segments(); - BOOST_TEST(se[0] == "path"); - BOOST_TEST(se[1] == "to"); - BOOST_TEST(se[2] == "the"); - BOOST_TEST(se[3] == "file.txt"); + BOOST_TEST_EQ(se[0], "path"); + BOOST_TEST_EQ(se[1], "to"); + BOOST_TEST_EQ(se[2], "the"); + BOOST_TEST_EQ(se[3], "file.txt"); // assign se.replace(se.begin() + 1, "from"); // comparison - BOOST_TEST(se[1] == "from"); - BOOST_TEST(se[1] != "path"); + BOOST_TEST_EQ(se[1], "from"); + BOOST_TEST_NE(se[1], "path"); } // front @@ -107,13 +107,13 @@ public: url u = u0; segments_encoded se = u.encoded_segments(); - BOOST_TEST(se.front() == "path"); + BOOST_TEST_EQ(se.front(), "path"); // assign se.replace(se.begin(), "etc"); // comparison - BOOST_TEST(se.front() == "etc"); - BOOST_TEST(se.front() != "path"); + BOOST_TEST_EQ(se.front(), "etc"); + BOOST_TEST_NE(se.front(), "path"); } // back @@ -121,13 +121,13 @@ public: url u = u0; segments_encoded se = u.encoded_segments(); - BOOST_TEST(se.back() == "file.txt"); + BOOST_TEST_EQ(se.back(), "file.txt"); // assign se.replace(se.end() - 1, "index.htm"); // comparison - BOOST_TEST(se.back() == "index.htm"); - BOOST_TEST(se.back() != "file.txt"); + BOOST_TEST_EQ(se.back(), "index.htm"); + BOOST_TEST_NE(se.back(), "file.txt"); } } @@ -148,7 +148,7 @@ public: url u = u0; segments_encoded se = u.encoded_segments(); - BOOST_TEST(se.begin() != se.end()); + BOOST_TEST_NE(se.begin(), se.end()); } // end @@ -156,7 +156,7 @@ public: url u = u0; segments_encoded se = u.encoded_segments(); - BOOST_TEST(se.end() != se.begin()); + BOOST_TEST_NE(se.end(), se.begin()); } // @@ -169,38 +169,38 @@ public: auto const& cs(se); segments_encoded::iterator it = se.begin(); - BOOST_TEST(*it == "path"); - BOOST_TEST(*++it == "to"); - BOOST_TEST(*it++ == "to"); - BOOST_TEST(*it-- == "the"); - BOOST_TEST(*it == "to"); - BOOST_TEST(*--it == "path"); - BOOST_TEST(it == se.begin()); - BOOST_TEST(it != se.end()); + BOOST_TEST_EQ(*it, "path"); + BOOST_TEST_EQ(*++it, "to"); + BOOST_TEST_EQ(*it++, "to"); + BOOST_TEST_EQ(*it--, "the"); + BOOST_TEST_EQ(*it, "to"); + BOOST_TEST_EQ(*--it, "path"); + BOOST_TEST_EQ(it, se.begin()); + BOOST_TEST_NE(it, se.end()); - BOOST_TEST(*(it += 1) == "to"); - BOOST_TEST(*(it + 1) == "the"); - BOOST_TEST(*(1 + it) == "the"); - BOOST_TEST(*(it -= 1) == "path"); + BOOST_TEST_EQ(*(it += 1), "to"); + BOOST_TEST_EQ(*(it + 1), "the"); + BOOST_TEST_EQ(*(1 + it), "the"); + BOOST_TEST_EQ(*(it -= 1), "path"); it += 2; - BOOST_TEST(*(it - 1) == "to"); + BOOST_TEST_EQ(*(it - 1), "to"); --it; - BOOST_TEST(it - se.begin() == 1); - BOOST_TEST(se.end() - it == 3); + BOOST_TEST_EQ(it - se.begin(), 1); + BOOST_TEST_EQ(se.end() - it, 3); - BOOST_TEST(it[0] == "to"); + BOOST_TEST_EQ(it[0], "to"); BOOST_TEST(it[1] == "the") ; - BOOST_TEST(it < se.end()); - BOOST_TEST(it < cs.end()); - BOOST_TEST(it <= se.end()); - BOOST_TEST(it <= cs.end()); - BOOST_TEST(it > se.begin()); - BOOST_TEST(it > cs.begin()); - BOOST_TEST(it >= se.begin()); - BOOST_TEST(it >= cs.begin()); - BOOST_TEST(it != se.begin()); - BOOST_TEST(it != cs.begin()); + BOOST_TEST_LT(it, se.end()); + BOOST_TEST_LT(it, cs.end()); + BOOST_TEST_LE(it, se.end()); + BOOST_TEST_LE(it, cs.end()); + BOOST_TEST_GT(it, se.begin()); + BOOST_TEST_GT(it, cs.begin()); + BOOST_TEST_GE(it, se.begin()); + BOOST_TEST_GE(it, cs.begin()); + BOOST_TEST_NE(it, se.begin()); + BOOST_TEST_NE(it, cs.begin()); } } @@ -223,7 +223,7 @@ public: url u = u0; segments_encoded se = u.encoded_segments(); - BOOST_TEST(se.size() == 4); + BOOST_TEST_EQ(se.size(), 4u); } } @@ -236,12 +236,12 @@ public: segments_encoded se = u.encoded_segments(); BOOST_TEST(! se.empty()); - BOOST_TEST(se.size() == 4); + BOOST_TEST_EQ(se.size(), 4u); se.clear(); BOOST_TEST(se.empty()); - BOOST_TEST(se.size() == 0); - BOOST_TEST(u.encoded_path() == "/"); - BOOST_TEST(u.string() == "x://y/"); + BOOST_TEST_EQ(se.size(), 0u); + BOOST_TEST_EQ(u.encoded_path(), "/"); + BOOST_TEST_EQ(u.string(), "x://y/"); } // insert( const_iterator, string_view ) @@ -250,26 +250,26 @@ public: segments_encoded se = u.encoded_segments(); segments_encoded const& cs(se); - BOOST_TEST(se.size() == 2); + BOOST_TEST_EQ(se.size(), 2u); segments_encoded::iterator it = se.insert(se.begin() + 1, "to"); - BOOST_TEST(se.size() == 3); - BOOST_TEST(u.encoded_path() == "/path/to/file.txt"); - BOOST_TEST(u.string() == "x://y/path/to/file.txt?q#f"); - BOOST_TEST(*it == "to"); + BOOST_TEST_EQ(se.size(), 3u); + BOOST_TEST_EQ(u.encoded_path(), "/path/to/file.txt"); + BOOST_TEST_EQ(u.string(), "x://y/path/to/file.txt?q#f"); + BOOST_TEST_EQ(*it, "to"); it = se.insert(cs.end(), ""); - BOOST_TEST(se.size() == 4); - BOOST_TEST(u.encoded_path() == "/path/to/file.txt/"); - BOOST_TEST(u.string() == "x://y/path/to/file.txt/?q#f"); - BOOST_TEST(*it == ""); - BOOST_TEST(it[-1] == "file.txt"); + BOOST_TEST_EQ(se.size(), 4u); + BOOST_TEST_EQ(u.encoded_path(), "/path/to/file.txt/"); + BOOST_TEST_EQ(u.string(), "x://y/path/to/file.txt/?q#f"); + BOOST_TEST_EQ(*it, ""); + BOOST_TEST_EQ(it[-1], "file.txt"); it = se.insert(se.begin(), "etc"); - BOOST_TEST(se.size() == 5); - BOOST_TEST(u.encoded_path() == "/etc/path/to/file.txt/"); - BOOST_TEST(u.string() == "x://y/etc/path/to/file.txt/?q#f"); - BOOST_TEST(*it == "etc"); + BOOST_TEST_EQ(se.size(), 5u); + BOOST_TEST_EQ(u.encoded_path(), "/etc/path/to/file.txt/"); + BOOST_TEST_EQ(u.string(), "x://y/etc/path/to/file.txt/?q#f"); + BOOST_TEST_EQ(*it, "etc"); BOOST_TEST_THROWS(se.insert(se.begin(), "%"), std::invalid_argument); BOOST_TEST_THROWS(se.insert(se.begin(), "/"), std::invalid_argument); @@ -282,26 +282,26 @@ public: segments_encoded se = u.encoded_segments(); segments_encoded const& cs(se); - BOOST_TEST(se.size() == 2); + BOOST_TEST_EQ(se.size(), 2u); segments_encoded::iterator it = se.insert(se.begin() + 1, "to"); - BOOST_TEST(se.size() == 3); - BOOST_TEST(u.encoded_path() == "path/to/file.txt"); - BOOST_TEST(u.string() == "x:path/to/file.txt?q#f"); - BOOST_TEST(*it == "to"); + BOOST_TEST_EQ(se.size(), 3u); + BOOST_TEST_EQ(u.encoded_path(), "path/to/file.txt"); + BOOST_TEST_EQ(u.string(), "x:path/to/file.txt?q#f"); + BOOST_TEST_EQ(*it, "to"); it = se.insert(cs.end(), ""); - BOOST_TEST(se.size() == 4); - BOOST_TEST(u.encoded_path() == "path/to/file.txt/"); - BOOST_TEST(u.string() == "x:path/to/file.txt/?q#f"); - BOOST_TEST(*it == ""); - BOOST_TEST(it[-1] == "file.txt"); + BOOST_TEST_EQ(se.size(), 4u); + BOOST_TEST_EQ(u.encoded_path(), "path/to/file.txt/"); + BOOST_TEST_EQ(u.string(), "x:path/to/file.txt/?q#f"); + BOOST_TEST_EQ(*it, ""); + BOOST_TEST_EQ(it[-1], "file.txt"); it = se.insert(se.begin(), "etc"); - BOOST_TEST(se.size() == 5); - BOOST_TEST(u.encoded_path() == "etc/path/to/file.txt/"); - BOOST_TEST(u.string() == "x:etc/path/to/file.txt/?q#f"); - BOOST_TEST(*it == "etc"); + BOOST_TEST_EQ(se.size(), 5u); + BOOST_TEST_EQ(u.encoded_path(), "etc/path/to/file.txt/"); + BOOST_TEST_EQ(u.string(), "x:etc/path/to/file.txt/?q#f"); + BOOST_TEST_EQ(*it, "etc"); BOOST_TEST_THROWS(se.insert(se.begin(), "%"), std::invalid_argument); BOOST_TEST_THROWS(se.insert(se.begin(), "/"), std::invalid_argument); @@ -317,10 +317,10 @@ public: std::initializer_list init = {"to", "the" }; auto it = se.insert( se.begin() + 1, init.begin(), init.end()); - BOOST_TEST(cs.size() == 4); - BOOST_TEST(*it == "to"); - BOOST_TEST(u.encoded_path() == "/path/to/the/file.txt"); - BOOST_TEST(u.string() == "x://y/path/to/the/file.txt?q#f"); + BOOST_TEST_EQ(cs.size(), 4u); + BOOST_TEST_EQ(*it, "to"); + BOOST_TEST_EQ(u.encoded_path(), "/path/to/the/file.txt"); + BOOST_TEST_EQ(u.string(), "x://y/path/to/the/file.txt?q#f"); std::initializer_list bad = {"%"}; BOOST_TEST_THROWS(se.insert( @@ -330,8 +330,8 @@ public: // empty range it = se.insert(se.begin() + 1, init.begin(), init.begin()); - BOOST_TEST(u.encoded_path() == "/path/to/the/file.txt"); - BOOST_TEST(it == se.begin() + 1); + BOOST_TEST_EQ(u.encoded_path(), "/path/to/the/file.txt"); + BOOST_TEST_EQ(it, se.begin() + 1); } { // rootless @@ -342,10 +342,10 @@ public: std::initializer_list init = {"path", "to" }; auto it = se.insert( se.begin(), init.begin(), init.end()); - BOOST_TEST(cs.size() == 4); - BOOST_TEST(*it == "path"); - BOOST_TEST(u.encoded_path() == "path/to/the/file.txt"); - BOOST_TEST(u.string() == "x:path/to/the/file.txt?q#f"); + BOOST_TEST_EQ(cs.size(), 4u); + BOOST_TEST_EQ(*it, "path"); + BOOST_TEST_EQ(u.encoded_path(), "path/to/the/file.txt"); + BOOST_TEST_EQ(u.string(), "x:path/to/the/file.txt?q#f"); std::initializer_list bad = {"%"}; BOOST_TEST_THROWS(se.insert( @@ -355,8 +355,8 @@ public: // empty range it = se.insert(se.begin() + 1, init.begin(), init.begin()); - BOOST_TEST(u.encoded_path() == "path/to/the/file.txt"); - BOOST_TEST(it == se.begin() + 1); + BOOST_TEST_EQ(u.encoded_path(), "path/to/the/file.txt"); + BOOST_TEST_EQ(it, se.begin() + 1); } // insert( const_iterator, initializer_list ) @@ -369,10 +369,10 @@ public: string_view> init = { "to", "the" }; auto it = se.insert(se.begin() + 1, init); - BOOST_TEST(cs.size() == 4); - BOOST_TEST(*it == "to"); - BOOST_TEST(u.encoded_path() == "/path/to/the/file.txt"); - BOOST_TEST(u.string() == "x://y/path/to/the/file.txt?q#f"); + BOOST_TEST_EQ(cs.size(), 4u); + BOOST_TEST_EQ(*it, "to"); + BOOST_TEST_EQ(u.encoded_path(), "/path/to/the/file.txt"); + BOOST_TEST_EQ(u.string(), "x://y/path/to/the/file.txt?q#f"); } // erase( const_iterator ) @@ -381,24 +381,24 @@ public: segments_encoded se = u.encoded_segments(); se.erase(se.begin() + 1); - BOOST_TEST(se.size() == 3); - BOOST_TEST(u.encoded_path() == "/path/the/file.txt"); - BOOST_TEST(u.string() == "x://y/path/the/file.txt?q#f"); + BOOST_TEST_EQ(se.size(), 3u); + BOOST_TEST_EQ(u.encoded_path(), "/path/the/file.txt"); + BOOST_TEST_EQ(u.string(), "x://y/path/the/file.txt?q#f"); se.erase(se.begin()); - BOOST_TEST(se.size() == 2); - BOOST_TEST(u.encoded_path() == "/the/file.txt"); - BOOST_TEST(u.string() == "x://y/the/file.txt?q#f"); + BOOST_TEST_EQ(se.size(), 2u); + BOOST_TEST_EQ(u.encoded_path(), "/the/file.txt"); + BOOST_TEST_EQ(u.string(), "x://y/the/file.txt?q#f"); se.erase(se.end() - 1); - BOOST_TEST(se.size() == 1); - BOOST_TEST(u.encoded_path() == "/the"); - BOOST_TEST(u.string() == "x://y/the?q#f"); + BOOST_TEST_EQ(se.size(), 1u); + BOOST_TEST_EQ(u.encoded_path(), "/the"); + BOOST_TEST_EQ(u.string(), "x://y/the?q#f"); se.erase(se.begin()); BOOST_TEST(se.empty()); - BOOST_TEST(u.encoded_path() == "/"); - BOOST_TEST(u.string() == "x://y/?q#f"); + BOOST_TEST_EQ(u.encoded_path(), "/"); + BOOST_TEST_EQ(u.string(), "x://y/?q#f"); } // erase( const_iterator, const_iterator ) @@ -407,12 +407,12 @@ public: segments_encoded se = u.encoded_segments(); se.erase(se.begin(), se.begin() + 2); - BOOST_TEST(u.encoded_path() == "/path/to/the/file.txt"); - BOOST_TEST(u.string() == "x://y/path/to/the/file.txt?q#f"); + BOOST_TEST_EQ(u.encoded_path(), "/path/to/the/file.txt"); + BOOST_TEST_EQ(u.string(), "x://y/path/to/the/file.txt?q#f"); se.erase(se.begin(), se.end()); - BOOST_TEST(u.encoded_path() == "/"); - BOOST_TEST(u.string() == "x://y/?q#f"); + BOOST_TEST_EQ(u.encoded_path(), "/"); + BOOST_TEST_EQ(u.string(), "x://y/?q#f"); } // replace(iterator, iterator, initializer-list) @@ -424,7 +424,7 @@ public: se.begin() + 1, se.begin() + 3, { "x", "y", "z" }); - BOOST_TEST(it == se.begin() + 1); + BOOST_TEST_EQ(it, se.begin() + 1); BOOST_TEST(u.encoded_path() == "/a/x/y/z/d/e/f/g"); } @@ -438,7 +438,7 @@ public: string_view("x"), string_view("y"), string_view("z") }); - BOOST_TEST(it == se.begin() + 1); + BOOST_TEST_EQ(it, se.begin() + 1); BOOST_TEST(u.encoded_path() == "/a/x/y/z/d/e/f/g"); } @@ -458,19 +458,19 @@ public: url u = parse_uri("x://y/path/to/file.txt?q#f").value(); segments_encoded se = u.encoded_segments(); - BOOST_TEST(se.size() == 3); + BOOST_TEST_EQ(se.size(), 3u); se.pop_back(); - BOOST_TEST(se.size() == 2); - BOOST_TEST(u.encoded_path() == "/path/to"); - BOOST_TEST(u.string() == "x://y/path/to?q#f"); + BOOST_TEST_EQ(se.size(), 2u); + BOOST_TEST_EQ(u.encoded_path(), "/path/to"); + BOOST_TEST_EQ(u.string(), "x://y/path/to?q#f"); se.pop_back(); - BOOST_TEST(se.size() == 1); - BOOST_TEST(u.encoded_path() == "/path"); - BOOST_TEST(u.string() == "x://y/path?q#f"); + BOOST_TEST_EQ(se.size(), 1u); + BOOST_TEST_EQ(u.encoded_path(), "/path"); + BOOST_TEST_EQ(u.string(), "x://y/path?q#f"); se.pop_back(); - BOOST_TEST(se.size() == 0); - BOOST_TEST(u.encoded_path() == "/"); - BOOST_TEST(u.string() == "x://y/?q#f"); + BOOST_TEST_EQ(se.size(), 0u); + BOOST_TEST_EQ(u.encoded_path(), "/"); + BOOST_TEST_EQ(u.string(), "x://y/?q#f"); } } diff --git a/test/unit/segments_encoded_view.cpp b/test/unit/segments_encoded_view.cpp index 5861f021..b6366abe 100644 --- a/test/unit/segments_encoded_view.cpp +++ b/test/unit/segments_encoded_view.cpp @@ -53,7 +53,7 @@ public: BOOST_TEST_THROWS(p = f(s).value(), std::exception); BOOST_TEST(p.empty()); - BOOST_TEST(p.begin() == p.end()); + BOOST_TEST_EQ(p.begin(), p.end()); } void @@ -73,7 +73,7 @@ public: sv.begin(), sv.end(), std::back_inserter(v1)); - BOOST_TEST(v0 == v1); + BOOST_TEST_EQ(v0, v1); } // reverse { @@ -83,7 +83,7 @@ public: reverse(sv.begin()), std::back_inserter(v1)); std::reverse(v1.begin(), v1.end()); - BOOST_TEST(v0 == v1); + BOOST_TEST_EQ(v0, v1); } } @@ -96,7 +96,7 @@ public: { segments_encoded_view sv; BOOST_TEST(sv.empty()); - BOOST_TEST(sv.size() == 0); + BOOST_TEST_EQ(sv.size(), 0u); BOOST_TEST( sv.begin() == sv.end()); } @@ -106,7 +106,7 @@ public: segments_encoded_view s1; segments_encoded_view s2; s1 = s2; - BOOST_TEST(s1.begin() == s2.begin()); + BOOST_TEST_EQ(s1.begin(), s2.begin()); } // decoded @@ -115,7 +115,7 @@ public: "/%70%61%74%68/%74%6f/%66%69%6c%65%2e%74%78%74").value(); segments_view sv = sev.decoded( std::allocator{}); - BOOST_TEST(sv.size() == 3); + BOOST_TEST_EQ(sv.size(), 3u); BOOST_TEST(sv.is_absolute()); } @@ -136,8 +136,8 @@ public: { segments_encoded_view sv = parse_path( "/path/to/file.txt").value(); - BOOST_TEST(sv.front() == "path"); - BOOST_TEST(sv.back() == "file.txt"); + BOOST_TEST_EQ(sv.front(), "path"); + BOOST_TEST_EQ(sv.back(), "file.txt"); } } @@ -153,9 +153,9 @@ public: "/path/to/file.txt").value(); iter_t it1; iter_t it2; - BOOST_TEST(it1 == it2); - BOOST_TEST(it1 != sv.begin()); - BOOST_TEST(it2 != sv.begin()); + BOOST_TEST_EQ(it1, it2); + BOOST_TEST_NE(it1, sv.begin()); + BOOST_TEST_NE(it2, sv.begin()); } // iterator(iterator const&) @@ -164,10 +164,10 @@ public: "/path/to/file.txt").value(); iter_t it1 = sv.begin(); iter_t it2(it1); - BOOST_TEST(it2 == it1); - BOOST_TEST(*it1 == *it2); - BOOST_TEST(*it1 == "path"); - BOOST_TEST(*it2 == "path"); + BOOST_TEST_EQ(it2, it1); + BOOST_TEST_EQ(*it1, *it2); + BOOST_TEST_EQ(*it1, "path"); + BOOST_TEST_EQ(*it2, "path"); } // operator=(iterator const&) @@ -178,12 +178,12 @@ public: it1 = sv.begin(); iter_t it2; it2 = sv.end(); - BOOST_TEST(it2 != it1); + BOOST_TEST_NE(it2, it1); it2 = it1; - BOOST_TEST(it2 == it1); - BOOST_TEST(*it1 == *it2); - BOOST_TEST(*it1 == "path"); - BOOST_TEST(*it2 == "path"); + BOOST_TEST_EQ(it2, it1); + BOOST_TEST_EQ(*it1, *it2); + BOOST_TEST_EQ(*it1, "path"); + BOOST_TEST_EQ(*it2, "path"); } // operator* @@ -193,11 +193,11 @@ public: segments_encoded_view sv = parse_path( "/path/to/file.txt").value(); iter_t it = sv.begin(); - BOOST_TEST(*it == "path"); - BOOST_TEST(*++it == "to"); - BOOST_TEST(*it++ == "to"); - BOOST_TEST(*it++ == "file.txt"); - BOOST_TEST(it == sv.end()); + BOOST_TEST_EQ(*it, "path"); + BOOST_TEST_EQ(*++it, "to"); + BOOST_TEST_EQ(*it++, "to"); + BOOST_TEST_EQ(*it++, "file.txt"); + BOOST_TEST_EQ(it, sv.end()); } // operator* @@ -207,11 +207,11 @@ public: segments_encoded_view sv = parse_path( "/path/to/file.txt").value(); iter_t it = sv.end(); - BOOST_TEST(*--it == "file.txt"); - BOOST_TEST(*it-- == "file.txt"); - BOOST_TEST(*it == "to"); - BOOST_TEST(*--it == "path"); - BOOST_TEST(it == sv.begin()); + BOOST_TEST_EQ(*--it, "file.txt"); + BOOST_TEST_EQ(*it--, "file.txt"); + BOOST_TEST_EQ(*it, "to"); + BOOST_TEST_EQ(*--it, "path"); + BOOST_TEST_EQ(it, sv.begin()); } // operator == @@ -220,10 +220,10 @@ public: segments_encoded_view sv = parse_path( "/path/to/file.txt").value(); iter_t it = sv.begin(); - BOOST_TEST(it == sv.begin()); - BOOST_TEST(it != sv.end()); - BOOST_TEST(++it != sv.begin()); - BOOST_TEST(it++ != sv.end()); + BOOST_TEST_EQ(it, sv.begin()); + BOOST_TEST_NE(it, sv.end()); + BOOST_TEST_NE(++it, sv.begin()); + BOOST_TEST_NE(it++, sv.end()); } } @@ -359,13 +359,13 @@ public: { segments_encoded_view sv; BOOST_TEST(sv.empty()); - BOOST_TEST(sv.size() == 0); + BOOST_TEST_EQ(sv.size(), 0u); sv = parse_path("/path/to/file.txt").value(); BOOST_TEST(! sv.empty()); - BOOST_TEST(sv.size() == 3); + BOOST_TEST_EQ(sv.size(), 3u); sv = {}; BOOST_TEST(sv.empty()); - BOOST_TEST(sv.size() == 0); + BOOST_TEST_EQ(sv.size(), 0u); } void @@ -375,7 +375,7 @@ public: segments_encoded_view sv = parse_path( "/path/to/file.txt").value(); ss << sv; - BOOST_TEST(ss.str() == "/path/to/file.txt"); + BOOST_TEST_EQ(ss.str(), "/path/to/file.txt"); } void diff --git a/test/unit/segments_view.cpp b/test/unit/segments_view.cpp index 3dafcad5..6bd249cc 100644 --- a/test/unit/segments_view.cpp +++ b/test/unit/segments_view.cpp @@ -56,7 +56,7 @@ public: sv = f(s).value().decoded(sp_.allocator()), std::exception); BOOST_TEST(sv.empty()); - BOOST_TEST(sv.begin() == sv.end()); + BOOST_TEST_EQ(sv.begin(), sv.end()); } template @@ -116,7 +116,7 @@ public: { segments_view sv; BOOST_TEST(sv.empty()); - BOOST_TEST(sv.size() == 0); + BOOST_TEST_EQ(sv.size(), 0u); BOOST_TEST( sv.begin() == sv.end()); } @@ -126,7 +126,7 @@ public: segments_view s1; segments_view s2; s1 = s2; - BOOST_TEST(s1.begin() == s2.begin()); + BOOST_TEST_EQ(s1.begin(), s2.begin()); } // decoded @@ -134,7 +134,7 @@ public: segments_view sv = parse_path( "/%70%61%74%68/%74%6f/%66%69%6c%65%2e%74%78%74" ).value().decoded(sp_.allocator()); - BOOST_TEST(sv.size() == 3); + BOOST_TEST_EQ(sv.size(), 3u); BOOST_TEST(sv.is_absolute()); } @@ -158,8 +158,8 @@ public: { segments_view sv = parse_path( "/path/to/file.txt").value().decoded(sp_.allocator()); - BOOST_TEST(sv.front() == "path"); - BOOST_TEST(sv.back() == "file.txt"); + BOOST_TEST_EQ(sv.front(), "path"); + BOOST_TEST_EQ(sv.back(), "file.txt"); } } @@ -175,9 +175,9 @@ public: "/path/to/file.txt").value().decoded(sp_.allocator()); iter_t it1; iter_t it2; - BOOST_TEST(it1 == it2); - BOOST_TEST(it1 != sv.begin()); - BOOST_TEST(it2 != sv.begin()); + BOOST_TEST_EQ(it1, it2); + BOOST_TEST_NE(it1, sv.begin()); + BOOST_TEST_NE(it2, sv.begin()); } // iterator(iterator const&) @@ -186,10 +186,10 @@ public: "/path/to/file.txt").value().decoded(sp_.allocator()); iter_t it1 = sv.begin(); iter_t it2(it1); - BOOST_TEST(it2 == it1); - BOOST_TEST(*it1 == *it2); - BOOST_TEST(*it1 == "path"); - BOOST_TEST(*it2 == "path"); + BOOST_TEST_EQ(it2, it1); + BOOST_TEST_EQ(*it1, *it2); + BOOST_TEST_EQ(*it1, "path"); + BOOST_TEST_EQ(*it2, "path"); } // operator=(iterator const&) @@ -201,12 +201,12 @@ public: it1 = sv.begin(); iter_t it2; it2 = sv.end(); - BOOST_TEST(it2 != it1); + BOOST_TEST_NE(it2, it1); it2 = it1; - BOOST_TEST(it2 == it1); - BOOST_TEST(*it1 == *it2); - BOOST_TEST(*it1 == "path"); - BOOST_TEST(*it2 == "path"); + BOOST_TEST_EQ(it2, it1); + BOOST_TEST_EQ(*it1, *it2); + BOOST_TEST_EQ(*it1, "path"); + BOOST_TEST_EQ(*it2, "path"); } // operator* @@ -217,11 +217,11 @@ public: "/path/to/file.txt").value().decoded( sp_.allocator()); iter_t it = sv.begin(); - BOOST_TEST(*it == "path"); - BOOST_TEST(*++it == "to"); - BOOST_TEST(*it++ == "to"); - BOOST_TEST(*it++ == "file.txt"); - BOOST_TEST(it == sv.end()); + BOOST_TEST_EQ(*it, "path"); + BOOST_TEST_EQ(*++it, "to"); + BOOST_TEST_EQ(*it++, "to"); + BOOST_TEST_EQ(*it++, "file.txt"); + BOOST_TEST_EQ(it, sv.end()); } // operator* @@ -232,11 +232,11 @@ public: "/path/to/file.txt").value().decoded( sp_.allocator()); iter_t it = sv.end(); - BOOST_TEST(*--it == "file.txt"); - BOOST_TEST(*it-- == "file.txt"); - BOOST_TEST(*it == "to"); - BOOST_TEST(*--it == "path"); - BOOST_TEST(it == sv.begin()); + BOOST_TEST_EQ(*--it, "file.txt"); + BOOST_TEST_EQ(*it--, "file.txt"); + BOOST_TEST_EQ(*it, "to"); + BOOST_TEST_EQ(*--it, "path"); + BOOST_TEST_EQ(it, sv.begin()); } // operator == @@ -246,10 +246,10 @@ public: "/path/to/file.txt").value().decoded( sp_.allocator()); iter_t it = sv.begin(); - BOOST_TEST(it == sv.begin()); - BOOST_TEST(it != sv.end()); - BOOST_TEST(++it != sv.begin()); - BOOST_TEST(it++ != sv.end()); + BOOST_TEST_EQ(it, sv.begin()); + BOOST_TEST_NE(it, sv.end()); + BOOST_TEST_NE(++it, sv.begin()); + BOOST_TEST_NE(it++, sv.end()); } } @@ -385,14 +385,14 @@ public: { segments_view sv; BOOST_TEST(sv.empty()); - BOOST_TEST(sv.size() == 0); + BOOST_TEST_EQ(sv.size(), 0u); sv = parse_path( "/path/to/file.txt").value().decoded(); BOOST_TEST(! sv.empty()); - BOOST_TEST(sv.size() == 3); + BOOST_TEST_EQ(sv.size(), 3u); sv = {}; BOOST_TEST(sv.empty()); - BOOST_TEST(sv.size() == 0); + BOOST_TEST_EQ(sv.size(), 0u); } void @@ -405,7 +405,7 @@ public: "").value().decoded(); BOOST_TEST(!sv.is_absolute()); ss << sv; - BOOST_TEST(ss.str() == ""); + BOOST_TEST_EQ(ss.str(), ""); } { // absolute @@ -415,7 +415,7 @@ public: ).value().decoded(); ss << sv; auto str = ss.str(); - BOOST_TEST(str == "/path/to/file.txt"); + BOOST_TEST_EQ(str, "/path/to/file.txt"); } { // relative @@ -424,7 +424,7 @@ public: "%70%61%74%68/%74%6f/%66%69%6c%65%2e%74%78%74" ).value().decoded(); ss << sv; - BOOST_TEST(ss.str() == "path/to/file.txt"); + BOOST_TEST_EQ(ss.str(), "path/to/file.txt"); } } diff --git a/test/unit/static_pool.cpp b/test/unit/static_pool.cpp index 2e6a9b47..a89d5c0b 100644 --- a/test/unit/static_pool.cpp +++ b/test/unit/static_pool.cpp @@ -59,7 +59,7 @@ public: static_pool<1024> sp; static_pool_allocator a = sp.allocator(); - BOOST_TEST(sp.allocator() == a); + BOOST_TEST_EQ(sp.allocator(), a); static_pool<1024> sp2; BOOST_TEST(sp.allocator() != sp2.allocator()); diff --git a/test/unit/static_url.cpp b/test/unit/static_url.cpp index 45752524..f9f75588 100644 --- a/test/unit/static_url.cpp +++ b/test/unit/static_url.cpp @@ -33,7 +33,7 @@ public: // default ctor { url_t u; - BOOST_TEST(*u.c_str() == '\0'); + BOOST_TEST_EQ(*u.c_str(), '\0'); BOOST_TEST(u.string().empty()); } @@ -46,18 +46,18 @@ public: { { url_t u(c1); - BOOST_TEST(u.string() == c1.string()); - BOOST_TEST(u.c_str() != c1.string().data()); + BOOST_TEST_EQ(u.string(), c1.string()); + BOOST_TEST_NE(u.c_str(), c1.string().data()); } { url_t u(c2); - BOOST_TEST(u.string() == c2.string()); - BOOST_TEST(u.c_str() != c2.string().data()); + BOOST_TEST_EQ(u.string(), c2.string()); + BOOST_TEST_NE(u.c_str(), c2.string().data()); } { url_t u(c3); - BOOST_TEST(u.string() == c3.string()); - BOOST_TEST(u.c_str() != c3.string().data()); + BOOST_TEST_EQ(u.string(), c3.string()); + BOOST_TEST_NE(u.c_str(), c3.string().data()); } } @@ -65,18 +65,18 @@ public: { { url_t u(std::move(c1)); - BOOST_TEST(u.string() == c1.string()); - BOOST_TEST(u.c_str() != c1.string().data()); + BOOST_TEST_EQ(u.string(), c1.string()); + BOOST_TEST_NE(u.c_str(), c1.string().data()); } { url_t u(std::move(c2)); - BOOST_TEST(u.string() == c2.string()); - BOOST_TEST(u.c_str() != c2.string().data()); + BOOST_TEST_EQ(u.string(), c2.string()); + BOOST_TEST_NE(u.c_str(), c2.string().data()); } { url_t u(std::move(c3)); - BOOST_TEST(u.string() == c3.string()); - BOOST_TEST(u.c_str() != c3.string().data()); + BOOST_TEST_EQ(u.string(), c3.string()); + BOOST_TEST_NE(u.c_str(), c3.string().data()); } } @@ -85,20 +85,20 @@ public: { url_t u(c4); u = c1; - BOOST_TEST(u.string() == c1.string()); - BOOST_TEST(u.c_str() != c1.string().data()); + BOOST_TEST_EQ(u.string(), c1.string()); + BOOST_TEST_NE(u.c_str(), c1.string().data()); } { url_t u(c4); u = c2; - BOOST_TEST(u.string() == c2.string()); - BOOST_TEST(u.c_str() != c2.string().data()); + BOOST_TEST_EQ(u.string(), c2.string()); + BOOST_TEST_NE(u.c_str(), c2.string().data()); } { url_t u(c4); u = c3; - BOOST_TEST(u.string() == c3.string()); - BOOST_TEST(u.c_str() != c3.string().data()); + BOOST_TEST_EQ(u.string(), c3.string()); + BOOST_TEST_NE(u.c_str(), c3.string().data()); } } @@ -107,20 +107,20 @@ public: { url_t u(c4); u = std::move(c1); - BOOST_TEST(u.string() == c1.string()); - BOOST_TEST(u.c_str() != c1.string().data()); + BOOST_TEST_EQ(u.string(), c1.string()); + BOOST_TEST_NE(u.c_str(), c1.string().data()); } { url_t u(c4); u = std::move(c2); - BOOST_TEST(u.string() == c2.string()); - BOOST_TEST(u.c_str() != c2.string().data()); + BOOST_TEST_EQ(u.string(), c2.string()); + BOOST_TEST_NE(u.c_str(), c2.string().data()); } { url_t u(c4); u = std::move(c3); - BOOST_TEST(u.string() == c3.string()); - BOOST_TEST(u.c_str() != c3.string().data()); + BOOST_TEST_EQ(u.string(), c3.string()); + BOOST_TEST_NE(u.c_str(), c3.string().data()); } } @@ -145,14 +145,14 @@ public: url_t u(uv); BOOST_TEST(u.encoded_origin() == "http://user:pass@www.boost.org:8080"); - BOOST_TEST(u.scheme() == "http"); - BOOST_TEST(u.user() == "user"); - BOOST_TEST(u.password() == "pass"); - BOOST_TEST(u.host() == "www.boost.org"); - BOOST_TEST(u.port() == "8080"); - BOOST_TEST(u.encoded_path() == "/x/y/z"); - BOOST_TEST(u.query() == "a=b&c=3"); - BOOST_TEST(u.encoded_fragment() == "frag"); + BOOST_TEST_EQ(u.scheme(), "http"); + BOOST_TEST_EQ(u.user(), "user"); + BOOST_TEST_EQ(u.password(), "pass"); + BOOST_TEST_EQ(u.host(), "www.boost.org"); + BOOST_TEST_EQ(u.port(), "8080"); + BOOST_TEST_EQ(u.encoded_path(), "/x/y/z"); + BOOST_TEST_EQ(u.query(), "a=b&c=3"); + BOOST_TEST_EQ(u.encoded_fragment(), "frag"); } void diff --git a/test/unit/test_rule.hpp b/test/unit/test_rule.hpp index 42354825..f73be989 100644 --- a/test/unit/test_rule.hpp +++ b/test/unit/test_rule.hpp @@ -52,7 +52,7 @@ test_char_set( if(cs(c)) ++n; }); - BOOST_TEST(n == s.size()); + BOOST_TEST_EQ(n, s.size()); // test find_if and find_if_not for_each_char( diff --git a/test/unit/url.cpp b/test/unit/url.cpp index 272cdfb8..901808aa 100644 --- a/test/unit/url.cpp +++ b/test/unit/url.cpp @@ -61,13 +61,13 @@ public: { url u = parse_uri_reference("x://y/z?q#f").value(); url u2(u); - BOOST_TEST(u2.string() == u.string()); + BOOST_TEST_EQ(u2.string(), u.string()); } { url u = parse_uri_reference("x://y/z?q#f").value(); url u2 = parse_relative_ref("./").value(); u2 = u; - BOOST_TEST(u2.string() == u.string()); + BOOST_TEST_EQ(u2.string(), u.string()); } // move @@ -75,14 +75,14 @@ public: url u = parse_uri_reference("x://y/z?q#f").value(); url u2(std::move(u)); BOOST_TEST(u.empty()); - BOOST_TEST(u2.string() == "x://y/z?q#f"); + BOOST_TEST_EQ(u2.string(), "x://y/z?q#f"); } { url u = parse_uri_reference("x://y/z?q#f").value(); url u2 = parse_relative_ref("./").value(); u2 = std::move(u); BOOST_TEST(u.empty()); - BOOST_TEST(u2.string() == "x://y/z?q#f"); + BOOST_TEST_EQ(u2.string(), "x://y/z?q#f"); } // url(string_view) @@ -99,7 +99,7 @@ public: // capacity_in_bytes { url u; - BOOST_TEST(u.capacity_in_bytes() == 0); + BOOST_TEST_EQ(u.capacity_in_bytes(), 0u); BOOST_TEST(u.empty()); } @@ -107,26 +107,26 @@ public: { url u; u.reserve_bytes(32); - BOOST_TEST(u.capacity_in_bytes() >= 32); + BOOST_TEST_GE(u.capacity_in_bytes(), 32u); u.reserve_bytes(16); - BOOST_TEST(u.capacity_in_bytes() >= 16); + BOOST_TEST_GE(u.capacity_in_bytes(), 16u); u.reserve_bytes(64); - BOOST_TEST(u.capacity_in_bytes() >= 64); + BOOST_TEST_GE(u.capacity_in_bytes(), 64u); u = url_view("http://example.com/path/to/file.txt?k=v"); u.reserve_bytes(128); - BOOST_TEST(u.capacity_in_bytes() >= 128); + BOOST_TEST_GE(u.capacity_in_bytes(), 128u); } // clear { url u = parse_uri( "http://example.com/index.htm?q#f").value(); - BOOST_TEST(u.capacity_in_bytes() > 0); + BOOST_TEST_GT(u.capacity_in_bytes(), 0u); BOOST_TEST(! u.empty()); u.clear(); - BOOST_TEST(u.capacity_in_bytes() > 0); + BOOST_TEST_GT(u.capacity_in_bytes(), 0u); BOOST_TEST(u.empty()); - BOOST_TEST(u.size() == 0); + BOOST_TEST_EQ(u.size(), 0u); } } @@ -153,8 +153,8 @@ public: url u = parse_uri_reference(s1).value(); BOOST_TEST( u.set_scheme(s2).string() == s3); - BOOST_TEST(u.scheme() == s2); - BOOST_TEST(u.scheme_id() == id); + BOOST_TEST_EQ(u.scheme(), s2); + BOOST_TEST_EQ(u.scheme_id(), id); }; auto const setid = []( @@ -164,7 +164,7 @@ public: url u = parse_uri_reference(s1).value(); BOOST_TEST( u.set_scheme(id).string() == s2); - BOOST_TEST(u.scheme_id() == id); + BOOST_TEST_EQ(u.scheme_id(), id); }; remove("", ""); @@ -232,7 +232,7 @@ public: url u = parse_uri_reference(s1).value(); BOOST_TEST( u.set_user(s2).string() == s3); - BOOST_TEST(u.user() == s2); + BOOST_TEST_EQ(u.user(), s2); BOOST_TEST(u.has_userinfo()); }; @@ -243,7 +243,7 @@ public: url u = parse_uri_reference(s1).value(); BOOST_TEST(u.set_encoded_user( s2).string() == s3); - BOOST_TEST(u.encoded_user() == s2); + BOOST_TEST_EQ(u.encoded_user(), s2); BOOST_TEST(u.has_userinfo()); }; @@ -363,8 +363,8 @@ public: url u = parse_uri_reference(s1).value(); BOOST_TEST( u.remove_password().string() == s2); - BOOST_TEST(u.encoded_password() == ""); - BOOST_TEST(u.password() == ""); + BOOST_TEST_EQ(u.encoded_password(), ""); + BOOST_TEST_EQ(u.password(), ""); }; auto const set = []( @@ -374,7 +374,7 @@ public: url u = parse_uri_reference(s1).value(); BOOST_TEST( u.set_password(s2).string() == s3); - BOOST_TEST(u.password() == s2); + BOOST_TEST_EQ(u.password(), s2); BOOST_TEST(u.has_userinfo()); }; @@ -385,7 +385,7 @@ public: url u = parse_uri_reference(s1).value(); BOOST_TEST(u.set_encoded_password( s2).string() == s3); - BOOST_TEST(u.encoded_password() == s2); + BOOST_TEST_EQ(u.encoded_password(), s2); BOOST_TEST(u.has_userinfo()); }; @@ -486,7 +486,7 @@ public: string_view s1, string_view s2) { url u = parse_uri_reference(s1).value(); - BOOST_TEST(u.remove_userinfo().string() == s2); + BOOST_TEST_EQ(u.remove_userinfo().string(), s2); BOOST_TEST(u.encoded_userinfo().empty()); BOOST_TEST(u.userinfo().empty()); BOOST_TEST(! u.has_userinfo()); @@ -498,7 +498,7 @@ public: url u = parse_uri_reference(s1).value(); BOOST_TEST( u.set_userinfo(s2).string() == s3); - BOOST_TEST(u.userinfo() == s2); + BOOST_TEST_EQ(u.userinfo(), s2); BOOST_TEST(u.has_userinfo()); }; @@ -508,7 +508,7 @@ public: url u = parse_uri_reference(s1).value(); BOOST_TEST( u.set_encoded_userinfo(s2).string() == s3); - BOOST_TEST(u.encoded_userinfo() == s2); + BOOST_TEST_EQ(u.encoded_userinfo(), s2); BOOST_TEST(u.has_userinfo()); }; @@ -649,8 +649,8 @@ public: url u = parse_uri_reference(s1).value(); BOOST_TEST( u.set_encoded_host(s2).string() == s3); - BOOST_TEST(u.encoded_host() == s2); - BOOST_TEST(u.host_type() == ht); + BOOST_TEST_EQ(u.encoded_host(), s2); + BOOST_TEST_EQ(u.host_type(), ht); }; void @@ -677,44 +677,44 @@ public: { url u; u.set_host(ipv4_address(0x01020304)); - BOOST_TEST(u.string() == "//1.2.3.4"); + BOOST_TEST_EQ(u.string(), "//1.2.3.4"); BOOST_TEST(u.host_type() == host_type::ipv4); BOOST_TEST(u.ipv4_address() == ipv4_address(0x01020304)); BOOST_TEST( u.encoded_host() == "1.2.3.4"); - BOOST_TEST(u.host() == "1.2.3.4"); + BOOST_TEST_EQ(u.host(), "1.2.3.4"); } { url u; u.set_host("1.2.3.4"); - BOOST_TEST(u.string() == "//1.2.3.4"); + BOOST_TEST_EQ(u.string(), "//1.2.3.4"); BOOST_TEST(u.host_type() == host_type::ipv4); BOOST_TEST(u.ipv4_address() == ipv4_address(0x01020304)); BOOST_TEST( u.encoded_host() == "1.2.3.4"); - BOOST_TEST(u.host() == "1.2.3.4"); + BOOST_TEST_EQ(u.host(), "1.2.3.4"); } { url u; u.set_encoded_host("1.2.3.4"); - BOOST_TEST(u.string() == "//1.2.3.4"); + BOOST_TEST_EQ(u.string(), "//1.2.3.4"); BOOST_TEST(u.host_type() == host_type::ipv4); BOOST_TEST(u.ipv4_address() == ipv4_address(0x01020304)); BOOST_TEST( u.encoded_host() == "1.2.3.4"); - BOOST_TEST(u.host() == "1.2.3.4"); + BOOST_TEST_EQ(u.host(), "1.2.3.4"); } // ipv6 { url u; u.set_host(ipv6_address()); - BOOST_TEST(u.string() == "//[::]"); + BOOST_TEST_EQ(u.string(), "//[::]"); BOOST_TEST(u.host_type() == host_type::ipv6); BOOST_TEST(u.ipv6_address() == @@ -723,22 +723,22 @@ public: { url u; u.set_encoded_host("[1:2:3:4::]"); - BOOST_TEST(u.string() == "//[1:2:3:4::]"); + BOOST_TEST_EQ(u.string(), "//[1:2:3:4::]"); BOOST_TEST(u.host_type() == host_type::ipv6); BOOST_TEST( u.encoded_host() == "[1:2:3:4::]"); - BOOST_TEST(u.host() == "[1:2:3:4::]"); + BOOST_TEST_EQ(u.host(), "[1:2:3:4::]"); } // reg-name { url u; u.set_host("example.com"); - BOOST_TEST(u.string() == "//example.com"); + BOOST_TEST_EQ(u.string(), "//example.com"); BOOST_TEST(u.host_type() == host_type::name); - BOOST_TEST(u.host() == "example.com"); - BOOST_TEST(u.encoded_host() == "example.com"); + BOOST_TEST_EQ(u.host(), "example.com"); + BOOST_TEST_EQ(u.encoded_host(), "example.com"); } } @@ -755,7 +755,7 @@ public: u.remove_port().string() == s2); BOOST_TEST(! u.has_port()); BOOST_TEST(u.port().empty()); - BOOST_TEST(u.port_number() == 0); + BOOST_TEST_EQ(u.port_number(), 0); }; auto const setn = [](string_view s1, @@ -765,7 +765,7 @@ public: BOOST_TEST( u.set_port(n).string() == s2); BOOST_TEST(u.has_port()); - BOOST_TEST(u.port_number() == n); + BOOST_TEST_EQ(u.port_number(), n); }; auto const set = [](string_view s1, @@ -776,8 +776,8 @@ public: BOOST_TEST( u.set_port(s2).string() == s3); BOOST_TEST(u.has_port()); - BOOST_TEST(u.port_number() == n); - BOOST_TEST(u.port() == s2); + BOOST_TEST_EQ(u.port_number(), n); + BOOST_TEST_EQ(u.port(), s2); }; BOOST_TEST_THROWS( @@ -892,7 +892,7 @@ public: string_view s1, string_view s2) { url u = parse_uri_reference(s1).value(); - BOOST_TEST(u.remove_authority().string() == s2); + BOOST_TEST_EQ(u.remove_authority().string(), s2); BOOST_TEST(u.encoded_authority().empty()); BOOST_TEST(! u.has_authority()); }; @@ -903,7 +903,7 @@ public: url u = parse_uri_reference(s1).value(); BOOST_TEST( u.set_encoded_authority(s2).string() == s3); - BOOST_TEST(u.encoded_authority() == s2); + BOOST_TEST_EQ(u.encoded_authority(), s2); BOOST_TEST(u.has_authority()); }; @@ -1016,7 +1016,7 @@ public: string_view s1, string_view s2) { url u = parse_uri_reference(s1).value(); - BOOST_TEST(u.remove_origin().string() == s2); + BOOST_TEST_EQ(u.remove_origin().string(), s2); BOOST_TEST(u.encoded_origin().empty()); BOOST_TEST(! u.has_authority()); }; @@ -1046,37 +1046,37 @@ public: BOOST_TEST(! u.is_path_absolute()); BOOST_TEST(u.set_path_absolute(false)); BOOST_TEST(! u.is_path_absolute()); - BOOST_TEST(u.string() == ""); + BOOST_TEST_EQ(u.string(), ""); BOOST_TEST(u.set_path_absolute(true)); BOOST_TEST(u.is_path_absolute()); - BOOST_TEST(u.string() == "/"); + BOOST_TEST_EQ(u.string(), "/"); } { url u = parse_relative_ref("/").value(); BOOST_TEST(u.is_path_absolute()); BOOST_TEST(u.set_path_absolute(true)); BOOST_TEST(u.is_path_absolute()); - BOOST_TEST(u.string() == "/"); + BOOST_TEST_EQ(u.string(), "/"); BOOST_TEST(u.set_path_absolute(false)); BOOST_TEST(! u.is_path_absolute()); - BOOST_TEST(u.string() == ""); + BOOST_TEST_EQ(u.string(), ""); } { url u = parse_relative_ref("//").value(); BOOST_TEST(! u.is_path_absolute()); BOOST_TEST(u.set_path_absolute(true)); BOOST_TEST(u.is_path_absolute()); - BOOST_TEST(u.string() == "///"); + BOOST_TEST_EQ(u.string(), "///"); BOOST_TEST(u.set_path_absolute(false)); BOOST_TEST(! u.is_path_absolute()); - BOOST_TEST(u.string() == "//"); + BOOST_TEST_EQ(u.string(), "//"); } { url u = parse_relative_ref("//x/y").value(); BOOST_TEST(u.is_path_absolute()); BOOST_TEST(! u.set_path_absolute(false)); BOOST_TEST(u.is_path_absolute()); - BOOST_TEST(u.string() == "//x/y"); + BOOST_TEST_EQ(u.string(), "//x/y"); } { url u = parse_uri("x:y").value(); @@ -1085,10 +1085,10 @@ public: BOOST_TEST(! u.is_path_absolute()); BOOST_TEST(u.set_path_absolute(true)); BOOST_TEST(u.is_path_absolute()); - BOOST_TEST(u.string() == "x:/y"); + BOOST_TEST_EQ(u.string(), "x:/y"); BOOST_TEST(u.set_path_absolute(false)); BOOST_TEST(! u.is_path_absolute()); - BOOST_TEST(u.string() == "x:y"); + BOOST_TEST_EQ(u.string(), "x:y"); } // set_encoded_path @@ -1096,27 +1096,27 @@ public: // empty url u = parse_uri("x://y/path/to/file.txt?q#f").value(); u.set_encoded_path(""); - BOOST_TEST(u.encoded_path() == "/"); - BOOST_TEST(u.string() == "x://y/?q#f"); + BOOST_TEST_EQ(u.encoded_path(), "/"); + BOOST_TEST_EQ(u.string(), "x://y/?q#f"); } { // path-abempty url u = parse_uri("x://y/path/to/file.txt?q#f").value(); u.set_encoded_path("/x"); - BOOST_TEST(u.encoded_path() == "/x"); - BOOST_TEST(u.string() == "x://y/x?q#f"); + BOOST_TEST_EQ(u.encoded_path(), "/x"); + BOOST_TEST_EQ(u.string(), "x://y/x?q#f"); u.set_encoded_path("x/"); - BOOST_TEST(u.string() == "x://y/x/?q#f"); + BOOST_TEST_EQ(u.string(), "x://y/x/?q#f"); } { // path-absolute url u = parse_relative_ref("/path/to/file.txt").value(); u.set_encoded_path("/home/file.txt"); - BOOST_TEST(u.encoded_path() == "/home/file.txt"); - BOOST_TEST(u.string() == "/home/file.txt"); + BOOST_TEST_EQ(u.encoded_path(), "/home/file.txt"); + BOOST_TEST_EQ(u.string(), "/home/file.txt"); u.set_encoded_path("//home/file.txt"); equal(u, { "", "home", "file.txt" }); - BOOST_TEST(u.encoded_path() == "/.//home/file.txt"); + BOOST_TEST_EQ(u.encoded_path(), "/.//home/file.txt"); BOOST_TEST_THROWS(u.set_encoded_path("/home/%ile.txt"), std::invalid_argument); } @@ -1124,26 +1124,26 @@ public: // path-rootless url u = parse_uri("x:mailto").value(); u.set_encoded_path("file.txt"); - BOOST_TEST(u.encoded_path() == "file.txt"); - BOOST_TEST(u.string() == "x:file.txt"); + BOOST_TEST_EQ(u.encoded_path(), "file.txt"); + BOOST_TEST_EQ(u.string(), "x:file.txt"); u.set_encoded_path(":file.txt"); - BOOST_TEST(u.encoded_path() == ":file.txt"); - BOOST_TEST(u.string() == "x::file.txt"); + BOOST_TEST_EQ(u.encoded_path(), ":file.txt"); + BOOST_TEST_EQ(u.string(), "x::file.txt"); // to path-absolute u.set_encoded_path("/file.txt"); - BOOST_TEST(u.encoded_path() == "/file.txt"); - BOOST_TEST(u.string() == "x:/file.txt"); + BOOST_TEST_EQ(u.encoded_path(), "/file.txt"); + BOOST_TEST_EQ(u.string(), "x:/file.txt"); } { // path-noscheme url u = parse_relative_ref("mailto").value(); u.set_encoded_path("file.txt"); - BOOST_TEST(u.encoded_path() == "file.txt"); - BOOST_TEST(u.string() == "file.txt"); + BOOST_TEST_EQ(u.encoded_path(), "file.txt"); + BOOST_TEST_EQ(u.string(), "file.txt"); u.set_encoded_path(":file.txt"); - BOOST_TEST(u.encoded_path() == "./:file.txt"); + BOOST_TEST_EQ(u.encoded_path(), "./:file.txt"); u.set_encoded_path("http:index.htm"); - BOOST_TEST(u.encoded_path() == "./http:index.htm"); + BOOST_TEST_EQ(u.encoded_path(), "./http:index.htm"); } // set_encoded_path @@ -1285,23 +1285,23 @@ public: url u; u.set_encoded_query(""); BOOST_TEST(u.has_query()); - BOOST_TEST(u.string() == "?"); - BOOST_TEST(u.encoded_query() == ""); + BOOST_TEST_EQ(u.string(), "?"); + BOOST_TEST_EQ(u.encoded_query(), ""); } { url u; u.set_encoded_query("x"); BOOST_TEST(u.has_query()); - BOOST_TEST(u.string() == "?x"); - BOOST_TEST(u.encoded_query() == "x"); + BOOST_TEST_EQ(u.string(), "?x"); + BOOST_TEST_EQ(u.encoded_query(), "x"); } { url u; u.set_encoded_query("%41"); BOOST_TEST(u.has_query()); - BOOST_TEST(u.string() == "?%41"); - BOOST_TEST(u.encoded_query() == "%41"); - BOOST_TEST(u.query() == "A"); + BOOST_TEST_EQ(u.string(), "?%41"); + BOOST_TEST_EQ(u.encoded_query(), "%41"); + BOOST_TEST_EQ(u.query(), "A"); } { url u; @@ -1320,39 +1320,39 @@ public: url u; u.set_query(""); BOOST_TEST(u.has_query()); - BOOST_TEST(u.string() == "?"); - BOOST_TEST(u.query() == ""); + BOOST_TEST_EQ(u.string(), "?"); + BOOST_TEST_EQ(u.query(), ""); } { url u; u.set_query("x"); BOOST_TEST(u.has_query()); - BOOST_TEST(u.string() == "?x"); - BOOST_TEST(u.query() == "x"); + BOOST_TEST_EQ(u.string(), "?x"); + BOOST_TEST_EQ(u.query(), "x"); } { url u; u.set_query("%41"); BOOST_TEST(u.has_query()); - BOOST_TEST(u.string() == "?%2541"); - BOOST_TEST(u.encoded_query() == "%2541"); - BOOST_TEST(u.query() == "%41"); + BOOST_TEST_EQ(u.string(), "?%2541"); + BOOST_TEST_EQ(u.encoded_query(), "%2541"); + BOOST_TEST_EQ(u.query(), "%41"); } { url u; u.set_query("%%fg"); BOOST_TEST(u.has_query()); - BOOST_TEST(u.string() == "?%25%25fg"); - BOOST_TEST(u.encoded_query() == "%25%25fg"); - BOOST_TEST(u.query() == "%%fg"); + BOOST_TEST_EQ(u.string(), "?%25%25fg"); + BOOST_TEST_EQ(u.encoded_query(), "%25%25fg"); + BOOST_TEST_EQ(u.query(), "%%fg"); } { url u; u.set_query("{}"); BOOST_TEST(u.has_query()); - BOOST_TEST(u.string() == "?%7b%7d"); - BOOST_TEST(u.encoded_query() == "%7b%7d"); - BOOST_TEST(u.query() == "{}"); + BOOST_TEST_EQ(u.string(), "?%7b%7d"); + BOOST_TEST_EQ(u.encoded_query(), "%7b%7d"); + BOOST_TEST_EQ(u.query(), "{}"); } } @@ -1372,13 +1372,13 @@ public: { url u = parse_relative_ref("?query").value(); BOOST_TEST(u.has_query()); - BOOST_TEST(u.encoded_query() == "query"); - BOOST_TEST(u.params().size() == 1); - BOOST_TEST(u.remove_query().has_query() == false); - BOOST_TEST(u.encoded_query() == ""); - BOOST_TEST(u.query() == ""); - BOOST_TEST(u.params().size() == 0); - BOOST_TEST(u.encoded_params().size() == 0); + BOOST_TEST_EQ(u.encoded_query(), "query"); + BOOST_TEST_EQ(u.params().size(), 1u); + BOOST_TEST_EQ(u.remove_query().has_query(), false); + BOOST_TEST_EQ(u.encoded_query(), ""); + BOOST_TEST_EQ(u.query(), ""); + BOOST_TEST_EQ(u.params().size(), 0u); + BOOST_TEST_EQ(u.encoded_params().size(), 0u); } // set_encoded_query @@ -1387,16 +1387,16 @@ public: BOOST_TEST(! u.has_query()); u.set_encoded_query("k1=v1&k2=v2"); BOOST_TEST(u.has_query()); - BOOST_TEST(u.params().size() == 2); - BOOST_TEST(u.params()[0].key == "k1"); - BOOST_TEST(u.params()[0].value == "v1"); - BOOST_TEST(u.params()[1].key == "k2"); - BOOST_TEST(u.params()[1].value == "v2"); + BOOST_TEST_EQ(u.params().size(), 2u); + BOOST_TEST_EQ(u.params()[0].key, "k1"); + BOOST_TEST_EQ(u.params()[0].value, "v1"); + BOOST_TEST_EQ(u.params()[1].key, "k2"); + BOOST_TEST_EQ(u.params()[1].value, "v2"); u.set_encoded_query(""); BOOST_TEST(u.has_query()); BOOST_TEST(u.encoded_query().empty()); - BOOST_TEST(u.params().size() == 0); + BOOST_TEST_EQ(u.params().size(), 0u); BOOST_TEST_THROWS( u.set_encoded_query("\x01"), @@ -1411,11 +1411,11 @@ public: BOOST_TEST(u.has_query()); BOOST_TEST(u.encoded_query() == "!@%23$%25%5e&*()_+=-;:'%7b%7d%5b%5d%7c%5c?/%3e.%3c,"); - BOOST_TEST(u.params().size() == 2); - BOOST_TEST(u.params()[0].key == "!@#$%^"); - BOOST_TEST(u.params()[0].value == ""); - BOOST_TEST(u.params()[1].key == "*()_ "); - BOOST_TEST(u.params()[1].value == + BOOST_TEST_EQ(u.params().size(), 2u); + BOOST_TEST_EQ(u.params()[0].key, "!@#$%^"); + BOOST_TEST_EQ(u.params()[0].value, ""); + BOOST_TEST_EQ(u.params()[1].key, "*()_ "); + BOOST_TEST_EQ(u.params()[1].value, "-;:'{}[]|\\?/>.<,"); } } @@ -1464,23 +1464,23 @@ public: url u; u.set_encoded_fragment(""); BOOST_TEST(u.has_fragment()); - BOOST_TEST(u.string() == "#"); - BOOST_TEST(u.encoded_fragment() == ""); + BOOST_TEST_EQ(u.string(), "#"); + BOOST_TEST_EQ(u.encoded_fragment(), ""); } { url u; u.set_encoded_fragment("x"); BOOST_TEST(u.has_fragment()); - BOOST_TEST(u.string() == "#x"); - BOOST_TEST(u.encoded_fragment() == "x"); + BOOST_TEST_EQ(u.string(), "#x"); + BOOST_TEST_EQ(u.encoded_fragment(), "x"); } { url u; u.set_encoded_fragment("%41"); BOOST_TEST(u.has_fragment()); - BOOST_TEST(u.string() == "#%41"); - BOOST_TEST(u.encoded_fragment() == "%41"); - BOOST_TEST(u.fragment() == "A"); + BOOST_TEST_EQ(u.string(), "#%41"); + BOOST_TEST_EQ(u.encoded_fragment(), "%41"); + BOOST_TEST_EQ(u.fragment(), "A"); } { url u; @@ -1499,39 +1499,39 @@ public: url u; u.set_fragment(""); BOOST_TEST(u.has_fragment()); - BOOST_TEST(u.string() == "#"); - BOOST_TEST(u.fragment() == ""); + BOOST_TEST_EQ(u.string(), "#"); + BOOST_TEST_EQ(u.fragment(), ""); } { url u; u.set_fragment("x"); BOOST_TEST(u.has_fragment()); - BOOST_TEST(u.string() == "#x"); - BOOST_TEST(u.fragment() == "x"); + BOOST_TEST_EQ(u.string(), "#x"); + BOOST_TEST_EQ(u.fragment(), "x"); } { url u; u.set_fragment("%41"); BOOST_TEST(u.has_fragment()); - BOOST_TEST(u.string() == "#%2541"); - BOOST_TEST(u.encoded_fragment() == "%2541"); - BOOST_TEST(u.fragment() == "%41"); + BOOST_TEST_EQ(u.string(), "#%2541"); + BOOST_TEST_EQ(u.encoded_fragment(), "%2541"); + BOOST_TEST_EQ(u.fragment(), "%41"); } { url u; u.set_fragment("%%fg"); BOOST_TEST(u.has_fragment()); - BOOST_TEST(u.string() == "#%25%25fg"); - BOOST_TEST(u.encoded_fragment() == "%25%25fg"); - BOOST_TEST(u.fragment() == "%%fg"); + BOOST_TEST_EQ(u.string(), "#%25%25fg"); + BOOST_TEST_EQ(u.encoded_fragment(), "%25%25fg"); + BOOST_TEST_EQ(u.fragment(), "%%fg"); } { url u; u.set_fragment("{}"); BOOST_TEST(u.has_fragment()); - BOOST_TEST(u.string() == "#%7b%7d"); - BOOST_TEST(u.encoded_fragment() == "%7b%7d"); - BOOST_TEST(u.fragment() == "{}"); + BOOST_TEST_EQ(u.string(), "#%7b%7d"); + BOOST_TEST_EQ(u.encoded_fragment(), "%7b%7d"); + BOOST_TEST_EQ(u.fragment(), "{}"); } } } @@ -1552,7 +1552,7 @@ public: f(u); equal(u.segments(), init); equal(u.encoded_segments(), init); - BOOST_TEST(u.string() == s1); + BOOST_TEST_EQ(u.string(), s1); } void @@ -1606,14 +1606,14 @@ public: u.segments() = init; equal(u.segments(), init); equal(u.encoded_segments(), init); - BOOST_TEST(u.string() == s1); + BOOST_TEST_EQ(u.string(), s1); } { url u(u0); u.encoded_segments() = init; equal(u.segments(), init); equal(u.encoded_segments(), init); - BOOST_TEST(u.string() == s1); + BOOST_TEST_EQ(u.string(), s1); } }; @@ -1724,7 +1724,7 @@ public: resolve(ub, ur, u, ec); if(! BOOST_TEST(! ec.failed())) return; - BOOST_TEST(u.string() == m); + BOOST_TEST_EQ(u.string(), m); }; check("g:h" , "g:h"); @@ -1804,7 +1804,7 @@ public: std::left << std::setw(11) << parse_uri("http://x").value(); - BOOST_TEST(ss.str() == "http://x***"); + BOOST_TEST_EQ(ss.str(), "http://x***"); } } @@ -1820,14 +1820,14 @@ public: { url u1 = parse_uri(before).value(); url_view u2 = parse_uri(after).value(); - BOOST_TEST(u1.compare(u2) == 0); - BOOST_TEST(u1 == u2); + BOOST_TEST_EQ(u1.compare(u2), 0); + BOOST_TEST_EQ(u1, u2); u1.normalize(); - BOOST_TEST(u1.string() == after); + BOOST_TEST_EQ(u1.string(), after); std::hash h; - BOOST_TEST(h(u1) == h(u2)); + BOOST_TEST_EQ(h(u1), h(u2)); h = std::hash(10); - BOOST_TEST(h(u1) == h(u2)); + BOOST_TEST_EQ(h(u1), h(u2)); }; check("HtTp://cPpAlLiAnCe.oRG/", @@ -1856,17 +1856,16 @@ public: string_view e) { url u1 = parse_relative_ref(p).value(); u1.normalize_path(); - BOOST_TEST(u1.encoded_path() == e); + BOOST_TEST_EQ(u1.encoded_path(), e); url u2 = parse_relative_ref(e).value(); - BOOST_TEST(u1.compare(u2) == 0); - BOOST_TEST(u1 == u2); + BOOST_TEST_EQ(u1.compare(u2), 0); + BOOST_TEST_EQ(u1, u2); std::hash h; - BOOST_TEST(h(u1) == h(u2)); + BOOST_TEST_EQ(h(u1), h(u2)); h = std::hash(10); - BOOST_TEST(h(u1) == h(u2)); + BOOST_TEST_EQ(h(u1), h(u2)); }; - check("/a/b/c/./../../g", "/a/g"); check("/aa/bb/cc/./../../gg", "/aa/gg"); check("../a/b/c/./../../g", "../a/g"); @@ -1891,17 +1890,17 @@ public: int cmp) { url_view u1 = parse_uri(e1).value(); url_view u2 = parse_uri(e2).value(); - BOOST_TEST(u1.compare(u2) == cmp); - BOOST_TEST(u2.compare(u1) == -cmp); - BOOST_TEST(u1 != u2); - BOOST_TEST((u1 < u2) == (cmp < 0)); - BOOST_TEST((u1 <= u2) == (cmp <= 0)); - BOOST_TEST((u1 > u2) == (cmp > 0)); - BOOST_TEST((u1 >= u2) == (cmp >= 0)); + BOOST_TEST_EQ(u1.compare(u2), cmp); + BOOST_TEST_EQ(u2.compare(u1), -cmp); + BOOST_TEST_NE(u1, u2); + BOOST_TEST_EQ((u1 < u2), (cmp < 0)); + BOOST_TEST_EQ((u1 <= u2), (cmp <= 0)); + BOOST_TEST_EQ((u1 > u2), (cmp > 0)); + BOOST_TEST_EQ((u1 >= u2), (cmp >= 0)); std::hash h; - BOOST_TEST(h(u1) != h(u2)); + BOOST_TEST_NE(h(u1), h(u2)); h = std::hash(10); - BOOST_TEST(h(u1) != h(u2)); + BOOST_TEST_NE(h(u1), h(u2)); }; check("http://cppalliance.org", "https://cppalliance.org", -1); @@ -1928,12 +1927,12 @@ public: int cmp) { url_view u1 = parse_relative_ref(e1).value(); url_view u2 = parse_relative_ref(e2).value(); - BOOST_TEST(u1.compare(u2) == cmp); - BOOST_TEST(u2.compare(u1) == -cmp); + BOOST_TEST_EQ(u1.compare(u2), cmp); + BOOST_TEST_EQ(u2.compare(u1), -cmp); std::hash h; - BOOST_TEST((h(u1) == h(u2)) != cmp); + BOOST_TEST_NE((h(u1) == h(u2)), cmp); h = std::hash(10); - BOOST_TEST((h(u1) == h(u2)) != cmp); + BOOST_TEST_NE((h(u1) == h(u2)), cmp); }; check("a/g", "/../g", 1); diff --git a/test/unit/url_view.cpp b/test/unit/url_view.cpp index b80c6496..f2bbbab0 100644 --- a/test/unit/url_view.cpp +++ b/test/unit/url_view.cpp @@ -31,15 +31,15 @@ public: { url_view u; BOOST_TEST(u.empty()); - BOOST_TEST(u.size() == 0); + BOOST_TEST_EQ(u.size(), 0u); } // url_view(url_view const&) { url_view u1("x://y/z?#"); url_view u2(u1); - BOOST_TEST(u2.data() == u1.data()); - BOOST_TEST(u2.size() == u1.size()); + BOOST_TEST_EQ(u2.data(), u1.data()); + BOOST_TEST_EQ(u2.size(), u1.size()); } // operator=(url_view const&) @@ -47,7 +47,7 @@ public: url_view u1("x://y/z?#"); url_view u2; u2 = u1; - BOOST_TEST(u2.data() == u1.data()); + BOOST_TEST_EQ(u2.data(), u1.data()); } // url_view(string_view) @@ -64,19 +64,18 @@ public: { // max_size() { - BOOST_TEST( - url_view::max_size() > 0); + BOOST_TEST_GT(url_view::max_size(), 0u); url_view u; - BOOST_TEST(u.max_size() > 0); + BOOST_TEST_GT(u.max_size(), 0u); } // size() { url_view u; - BOOST_TEST(u.size() == 0); + BOOST_TEST_EQ(u.size(), 0u); u = url_view("/"); - BOOST_TEST(u.size() == 1); + BOOST_TEST_EQ(u.size(), 1u); } // empty() @@ -91,8 +90,8 @@ public: { string_view s = "/index.htm"; url_view u(s); - BOOST_TEST(u.data() != nullptr); - BOOST_TEST(u.data() == s.data()); + BOOST_TEST_NE(u.data(), nullptr); + BOOST_TEST_EQ(u.data(), s.data()); } // begin() @@ -100,18 +99,18 @@ public: { string_view s = "/index.htm"; url_view u(s); - BOOST_TEST(u.begin() == s.data()); - BOOST_TEST(u.begin() == u.data()); - BOOST_TEST(u.end() != u.begin()); - BOOST_TEST(u.end()[-1] == 'm'); + BOOST_TEST_EQ(u.begin(), s.data()); + BOOST_TEST_EQ(u.begin(), u.data()); + BOOST_TEST_NE(u.end(), u.begin()); + BOOST_TEST_EQ(u.end()[-1], 'm'); } // string() { string_view s = "/index.htm"; url_view u = parse_relative_ref(s).value(); - BOOST_TEST(u.string() == s); - BOOST_TEST(u.string().data() == s.data()); + BOOST_TEST_EQ(u.string(), s); + BOOST_TEST_EQ(u.string().data(), s.data()); } // collect() @@ -216,7 +215,7 @@ public: { url_view u("http:/path"); - BOOST_TEST(u.encoded_host() == ""); + BOOST_TEST_EQ(u.encoded_host(), ""); } // Docs @@ -275,74 +274,74 @@ public: { url_view u("x://@"); BOOST_TEST(u.has_userinfo()); - BOOST_TEST(u.encoded_userinfo() == ""); - BOOST_TEST(u.userinfo() == ""); - BOOST_TEST(u.encoded_user() == ""); - BOOST_TEST(u.user() == ""); - BOOST_TEST(u.has_password() == false); - BOOST_TEST(u.encoded_password() == ""); - BOOST_TEST(u.password() == ""); + BOOST_TEST_EQ(u.encoded_userinfo(), ""); + BOOST_TEST_EQ(u.userinfo(), ""); + BOOST_TEST_EQ(u.encoded_user(), ""); + BOOST_TEST_EQ(u.user(), ""); + BOOST_TEST_EQ(u.has_password(), false); + BOOST_TEST_EQ(u.encoded_password(), ""); + BOOST_TEST_EQ(u.password(), ""); } { url_view u("x://:@"); BOOST_TEST(u.has_userinfo()); - BOOST_TEST(u.encoded_userinfo() == ":"); - BOOST_TEST(u.userinfo() == ":"); - BOOST_TEST(u.encoded_user() == ""); - BOOST_TEST(u.user() == ""); - BOOST_TEST(u.has_password() == true); - BOOST_TEST(u.encoded_password() == ""); - BOOST_TEST(u.password() == ""); + BOOST_TEST_EQ(u.encoded_userinfo(), ":"); + BOOST_TEST_EQ(u.userinfo(), ":"); + BOOST_TEST_EQ(u.encoded_user(), ""); + BOOST_TEST_EQ(u.user(), ""); + BOOST_TEST_EQ(u.has_password(), true); + BOOST_TEST_EQ(u.encoded_password(), ""); + BOOST_TEST_EQ(u.password(), ""); } { url_view u("x://a%41:@"); BOOST_TEST(u.has_userinfo()); - BOOST_TEST(u.encoded_userinfo() == "a%41:"); - BOOST_TEST(u.encoded_user() == "a%41"); - BOOST_TEST(u.user() == "aA"); - BOOST_TEST(u.has_password() == true); - BOOST_TEST(u.encoded_password() == ""); - BOOST_TEST(u.password() == ""); + BOOST_TEST_EQ(u.encoded_userinfo(), "a%41:"); + BOOST_TEST_EQ(u.encoded_user(), "a%41"); + BOOST_TEST_EQ(u.user(), "aA"); + BOOST_TEST_EQ(u.has_password(), true); + BOOST_TEST_EQ(u.encoded_password(), ""); + BOOST_TEST_EQ(u.password(), ""); } { url_view u("x://:b%42@"); BOOST_TEST(u.has_userinfo()); - BOOST_TEST(u.encoded_userinfo() == ":b%42"); - BOOST_TEST(u.encoded_user() == ""); - BOOST_TEST(u.user() == ""); - BOOST_TEST(u.has_password() == true); - BOOST_TEST(u.encoded_password() == "b%42"); - BOOST_TEST(u.password() == "bB"); + BOOST_TEST_EQ(u.encoded_userinfo(), ":b%42"); + BOOST_TEST_EQ(u.encoded_user(), ""); + BOOST_TEST_EQ(u.user(), ""); + BOOST_TEST_EQ(u.has_password(), true); + BOOST_TEST_EQ(u.encoded_password(), "b%42"); + BOOST_TEST_EQ(u.password(), "bB"); } { url_view u("x://a:b@"); BOOST_TEST(u.has_userinfo()); - BOOST_TEST(u.encoded_userinfo() == "a:b"); - BOOST_TEST(u.encoded_user() == "a"); - BOOST_TEST(u.has_password() == true); - BOOST_TEST(u.encoded_password() == "b"); + BOOST_TEST_EQ(u.encoded_userinfo(), "a:b"); + BOOST_TEST_EQ(u.encoded_user(), "a"); + BOOST_TEST_EQ(u.has_password(), true); + BOOST_TEST_EQ(u.encoded_password(), "b"); } { url_view u("x://%3a:%3a@"); BOOST_TEST(u.has_userinfo()); - BOOST_TEST(u.encoded_userinfo() == "%3a:%3a"); - BOOST_TEST(u.userinfo() == ":::"); - BOOST_TEST(u.encoded_user() == "%3a"); - BOOST_TEST(u.user() == ":"); - BOOST_TEST(u.has_password() == true); - BOOST_TEST(u.encoded_password() == "%3a"); - BOOST_TEST(u.password() == ":"); + BOOST_TEST_EQ(u.encoded_userinfo(), "%3a:%3a"); + BOOST_TEST_EQ(u.userinfo(), ":::"); + BOOST_TEST_EQ(u.encoded_user(), "%3a"); + BOOST_TEST_EQ(u.user(), ":"); + BOOST_TEST_EQ(u.has_password(), true); + BOOST_TEST_EQ(u.encoded_password(), "%3a"); + BOOST_TEST_EQ(u.password(), ":"); } { url_view u("x://%2525@"); BOOST_TEST(u.has_userinfo()); - BOOST_TEST(u.encoded_userinfo() == "%2525"); - BOOST_TEST(u.userinfo() == "%25"); - BOOST_TEST(u.encoded_user() == "%2525"); - BOOST_TEST(u.user() == "%25"); - BOOST_TEST(u.has_password() == false); - BOOST_TEST(u.encoded_password() == ""); - BOOST_TEST(u.password() == ""); + BOOST_TEST_EQ(u.encoded_userinfo(), "%2525"); + BOOST_TEST_EQ(u.userinfo(), "%25"); + BOOST_TEST_EQ(u.encoded_user(), "%2525"); + BOOST_TEST_EQ(u.user(), "%25"); + BOOST_TEST_EQ(u.has_password(), false); + BOOST_TEST_EQ(u.encoded_password(), ""); + BOOST_TEST_EQ(u.password(), ""); } } @@ -428,56 +427,56 @@ public: { url_view u("http://"); BOOST_TEST(! u.has_port()); - BOOST_TEST(u.port() == ""); - BOOST_TEST(u.port_number() == 0); + BOOST_TEST_EQ(u.port(), ""); + BOOST_TEST_EQ(u.port_number(), 0); } { url_view u("http://www"); BOOST_TEST(! u.has_port()); - BOOST_TEST(u.port() == ""); - BOOST_TEST(u.port_number() == 0); + BOOST_TEST_EQ(u.port(), ""); + BOOST_TEST_EQ(u.port_number(), 0); } { url_view u("http://:"); BOOST_TEST(u.has_port()); - BOOST_TEST(u.port() == ""); - BOOST_TEST(u.port_number() == 0); + BOOST_TEST_EQ(u.port(), ""); + BOOST_TEST_EQ(u.port_number(), 0); } { url_view u("http://:0"); BOOST_TEST(u.has_port()); - BOOST_TEST(u.port() == "0"); - BOOST_TEST(u.port_number() == 0); + BOOST_TEST_EQ(u.port(), "0"); + BOOST_TEST_EQ(u.port_number(), 0); } { url_view u("http://:42"); BOOST_TEST(u.has_port()); - BOOST_TEST(u.port() == "42"); - BOOST_TEST(u.port_number() == 42); + BOOST_TEST_EQ(u.port(), "42"); + BOOST_TEST_EQ(u.port_number(), 42); } { url_view u("http://:00000"); BOOST_TEST(u.has_port()); - BOOST_TEST(u.port() == "00000"); - BOOST_TEST(u.port_number() == 0); + BOOST_TEST_EQ(u.port(), "00000"); + BOOST_TEST_EQ(u.port_number(), 0); } { url_view u("http://:000001"); BOOST_TEST(u.has_port()); - BOOST_TEST(u.port() == "000001"); - BOOST_TEST(u.port_number() == 1); + BOOST_TEST_EQ(u.port(), "000001"); + BOOST_TEST_EQ(u.port_number(), 1); } { url_view u("http://:65535"); BOOST_TEST(u.has_port()); - BOOST_TEST(u.port() == "65535"); - BOOST_TEST(u.port_number() == 65535); + BOOST_TEST_EQ(u.port(), "65535"); + BOOST_TEST_EQ(u.port_number(), 65535); } { url_view u("http://:65536"); BOOST_TEST(u.has_port()); - BOOST_TEST(u.port() == "65536"); - BOOST_TEST(u.port_number() == 0); + BOOST_TEST_EQ(u.port(), "65536"); + BOOST_TEST_EQ(u.port_number(), 0); } } @@ -534,15 +533,15 @@ public: "/path/to/file.htm"); auto const p = u.encoded_segments(); BOOST_TEST(! p.empty()); - BOOST_TEST(p.size() == 3); + BOOST_TEST_EQ(p.size(), 3u); auto it = p.begin(); - BOOST_TEST(*it == "path"); + BOOST_TEST_EQ(*it, "path"); ++it; - BOOST_TEST(*it == "to"); + BOOST_TEST_EQ(*it, "to"); ++it; - BOOST_TEST(*it == "file.htm"); + BOOST_TEST_EQ(*it, "file.htm"); ++it; - BOOST_TEST(it == p.end()); + BOOST_TEST_EQ(it, p.end()); } } @@ -552,62 +551,62 @@ public: { url_view u("http://"); BOOST_TEST(! u.has_query()); - BOOST_TEST(u.encoded_query() == ""); - BOOST_TEST(u.query() == ""); + BOOST_TEST_EQ(u.encoded_query(), ""); + BOOST_TEST_EQ(u.query(), ""); } { url_view u("http://?"); BOOST_TEST(u.has_query()); - BOOST_TEST(u.encoded_query() == ""); - BOOST_TEST(u.query() == ""); + BOOST_TEST_EQ(u.encoded_query(), ""); + BOOST_TEST_EQ(u.query(), ""); } { url_view u("http://?k"); BOOST_TEST(u.has_query()); - BOOST_TEST(u.encoded_query() == "k"); - BOOST_TEST(u.query() == "k"); + BOOST_TEST_EQ(u.encoded_query(), "k"); + BOOST_TEST_EQ(u.query(), "k"); } { url_view u("http://?k="); BOOST_TEST(u.has_query()); - BOOST_TEST(u.encoded_query() == "k="); - BOOST_TEST(u.query() == "k="); + BOOST_TEST_EQ(u.encoded_query(), "k="); + BOOST_TEST_EQ(u.query(), "k="); } { url_view u("http://?#"); BOOST_TEST(u.has_query()); - BOOST_TEST(u.encoded_query() == ""); - BOOST_TEST(u.query() == ""); + BOOST_TEST_EQ(u.encoded_query(), ""); + BOOST_TEST_EQ(u.query(), ""); } { url_view u("http://?%3f"); BOOST_TEST(u.has_query()); - BOOST_TEST(u.encoded_query() == "%3f"); - BOOST_TEST(u.query() == "?"); + BOOST_TEST_EQ(u.encoded_query(), "%3f"); + BOOST_TEST_EQ(u.query(), "?"); } { url_view u("http://?%25"); BOOST_TEST(u.has_query()); - BOOST_TEST(u.encoded_query() == "%25"); - BOOST_TEST(u.query() == "%"); + BOOST_TEST_EQ(u.encoded_query(), "%25"); + BOOST_TEST_EQ(u.query(), "%"); } { url_view u("http://?&"); BOOST_TEST(u.has_query()); - BOOST_TEST(u.encoded_query() == "&"); - BOOST_TEST(u.query() == "&"); + BOOST_TEST_EQ(u.encoded_query(), "&"); + BOOST_TEST_EQ(u.query(), "&"); } { url_view u("http://?%26"); BOOST_TEST(u.has_query()); - BOOST_TEST(u.encoded_query() == "%26"); - BOOST_TEST(u.query() == "&"); + BOOST_TEST_EQ(u.encoded_query(), "%26"); + BOOST_TEST_EQ(u.query(), "&"); } { url_view u("http://?a%3db%26"); BOOST_TEST(u.has_query()); - BOOST_TEST(u.encoded_query() == "a%3db%26"); - BOOST_TEST(u.query() == "a=b&"); + BOOST_TEST_EQ(u.encoded_query(), "a%3db%26"); + BOOST_TEST_EQ(u.query(), "a=b&"); } // VFALCO TODO test params() @@ -628,7 +627,7 @@ public: BOOST_TEST(u.has_fragment()); BOOST_TEST(u.encoded_fragment() == string_view(encoded)); - BOOST_TEST(u.fragment() == plain); + BOOST_TEST_EQ(u.fragment(), plain); } else { @@ -664,7 +663,7 @@ public: url_view u; BOOST_TEST( u.encoded_fragment() == ""); - BOOST_TEST(u.fragment() == ""); + BOOST_TEST_EQ(u.fragment(), ""); } }