3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-12-28 13:43:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,195 Commits 11 Branches 133 Tags 85 MiB
75a08bbc6c
Commit Graph

239 Commits

Author SHA1 Message Date
Phil Nash
9390675260 Build 26 2013-03-16 20:21:51 +00:00
Phil Nash
9c5bbab239 build 25 2013-03-13 20:54:19 +00:00
Phil Nash
37186a1d04 Added BDD macros 
(Also includes regenerated files from previous commits)
 2013-03-13 12:19:30 +00:00
Phil Nash
6d56d71318 build 24 2013-03-12 18:49:37 +00:00
Phil Nash
3df6c0d1b4 Refactored ConsoleColour impl. Tweaked the (Windows) colours a bit. 
Also fixed issue that would cause warnings on some compilers when doing REQUIRE( p ); where p is a pointer.
Moved to build 23
 2013-03-11 18:38:29 +00:00
Phil Nash
a04981b450 Build 22 2013-03-08 09:30:25 +00:00
Phil Nash
90b2bfec3d Patched issue where an assert before the first section can cause a set-fault (needs a better fix, though) 2013-03-04 15:06:31 +01:00
Phil Nash
767f1588dc Added StringMaker (for partially specialising string conversions), extended BDD macros and moved file/line info to top of message. 
Re-enable ANSI colour by default - hopefully properly excluding Windows this time
 2013-03-04 12:19:15 +01:00
Phil Nash
ead139e094 Reverted ANSI colour change (it was failing for Windows) 
Produced build 20
 2013-02-19 19:59:04 +00:00
Phil Nash
5bdae8456c build 19 2013-02-19 19:47:18 +00:00
Phil Nash
a8c6543bcc Merged Matcher changes to Objective-C bindings 2013-02-19 08:46:09 +00:00
Phil Nash
d768b1b7f9 Fixed sticky INFO (which persisted across TEST_CASEs) from #152 and generated build 18 2013-02-04 00:05:16 +00:00
Phil Nash
a2773810db Build 17 - includes reworking of message/ info handling 2013-02-02 20:37:58 +00:00
Phil Nash
e475645731 Build 16 2013-01-26 20:18:30 +00:00
Phil Nash
3ce320db4f More console reporter tweaks 2013-01-18 08:09:28 +00:00
Phil Nash
b588755a92 Tweaked console reporter some more 2013-01-17 12:07:34 +00:00
Phil Nash
2e7d966b76 Generated build 13 2013-01-16 09:44:43 +00:00
Phil Nash
cf5ced59d1 Build 12 2012-12-14 07:50:08 +00:00
Phil Nash
f117812cff build 11: Console reporter changes 2012-12-11 09:03:14 +00:00
Phil Nash
bcad093af7 Console reporter is now the default 2012-12-10 08:54:57 +00:00
Phil Nash
ff03cdf2b2 Work in progress on Console reporter. 
Includes regenerated single include for Obj-C fixes
 2012-12-06 08:44:51 +00:00
