Skip to content

Commit 7e15d9b

Browse files
philsquaredphilsquared
committed
dev build 4
1 parent 0e64973 commit 7e15d9b

File tree

3 files changed

+68
-38
lines changed

3 files changed

+68
-38
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
![catch logo](catch-logo-small.png)
22

3-
*v1.3.0-develop.3*
3+
*v1.3.0-develop.4*
44

55
Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)
66

‎include/internal/catch_version.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace Catch {
3737
return os;
3838
}
3939

40-
Version libraryVersion( 1, 3, 0, "develop", 3 );
40+
Version libraryVersion( 1, 3, 0, "develop", 4 );
4141

4242
}
4343

‎single_include/catch.hpp

Lines changed: 66 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* Catch v1.3.0-develop.3
3-
* Generated: 2015-11-18 08:39:33.879583
2+
* Catch v1.3.0-develop.4
3+
* Generated: 2015-11-20 16:58:58.532767
44
* ----------------------------------------------------------
55
* This file has been merged from multiple headers. Please don't edit it directly
66
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -629,27 +629,32 @@ struct NameAndDesc {
629629
const char* description;
630630
};
631631

632+
void registerTestCase
633+
( ITestCase* testCase,
634+
char const* className,
635+
NameAndDesc const& nameAndDesc,
636+
SourceLineInfo const& lineInfo );
637+
632638
struct AutoReg {
633639

634-
AutoReg( TestFunction function,
635-
SourceLineInfo const& lineInfo,
636-
NameAndDesc const& nameAndDesc );
640+
AutoReg
641+
( TestFunction function,
642+
SourceLineInfo const& lineInfo,
643+
NameAndDesc const& nameAndDesc );
637644

638645
template<typename C>
639-
AutoReg( void (C::*method)(),
640-
char const* className,
641-
NameAndDesc const& nameAndDesc,
642-
SourceLineInfo const& lineInfo ) {
643-
registerTestCase( new MethodTestCase<C>( method ),
644-
className,
645-
nameAndDesc,
646-
lineInfo );
647-
}
648-
649-
void registerTestCase( ITestCase* testCase,
650-
char const* className,
651-
NameAndDesc const& nameAndDesc,
652-
SourceLineInfo const& lineInfo );
646+
AutoReg
647+
( void (C::*method)(),
648+
char const* className,
649+
NameAndDesc const& nameAndDesc,
650+
SourceLineInfo const& lineInfo ) {
651+
652+
registerTestCase
653+
( new MethodTestCase<C>( method ),
654+
className,
655+
nameAndDesc,
656+
lineInfo );
657+
}
653658

654659
~AutoReg();
655660

@@ -658,6 +663,11 @@ struct AutoReg {
658663
void operator= ( AutoReg const& );
659664
};
660665

666+
void registerTestCaseFunction
667+
( TestFunction function,
668+
SourceLineInfo const& lineInfo,
669+
NameAndDesc const& nameAndDesc );
670+
661671
} // end namespace Catch
662672

663673
#ifdef CATCH_CONFIG_VARIADIC_MACROS
@@ -681,6 +691,10 @@ struct AutoReg {
681691
} \
682692
void INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ )::test()
683693

694+
///////////////////////////////////////////////////////////////////////////////
695+
#define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
696+
Catch::AutoReg( Function, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( __VA_ARGS__ ) );
697+
684698
#else
685699
///////////////////////////////////////////////////////////////////////////////
686700
#define INTERNAL_CATCH_TESTCASE( Name, Desc ) \
@@ -702,6 +716,9 @@ struct AutoReg {
702716
} \
703717
void INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ )::test()
704718

719+
///////////////////////////////////////////////////////////////////////////////
720+
#define INTERNAL_CATCH_REGISTER_TESTCASE( Function, Name, Desc ) \
721+
Catch::AutoReg( Function, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( Name, Desc ) );
705722
#endif
706723

707724
// #included from: internal/catch_capture.hpp
@@ -6296,29 +6313,38 @@ namespace Catch {
62966313
return className;
62976314
}
62986315

