3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-02-22 22:23:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

1. fixed bug in XmlEncode::encodeTo(): incorrect escaping of UTF-8 symbols

Browse Source 
2. added test for XmlEncode in case of UTF-8 symbols
This commit is contained in:
Vladimir Zelyonkin 2016-04-05 10:00:15 +03:00
parent c984fc3ecd
commit 42d4e9f1b0
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/internal/catch_xmlwriter.hpp
View File

@ -34,7 +34,7 @@ namespace Catch {
// (see: http://www.w3.org/TR/xml/#syntax) // (see: http://www.w3.org/TR/xml/#syntax)
for( std::size_t i = 0; i < m_str.size(); ++ i ) { for( std::size_t i = 0; i < m_str.size(); ++ i ) {
char c = m_str[i]; unsigned char c = m_str[i];
switch( c ) { switch( c ) {
case '<': os << "&lt;"; break; case '<': os << "&lt;"; break;
case '&': os << "&amp;"; break; case '&': os << "&amp;"; break;
@ -57,7 +57,7 @@ namespace Catch {
default: default:
// Escape control chars - based on contribution by @espenalb in PR #465 // Escape control chars - based on contribution by @espenalb in PR #465
if ( ( c < '\x09' ) || ( c > '\x0D' && c < '\x20') || c=='\x7F' ) if ( ( c < '\x09' ) || ( c > '\x0D' && c < '\x20') || c=='\x7F' )
os << "&#x" << std::uppercase << std::hex << static_cast<int>( c ); os << "&#x" << std::uppercase << std::hex << static_cast<int>( c ) << ";";
else else
os << c; os << c;
} }

7
projects/SelfTest/MiscTests.cpp
View File

@ -458,10 +458,13 @@ TEST_CASE( "XmlEncode" ) {
REQUIRE( encode( stringWithQuotes, Catch::XmlEncode::ForAttributes ) == "don't &quot;quote&quot; me on that" ); REQUIRE( encode( stringWithQuotes, Catch::XmlEncode::ForAttributes ) == "don't &quot;quote&quot; me on that" );
} }
SECTION( "string with control char (1)" ) { SECTION( "string with control char (1)" ) {
REQUIRE( encode( "[\x01]" ) == "[&#x1]" ); REQUIRE( encode( "[\x01]" ) == "[&#x1;]" );
} }
SECTION( "string with control char (x7F)" ) { SECTION( "string with control char (x7F)" ) {
REQUIRE( encode( "[\x7F]" ) == "[&#x7F]" ); REQUIRE( encode( "[\x7F]" ) == "[&#x7F;]" );
}
SECTION( "string with utf-8 characters (ðóññêèé òåêñò)" ) {
REQUIRE( encode( "ðóññêèé òåêñò" ) == "ðóññêèé òåêñò" );
} }
} }