3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-05 05:39:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,325 Commits 11 Branches 133 Tags 84 MiB
b74d4ca96d
Commit Graph

265 Commits

Author SHA1 Message Date
Phil Nash
bc8840cbb8 Removed deprecated section tracking implementation and tests 2015-11-03 07:38:14 +00:00
Phil Nash
471bd2556a Approved changes due to "No assertions" warnings now firing correctly on inner sections 2015-11-03 07:33:43 +00:00
Phil Nash
368714e7aa Added Listeners (programatically provided extra reporters) 2015-08-07 08:20:56 +01:00
Phil Nash
85c8074784 Set group name to -n parameter (or exe name) 
- As discussed in #469
 2015-07-28 18:26:09 +01:00
Phil Nash
0edebf41b0 approvals rebase 
- I *think* this fixes an earlier regression, but I'm not 100% sure where that came from!
 2015-07-28 18:24:20 +01:00
Phil Nash
70975517b3 rebased approvals for long long test 2015-07-23 23:05:52 +01:00
Phil Nash
d6e59cd56f Fixed Xml encoding 
- don't encode apostrophes
- only encode quotes in attributes
- encode control characters (as in PR #465)
 2015-07-23 18:45:31 +01:00
Phil Nash
72868920bb Exception message assertions now work with matchers 2015-07-15 23:02:25 +01:00
Phil Nash
2104ca2aa4 Exception message testing now supports wildcards 
- extracted WildcardPattern from TestSpec::NamePattern
 2015-07-13 15:03:04 +01:00
Phil Nash
85de743d70 Added _THROWS_WITH macros 
- asserts on exception message
 2015-07-13 06:34:41 +01:00
Phil Nash
805de43a3d Use CATCH_NULL instead of NULL 
- expands to nullptr if CATCH_CONFIG_CPP11_NULLPTR is defined (see #444)
 2015-07-01 07:33:27 +01:00
Phil Nash
6ed74b5cab changed hex threshold on ints to 255 
- and print it in *addition* to the decimal form
 2015-05-20 18:28:22 +01:00
Phil Nash
2fc9de9370 Updated approvals following merge of develop back to master 2015-05-18 18:11:58 +01:00
Phil Nash
856468c8c4 Rebased to include new --force-colour tests 2015-03-04 08:22:32 +00:00
Phil Nash
50183208a3 Added tests for toString<std::tuple<>> and rebased 2014-12-30 18:47:01 +00:00
Phil Nash
c6635a7b79 Added type attribute to xml reporter output 
- reports the macro used
 2014-12-30 18:25:27 +00:00
Phil Nash
6817bb099d Fixed up xml reporter and rebased 2014-12-30 18:24:31 +00:00
Phil Nash
3c8c9b2933 rebased 2014-12-22 20:17:50 +00:00
Phil Nash
3dc3763b07 Rebased 2014-12-21 00:20:09 +00:00
Phil Nash
ff9e51df7f toString( int ) uses hex for large values 
now matches behaviour of unsigned int
 2014-12-12 08:10:45 +00:00
Phil Nash
a99e75b928 Made approvals more platform agnostic 
removes root from all paths - so only relative paths remain
 2014-12-11 23:40:29 +00:00
Phil Nash
3e1d3c7271 Give (currently not used, so global only) group a name 2014-09-08 08:14:22 +01:00
Phil Nash
886ef1620a Some minor tidy-up/ style alignment of recent toString merges 2014-09-04 07:27:09 +01:00
Phil Nash
5ea3266857 Added baselines for new test cases 2014-09-03 19:22:47 +01:00
Phil Nash
cb8fe472b2 Approvals for develop branch 2014-08-22 08:13:47 +01:00
Phil Nash
8b5a4e9355 Added approvals for new tests 2014-08-20 08:08:13 +01:00
Phil Nash
3ff3acf46c Approvals for last change 2014-07-09 19:21:44 +01:00
Phil Nash
d89e74faff Format floats like doubles when printing - but add ‘f’ suffix (a lá #291) 2014-07-09 18:16:40 +01:00
Phil Nash
08e5296720 Regenerated single include and baselines 2014-07-03 19:08:44 +01:00
Phil Nash
9c1f9a8f9a Added [!mayfail] tag to indicate test case that can fail without failing the suite. 
Overhauled the summary report (including the expected failure count)
 2014-07-03 08:09:57 +01:00
Phil Nash
061861d940 Approved tag alias tests 2014-06-30 07:34:27 +01:00
Phil Nash
9438a03d5b Big assertion capture refactoring. 
- moved as much logic out of the macros as possible
- moved most logic into new ResultBuilder class, which wraps ExpressionResultBuilder (may take it over next), subsumes ResultAction and also takes place of ExpressionDecomposer.

This introduces many SRP violations - but all in the name of minimising macro logic!
 2014-05-28 18:53:01 +01:00
Phil Nash
14796814b8 Approved new test case 2014-05-23 18:55:05 +01:00
Phil Nash
a2d8f774d2 Approved new test output 2014-05-20 18:28:48 +01:00
Phil Nash
baf181f15d Minor fixes to a couple of test names 2014-05-20 18:11:43 +01:00
Phil Nash
7139035906 Updated approvals after adding extra tests 2014-05-19 18:21:01 +01:00
Phil Nash
766491a7c4 Approved all the changes following name/ tag parser rework 2014-05-16 18:31:15 +01:00
Phil Nash
1a6f2a0a80 Changed the way noexcept support is handled to (hopefully) fix #275 and #273 2014-04-23 18:19:19 +01:00
Phil Nash
31caba4f73 Added test for invisibles 2014-04-23 07:07:27 +01:00
Phil Nash
a020865990 Sections are, once again, eagerly entered. 
When the section tracking code was rewritten a while back to simplify and iron out some bugs the order of evaluation was changed so that each new section was skipped on the first run through.
This had unwelcome consequences for some people.
This commit restores the original semantics (while maintaining the simpler, less buggy, new code).
 2014-04-21 19:02:38 +01:00
Phil Nash
87891cf38b Updated approval tests baselines 2014-04-16 18:00:55 +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
1bccc03213 Secondary fix for #270 (addresses same issue with CHECK) 2014-04-12 19:20:46 +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
e9d35377fa re-approved following recent command line description tweak 2014-04-12 19:05:03 +01:00
Phil Nash
fd879f7e77 Build 28 
- new version of Clara
- removed command line tests
 2014-03-06 08:17:24 +00:00
Phil Nash
e091018514 Fixes toString() for function pointers and added support for member function pointers. 
- thanks to Malcolm Noyes for supplying sample code on which the solution here was based
 2014-01-07 17:25:27 +00:00
Phil Nash
1aa60fada9 Changed Approx::toString() to be implemented in terms of toString( double ) (as proposed in #233) 2013-12-19 18:41:55 +00:00
Phil Nash
fb90d38310 Changed stdout/ stderr messages to be less misleading 2013-12-19 08:07:33 +00:00
Phil Nash
557b3bdbe3 Made SUCCESS variadic too (optional stream) 2013-12-14 23:16:03 +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
a1e87a4b7d trim test/ section names in xml reporter 
- BDD-style test names have leading spaces for alignment in the console reporter
 2013-12-10 08:20:46 +00:00
Phil Nash
337dc25ed7 Converted all test case names to "modern" style (freeform text + tags) 2013-11-19 07:21:03 +00:00
Phil Nash
4f57c8c589 Print warnings if no assertions and not running with -s 2013-11-13 08:07:38 +00:00
Phil Nash
93a945cee9 Fixed uninitialised members in Context object 2013-10-23 15:35:07 +01:00
Phil Nash
a35ee200da Filter out version number from approval tests 2013-09-30 08:05:14 +01:00
Phil Nash
16c21ee265 No, really trim paths in approval tests down to just filenames 2013-09-30 08:01:10 +01:00
Phil Nash
1e74938538 Trim paths in approval tests down to filenames 2013-09-30 07:39:06 +01:00
Phil Nash
2f7a296897 Split approve file into multiple files 2013-09-27 19:01:14 +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
46118714b1 Build 8 
- includes command line tweaks and fixes for durations
 2013-08-16 19:01:32 +01:00
Phil Nash
3faa412855 Removed basic reporter 2013-08-15 19:09:07 +01:00
Phil Nash
11b5179ceb Redacted test durations from JUnit reporter output in approval test script 2013-08-15 18:50:40 +01:00
Phil Nash
2ddb9d3802 Completed CumulativeReporterBase and reimplemented JUnitReporter in terms of it 2013-08-15 18:39:55 +01:00
Phil Nash
29ccaa67ad Replaced currentSectionInfo and m_rootSection with m_sectionStack 2013-08-08 08:05:19 +01:00
Phil Nash
6339254cb2 First cut of Timer class. 
- started integrating with reporters (now (optionally) supported in console reporter).
- introduced Node<> template to help with cumulative reporting and used it instead of ThreadedSectionInfo.
 2013-08-07 18:56:35 +01:00
Phil Nash
b80280f428 Tidied up reporting of missing assertions in test cases 
- also removed basic reporter from approval test
 2013-07-26 19:19:44 +01:00
Phil Nash
9aff9aa328 Integrated new section tracker. 
- also pass extra section to reporter - one for each test case - ignore it in headers
  (this is so we know a test case has restarted)
- significant effect on regression test due to change of ordering of sections
- fixes infinite loop issue
 2013-07-24 19:13:08 +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
a9b346b14d Removed line numbers from approval tests of xml too 2013-06-29 12:04:38 +01:00
Phil Nash
40b8c7794c Removed line numbers from approval tests 2013-06-29 11:59:49 +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
0d357302a0 INFOs only reset at assertion if consumed 2013-06-28 16:25:49 +01:00
Phil Nash
239fa28e46 Added run without -s to approvals 2013-06-28 16:23:14 +01:00
Phil Nash
47751e4df3 Approved [.] change 2013-06-28 16:07:42 +01:00
Phil Nash
235204393a Big merge from Integration 
- now v1.0 build 1
 2013-06-28 14:11:28 +01:00
Phil Nash
c57ebc84b2 Approved latest changes 2013-06-05 08:20:34 +01:00
Phil Nash
c9f0f55451 Last changes to ConfigData names (for now) 2013-05-31 08:01:56 +01:00
Phil Nash
40e529740c Removed stream name from config 2013-05-29 19:06:25 +01:00
Phil Nash
3f184e22e8 ConfigData now looks virtually identical to the Clara test Config 2013-05-29 19:01:06 +01:00
Phil Nash
20ddb0055f ConfigData just keeps strings for test names/ specs/ tags (processed in Config actor) 2013-05-29 18:56:29 +01:00
Phil Nash
c2ca80d9fb Config refactoring: split List enum into three bools 2013-05-29 18:42:46 +01:00
Phil Nash
3c3beb57c3 More config refactoring 2013-05-29 18:34:11 +01:00
Phil Nash
be8fd82f20 Started nudging ConfigData towards new layout 2013-05-29 08:12:57 +01:00
Phil Nash
e1459955f1 Refactoring towards interface based config 2013-05-28 18:39:32 +01:00
Phil Nash
d4305377b7 Fixed inconsistency in reporting of _FALSE (negated) expressions 2013-05-17 19:35:33 +01:00
Phil Nash
374335fc84 Approved current output 2013-05-17 08:18:42 +01:00
Phil Nash
8defc71e6d Build 38 2013-04-24 19:10:02 +01:00
Phil Nash
1309da2b55 approved changes relating to no-return functions 2013-04-24 18:51:34 +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
2666c96d4e Fixes issue #164 
- Removed spurious (re-)throw when catching unexpected exception
 2013-04-20 21:04:32 +01:00
Phil Nash
b3acf45d70 Fully committed to new Text class. 
- moved impl into .hpp
- replaced last few uses of LineWrapper with Text
- removed LineWrapper
 2013-04-20 19:36:40 +01:00
Phil Nash
243f2d2caf build 33 2013-04-12 10:43:06 +01:00
Phil Nash
3bd4241795 Fixed Junit issue with REQUIRE_THROWS 
- As mentioned by @SebDyn in GitHub issue #5
 2013-04-08 12:05:32 +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
4746caacaf LineWrapper can indent first line differently to subsequent lines 
- use this to wrap Given/ When/ Then with indent after the :
 2013-04-05 20:55:57 +01:00
Phil Nash
5c7d3d75cc build 30 2013-04-01 11:27:10 +01:00
Phil Nash
e324d2829d Added -l tags 
- which lists available tags.
- also improved formatting of -l for tests
 2013-03-29 11:42:10 +00:00
Phil Nash
b052bd729a Refactored string wrapper 
- to be much more flexible (writes to vector)
- fixed a couple of bugs
 2013-03-27 19:08:16 +00:00
Phil Nash
016b063ae8 Line numbers changed and test added 2013-03-25 09:25:01 +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
dc2735c23d Removed some cruft and warnings 2013-03-13 08:04:50 +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
5de07c3a30 Removed unnecessary test 2013-03-06 20:41:02 +01:00
Phil Nash
b7ff995e89 Tidied up some loose ends with reporting test cases and sections (now handles them as a single block). 
This should fixes an issue where sections not being printed when they should be (and reverses a workaround where they were being printed too much)
 2013-03-06 20:40:16 +01: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
10ed1e0e34 Handle section ends in the event of unexpected exceptions 2013-02-19 19:45:09 +00:00
Phil Nash
3f503851d7 Updated approval file 2013-02-19 18:51:46 +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
fb944f2b6b Updated message tests to reflect slightly changed semantics 2013-02-02 20:46:55 +00:00
Phil Nash
207b27b3c5 Changed the way info messages are handled. 
This fixes issue with SCOPED_INFO and makes output more readable.
Needs some refactoring.
 2013-02-02 19:58:04 +00:00
Phil Nash
67ccd8d74a Allows console line width to be configured (and defaults to 80). 
Line wrap is at console width-1
 2013-01-26 20:06:55 +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
10e891767f Dropped "Test case" and "Section" prefixes in test report headers 2013-01-17 11:47:23 +00:00
Phil Nash
5a60ce2117 console reporter: got rid of spurious blank lines 2013-01-16 09:30:41 +00:00
Phil Nash
f8ba2277d3 console reporter: 
Always print test case + sections in header for every new section.
Group sections into single block
Tweaked BDD mappings to print out nicely with above
 2013-01-15 23:14:52 +00:00
Phil Nash
21c479f5aa More console reporter tweaks and approved new output 2013-01-14 18:36:25 +00:00
Phil Nash
619d53439d Added "basic" reports to the Approval results (in addition to the console reports) 2013-01-03 19:19:00 +00:00
Phil Nash
7409075302 Approval filter condenses hop filenames as well as cpp 2013-01-03 08:48:05 +00:00
Phil Nash
8b71158540 Fixed reference to basic reporter (to console reporter) 2012-12-14 18:17:47 +00:00
Phil Nash
86ad6348d4 Split original/ expanded expressions over multiple lines 2012-12-14 07:49:18 +00:00
Phil Nash
eac51f38bd Fix for long headers 2012-12-13 12:57:49 +00:00
Phil Nash
a7079a2dbe Changed header and summary logs to multiline forms 2012-12-13 12:46:47 +00:00
Phil Nash
6488fc1c88 Console reporter: Don't print full path for every line 2012-12-11 09:02:31 +00:00
Phil Nash
6fb8260add Tweaks to summary counts in console reporter 2012-12-11 08:27:21 +00:00
Phil Nash
bcad093af7 Console reporter is now the default 2012-12-10 08:54:57 +00:00
Phil Nash
f4c0a1848d console reporter is now a full replacement for the basic reporter, using the new streaming interface directly 2012-12-09 21:46:15 +00:00
Phil Nash
51f0572209 Added approval test for aborted test results (-a) 2012-12-09 11:33:54 +00:00
Phil Nash
602880f5ab Approval filenames are now approvedResults.txt and unapprovedResults.txt (only the former is checked in) 2012-12-01 19:11:06 +00:00
Phil Nash
209e89bcb9 Removed some more test cruft 2012-12-01 19:09:01 +00:00
Phil Nash
37ce023a30 Removed mocked output logging tests in favour of approval tests 2012-12-01 09:13:36 +00:00
Phil Nash
994e64c217 Added xml and junit output 
- also fixed a typo in a test name
 2012-11-29 08:49:32 +00:00
Phil Nash
22694335a5 Scripts for running approval tests using diff. 
Runs CATCH, filters results (truncates paths, removes hex digits which are probably pointers) then diffs the results)
 2012-11-29 08:41:17 +00:00