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

986 Commits

Author SHA1 Message Date
Martin Hořeňovský
be4f6ab8e1 Change reporting of CAPTURE'd variables 
Info is not changed, intentionally.

Closes #639
 2017-03-03 14:34:50 +01:00
Martin Hořeňovský
cd6de9cd34 Don't reconstruct expression on encountering fatal error 
In some cases, like when given

```cpp
std::vector<char>* str =
reinterpret_cast<std::vector<char>*>(0x1234458);
CHECK(*str == std::vector<char>());
```

reconstructing the expression to report it would cause another fatal
error. Instead we just put together an AssertionResult without
reconstructing the expression fully.

This should fully fix #810
 2017-03-02 18:18:28 +01:00
Martin Hořeňovský
40f6a5b8a4 Added duration reporting to compact reporter 
Also made the duration formatting code available to all reporters.

Closes #780
 2017-03-02 16:16:17 +01:00
Martin Hořeňovský
95b0eb2b6c TAP reporter now behaves as if -s was always set 
This should fulfill the TAP specification better.
 2017-03-02 15:54:08 +01:00
Martin Hořeňovský
0b28d3daf2 Merge branch 'tap-count-success' of https://github.com/gahr/Catch 2017-03-02 15:23:46 +01:00
Phil Nash
c6535a080e v1.8.1 release 2017-03-01 16:04:44 +00:00
Phil Nash
673ec550f5 Moved definition of _BSD_SOURCE earlier 2017-03-01 15:59:10 +00:00
Pietro Cerutti
da023b2f9a TAP Reporter: count success tests even if not printed 
This fixes a bug whereas running the TAP reporter without the -s switch
causes the reporter to print 1..0.
 2017-03-01 09:24:58 +00:00
Phil Nash
0952b76e16 v1.8.0 release 2017-02-28 14:19:09 +00:00
Martin Hořeňovský
d5c623b3b6 Merge branch 'develop' of https://github.com/CNugteren/Catch 
This adds an optional absolute margin to the Approx checks.
 2017-02-27 13:12:13 +01:00
Martin Hořeňovský
061a183036 Console reporter now uses fixed decimal formatting 
3 decimal places, output in seconds.
 2017-02-27 11:34:15 +01:00
Martin Hořeňovský
72b72ca937 Fix C++11 dependency in TAP reporter 2017-02-22 17:04:36 +01:00
Martin Hořeňovský
a8a6b3159d Disabled C4312 in the evaluate layer 
We reinterpret cast int to T* (because someone might compare 0 to a
ptr), which causes 4312 to fire when x64 platform is set.

Fixes #148
 2017-02-22 14:14:59 +01:00
Martin Hořeňovský
9e2616aeac Add missing assert.h include to reporter bases. 
It being missing caused an error when compiling under MSVC.
 2017-02-22 13:31:51 +01:00
