3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 13:26:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix use of u8-literal that would break in C++20

Browse Source
This commit is contained in:
Martin Hořeňovský 2022-05-03 10:49:45 +02:00
parent e2d07d35f4
commit 91ea25e51a
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMake/CatchMiscFunctions.cmake
View File

@ -45,6 +45,7 @@ function(add_warnings_to_targets targets)
set(CHECKED_WARNING_FLAGS set(CHECKED_WARNING_FLAGS
"-Wabsolute-value" "-Wabsolute-value"
"-Wall" "-Wall"
"-Wc++20-compat"
"-Wcall-to-pure-virtual-from-ctor-dtor" "-Wcall-to-pure-virtual-from-ctor-dtor"
"-Wcast-align" "-Wcast-align"
"-Wcatch-value" "-Wcatch-value"

12
tests/SelfTest/IntrospectiveTests/Xml.tests.cpp
View File

@ -52,10 +52,9 @@ TEST_CASE( "XmlEncode", "[XML]" ) {
// Thanks to Peter Bindels (dascandy) for some of the tests // Thanks to Peter Bindels (dascandy) for some of the tests
TEST_CASE("XmlEncode: UTF-8", "[XML][UTF-8][approvals]") { TEST_CASE("XmlEncode: UTF-8", "[XML][UTF-8][approvals]") {
#define ESC(lit) reinterpret_cast<const char*>(lit)
SECTION("Valid utf-8 strings") { SECTION("Valid utf-8 strings") {
CHECK(encode(ESC(u8"Here be 👾")) == ESC(u8"Here be 👾")); CHECK(encode("Here be 👾") == "Here be 👾");
CHECK(encode(ESC(u8"šš")) == ESC(u8"šš")); CHECK(encode("šš") == "šš");
CHECK(encode("\xDF\xBF") == "\xDF\xBF"); // 0x7FF CHECK(encode("\xDF\xBF") == "\xDF\xBF"); // 0x7FF
CHECK(encode("\xE0\xA0\x80") == "\xE0\xA0\x80"); // 0x800 CHECK(encode("\xE0\xA0\x80") == "\xE0\xA0\x80"); // 0x800
@ -67,10 +66,10 @@ TEST_CASE("XmlEncode: UTF-8", "[XML][UTF-8][approvals]") {
} }
SECTION("Invalid utf-8 strings") { SECTION("Invalid utf-8 strings") {
SECTION("Various broken strings") { SECTION("Various broken strings") {
CHECK(encode(ESC("Here \xFF be \xF0\x9F\x91\xBE")) == ESC(u8"Here \\xFF be 👾")); CHECK(encode("Here \xFF be \xF0\x9F\x91\xBE") == "Here \\xFF be 👾");
CHECK(encode("\xFF") == "\\xFF"); CHECK(encode("\xFF") == "\\xFF");
CHECK(encode("\xC5\xC5\xA0") == ESC(u8"\\xC5Š")); CHECK(encode("\xC5\xC5\xA0") == "\\xC5Š");
CHECK(encode("\xF4\x90\x80\x80") == ESC(u8"\\xF4\\x90\\x80\\x80")); // 0x110000 -- out of unicode range CHECK(encode("\xF4\x90\x80\x80") == "\\xF4\\x90\\x80\\x80"); // 0x110000 -- out of unicode range
} }
SECTION("Overlong encodings") { SECTION("Overlong encodings") {
@ -121,7 +120,6 @@ TEST_CASE("XmlEncode: UTF-8", "[XML][UTF-8][approvals]") {
CHECK(encode("\xF4\x80\x80") == "\\xF4\\x80\\x80"); CHECK(encode("\xF4\x80\x80") == "\\xF4\\x80\\x80");
} }
} }
#undef ESC
} }
TEST_CASE("XmlWriter writes boolean attributes as true/false", "[XML][XmlWriter]") { TEST_CASE("XmlWriter writes boolean attributes as true/false", "[XML][XmlWriter]") {