3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Final reformatting

This commit is contained in:
Phil Nash 2012-05-16 15:07:11 +01:00
parent ee18b8c507
commit 44fbbb07f0
1 changed files with 40 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
include/internal/catch_objc.hpp
View File

@ -28,12 +28,10 @@ void arcSafeRelease( NSObject* obj );
id performOptionalSelector( id obj, SEL sel ); id performOptionalSelector( id obj, SEL sel );
#if !CATCH_ARC_ENABLED #if !CATCH_ARC_ENABLED
inline void arcSafeRelease( NSObject* obj ) inline void arcSafeRelease( NSObject* obj ) {
{
[obj release]; [obj release];
} }
inline id performOptionalSelector( id obj, SEL sel ) inline id performOptionalSelector( id obj, SEL sel ) {
{
if( [obj respondsToSelector: sel] ) if( [obj respondsToSelector: sel] )
return [obj performSelector: sel]; return [obj performSelector: sel];
return nil; return nil;
@ -41,8 +39,7 @@ id performOptionalSelector( id obj, SEL sel );
#define CATCH_UNSAFE_UNRETAINED #define CATCH_UNSAFE_UNRETAINED
#else #else
inline void arcSafeRelease( NSObject* ){} inline void arcSafeRelease( NSObject* ){}
inline id performOptionalSelector( id obj, SEL sel ) inline id performOptionalSelector( id obj, SEL sel ) {
{
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Warc-performSelector-leaks" #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
if( [obj respondsToSelector: sel] ) if( [obj respondsToSelector: sel] )
@ -65,27 +62,14 @@ id performOptionalSelector( id obj, SEL sel );
@end @end
namespace Catch namespace Catch {
{
class OcMethod : public ITestCase class OcMethod : public ITestCase {
{
public: public:
/////////////////////////////////////////////////////////////////////// OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel ) {}
OcMethod
(
Class cls,
SEL sel
)
: m_cls( cls ),
m_sel( sel )
{
}
/////////////////////////////////////////////////////////////////////// virtual void invoke() const {
virtual void invoke
()
const
{
id obj = [[m_cls alloc] init]; id obj = [[m_cls alloc] init];
performOptionalSelector( obj, @selector(setUp) ); performOptionalSelector( obj, @selector(setUp) );
@ -95,32 +79,16 @@ namespace Catch
arcSafeRelease( obj ); arcSafeRelease( obj );
} }
/////////////////////////////////////////////////////////////////////// virtual ITestCase* clone() const {
virtual ITestCase* clone
()
const
{
return new OcMethod( m_cls, m_sel ); return new OcMethod( m_cls, m_sel );
} }
/////////////////////////////////////////////////////////////////////// virtual bool operator == ( const ITestCase& other ) const {
virtual bool operator ==
(
const ITestCase& other
)
const
{
const OcMethod* ocmOther = dynamic_cast<const OcMethod*> ( &other ); const OcMethod* ocmOther = dynamic_cast<const OcMethod*> ( &other );
return ocmOther && ocmOther->m_sel == m_sel; return ocmOther && ocmOther->m_sel == m_sel;
} }
/////////////////////////////////////////////////////////////////////// virtual bool operator < ( const ITestCase& other ) const {
virtual bool operator <
(
const ITestCase& other
)
const
{
const OcMethod* ocmOther = dynamic_cast<const OcMethod*> ( &other ); const OcMethod* ocmOther = dynamic_cast<const OcMethod*> ( &other );
return ocmOther && ocmOther->m_sel < m_sel; return ocmOther && ocmOther->m_sel < m_sel;
} }
@ -130,27 +98,15 @@ namespace Catch
SEL m_sel; SEL m_sel;
}; };
namespace Detail namespace Detail{
{
/////////////////////////////////////////////////////////////////////// inline bool startsWith( const std::string& str, const std::string& sub ) {
inline bool startsWith
(
const std::string& str,
const std::string& sub
)
{
return str.length() > sub.length() && str.substr( 0, sub.length() ) == sub; return str.length() > sub.length() && str.substr( 0, sub.length() ) == sub;
} }
/////////////////////////////////////////////////////////////////////// inline std::string getAnnotation( Class cls,
inline std::string getAnnotation const std::string& annotationName,
( const std::string& testCaseName ) {
Class cls,
const std::string& annotationName,
const std::string& testCaseName
)
{
NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()]; NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()];
SEL sel = NSSelectorFromString( selStr ); SEL sel = NSSelectorFromString( selStr );
arcSafeRelease( selStr ); arcSafeRelease( selStr );
@ -161,35 +117,28 @@ namespace Catch
} }
} }
/////////////////////////////////////////////////////////////////////////// inline size_t registerTestMethods() {
inline size_t registerTestMethods
()
{
size_t noTestMethods = 0; size_t noTestMethods = 0;
int noClasses = objc_getClassList( NULL, 0 ); int noClasses = objc_getClassList( NULL, 0 );
Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses); Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses);
objc_getClassList( classes, noClasses ); objc_getClassList( classes, noClasses );
for( int c = 0; c < noClasses; c++ ) for( int c = 0; c < noClasses; c++ ) {
{
Class cls = classes[c]; Class cls = classes[c];
{ {
u_int count; u_int count;
Method* methods = class_copyMethodList( cls, &count ); Method* methods = class_copyMethodList( cls, &count );
for( int m = 0; m < count ; m++ ) for( int m = 0; m < count ; m++ ) {
{
SEL selector = method_getName(methods[m]); SEL selector = method_getName(methods[m]);
std::string methodName = sel_getName(selector); std::string methodName = sel_getName(selector);
if( Detail::startsWith( methodName, "Catch_TestCase_" ) ) if( Detail::startsWith( methodName, "Catch_TestCase_" ) ) {
{
std::string testCaseName = methodName.substr( 15 ); std::string testCaseName = methodName.substr( 15 );
std::string name = Detail::getAnnotation( cls, "Name", testCaseName ); std::string name = Detail::getAnnotation( cls, "Name", testCaseName );
std::string desc = Detail::getAnnotation( cls, "Description", testCaseName ); std::string desc = Detail::getAnnotation( cls, "Description", testCaseName );
Context::getTestCaseRegistry().registerTest( TestCaseInfo( new OcMethod( cls, selector ), name.c_str(), desc.c_str(), SourceLineInfo() ) ); Context::getTestCaseRegistry().registerTest( TestCaseInfo( new OcMethod( cls, selector ), name.c_str(), desc.c_str(), SourceLineInfo() ) );
noTestMethods++; noTestMethods++;
} }
} }
free(methods); free(methods);
@ -198,86 +147,69 @@ namespace Catch
return noTestMethods; return noTestMethods;
} }
inline std::string toString( NSString* const& nsstring ) inline std::string toString( NSString* const& nsstring ) {
{
return std::string( "@\"" ) + [nsstring UTF8String] + "\""; return std::string( "@\"" ) + [nsstring UTF8String] + "\"";
} }
namespace Matchers namespace Matchers {
{ namespace Impl {
namespace Impl namespace NSStringMatchers {
{
namespace NSStringMatchers struct StringHolder {
{
struct StringHolder
{
StringHolder( NSString* substr ) : m_substr( [substr copy] ){} StringHolder( NSString* substr ) : m_substr( [substr copy] ){}
StringHolder() StringHolder() {
{
arcSafeRelease( m_substr ); arcSafeRelease( m_substr );
} }
NSString* m_substr; NSString* m_substr;
}; };
struct Equals : StringHolder struct Equals : StringHolder {
{
Equals( NSString* substr ) : StringHolder( substr ){} Equals( NSString* substr ) : StringHolder( substr ){}
bool operator()( NSString* str ) const bool operator()( NSString* str ) const {
{
return [str isEqualToString:m_substr]; return [str isEqualToString:m_substr];
} }
friend std::ostream& operator<<( std::ostream& os, const Equals& matcher ) friend std::ostream& operator<<( std::ostream& os, const Equals& matcher ) {
{
os << "equals string: " << Catch::toString( matcher.m_substr ); os << "equals string: " << Catch::toString( matcher.m_substr );
return os; return os;
} }
}; };
struct Contains : StringHolder struct Contains : StringHolder {
{
Contains( NSString* substr ) : StringHolder( substr ){} Contains( NSString* substr ) : StringHolder( substr ){}
bool operator()( NSString* str ) const bool operator()( NSString* str ) const {
{
return [str rangeOfString:m_substr].location != NSNotFound; return [str rangeOfString:m_substr].location != NSNotFound;
} }
friend std::ostream& operator<<( std::ostream& os, const Contains& matcher ) friend std::ostream& operator<<( std::ostream& os, const Contains& matcher ) {
{
os << "contains: " << Catch::toString( matcher.m_substr ); os << "contains: " << Catch::toString( matcher.m_substr );
return os; return os;
} }
}; };
struct StartsWith : StringHolder struct StartsWith : StringHolder {
{
StartsWith( NSString* substr ) : StringHolder( substr ){} StartsWith( NSString* substr ) : StringHolder( substr ){}
bool operator()( NSString* str ) const bool operator()( NSString* str ) const {
{
return [str rangeOfString:m_substr].location == 0; return [str rangeOfString:m_substr].location == 0;
} }
friend std::ostream& operator<<( std::ostream& os, const StartsWith& matcher ) friend std::ostream& operator<<( std::ostream& os, const StartsWith& matcher ) {
{
os << "starts with: " << Catch::toString( matcher.m_substr ); os << "starts with: " << Catch::toString( matcher.m_substr );
return os; return os;
} }
}; };
struct EndsWith : StringHolder struct EndsWith : StringHolder {
{
EndsWith( NSString* substr ) : StringHolder( substr ){} EndsWith( NSString* substr ) : StringHolder( substr ){}
bool operator()( NSString* str ) const bool operator()( NSString* str ) const {
{
return [str rangeOfString:m_substr].location == [str length] - [m_substr length]; return [str rangeOfString:m_substr].location == [str length] - [m_substr length];
} }
friend std::ostream& operator<<( std::ostream& os, const EndsWith& matcher ) friend std::ostream& operator<<( std::ostream& os, const EndsWith& matcher ) {
{
os << "ends with: " << Catch::toString( matcher.m_substr ); os << "ends with: " << Catch::toString( matcher.m_substr );
return os; return os;
} }