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

Fixes nil NSString issue reported in #159

Browse Source
This commit is contained in:
Phil Nash 2013-03-12 18:49:22 +00:00
parent 17479c6e49
commit 32e70b2235
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/internal/catch_tostring.hpp
View File

@ -161,9 +161,13 @@ inline std::string toString( std::nullptr_t ) {
#ifdef __OBJC__ #ifdef __OBJC__
inline std::string toString( NSString const * const& nsstring ) { inline std::string toString( NSString const * const& nsstring ) {
if( !nsstring )
return "nil";
return std::string( "@\"" ) + [nsstring UTF8String] + "\""; return std::string( "@\"" ) + [nsstring UTF8String] + "\"";
} }
inline std::string toString( NSString * CATCH_ARC_STRONG const& nsstring ) { inline std::string toString( NSString * CATCH_ARC_STRONG const& nsstring ) {
if( !nsstring )
return "nil";
return std::string( "@\"" ) + [nsstring UTF8String] + "\""; return std::string( "@\"" ) + [nsstring UTF8String] + "\"";
} }
inline std::string toString( NSObject* const& nsObject ) { inline std::string toString( NSObject* const& nsObject ) {

5
projects/XCode4/OCTest/OCTest/CatchOCTestCase.mm
View File

@ -74,4 +74,9 @@ OC_TEST_CASE( "OCTest/matchers", "Matches work with OC types (NSString so far)"
REQUIRE_THAT( @"This is a string", EndsWith( @"string" ) ); REQUIRE_THAT( @"This is a string", EndsWith( @"string" ) );
} }
OC_TEST_CASE( "OCTest/matchers/nil", "nil NSString should not crash the test" )
{
REQUIRE_THAT( (NSString*)nil, Equals( @"This should fail, but not crash" ) );
}
@end @end