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

Fixed null string reporting issue

Browse Source
This commit is contained in:
Phil Nash 2011-02-23 20:02:18 +00:00
parent 331188f6b3
commit 8087f5738c
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Test/MiscTests.cpp
View File

@ -105,3 +105,14 @@ TEST_CASE( "./succeeding/Misc/stdout,stderr", "Sends stuff to stdout and stderr"
std::cerr << "An error";
}
const char* makeString( bool makeNull )
{
return makeNull ? NULL : "valid string";
}
TEST_CASE( "./succeeding/Misc/null strings", "" )
{
REQUIRE( makeString( false ) != static_cast<char*>(NULL));
REQUIRE( makeString( true ) == static_cast<char*>(NULL));
}

14
internal/catch_capture.hpp
View File

@ -105,15 +105,23 @@ inline std::string toString
{
return value;
}
///////////////////////////////////////////////////////////////////////////////
inline std::string toString
(
const char* const value
)
{
return value ? "'" + std::string( value ) + "'" : std::string( "{null string}" );
}
///////////////////////////////////////////////////////////////////////////////
inline std::string toString
(
const char* value
char* const value
)
{
return value;
}
return toString( static_cast<const char* const>( value ) );
}
///////////////////////////////////////////////////////////////////////////////
inline std::string toString