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

Fixed GitHub Issue #70

Browse Source 
Interleave XML entities are now encoded correctly
This commit is contained in:
Phil Nash
2012-02-10 18:58:06 +00:00
parent a162e22fa3
commit 0b09d1c089
3 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -9,3 +9,4 @@ Release
*.xcuserstate *.xcuserstate
.DS_Store .DS_Store
xcuserdata xcuserdata
CatchSelfTest.xcscheme

42
include/internal/catch_xmlwriter.hpp
View File

@@ -294,31 +294,29 @@ namespace Catch
const std::string& text const std::string& text
) )
{ {
// !TBD finish this static const char* charsToEncode = "<&\"";
if( !findReplaceableString( text, "<", "&lt;" ) && std::string mtext = text;
!findReplaceableString( text, "&", "&amp;" ) && std::string::size_type pos = mtext.find_first_of( charsToEncode );
!findReplaceableString( text, "\"", "&quot;" ) ) while( pos != std::string::npos )
{ {
stream() << text; stream() << mtext.substr( 0, pos );
}
}
/////////////////////////////////////////////////////////////////////// switch( mtext[pos] )
bool findReplaceableString {
( case '<':
const std::string& text, stream() << "&lt;";
const std::string& replaceWhat, break;
const std::string& replaceWith case '&':
) stream() << "&amp;";
{ break;
std::string::size_type pos = text.find_first_of( replaceWhat ); case '\"':
if( pos != std::string::npos ) stream() << "&quot;";
{ break;
stream() << text.substr( 0, pos ) << replaceWith; }
writeEncodedText( text.substr( pos+1 ) ); mtext = mtext.substr( pos+1 );
return true; pos = mtext.find_first_of( charsToEncode );
} }
return false; stream() << mtext;
} }
bool m_tagIsOpen; bool m_tagIsOpen;

12
projects/SelfTest/MiscTests.cpp
View File

@@ -157,3 +157,15 @@ TEST_CASE( "./failing/checkedelse", "" )
{ {
REQUIRE( testCheckedElse( false ) ); REQUIRE( testCheckedElse( false ) );
} }
TEST_CASE( "./misc/xmlentitycheck", "" )
{
SECTION( "embedded xml", "<test>it should be possible to embed xml characters, such as <, \" or &, or even whole <xml>documents</xml> within an attribute</test>" )
{
// No test
}
SECTION( "encoded chars", "these should all be encoded: &&&\"\"\"<<<&\"<<&\"" )
{
// No test
}
}