Phil Nash
f276a0588c Added missing #include for assert to fix build failure 2012-12-02 00:05:51 +00:00
Phil Nash
a1fbfea659 Generated build 7 2012-12-01 23:57:18 +00:00
Phil Nash
2846367109 build 6 2012-11-21 18:06:13 +00:00
Phil Nash
a90a88adcd Junit reporter uses filename for suite name if no explicit groups 2012-11-19 19:59:10 +00:00
Phil Nash
3e2e318eeb Build 4 2012-11-17 10:49:24 +00:00
Phil Nash
08142bfdb6 Fixes const int error seen on some compilers (see #136) 
Added a new test to try to highlight issue.
 2012-11-16 21:03:59 +00:00
Wichert Akkerman
fec10533e7 Fix expression compile errors. 2012-11-16 10:47:33 +01:00
Phil Nash
ef60d54671 Fix (hopefully) for #5 (reopened) 
Adds name to JUnit reporter's testsuite element, even when running all tests.
Also removes redundant comment from the output.
 2012-11-16 08:47:03 +00:00
Phil Nash
7673a308d9 Added versioning 2012-11-15 22:15:41 +00:00
Phil Nash
90a3594e10 Regenerated single include following merge 2012-11-13 22:04:29 +00:00
Phil Nash
70c5ef9eed Regen single include 2012-11-13 21:46:01 +00:00
Phil Nash
7717c29072 Implemented CHECK_NOFAIL 
Previous commit missed some files
 2012-11-13 09:45:29 +00:00
Phil Nash
d539da9030 Implemented CHECK_NO_FAIL 2012-11-13 09:44:52 +00:00
Phil Nash
af1a321860 Regen single include 2012-11-10 18:46:39 +00:00
Phil Nash
a1dc7e312c Regen single include 2012-11-06 19:34:35 +00:00
Phil Nash
b5b1b1e430 Some expression/ evaluation clean-up 2012-11-06 19:13:25 +00:00
Phil Nash
ec5956f471 Fix for #134 
The INTERNAL_CATCH_MSG macro, which is used by INFO, WARN and FAIL places its lines in a do…while block so it can be used after an if statement with no block
 2012-11-06 07:52:28 +00:00
Phil Nash
88b70828f2 Regen single include 2012-11-04 21:39:38 +00:00
Phil Nash
e0a40e2ced Regenerated single include following merge 2012-11-01 08:28:26 +00:00
Phil Nash
ce612bf656 Squashed commit of the following: 
commit 2a1e8bfc6e
Author: Phil Nash <github@philnash.me>
Date:   Thu Nov 1 08:16:15 2012 +0000

    Updated colour comments

commit f0f407fc3e
Author: Phil Nash <github@philnash.me>
Date:   Wed Oct 31 18:28:21 2012 +0000

    Manually applied merge #133 from Master

commit 355b95fda1
Author: Phil Nash <github@philnash.me>
Date:   Wed Oct 31 18:04:22 2012 +0000

    Cleaned up ANSI colour code impl a bit

commit 778f9c4fc7
Author: Phil Nash <github@philnash.me>
Date:   Tue Oct 30 09:09:30 2012 +0000

    Removed "no-" from Wno-global-constructors when disabling

commit 5efa4bcb8a
Author: Phil Nash <github@philnash.me>
Date:   Mon Oct 29 20:49:22 2012 +0000

    Regenerated single_include

commit 108f1937d8
Author: Phil Nash <github@philnash.me>
Date:   Mon Oct 29 20:46:45 2012 +0000

    Added terminal colour codes for POSIX

    With thanks to Adam Strzelecki

commit 8f4cc541d5
Author: Phil Nash <github@philnash.me>
Date:   Mon Oct 29 19:55:34 2012 +0000

    Added regression test baselines

commit 2e203a1834
Author: Phil Nash <github@philnash.me>
Date:   Mon Oct 29 19:55:13 2012 +0000

    Fixed remaining reporting regressions

commit 134e45b3ad
Author: Phil Nash <github@philnash.me>
Date:   Sun Oct 28 20:57:21 2012 +0000

    Fixed #132

commit 2f92db9898
Author: Phil Nash <github@philnash.me>
Date:   Sun Oct 28 12:15:34 2012 +0000

    Updated the readme specifically for the Integration branch

commit 82acc2ca05
Author: Phil Nash <github@philnash.me>
Date:   Sun Oct 28 12:07:17 2012 +0000

    Regenerated single include

commit fe1d7c1d08
Author: Phil Nash <github@philnash.me>
Date:   Sun Oct 28 10:27:44 2012 +0000

    Small fixes and tweaks

commit 355b5e546d
Author: Phil Nash <github@philnash.me>
Date:   Fri Oct 26 09:05:36 2012 +0100

    Some tidy-up

commit f847186ebb
Author: Phil Nash <github@philnash.me>
Date:   Fri Oct 26 08:45:23 2012 +0100

    AssertionResultBuilder -> ExpressionResultBuilder

commit 8cca2f1369
Author: Phil Nash <github@philnash.me>
Date:   Wed Oct 24 22:09:01 2012 +0100

    ExpressionBuilder ->ExpressionDecomposer
    Expression -> ExpressionLhs

commit e04e74f896
Author: Phil Nash <github@philnash.me>
Date:   Wed Oct 24 21:59:47 2012 +0100

    More AssertionResult refactoring

commit 1dd56d4d2b
Author: Phil Nash <github@philnash.me>
Date:   Fri Oct 19 08:01:34 2012 +0100

    AssertionResultBuilder can be constructed from result type

commit f2d5f1b3e4
Author: Phil Nash <github@philnash.me>
Date:   Fri Oct 19 08:01:05 2012 +0100

    Expression has its own result builder - not passed in from expression builder

commit e3b111a39a
Author: Phil Nash <github@philnash.me>
Date:   Thu Oct 18 22:59:16 2012 +0100

    streamlined acceptResult

commit 3ad13256e1
Author: Phil Nash <github@philnash.me>
Date:   Thu Oct 18 08:39:44 2012 +0100

    Refactored assertion builder stuff out of expression builder

commit c96f9330a0
Author: Phil Nash <github@philnash.me>
Date:   Wed Oct 17 08:14:22 2012 +0100

    Collect assertion info up front

commit a5fa78284d
Author: Phil Nash <github@philnash.me>
Date:   Tue Oct 16 08:33:13 2012 +0100

    ResultData -> AssertionResultData

commit c597a893fa
Author: Phil Nash <github@philnash.me>
Date:   Tue Oct 16 08:31:05 2012 +0100

    ResultInfo -> AssertionResult filenames and variables

commit d16955f63a
Author: Phil Nash <github@philnash.me>
Date:   Tue Oct 16 08:27:21 2012 +0100

    Renamed ResultInfo -> AssertionResult

commit 175da3ef64
Author: Phil Nash <github@philnash.me>
Date:   Fri Oct 12 18:39:22 2012 +0100

    regen test 3
 2012-11-01 08:27:09 +00:00
Vadim Zeitlin
b7f7054828 Fix harmless but annoying MSVC warnings. 
Suppress

catch.hpp(1760) : warning C4512: 'Catch::TagExtracter' : assignment operator could not be generated
catch.hpp(1864) : warning C4512: 'Catch::TagExpressionParser' : assignment operator could not be generated

warnings given by MSVC 9 (and probably other version too) compiler with /W4 switch.

The warnings are given because the compiler can't synthesize the assignment
operators for the classes with members of reference type, so simply explicitly
declare (without defining) these operators ourselves to suppress them.
 2012-10-31 19:17:31 +01:00
Phil Nash
355b95fda1 Cleaned up ANSI colour code impl a bit 2012-10-31 18:04:22 +00:00
Phil Nash
778f9c4fc7 Removed "no-" from Wno-global-constructors when disabling 2012-10-30 09:09:30 +00:00
Phil Nash
5efa4bcb8a Regenerated single_include 2012-10-29 20:49:22 +00:00
Phil Nash
134e45b3ad Fixed #132 2012-10-28 20:57:21 +00:00
Phil Nash
82acc2ca05 Regenerated single include 2012-10-28 12:07:17 +00:00
Phil Nash
175da3ef64 regen test 3 2012-10-12 18:39:22 +01:00
Phil Nash
190fe09be5 regen test 2 2012-10-12 18:18:14 +01:00
Phil Nash
813a13caed Regenerated to test branch 2012-10-12 08:05:45 +01:00
Phil Nash
9444bbcb7b Added AllOf and AnyOf matchers 2012-10-12 07:58:17 +01:00
Phil Nash
9902ac9f1a Cleaned up ResultInfoBuilder a bit 2012-10-09 20:58:33 +01:00
Phil Nash
6730512afa Refactoring ResultData out of ResultInfo/ Builder pt2 2012-10-09 11:48:55 +01:00
Phil Nash
803f6b7e4b Added SCOPED_CAPTURE 2012-10-04 08:14:48 +01:00
Phil Nash
9e7e63c687 Regenerated single include 2012-09-29 20:54:03 +01:00
Matt Wozniski
07e20aa706 Merge remote-tracking branch 'phil' into include-guard-fixes 
Conflicts:
	single_include/catch.hpp
 2012-09-26 21:42:44 -04:00
Phil Nash
67ec8709ea First cut of command line support for tags 2012-09-26 18:38:26 +01:00
Phil Nash
799ecf9604 Regenerated single include 2012-09-24 08:30:13 +01:00
Matt Wozniski
f29c898443 Normalize include guards for all *.h and *.hpp 
Some files had include guards that didn't match the file name, and
others were missing the include guards entirely.

Standardized this so that every include file has an include guard, and
all the guards are of the form TWOBLUECUBES_<FILENAME>_<EXT>_INCLUDED
 2012-09-17 01:53:39 -04:00
Phil Nash
fc1baac7f5 First cut of tags support 2012-09-15 17:53:27 +01:00
Phil Nash
f7418eb2dd Completed embedded docs 2012-09-09 11:44:30 +01:00
Phil Nash
e2d215e9c0 Added internal documentation for some options 2012-09-07 17:52:35 +01:00
Phil Nash
deb3ced619 Ptr op= takes const ref (fixes: #115) 2012-08-31 18:50:46 +01:00
Phil Nash
62b7039a7b Fixed #114 (no exit code on failure) 2012-08-31 18:46:13 +01:00
Phil Nash
74d1d31997 Added CATCH_ version of SUCCEED macro 2012-08-31 18:37:47 +01:00
Phil Nash
a70fbe3c1a Completed NoAssertions warning implementation 2012-08-31 08:10:36 +01:00
Phil Nash
78c92e68aa Got rid of some warnings 2012-08-27 21:48:15 +01:00
Phil Nash
ecf934b045 Option objects now enforce min/ max args generically 2012-08-27 21:42:55 +01:00
Phil Nash
95ae50ad3d Test for ~ and removed debug print 2012-08-24 19:01:35 +01:00
Phil Nash
f82861fb0a Changed shorthand for exclude: to ~ 2012-08-24 18:57:49 +01:00
Phil Nash
e571e6f4a0 Can specify tests without -t. ex: is shorthand for exclude: 2012-08-24 18:54:56 +01:00
Phil Nash
4c97fc5619 WIldcards at both ends 2012-08-24 08:23:50 +01:00
Phil Nash
56d5c42912 First cut of new filtering mechanism 2012-08-23 20:08:50 +01:00
Phil Nash
d2ec849984 Regenerated single include 2012-08-23 19:48:57 +01:00
Phil Nash
5bc030ddd7 Regenerated single include 2012-08-16 18:48:50 +01:00
Phil Nash
a695eb9006 Builds almost completely cleanly with -WEverything in LLVM 2012-08-13 07:46:10 +01:00
Phil Nash
3b80af7a06 Recreated the single include test project and got it working after impl refactorings 2012-08-09 07:47:30 +01:00
Phil Nash
0dc9e43c02 Fixed toString for NSString* in Xcode 4.4 2012-08-01 08:17:07 +01:00
Phil Nash
61756974d0 Catches incorrect reporter name as per #107 2012-07-28 20:37:07 +01:00
Phil Nash
b084562b3b Improved error handling for --abort as per #108 2012-07-28 20:22:40 +01:00
Phil Nash
6f220863cf Removed stray + 2012-07-23 08:24:52 +01:00
Phil Nash
d2553cdc64 Made ReportConfig a value type 2012-07-20 19:07:42 +01:00
Phil Nash
f606517376 Fixed pluralization bug from GitHub issue #101 2012-07-20 18:47:45 +01:00
Phil Nash
46bcd4b2b7 Added ability to specify if macros should be prefixed with CATCH_ 2012-07-20 18:43:48 +01:00
Phil Nash
5d73c5a008 Resolve reporter outside of Config 
config now only only holds reporter name
 2012-07-17 08:04:19 +01:00
Phil Nash
02006d85d7 Disabled use of __FUNCTION__ for now 2012-07-05 23:12:22 +01:00
Phil Nash
abf271672f Added NotImplementedException 2012-07-05 18:37:58 +01:00
Phil Nash
78372d09d4 Added toString overload for chars 
(and, by extension, Obj-C's BOOL)
 2012-06-06 08:06:40 +01:00
Phil Nash
e463687725 Regen single include 2012-06-05 20:51:05 +01:00
Phil Nash
e20b252b5a Regen single include 2012-06-05 20:16:58 +01:00
Phil Nash
8d02b9306d Changed --cutoff to --abort 2012-06-02 23:26:32 +01:00
Phil Nash
0f9c551d4d Moved catch_interfaces_runner.hpp out of conditionally compiled section 2012-06-02 23:12:42 +01:00
Phil Nash
19b2aa6187 Added cutoff option to command line 
Aborts testing after a certain number of assertion failures
 2012-06-01 19:40:27 +01:00
Phil Nash
163088a11f Refactored command line parser to be more cohesive 
Also added a set of unit tests for them (incomplete)
 2012-05-31 19:40:26 +01:00
Phil Nash
06e959be3e Fixed used of cleaned-up context by runner's destructor 
This was causing a segfault for some
 2012-05-25 08:52:05 +01:00
Phil Nash
a8570dfdfe Regenerated single include 2012-05-24 08:29:41 +01:00
Phil Nash
4df051bcf4 single header now includes date-time of generation in comment header 2012-05-22 22:22:22 +01:00
Phil Nash
7004f4a234 Regenerated single include 2012-05-22 08:56:59 +01:00
Phil Nash
35b31fa78a Added support for Objective-C exceptions 2012-05-21 21:51:16 +01:00
Phil Nash
371db8b42f Context methods are non-static - accessed via interface 
This is a move towards allowing multiple contexts - with the concept of a (possibly thread local) "current" context
 2012-05-21 18:52:09 +01:00
Phil Nash
89d2a3f911 Regenerated single include 2012-05-16 15:09:17 +01:00
Phil Nash
6217966743 Regenerated single include 2012-05-11 19:06:43 +01:00
Phil Nash
176eb81563 Regenerate single include 2012-05-11 08:17:16 +01:00
Phil Nash
aec1e5ed86 Tweaked single include merging to remove comment blocks 
Also removed multiple blank lines
 2012-05-09 19:37:51 +01:00
Phil Nash
d31737f18b Regenerated single_include 2012-05-09 19:04:00 +01:00
Phil Nash
6f1543b1b1 Regenerated single include 2012-05-07 19:46:19 +01:00
Phil Nash
49e6d536e1 Clean-up and regenerated single include 2012-05-05 19:35:35 +01:00
Phil Nash
83a66a6255 Removed redundant const 
(also fixed test counts)
 2012-04-28 12:39:15 +01:00
Phil Nash
861a1e79cf Conditionally compile __unsafe_unretained 
Addresses, and hopefully fixes, issue #77.
 2012-04-28 12:29:52 +01:00
Jardel Weyrich
11dca66336 Fix missing parameter for comparisons between long and unsigned X. 2012-04-27 14:42:40 -03:00
Phil Nash
53c990a7e1 ARC support for Object-C projects 2012-03-17 18:20:06 +00:00
Phil Nash
8d18d1648a Regenerated single include 2012-03-14 20:06:14 +00:00
Phil Nash
78d95a0854 Regen single include 2012-03-04 21:22:36 +00:00
Phil Nash
5ff4ab0a76 Suppress warning about constant conditional 2012-02-29 08:47:18 +00:00
Phil Nash
777b8af589 regen single include 2012-02-29 08:39:46 +00:00
Phil Nash
918046aaf1 Regen single include for last few checkins 2012-02-28 20:04:42 +00:00
Phil Nash
f7299fc87b Regen include 2012-02-25 09:39:45 +00:00
Phil Nash
2cc9b0dba1 Regen header 2012-02-22 09:44:06 +00:00
Phil Nash
3619cb2f09 Regenerated single include 2012-02-18 19:16:30 +00:00
Phil Nash
dd5b9c2ae5 Added clean-up 
Clean-up statics at the end of main to avoid added noise when looking for leaks
 2012-02-18 09:58:30 +00:00
Phil Nash
333e6e6254 Improved exception reporting 
Refactored exception handling (handle more in the translator)
and report exceptions in CHECKs
 2012-02-17 19:50:59 +00:00
Phil Nash
6e0f58d474 Generated single include 2012-02-15 18:37:21 +00:00
Phil Nash
a162e22fa3 Added CHECKED_IF and CHECKED_ELSE 2012-02-10 08:30:13 +00:00
Phil Nash
4a0a70a82e Regenerated single header 2012-02-09 08:37:02 +00:00
Phil Nash
fd78e0f6df Regenerated single include after last commit 2011-12-28 19:56:39 +00:00
Phil Nash
f51d316dba Regenerated single include for last few commits 2011-12-28 10:37:31 +00:00
Phil Nash
98a21bce5d regenerated single_include 2011-09-19 18:23:07 +01:00
Phil Nash
8152825e9f Fixed Obj-C related #include ordering 2011-08-15 09:06:31 +01:00
Phil Nash
83224e637f Regenerated single include 2011-08-12 18:53:28 +01:00
Phil Nash
2254540959 Regenerated single include 2011-08-09 18:41:01 +01:00
Phil Nash
4021d65f64 Regenerated single_include 2011-07-15 08:12:10 +01:00
Phil Nash
d6566f9d2f regen single header with __debugbreak fix 2011-07-04 09:14:15 +01:00
Phil Nash
62a5ddce2b regen single header with lhs string literal fix 2011-06-29 19:25:14 +01:00
Phil Nash
b5fabcb26b Updated glue script to work relative to script dir, then regenerated single header 2011-06-28 08:38:55 +01:00
Phil Nash
3c20a75189 regenerated single header 2011-06-23 08:23:33 +01:00
Phil Nash
f721a96d24 regenerated to include Approx changes 2011-06-07 14:13:57 +01:00
Phil Nash
48112c2700 Fixed a potential ordering issue with output streambufs 2011-05-31 18:47:30 +01:00
Phil Nash
6b6143ccd4 Removed templates from Approx (just uses double) 2011-05-31 07:51:04 +01:00
Phil Nash
89d1e6c4f1 Tweaks to allow headers to be glued together. 
Added Python script to generate single header.
Added new XCode project that runs self test against single header
 2011-05-24 08:23:02 +01:00