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

Some clean-ups for string handling in Objective-C

Browse Source
This commit is contained in:
Phil Nash 2014-06-20 18:05:31 +01:00
parent f4f4fec5f0
commit 006aafd982
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/internal/catch_objc.hpp
View File

@ -125,7 +125,7 @@ namespace Catch {
} }
virtual std::string toString() const { virtual std::string toString() const {
return "equals string: \"" + Catch::toString( m_substr ) + "\""; return "equals string: " + Catch::toString( m_substr );
} }
}; };
@ -138,7 +138,7 @@ namespace Catch {
} }
virtual std::string toString() const { virtual std::string toString() const {
return "contains string: \"" + Catch::toString( m_substr ) + "\""; return "contains string: " + Catch::toString( m_substr );
} }
}; };
@ -151,7 +151,7 @@ namespace Catch {
} }
virtual std::string toString() const { virtual std::string toString() const {
return "starts with: \"" + Catch::toString( m_substr ) + "\""; return "starts with: " + Catch::toString( m_substr );
} }
}; };
struct EndsWith : StringHolder<EndsWith> { struct EndsWith : StringHolder<EndsWith> {
@ -163,7 +163,7 @@ namespace Catch {
} }
virtual std::string toString() const { virtual std::string toString() const {
return "ends with: \"" + Catch::toString( m_substr ) + "\""; return "ends with: " + Catch::toString( m_substr );
} }
}; };

4
include/internal/catch_tostring.hpp
View File

@ -146,12 +146,12 @@ std::string toString( std::nullptr_t ) {
std::string toString( NSString const * const& nsstring ) { std::string toString( NSString const * const& nsstring ) {
if( !nsstring ) if( !nsstring )
return "nil"; return "nil";
return std::string( "@\"" ) + [nsstring UTF8String] + "\""; return "@" + toString([nsstring UTF8String]);
} }
std::string toString( NSString * CATCH_ARC_STRONG const& nsstring ) { std::string toString( NSString * CATCH_ARC_STRONG const& nsstring ) {
if( !nsstring ) if( !nsstring )
return "nil"; return "nil";
return std::string( "@\"" ) + [nsstring UTF8String] + "\""; return "@" + toString([nsstring UTF8String]);
} }
std::string toString( NSObject* const& nsObject ) { std::string toString( NSObject* const& nsObject ) {
return toString( [nsObject description] ); return toString( [nsObject description] );