3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,133 Commits 9 Branches 131 Tags 81 MiB
Commit Graph

303 Commits

Author SHA1 Message Date
Phil Nash 9d469b6cb5 build 37 2014-04-18 08:30:31 +01:00
Phil Nash 20cad7cb1d Tags beginning with a non alpha-numeric character are now disallowed. 
Added !throws special tag which denotes a test case to be skipped when run with -e
(the idea being that the test case is expected to throw an exception which is not caught within a XXX_THROWS assertion).
 2014-04-15 18:44:37 +01:00
Phil Nash c5406a25bf build 35 2014-04-12 19:21:08 +01:00
Phil Nash a176b93738 Fix for #270 (REQUIRE continues if test throws an exception). 
Added test case that reproduced the bug then applied the fix.
 2014-04-12 19:07:24 +01:00
Phil Nash af8cd98f20 New version of Clara that fixes operator= issue with ref member (#265) 2014-03-24 18:15:04 +00:00
Phil Nash 472dc2a61f New version of Clara 
- interface changed slightly
- moved clara.h and tbc_text_format.h into “external” folder
 2014-03-17 18:40:58 +00:00
Phil Nash f9df35b12b Fixed instance of Clara::_ placeholder when using CATCH_CONFIG_RUNNER 2014-03-10 18:02:18 +00:00
Phil Nash dd2810d60a build 30 
- with Clara fix for null deref crash
 2014-03-07 06:58:33 +00:00
Phil Nash 9abb27676d Fix problem (hopefully) with single source definitions from Clara 
- define CLARA_CONFIG_MAIN in the right place
 2014-03-06 21:53:34 +00:00
Phil Nash fd879f7e77 Build 28 
- new version of Clara
- removed command line tests
 2014-03-06 08:17:24 +00:00
Phil Nash b9fea75109 New version of Clara. 
- updated command line setup with new API
- updated STITCH macros
- force embedded Clara to use Catch’s console width (but restore it after)
- remove command line tests (as these have now moved into the Clara project)
 2014-03-06 08:16:06 +00:00
Phil Nash 1f1ee3c63d New version of Clara 
- Clara now built with new stitch script (based on generateSingleInclude)
- also fixed python scripts for python 3 (print now a function rather than a keyword)
 2014-03-01 10:38:14 +00:00
Phil Nash 1c2fbe146b build 26 2014-02-11 18:12:41 +00:00
Phil Nash 7eb5acc183 build 25 
- fix for #231
 2014-01-08 17:17:31 +00:00
Phil Nash be890d0c15 build 24 2014-01-07 17:26:59 +00:00
Phil Nash e45e3a139a Clara ignores anything after a lone — (double dash) 
- this allows use within an environment that appends additional arguments that Clara will otherwise reject
- generated build 23
 2013-12-23 10:24:06 +00:00
Phil Nash 91ef5f7d40 build 22 2013-12-20 19:06:26 +00:00
Phil Nash f385a0b13d build 21 2013-12-19 18:42:25 +00:00
Phil Nash eb760f689b Build 20 2013-12-18 08:38:33 +00:00
Phil Nash 66d641af64 Sneaking last change in without version bump 2013-12-14 23:16:44 +00:00
Phil Nash 2851b4a55a Try again with nullptr compatibility check in GCC 2013-12-14 23:04:06 +00:00
Phil Nash 9d7b77956c build 19 
- fixes nullptr regression (I had accidentally left in some dev changes)
 2013-12-14 22:53:28 +00:00
Phil Nash 859760abb4 Build 18 2013-12-14 14:34:05 +00:00
Phil Nash a6d74bd55a Build 17 2013-12-11 08:28:15 +00:00
Phil Nash de49ec4d7c Fixed broken single header following script change 
- fixed the script (was missing #ifdefs)
- also fixed single include (Xcode) test project
- build 16
 2013-12-04 20:25:14 +00:00
Phil Nash 3649fdf285 Build 15 2013-12-03 18:53:55 +00:00
Phil Nash 5ecb72b9bb Build 14 2013-11-26 20:57:45 +00:00
Phil Nash 8d44f2dbb2 build 13 2013-11-13 08:10:45 +00:00
Phil Nash 5320518dbc Build 12 2013-11-09 07:47:09 +00:00
Phil Nash 93a945cee9 Fixed uninitialised members in Context object 2013-10-23 15:35:07 +01:00
Phil Nash 380f98ed1f Regenerated single include 2013-10-17 22:45:21 +01:00
Andy Sawyer 7974e1cb55 updated single-include version 2013-09-21 19:08:23 +01:00
Andy Sawyer 0dbcf218c3 Add allocator support to StringMaker<vector> 
- also extracted out 'rangeToString', in an attempt to make it easier
   to add support for other containers
 2013-09-17 22:22:47 +01:00
Phil Nash 1e2f1d1603 Fixes toString forward reference issue: 
- as raised in https://github.com/philsquared/Catch/pull/195
 2013-09-14 19:58:45 +01:00
Phil Nash f7378eebb6 Fixed string indexing bug 2013-09-07 12:07:38 +01:00
Phil Nash 04a3364b5a Regen single header 2013-08-16 19:09:09 +01:00
Phil Nash 46118714b1 Build 8 
- includes command line tweaks and fixes for durations
 2013-08-16 19:01:32 +01:00
Phil Nash 357d654641 Added missing assert include 2013-08-16 08:01:16 +01:00
Phil Nash 3faa412855 Removed basic reporter 2013-08-15 19:09:07 +01:00
Phil Nash aa7123b696 Build 7 
- New Junit reporter
- New Timer class
 2013-08-15 19:01:00 +01:00
Phil Nash 801672b962 Fix MSVC warning 2013-07-25 08:18:09 +01:00
Phil Nash 8a52a39fdc Build 6 
- fixes infinite loop bug (#185 and #166)
 2013-07-25 08:12:03 +01:00
Phil Nash 372a6c6fed Small fixes and started new section tracking code 2013-07-23 08:15:34 +01:00
Phil Nash 503d5d0c8e Converted stray tabs to spaces 2013-07-03 08:25:11 +01:00
Phil Nash ad7445d33c build 5 
- added throw() to streambuf destructor overrides (#182)
 2013-07-02 08:49:29 +01:00
Phil Nash 3907559896 build 4 2013-07-01 19:02:29 +01:00
Phil Nash 4b5e008b20 guard NOMINMAX definition (windows) 2013-06-29 20:31:17 +01:00
Phil Nash cd688300b0 Build 2 2013-06-29 12:11:32 +01:00
Phil Nash b5fd5a6496 INFO and CAPTURE are now scoped 
- SCOPED_INFO and SCOPED_CAPTURE are now just aliases
 2013-06-28 17:09:57 +01:00
Phil Nash 235204393a Big merge from Integration 
- now v1.0 build 1
 2013-06-28 14:11:28 +01:00
Phil Nash 7d5f2715ce Fixed script for new readme 
- updated README with new version
- fixed casing error for -e opt description
 2013-06-07 21:15:25 +01:00
Phil Nash 786959d535 build 39 2013-06-07 19:07:50 +01:00
Phil Nash 8defc71e6d Build 38 2013-04-24 19:10:02 +01:00
Phil Nash d0d4d93a6b Build 37 
- string matchers work with NULLs
- removed stray CATCH_CONFIG_SFINAE for GCC 3
 2013-04-23 08:02:48 +01:00
Phil Nash 471eba2c32 Build 36 
- incorporation of pull request #154 to allow comparison with nullptr_t
- some compiler capability tweaks
 2013-04-22 18:55:12 +01:00
Phil Nash dd52044374 Build 35 
- non-SFINAE IsStreamInsertable
 2013-04-20 23:20:05 +01:00
Phil Nash 19279250e8 Build 34 
includes:
- SFINAE version of IsStreamable (where available)
- new Text class that replaces LineWrapper (internal)
- fix for spurious double exception reporting (#164)
 2013-04-20 21:07:32 +01:00
Phil Nash 243f2d2caf build 33 2013-04-12 10:43:06 +01:00
Phil Nash 8764177c0e build 32 2013-04-08 11:50:41 +01:00
Phil Nash 12c16fff8d Build 31 
- new Colour class
- Headers are wrapped, with special indentation for given/ when/ then
 2013-04-05 20:58:01 +01:00
Phil Nash 5c7d3d75cc build 30 2013-04-01 11:27:10 +01:00
Phil Nash 38f7eef6fe build 29 2013-03-29 13:44:33 +00:00
Phil Nash dd26e889b5 Build 28 2013-03-25 09:25:31 +00:00
Phil Nash bd7f797e09 build 27 2013-03-21 09:00:24 +00:00
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