Rename to BEAST_EXPECT

This commit is contained in:
Vinnie Falco
2017-07-25 15:58:06 -07:00
parent 175763e773
commit c831afd93b
54 changed files with 2014 additions and 1657 deletions
+56 -56
View File
@@ -38,22 +38,22 @@ public:
})();
// Valid range 0-127
BOOST_BEAST_EXPECT(utf8.write(buf.data(), 128));
BOOST_BEAST_EXPECT(utf8.finish());
BEAST_EXPECT(utf8.write(buf.data(), 128));
BEAST_EXPECT(utf8.finish());
// Invalid range 128-193
for(auto it = std::next(buf.begin(), 128);
it != std::next(buf.begin(), 194); ++it)
BOOST_BEAST_EXPECT(! utf8.write(&(*it), 1));
BEAST_EXPECT(! utf8.write(&(*it), 1));
// Invalid range 245-255
for(auto it = std::next(buf.begin(), 245);
it != buf.end(); ++it)
BOOST_BEAST_EXPECT(! utf8.write(&(*it), 1));
BEAST_EXPECT(! utf8.write(&(*it), 1));
// Invalid sequence
std::fill(buf.begin(), buf.end(), '\xff');
BOOST_BEAST_EXPECT(! utf8.write(&buf.front(), buf.size()));
BEAST_EXPECT(! utf8.write(&buf.front(), buf.size()));
}
void
@@ -70,27 +70,27 @@ public:
{
// Second byte valid range 128-191
buf[1] = static_cast<std::uint8_t>(j);
BOOST_BEAST_EXPECT(utf8.write(buf, 2));
BOOST_BEAST_EXPECT(utf8.finish());
BEAST_EXPECT(utf8.write(buf, 2));
BEAST_EXPECT(utf8.finish());
}
for(auto j = 0; j <= 127; ++j)
{
// Second byte invalid range 0-127
buf[1] = static_cast<std::uint8_t>(j);
BOOST_BEAST_EXPECT(! utf8.write(buf, 2));
BEAST_EXPECT(! utf8.write(buf, 2));
}
for(auto j = 192; j <= 255; ++j)
{
// Second byte invalid range 192-255
buf[1] = static_cast<std::uint8_t>(j);
BOOST_BEAST_EXPECT(! utf8.write(buf, 2));
BEAST_EXPECT(! utf8.write(buf, 2));
}
// Segmented sequence second byte invalid
BOOST_BEAST_EXPECT(utf8.write(buf, 1));
BOOST_BEAST_EXPECT(! utf8.write(&buf[1], 1));
BEAST_EXPECT(utf8.write(buf, 1));
BEAST_EXPECT(! utf8.write(&buf[1], 1));
utf8.reset();
}
}
@@ -116,15 +116,15 @@ public:
{
// Third byte valid range 128-191
buf[2] = static_cast<std::uint8_t>(k);
BOOST_BEAST_EXPECT(utf8.write(buf, 3));
BOOST_BEAST_EXPECT(utf8.finish());
BEAST_EXPECT(utf8.write(buf, 3));
BEAST_EXPECT(utf8.finish());
// Segmented sequence
BOOST_BEAST_EXPECT(utf8.write(buf, 1));
BOOST_BEAST_EXPECT(utf8.write(&buf[1], 2));
BEAST_EXPECT(utf8.write(buf, 1));
BEAST_EXPECT(utf8.write(&buf[1], 2));
utf8.reset();
// Segmented sequence
BOOST_BEAST_EXPECT(utf8.write(buf, 2));
BOOST_BEAST_EXPECT(utf8.write(&buf[2], 1));
BEAST_EXPECT(utf8.write(buf, 2));
BEAST_EXPECT(utf8.write(&buf[2], 1));
utf8.reset();
if (i == 224)
@@ -133,11 +133,11 @@ public:
{
// Second byte invalid range 0-127 or 0-159
buf[1] = static_cast<std::uint8_t>(l);
BOOST_BEAST_EXPECT(! utf8.write(buf, 3));
BEAST_EXPECT(! utf8.write(buf, 3));
if (l > 127)
{
// Segmented sequence second byte invalid
BOOST_BEAST_EXPECT(! utf8.write(buf, 2));
BEAST_EXPECT(! utf8.write(buf, 2));
utf8.reset();
}
}
@@ -149,11 +149,11 @@ public:
{
// Second byte invalid range 160-255 or 192-255
buf[1] = static_cast<std::uint8_t>(l);
BOOST_BEAST_EXPECT(!utf8.write(buf, 3));
BEAST_EXPECT(!utf8.write(buf, 3));
if (l > 159)
{
// Segmented sequence second byte invalid
BOOST_BEAST_EXPECT(! utf8.write(buf, 2));
BEAST_EXPECT(! utf8.write(buf, 2));
utf8.reset();
}
}
@@ -165,19 +165,19 @@ public:
{
// Third byte invalid range 0-127
buf[2] = static_cast<std::uint8_t>(k);
BOOST_BEAST_EXPECT(! utf8.write(buf, 3));
BEAST_EXPECT(! utf8.write(buf, 3));
}
for(auto k = 192; k <= 255; ++k)
{
// Third byte invalid range 192-255
buf[2] = static_cast<std::uint8_t>(k);
BOOST_BEAST_EXPECT(! utf8.write(buf, 3));
BEAST_EXPECT(! utf8.write(buf, 3));
}
// Segmented sequence third byte invalid
BOOST_BEAST_EXPECT(utf8.write(buf, 2));
BOOST_BEAST_EXPECT(! utf8.write(&buf[2], 1));
BEAST_EXPECT(utf8.write(buf, 2));
BEAST_EXPECT(! utf8.write(&buf[2], 1));
utf8.reset();
}
@@ -185,19 +185,19 @@ public:
{
// Second byte invalid range 0-127 or 0-159
buf[1] = static_cast<std::uint8_t>(j);
BOOST_BEAST_EXPECT(! utf8.write(buf, 3));
BEAST_EXPECT(! utf8.write(buf, 3));
}
for(auto j = e + 1; j <= 255; ++j)
{
// Second byte invalid range 160-255 or 192-255
buf[1] = static_cast<std::uint8_t>(j);
BOOST_BEAST_EXPECT(! utf8.write(buf, 3));
BEAST_EXPECT(! utf8.write(buf, 3));
}
// Segmented sequence second byte invalid
BOOST_BEAST_EXPECT(utf8.write(buf, 1));
BOOST_BEAST_EXPECT(! utf8.write(&buf[1], 1));
BEAST_EXPECT(utf8.write(buf, 1));
BEAST_EXPECT(! utf8.write(&buf[1], 1));
utf8.reset();
}
}
@@ -229,19 +229,19 @@ public:
{
// Fourth byte valid range 128-191
buf[3] = static_cast<std::uint8_t>(n);
BOOST_BEAST_EXPECT(utf8.write(const_buffers_1{buf, 4}));
BOOST_BEAST_EXPECT(utf8.finish());
BEAST_EXPECT(utf8.write(const_buffers_1{buf, 4}));
BEAST_EXPECT(utf8.finish());
// Segmented sequence
BOOST_BEAST_EXPECT(utf8.write(buf, 1));
BOOST_BEAST_EXPECT(utf8.write(&buf[1], 3));
BEAST_EXPECT(utf8.write(buf, 1));
BEAST_EXPECT(utf8.write(&buf[1], 3));
utf8.reset();
// Segmented sequence
BOOST_BEAST_EXPECT(utf8.write(buf, 2));
BOOST_BEAST_EXPECT(utf8.write(&buf[2], 2));
BEAST_EXPECT(utf8.write(buf, 2));
BEAST_EXPECT(utf8.write(&buf[2], 2));
utf8.reset();
// Segmented sequence
BOOST_BEAST_EXPECT(utf8.write(buf, 3));
BOOST_BEAST_EXPECT(utf8.write(&buf[3], 1));
BEAST_EXPECT(utf8.write(buf, 3));
BEAST_EXPECT(utf8.write(&buf[3], 1));
utf8.reset();
if (i == 240)
@@ -250,11 +250,11 @@ public:
{
// Second byte invalid range 0-127 or 0-143
buf[1] = static_cast<std::uint8_t>(l);
BOOST_BEAST_EXPECT(! utf8.write(buf, 4));
BEAST_EXPECT(! utf8.write(buf, 4));
if (l > 127)
{
// Segmented sequence second byte invalid
BOOST_BEAST_EXPECT(! utf8.write(buf, 2));
BEAST_EXPECT(! utf8.write(buf, 2));
utf8.reset();
}
}
@@ -266,11 +266,11 @@ public:
{
// Second byte invalid range 144-255 or 192-255
buf[1] = static_cast<std::uint8_t>(l);
BOOST_BEAST_EXPECT(! utf8.write(buf, 4));
BEAST_EXPECT(! utf8.write(buf, 4));
if (l > 143)
{
// Segmented sequence second byte invalid
BOOST_BEAST_EXPECT(! utf8.write(buf, 2));
BEAST_EXPECT(! utf8.write(buf, 2));
utf8.reset();
}
}
@@ -282,19 +282,19 @@ public:
{
// Fourth byte invalid range 0-127
buf[3] = static_cast<std::uint8_t>(n);
BOOST_BEAST_EXPECT(! utf8.write(const_buffers_1{buf, 4}));
BEAST_EXPECT(! utf8.write(const_buffers_1{buf, 4}));
}
for(auto n = 192; n <= 255; ++n)
{
// Fourth byte invalid range 192-255
buf[3] = static_cast<std::uint8_t>(n);
BOOST_BEAST_EXPECT(! utf8.write(buf, 4));
BEAST_EXPECT(! utf8.write(buf, 4));
}
// Segmented sequence fourth byte invalid
BOOST_BEAST_EXPECT(utf8.write(buf, 3));
BOOST_BEAST_EXPECT(! utf8.write(&buf[3], 1));
BEAST_EXPECT(utf8.write(buf, 3));
BEAST_EXPECT(! utf8.write(&buf[3], 1));
utf8.reset();
}
@@ -302,19 +302,19 @@ public:
{
// Third byte invalid range 0-127
buf[2] = static_cast<std::uint8_t>(k);
BOOST_BEAST_EXPECT(! utf8.write(buf, 4));
BEAST_EXPECT(! utf8.write(buf, 4));
}
for(auto k = 192; k <= 255; ++k)
{
// Third byte invalid range 192-255
buf[2] = static_cast<std::uint8_t>(k);
BOOST_BEAST_EXPECT(! utf8.write(buf, 4));
BEAST_EXPECT(! utf8.write(buf, 4));
}
// Segmented sequence third byte invalid
BOOST_BEAST_EXPECT(utf8.write(buf, 2));
BOOST_BEAST_EXPECT(! utf8.write(&buf[2], 1));
BEAST_EXPECT(utf8.write(buf, 2));
BEAST_EXPECT(! utf8.write(&buf[2], 1));
utf8.reset();
}
@@ -322,19 +322,19 @@ public:
{
// Second byte invalid range 0-127 or 0-143
buf[1] = static_cast<std::uint8_t>(j);
BOOST_BEAST_EXPECT(! utf8.write(buf, 4));
BEAST_EXPECT(! utf8.write(buf, 4));
}
for(auto j = e + 1; j <= 255; ++j)
{
// Second byte invalid range 144-255 or 192-255
buf[1] = static_cast<std::uint8_t>(j);
BOOST_BEAST_EXPECT(! utf8.write(buf, 4));
BEAST_EXPECT(! utf8.write(buf, 4));
}
// Segmented sequence second byte invalid
BOOST_BEAST_EXPECT(utf8.write(buf, 1));
BOOST_BEAST_EXPECT(! utf8.write(&buf[1], 1));
BEAST_EXPECT(utf8.write(buf, 1));
BEAST_EXPECT(! utf8.write(&buf[1], 1));
utf8.reset();
}
@@ -342,7 +342,7 @@ public:
{
// First byte invalid range 245-255
buf[0] = static_cast<std::uint8_t>(i);
BOOST_BEAST_EXPECT(! utf8.write(buf, 4));
BEAST_EXPECT(! utf8.write(buf, 4));
}
}
@@ -390,8 +390,8 @@ public:
cb.consume(amount);
n -= amount;
}
BOOST_BEAST_EXPECT(utf8.write(b.data()));
BOOST_BEAST_EXPECT(utf8.finish());
BEAST_EXPECT(utf8.write(b.data()));
BEAST_EXPECT(utf8.finish());
}
}
}