6299-
///////////////////////////////////////////////////////////////////////////
6316+
void registerTestCase
6317+
( ITestCase* testCase,
6318+
char const* classOrQualifiedMethodName,
6319+
NameAndDesc const& nameAndDesc,
6320+
SourceLineInfo const& lineInfo ) {
63006321

6301-
AutoReg::AutoReg( TestFunction function,
6302-
SourceLineInfo const& lineInfo,
6303-
NameAndDesc const& nameAndDesc ) {
6322+
getMutableRegistryHub().registerTest
6323+
( makeTestCase
6324+
( testCase,
6325+
extractClassName( classOrQualifiedMethodName ),
6326+
nameAndDesc.name,
6327+
nameAndDesc.description,
6328+
lineInfo ) );
6329+
}
6330+
void registerTestCaseFunction
6331+
( TestFunction function,
6332+
SourceLineInfo const& lineInfo,
6333+
NameAndDesc const& nameAndDesc ) {
63046334
registerTestCase( new FreeFunctionTestCase( function ), "", nameAndDesc, lineInfo );
63056335
}
63066336

6307-
AutoReg::~AutoReg() {}
6308-
6309-
void AutoReg::registerTestCase( ITestCase* testCase,
6310-
char const* classOrQualifiedMethodName,
6311-
NameAndDesc const& nameAndDesc,
6312-
SourceLineInfo const& lineInfo ) {
6337+
///////////////////////////////////////////////////////////////////////////
63136338

6314-
getMutableRegistryHub().registerTest
6315-
( makeTestCase( testCase,
6316-
extractClassName( classOrQualifiedMethodName ),
6317-
nameAndDesc.name,
6318-
nameAndDesc.description,
6319-
lineInfo ) );
6339+
AutoReg::AutoReg
6340+
( TestFunction function,
6341+
SourceLineInfo const& lineInfo,
6342+
NameAndDesc const& nameAndDesc ) {
6343+
registerTestCaseFunction( function, lineInfo, nameAndDesc );
63206344
}
63216345

6346+
AutoReg::~AutoReg() {}
6347+
63226348
} // end namespace Catch
63236349

63246350
// #included from: catch_reporter_registry.hpp
@@ -7241,7 +7267,7 @@ namespace Catch {
72417267
return os;
72427268
}
72437269

7244-
Version libraryVersion( 1, 3, 0, "develop", 3 );
7270+
Version libraryVersion( 1, 3, 0, "develop", 4 );
72457271

72467272
}
72477273

@@ -10061,13 +10087,15 @@ int main (int argc, char * const argv[]) {
1006110087
#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
1006210088
#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
1006310089
#define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
10090+
#define CATCH_REGISTER_TEST_CASE( ... ) INTERNAL_CATCH_REGISTER_TESTCASE( __VA_ARGS__ )
1006410091
#define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
1006510092
#define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "CATCH_FAIL", __VA_ARGS__ )
1006610093
#define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, "CATCH_SUCCEED", __VA_ARGS__ )
1006710094
#else
1006810095
#define CATCH_TEST_CASE( name, description ) INTERNAL_CATCH_TESTCASE( name, description )
1006910096
#define CATCH_TEST_CASE_METHOD( className, name, description ) INTERNAL_CATCH_TEST_CASE_METHOD( className, name, description )
1007010097
#define CATCH_METHOD_AS_TEST_CASE( method, name, description ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, name, description )
10098+
#define CATCH_REGISTER_TEST_CASE( function, name, description ) INTERNAL_CATCH_REGISTER_TESTCASE( function, name, description )
1007110099
#define CATCH_SECTION( name, description ) INTERNAL_CATCH_SECTION( name, description )
1007210100
#define CATCH_FAIL( msg ) INTERNAL_CATCH_MSG( Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "CATCH_FAIL", msg )
1007310101
#define CATCH_SUCCEED( msg ) INTERNAL_CATCH_MSG( Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, "CATCH_SUCCEED", msg )
@@ -10128,13 +10156,15 @@ int main (int argc, char * const argv[]) {
1012810156
#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
1012910157
#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
1013010158
#define METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
10159+
#define REGISTER_TEST_CASE( ... ) INTERNAL_CATCH_REGISTER_TESTCASE( __VA_ARGS__ )
1013110160
#define SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
1013210161
#define FAIL( ... ) INTERNAL_CATCH_MSG( Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "FAIL", __VA_ARGS__ )
1013310162
#define SUCCEED( ... ) INTERNAL_CATCH_MSG( Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, "SUCCEED", __VA_ARGS__ )
1013410163
#else
1013510164
#define TEST_CASE( name, description ) INTERNAL_CATCH_TESTCASE( name, description )
1013610165
#define TEST_CASE_METHOD( className, name, description ) INTERNAL_CATCH_TEST_CASE_METHOD( className, name, description )
1013710166
#define METHOD_AS_TEST_CASE( method, name, description ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, name, description )
10167+
#define REGISTER_TEST_CASE( ... ) INTERNAL_CATCH_REGISTER_TESTCASE( __VA_ARGS__ )
1013810168
#define SECTION( name, description ) INTERNAL_CATCH_SECTION( name, description )
1013910169
#define FAIL( msg ) INTERNAL_CATCH_MSG( Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, "FAIL", msg )
1014010170
#define SUCCEED( msg ) INTERNAL_CATCH_MSG( Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, "SUCCEED", msg )

0 commit comments

Comments
 (0)