Martin Hořeňovský
c5ffd2e3f0 Fixed up Automake reporter 2017-02-22 13:29:17 +01:00
Martin Hořeňovský
b0260c615d Fixed-up TAP reporter a bit. 2017-02-22 13:28:13 +01:00
Colton Wolkins (Ogre)
a63ce953a0 Add TAP reporter 
This is a hackish attempt to add a TAP reporter (see
philsquared/Catch#309 ) by following the TAP 12 specification
<http://testanything.org/tap-specification.html>. I'm unsure how well I
did in following the spec or with following good C++ guidelines.
Comments are appreciated.

Signed-off-by: Colton Wolkins (Ogre) <frostyfrog2@gmail.com>
 2017-02-22 11:35:20 +01:00
Justin Wilson
b753f05d74 Add reporter for Automake (#826) 
This allows for integration with Automake's default log compiler.

See #826 for more details.
 2017-02-22 11:17:25 +01:00
Martin Hořeňovský
9bab7c8229 Changed console reporter test duration reporting format 
Was
"<section-name> completed in XXX s."
Now is
"XXX s: <section-name>"

Closes #322

(cherry picked from commit 0805539)
 2017-02-22 08:35:53 +00:00
Phil Nash
d8c4512b25 Removed tabs 2017-02-22 08:26:52 +00:00
Phil Nash
d2a59ad37b Fixed test spec parser issue 
- multiple specs in a single string, with escapes in each were erroring out
 2017-02-22 07:49:38 +00:00
Phil Nash
10dfca34ac Added first vector matchers (Contains and Equals) 2017-02-21 16:05:04 +00:00
Phil Nash
45d4096756 Generalised Matchers so objects and comparators can be different types 2017-02-21 15:52:03 +00:00
Phil Nash
1ca8cefa9a Added #define needed for gettimeofday() to be declared on some versions of Cygwin 2017-02-21 11:32:32 +00:00
philsquared
ca66dd243c Added a couple more unimplemented assignment operators to silence VS2013 warnings 2017-02-21 09:10:44 +00:00
philsquared
44632c3d71 Merge branch 'warning-c4512' of https://github.com/gchudnov/Catch into gchudnov-warning-c4512 2017-02-21 08:56:14 +00:00
philsquared
b1835e1de9 Moved WIndows leak detector code out of main() 2017-02-17 23:43:31 +00:00
Martin Hořeňovský
8cd413572a Merge branch 'dev-windows-leakdetection' 2017-02-17 14:25:08 +01:00
Martin Hořeňovský
30e4dbef1c Report leaks to debugger in addition to stderr 
This branch should also close #120.
 2017-02-17 14:22:57 +01:00
Phil Nash
90b3946e9c Add file/line to TestCase, Section and Failure elements in Xml Reporter 2017-02-17 10:26:17 +00:00
Martin Hořeňovský
d8230a8d4d Add opt-in leak detection under MSVC + Windows. 
Closes #439
 2017-02-16 11:09:09 +01:00
Martin Hořeňovský
c6178601c5 Cygwin compatibility fixes 2017-02-15 17:57:22 +01:00
Martin Hořeňovský
2e0ae01b05 Improve -Wparentheses supression for gcc 
If the gcc version supports `_Pragma` properly, we use that to disable
it locally inside assertions.

Otherwise we disable it for the entire TU.

Fixes #674
 2017-02-15 17:11:44 +01:00
Phil Nash
fe690a68ef push/pop warnings when disabling parentheses warnings within assertion (gcc/ clang) 2017-02-15 10:03:28 +00:00
Martin Hořeňovský
3cfef738e7 Merge branch 'dev-performance-round3' 2017-02-15 10:35:01 +01:00
Martin Hořeňovský
7b13a8f85a Move debug break out of tests, speeds up compilation time 
This is hidden behind CATCH_CONFIG_FAST_COMPILE
 2017-02-14 15:35:12 +01:00
Phil Nash
2081caa452 Import MatcherBase to Catch namespace 2017-02-14 09:16:54 +00:00
Phil Nash
a5a013811c Renamed toStringUncached -> describe 2017-02-14 09:16:54 +00:00
Phil Nash
1400127d6f Extracted string matchers impl into cpp that is only compiled into main TU 2017-02-14 09:16:54 +00:00
Phil Nash
7fed25ad1f New Matchers implementation 
- simpler
- less templates and machinery
- no cloning, copying or unnecessary heap allocations
- better factored
 2017-02-14 09:16:54 +00:00
Phil Nash
d08cee288f v1.7.2 build 2017-02-13 16:15:42 +00:00
Phil Nash
873ef276b6 XML Reporter closes tag and flushes stream at end of TestCase and Section tags. 
This fixes an issue where XML reports on stdout are broken by printf statements
 2017-02-13 15:56:25 +00:00
Martin Hořeňovský
bc68b9f454 More include simplifications 2017-02-13 14:12:22 +01:00
Phil Nash
67d513aa73 Removed single char contains() 
- had incorrect prototype anyway
 2017-02-13 08:20:45 +00:00
Phil Nash
9a3486a705 Replaced use of dynamic_cast with static_cast. 
It wasn't necessary anyway.
This addresses #821
 2017-02-12 22:00:17 +00:00
Martin Hořeňovský
50dee9ae57 Fixed typo in CLI error reporting 2017-02-12 13:50:15 +01:00
Martin Hořeňovský
b2a6fe971b Couple more includes cleaned out 2017-02-12 12:48:25 +01:00
Martin Hořeňovský
9012f95964 Moved some std includes out from catch_common.h 2017-02-12 12:17:07 +01:00
Martin Hořeňovský
d0620c3495 Added std:: qualification to some functions from C stdlib 
This should solve #543, once Clara changes are in as well.
 2017-02-11 23:20:09 +01:00
Phil Nash
005787f1c5 Marked IConfig implementations in Config CATCH_OVERRIDE 
(silences warnings)
 2017-02-10 22:39:27 +00:00
Martin Hořeňovský
f75a511b5c Fix MSVC /analyze warning about inconsistent annotations 2017-02-10 17:12:41 +01:00
Phil Nash
ab44fb6811 The file/ line in sections is now of the section. not the test case 2017-02-10 11:56:46 +00:00
Martin Hořeňovský
73159ace3d REQUIRE_THROWS_AS now catches exception by const& 
Prevents some warnings caused by catching complex types by value.

Closes #542
 2017-02-09 12:57:01 +01:00
Martin Hořeňovský
9952dda524 REQUIRE_THROWS_AS is now reported with expected type as well 
Also updated tests to reflect this change.
 2017-02-09 12:51:43 +01:00
Martin Hořeňovský
e543cc0646 Removed an obsolete file that somehow got into the previous master. 2017-02-09 11:12:25 +01:00
Martin Hořeňovský
a38ccec33a Added 3rd party bug to documentation 2017-02-08 20:53:39 +01:00
Marek Klus
ab199d9cf9 XmlReporter: Trim test case name; added description and tags attributes to the test case element in the xml report. 2017-02-07 23:12:58 +00:00
Phil Nash
97d8003a71 XmlWriter can specify a stylesheet 
Provide an extension point on XmlReporter to be able to supply a stylesheet url in a derived implementation
 2017-02-07 23:09:43 +00:00
Phil Nash
1f271c9944 XmlWriter reverts to XML 1.0. 
Character encodings that are not valid in XML 1.0 are instead written using C-style escapes
 2017-02-07 22:48:06 +00:00
Martin Hořeňovský
7b8a27eadb v1.7.1 build 2017-02-07 10:06:52 +01:00
Phil Nash
2b74613c54 Revert "First cut of Evaluate refactoring to remove int specialisations, among other things" 
This reverts commit 39753558eb.
 2017-02-06 22:37:23 +00:00
Martin Hořeňovský
23600609c0 Deregister SEH handler before reporting SE. 2017-02-06 20:40:46 +01:00
Martin Hořeňovský
4feb2dbb50 Removed const qualification to disambiguate between operator overloads 2017-02-06 20:39:32 +01:00
Phil Nash
84af6bc955 XmllWriter flushes the stream after every endElement now 2017-02-06 16:25:36 +00:00
Phil Nash
88b760276d Revert "XmlWriter reverts to XML 1.0." 
This reverts commit a189387f49.
 2017-02-06 16:21:01 +00:00
Phil Nash
23eb4cc580 Added stdout and stderr to XML Reporter 2017-02-06 16:14:06 +00:00
Phil Nash
a189387f49 XmlWriter reverts to XML 1.0. 
Character encodings that are not valid in XML 1.0 are instead written using C-style escapes
 2017-02-06 16:00:05 +00:00
Phil Nash
39753558eb First cut of Evaluate refactoring to remove int specialisations, among other things 2017-02-06 15:15:43 +00:00
Martin Hořeňovský
e991c006b7 Fixes for MinGW compatibility 
Some versions of MinGW do not support enough of Win32 API to let us work
with SEH, so SEH is now MSVC only (+ configurable toggle).

Also made use of gmtime_s MSVC only (as oposed to Windows only).

Fixes #805
 2017-02-06 01:43:53 +01:00
Martin Hořeňovský
712323ab7c Include windows.h proxy header, instead of windows.h itself 
Because the signal changes were in a different branch from the windows.h
related changes, the SEH handling code included the header directly.

Fixes #803
 2017-02-03 14:09:17 +01:00
Martin Hořeňovský
ce37f48ffa v1.7.0 build 2017-02-01 21:47:43 +01:00
Martin Hořeňovský
f58ff0c540 Remove \l, add \f in character pretty printing 
I have never head of \l and MSVC warns about unknown escape sequence, so
I changed it into \f that definitely exists and potentially might be
useful.
 2017-02-01 21:31:14 +01:00
Phil Nash
b524fa7cd8 Fixed bugs in escape char handling in test names 
1. If escape char is first char, sets start of range
2. Multiple escape chars are handled (offsets chars to remove)
 2017-02-01 14:13:20 +00:00
Eric Schmidt
5121b5b058 Put quote marks around printed characters; also nicely print some escapes 2017-01-31 21:53:36 +01:00
Jan Včelák
1e5176bd69 Cap main exit code to 255 (#797) 
Changed default main to clamp exit code to 8 bits because of POSIX limitations.

Updated documentation about declaring non-default main.
 2017-01-31 20:48:14 +01:00
Martin Hořeňovský
0dabd951ba expr is now cast to void in THROWS family of assertions. 
This prevents Clang from complaining about unused value in expressions
containing explicit casts used in the THROW assertion macro family.

Example:
`REQUIRE_THROWS_AS(static_cast<bool>(object), std::bad_cast);` would
trigger `-Wunused-value` warning. Now it does not.

Credits to Arto Bendiken, who submitted a PR almost 3 years ago, but his
branch has since died and I was unable to merge it.
 2017-01-31 18:02:11 +01:00
Josef Kemetmueller
70d3c937c3 Enable breaking into debugger on Mac 
The integrated assembler segment was missing an underscore:
"_asm__". Also we remove the "DEBUG" macro check, so we are consistent
with the linux and windows variant.
Now breaking into gdb on failure should work via:
	gdb --args test_executable --break
 2017-01-31 16:00:42 +00:00
Martin Hořeňovský
38af8d7035 Fixed SEH deregistration on Windows 
Should fix #796
 2017-01-30 19:54:16 +01:00
Martin Hořeňovský
615aa071a8 Merge branch 'dev-performance-round2' 2017-01-30 13:02:48 +01:00
Martin Hořeňovský
15816c5760 Revert "use sizeof(expr) for unevaluated syntax check" 
Using sizeof(expr) can trigger a compile-time error,
"lambda expressions are not allowed in an unevaluated context", when passing
expression containing lambda, like a std algorithm. This error is considered
a standard defect, as it is meant to prevent lambdas in decltype
or templates, but not in sizeof.

This reverts commit 227598af47.
 2017-01-30 11:56:29 +01:00
Martin Hořeňovský
bcaa2f9646 Use char literal instead of string literal with 1 char 
In reality, this is a relatively small performance improvement,
especially with the previous improvements removing lots of superfluous
string handling, but still was measurable.
 2017-01-29 23:07:15 +01:00
Martin Hořeňovský
60f8ebec49 Use const char* for filename in SourceLineInfo 
This is sane, because those `const char*`s are given to us by compiler,
from the text area and thus we do not have to manage their lifetimes. We
also never want to change them.

Also moved copy constructor to compiler-generated methods, not sure why
it wasn't -- even before it was the same as a compiler would generate.
 2017-01-29 22:03:27 +01:00
Alexander Ryabykin
02a69b449f Compilation warnings fix (#791) 
* Compilation warnings fix

* Removed unused argument from reportFatal function
 2017-01-27 09:32:58 +01:00
Martin Hořeňovský
c390c4cb9f Fixed inconsistent and trailing whitespace 
This means that all tabs used in indentation are now 4 spaces and that
there should be no more trailing whitespace.

Ill also look into creating a pre-commit hook that will prevent this
from happening in the future.

Fixes #105
 2017-01-26 23:13:12 +01:00
Martin Hořeňovský
60a9ac7e65 Enabled previous commit under MSVC, introduced new feature toggle 2017-01-26 18:47:29 +01:00
Jonathan Coe
c06afe438e Add support for comparison of Approx with strong typedefs 
closes #652
 2017-01-26 18:44:03 +01:00
Martin Hořeňovský
4ce11d63a6 Merge branch 'dev-performance' 2017-01-25 22:56:36 +01:00
Martin Hořeňovský
83f4b39680 Added benchmark for previous commit, added iterations to failure bench. 2017-01-25 22:39:43 +01:00
Martin Hořeňovský
b1171bd1f2 Merge branch 'dev-signals' 2017-01-25 22:09:52 +01:00
Martin Hořeňovský
184865358c CHECK no longer stops running SECTION on exception. 
This seems to be much closer to desired behaviour than the current one, where
CHECK(false) lets the execution continue, but CHECK(<throws>) does not.
 2017-01-23 17:52:17 +00:00
Phil Nash
31c23b9489 Added [!nonportable] tag 2017-01-23 17:44:55 +00:00
Phil Nash
f347611403 Restated text format loop to avoid out-of-bounds condition 2017-01-23 16:58:49 +00:00
Phil Nash
1efd8d3067 Added missing <iterator> #include 2017-01-23 15:19:42 +00:00
Phil Nash
e7bcbb35c0 First cut of -c/—section option for running specific sections 2017-01-23 12:36:03 +00:00
Phil Nash
4a04682e49 Text formatting rework 
Rewrote main wrapping loop. Now uses iterators instead of indices and intermediate strings.
Differentiates between chars to wrap before, after or instead of.
Doesn’t preserve trailing newlines.
Wraps or more characters.
Dropped support for using tab character as an indent setting control char.
Hopefully avoids all the undefined behaviour and other bugs of the previous implementation.
 2017-01-23 12:28:40 +00:00
Martin Hořeňovský
9a56609569 v1.6.1 build 2017-01-20 12:49:59 +01:00
Mickey Rose
227598af47 use sizeof(expr) for unevaluated syntax check 2017-01-19 21:25:27 +01:00
Martin Hořeňovský
ee0ca512ea Force short-circuited evaluation for types that have overloaded &&. 
This fixes #574.
 2017-01-17 23:31:03 +01:00
Martin Hořeňovský
b71a06cf98 JUnit reporter outputs timestamps now 
Also extended approval tests script to support the change
 2017-01-16 20:21:43 +01:00
Martin Hořeňovský
2e87f8e328 Merge branch 'windows-header-defines' of https://github.com/horenmar/Catch 2017-01-16 17:00:43 +01:00