boost/url
2
0
Fork 0
mirror of https://github.com/boostorg/url.git synced 2026-02-22 15:52:20 +00:00
Code Issues Projects Releases Wiki Activity

no more error_code&

Browse Source 
fix #368
This commit is contained in:
alandefreitas
2022-08-16 03:23:30 -03:00
parent ffdc0b257d
commit c663de5b6a
29 changed files with 218 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
test/unit/pct_encoding.cpp
View File

@@ -66,12 +66,11 @@ public:
{
// validate_pct_encoding
{
error_code ec;
auto n = validate_pct_encoding(
s0, ec, *pcs, opt);
if(! BOOST_TEST(! ec.failed()))
auto rn = validate_pct_encoding(
s0, *pcs, opt);
if(! BOOST_TEST(! rn.has_error()))
return;
BOOST_TEST_EQ(n, s1.size());
BOOST_TEST_EQ(*rn, s1.size());
}
// pct_decode to buffer
{
@@ -79,22 +78,21 @@ public:
for(std::size_t i = 0;
i < sizeof(buf); ++i)
{
error_code ec;
auto const n = pct_decode(
auto const rn = pct_decode(
buf, buf + i,
s0, ec, *pcs, opt);
s0, *pcs, opt);
if(i < s1.size())
{
BOOST_TEST(
ec == error::no_space);
BOOST_TEST_LT(n, s1.size());
BOOST_TEST_LE(n, i);
rn.error() == error::no_space);
// BOOST_TEST_LT(n, s1.size());
// BOOST_TEST_LE(n, i);
continue;
}
BOOST_TEST(! ec.failed());
BOOST_TEST_EQ(n, s1.size());
BOOST_TEST(! rn.has_error());
BOOST_TEST_EQ(*rn, s1.size());
BOOST_TEST_EQ(
string_view(buf, n), s1);
string_view(buf, *rn), s1);
break;
}
}
@@ -102,10 +100,10 @@ public:
{
std::string s;
s.resize(pct_decode_bytes_unchecked(s0));
error_code ec;
std::size_t n =
pct_decode(&s[0], &s[0] + s.size(), s0, ec, opt);
s.resize(n);
auto rn =
pct_decode(&s[0], &s[0] + s.size(), s0, opt);
BOOST_TEST(rn.has_value());
s.resize(*rn);
BOOST_TEST_EQ(s, s1);
}
// pct_decode() -> std::basic_string
@@ -114,8 +112,8 @@ public:
std::basic_string<char,
std::char_traits<char>, A> s(A{});
s.resize(pct_decode_bytes_unchecked(s0));
error_code ec;
pct_decode(&s[0], &s[0] + s.size(), s0, ec, opt);
auto rn = pct_decode(&s[0], &s[0] + s.size(), s0, opt);
BOOST_TEST(rn.has_value());
BOOST_TEST_EQ(s, s1);
}
// pct_decode_bytes_unchecked
@@ -142,21 +140,19 @@ public:
{
// validate_pct_encoding
{
error_code ec;
validate_pct_encoding(
s, ec, test_chars{}, opt);
BOOST_TEST(ec.failed());
if (!ec.failed())
auto rn = validate_pct_encoding(
s, test_chars{}, opt);
BOOST_TEST(rn.has_error());
if (!rn.has_error())
BOOST_TEST_EQ(s, "");
}
// pct_decode to buffer
{
char buf[16];
error_code ec;
pct_decode(buf,
auto rn = pct_decode(buf,
buf + sizeof(buf),
s, ec, *pcs, opt);
BOOST_TEST(ec.failed());
s, *pcs, opt);
BOOST_TEST(rn.has_error());
}
// pct_decode_bytes_unchecked
{
@@ -432,12 +428,53 @@ public:
}
}
void
testValidate()
{
auto check = [](
string_view s,
error_code ec,
pct_decode_opts opt)
{
auto r = validate_pct_encoding(s, opt);
BOOST_TEST(r.has_error());
BOOST_TEST(r.error() == ec);
};
pct_decode_opts opt;
opt.allow_null = true;
check("%a", error::missing_pct_hexdig, opt);
check("%ar", error::bad_pct_hexdig, opt);
opt.allow_null = false;
check(string_view("\0", 1), error::illegal_null, opt);
check("%00", error::illegal_null, opt);
check("%a", error::missing_pct_hexdig, opt);
check("%ar", error::bad_pct_hexdig, opt);
{
std::string dest;
dest.resize(1);
result<std::size_t> r = pct_decode(
&dest[0], &dest[1], "%a", opt);
BOOST_TEST_EQ(r.error(), error::missing_pct_hexdig);
}
{
std::string dest;
dest.resize(1);
result<std::size_t> r = pct_decode(
&dest[0], &dest[1], "%aa%aa", opt);
BOOST_TEST_EQ(r.error(), error::no_space);
}
}
void
run()
{
testDecoding();
testEncode();
testEncodeExtras();
testValidate();
}
};