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ý
b71a06cf98
JUnit reporter outputs timestamps now
...
Also extended approval tests script to support the change
2017-01-16 20:21:43 +01:00
Phil Nash
9062ebe390
Removed make file (now generated from CMake)
2017-01-12 11:22:30 +00:00
Phil Nash
0cde0e90a6
Added approvals for “Greater-than inequalities with different epsilons” test
2017-01-09 14:40:09 +00:00
Phil Nash
0f0dcd31eb
Excluded two more C++11 tests from Approval tests
2017-01-09 14:37:28 +00:00
Phil Nash
62cbde369e
Exclude test name from approval tests
2017-01-09 14:37:28 +00:00
Phil Nash
1ae84897d4
Marked tests that use C++11 features with [c++11] tag and exclude them from approval tests
2017-01-09 14:37:28 +00:00
Phil Nash
976a655496
Approval tests can use Catch path fixed in env. var, and convert nullptr and __null to 0 for comparison
2017-01-09 14:37:28 +00:00
Jonathan B. Coe
37e1e24309
add support for inequalities
2017-01-08 22:28:53 +01:00
Phil Nash
79acc0504b
Sort test ordering during Approval testing
2016-11-29 11:32:16 +00:00
Phil Nash
30cebd6177
Added some missing source files (including all SurrogateCpps) to CMake project.
...
Fixed up relative include paths to make this work.
2016-11-09 22:55:32 +00:00
Phil Nash
31861bbd46
rebased following recent changes
2016-09-27 10:28:11 +01:00
Phil Nash
b1eeec7c69
-f supports quoted test names (test name surrounded with " characters).
...
This is the first part to resolving #717
2016-09-27 10:27:28 +01:00
Robert A Zeh
5095619955
Fixes for XML encoding.
...
This commit fixes the following scenario:
* You have a test that compares strings with embedded control
characters.
* The test fails.
* You are using JUnit tests within TeamCity.
Before this commit, the JUnit report watcher fails on parsing the XML
for two reasons: the control characters are missing a semicolon at the
end, and the XML document doesn't specify that it is XML 1.1.
XML 1.0 --- what we get if we don't specify an XML version --- doesn't support embedding control characters --- see
http://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml
for all of the gory details.
This is based on PR #588 by @mrpi
2016-08-24 09:38:24 -05:00
Phil Nash
1c47fe023a
Updated embedded Clara to 0.0.2.3
...
- has all new, more robust, token parsing.
- eliminates issue with unreachable code
- allows use of forward slashes to introduce short args on Windows
2016-04-23 13:21:29 +01:00
Phil Nash
447f53e9e3
Fixed !shouldfail
2016-03-14 19:13:34 +00:00
Phil Nash
f895e0d95f
Rebased approvals following colour changes
2016-02-29 08:13:27 +00:00
Phil Nash
8ccb18daa9
Added --use-colour option to give finer control over colourisation.
...
--force-colour is still present but deprecated (will remove in v2)
2016-02-29 08:03:48 +00:00
Phil Nash
5262e61e9d
Approvals for Matcher change (added comma)
2015-12-10 18:43:29 +00:00
Phil Nash
722315a1f5
Removed some trailing whitespace
2015-12-04 10:20:33 +00:00
Phil Nash
d274fc571c
Added noexcept to CustomStdException destructor
2015-11-20 17:09:48 +00:00
Phil Nash
0e64973f55
Added support for manually registering test functions.
...
As discussed in #421
2015-11-20 16:58:16 +00:00
Phil Nash
a49f088032
exception translators considered even for types deriving from std::exception, now
...
- also added docs for exception translators
- updated approvals
2015-11-18 08:39:21 +00:00
Phil Nash
71fd2c2fdf
Fixed test names mentioning the new Matcher combinator operators
2015-11-06 18:07:28 +00:00
Phil Nash
054e3c5b43
Added &&, || and ! operator overloads for matchers
...
(syntactic sugar for AllOf, AnyOf and Not compositional matchers, respectively)
2015-11-05 18:46:00 +00:00
Phil Nash
f3e7722cc6
Don't introduce Catch::Matchers namespace in macro
...
- this could be a breaking change - fixed up self-test code to compensate
2015-11-05 18:10:33 +00:00
Phil Nash
e91738103c
Stripped trailing whitespace from all source code lines
...
(replaces need for PRs #310 and #504 )
2015-11-04 18:04:15 +00:00
Phil Nash
f5642be7b4
Fixed reversed logic of NoAssertions warning check
...
(that explains the previous regressions)
2015-11-03 17:05:08 +00:00
Phil Nash
015e07100e
Added SUCCEEDs to empty leaf sections to avoid failing due to no assertions
2015-11-03 07:46:37 +00:00
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
0b523db6b9
Converted all new part tracking tests/ sections to non variadic form
2015-11-02 06:16:09 +00:00
Phil Nash
b8515929b8
Moved all new tracking impl into catch_test_case_tracker.pp
2015-11-02 06:14:52 +00:00
Phil Nash
3deb3e010f
Removed the "part" component of the tracker names
2015-10-29 19:41:50 +00:00
Phil Nash
73a140fb9e
More minor tweaks
2015-10-29 19:33:25 +00:00
Phil Nash
ef62b578e2
Added tests for failing a section within a generator
...
- small fixes to implementation to make it work
2015-10-29 19:25:27 +00:00
Phil Nash
f4389b4fdb
more minor clean-ups
2015-10-29 08:33:50 +00:00
Phil Nash
4b99be6a9a
Cleaned tests up a bit
2015-10-29 08:17:55 +00:00
Phil Nash
293e54dcbe
Added IndexTracker and got it working with a single generator
...
- made some simplifications to state machine
2015-10-29 08:02:40 +00:00
Phil Nash
9a6a0865f2
More name changes
2015-10-23 18:44:48 +01:00
Phil Nash
2c6411e70a
Tweaks
2015-10-23 18:34:16 +01:00
Phil Nash
1cb993970a
First cut of new section/ part tracking
2015-10-23 18:20:33 +01:00
Phil Nash
d43a47efca
Refactored stream related stuff
...
- simpler, polymorphic hierarchy-based, approach
- less bitty conditionals spread across the code
- all resolved up-front so now config class is immutable
(it had evolved the way it was and in need of a clean-up sweep for a long time)
2015-09-29 19:23:06 +01:00
Phil Nash
afcc38efc5
Fixes for single include
2015-08-07 17:28:48 +01:00
Phil Nash
368714e7aa
Added Listeners (programatically provided extra reporters)
2015-08-07 08:20:56 +01:00
Phil Nash
4cb74761d9
Support for multiple reporters
...
- can't (yet) specify different targets for each reporter (e.g. different files)
2015-08-05 19:02:17 +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
e085d4811a
Qualified path to xmlwriter to fix travis error
2015-07-24 08:13:07 +01:00
Phil Nash
70975517b3
rebased approvals for long long test
2015-07-23 23:05:52 +01:00
Phil Nash
733ebb6024
Added CATCH_CONFIG_CPP11_LONG_LONG support
2015-07-23 23:05:05 +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
d6f1446e4e
Fixed an issue on some compilers with implicit conversion from nullptr to Ptr
...
- also cleaned up some warnings to do with CATCH_NULL
2015-07-03 18:27:36 +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
bfa3f863d6
Removed some more warnings
2015-05-19 18:23:52 +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
Peter Huene
e5280b2c57
Add --force-colour option to force colour output.
...
Adding a --force-colour option to force colour output on POSIX systems,
provided a debugger is not attached.
This allows for Catch to output colours even if STDOUT is not a tty,
which can be the case when the test executable is being spawned by a
parent process (e.g. CMake's ctest).
2015-02-11 13:12:42 -08:00
Phil Nash
50183208a3
Added tests for toString<std::tuple<>> and rebased
2014-12-30 18:47:01 +00:00
Phil Nash
75a08bbc6c
Merge branch 'tuple_to_string' of https://github.com/PureAbstract/Catch into PureAbstract-tuple_to_string
2014-12-30 18:42:17 +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
fa751e6a37
FIxed a couple of test names
2014-12-22 20:17:26 +00:00
Phil Nash
3dc3763b07
Rebased
2014-12-21 00:20:09 +00:00
Phil Nash
8ec959e936
TeamCity reporter work
...
expanded reporting - includes section headers
2014-12-20 00:46:02 +00:00
Phil Nash
458b3ae257
Fixed replace(inPlace) function
...
and added tests (should have done that in the first place - I'll never learn!)
2014-12-19 18:16:19 +00:00
Phil Nash
db0421e840
First commit of (in progress) TeamCity reporter
...
Should run but is not complete
2014-12-19 17:52:33 +00:00
Phil Nash
0dd214f6db
tags with . prefix are all hidden
2014-12-15 07:25:34 +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
a5dca3d370
removed some warnings
2014-10-03 08:17:40 +01:00
Phil Nash
383d7c06a1
Only use std::cout/ cert via Catch::cout/ cert - and make those conditional on CATCH_CONFIG_NOSTDOUT
2014-10-02 19:08:19 +01: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
Andy Sawyer
f559a51926
ToStringTuple - gcc doesn't like tuple init_list ctor
2014-09-04 01:05:51 +01:00
Andy Sawyer
13cbdf7e7d
Add tests for toString(std::tuple<...>)
2014-09-04 00:34:29 +01:00
Phil Nash
5ea3266857
Added baselines for new test cases
2014-09-03 19:22:47 +01:00
Phil Nash
ee5e7ed2c9
Merge branch 'develop' of github.com:philsquared/Catch into develop
...
# By Andy Sawyer
# Via Andy Sawyer (1) and Phil Nash (1)
* 'develop' of github.com:philsquared/Catch:
Updated CMakeLists.txt for toString work
A bunch of Catch::toString tests
2014-09-03 19:19:05 +01:00
Phil Nash
dd22431fea
Merge branch 'develop' of github.com:philsquared/Catch into develop
...
# By Andy Sawyer
# Via Andy Sawyer (1) and Phil Nash (1)
* 'develop' of github.com:philsquared/Catch:
catch_tostring: tostring for enum class types
SelfTest: Build as C++11, add EnumToString tests
SelfTest: refresh makefile
2014-09-03 08:40:07 +01:00
Andy Sawyer
abf9ffc982
A bunch of Catch::toString tests
2014-09-01 18:09:37 +01:00
Andy Sawyer
142f8f4b1e
SelfTest: Build as C++11, add EnumToString tests
...
Note: EnumToString tests currently fail - haven't made the changes to
catch_tostring yet.
2014-09-01 17:24:45 +01:00
Andy Sawyer
000e746415
SelfTest: refresh makefile
2014-09-01 17:21:14 +01:00
Phil Nash
cb8fe472b2
Approvals for develop branch
2014-08-22 08:13:47 +01:00
Phil Nash
8edf4bf5d3
Removed signal handler test, for now
...
(to avoid screwing up the approval tests)
2014-08-22 08:13:15 +01:00
Phil Nash
c1a8e1c5dd
Added signal handlers (and placeholder for SEH handlers)
...
- based on PR 232 (https://github.com/philsquared/Catch/pull/232 - thanks Lukasz Forynski)
- Writes to reporter, so gets all the usual context, but then exits directly (since the stack cannot be resumed) so no summary
- On Windows does nothing, as yet.
2014-08-22 08:07:39 +01:00
Phil Nash
8b5a4e9355
Added approvals for new tests
2014-08-20 08:08:13 +01:00
Phil Nash
4aaf67ff31
const_casts to get rid of warnings in new wchar_t tests
2014-08-19 08:16:44 +01:00
Phil Nash
7bc0b44597
Merge branch 'master' of https://github.com/jbrwilkinson/Catch
...
# By James Wilkinson
# Via James Wilkinson
* 'master' of https://github.com/jbrwilkinson/Catch :
Added SCENARIO_METHOD for BDD testing with fixtures.
2014-08-19 08:13:30 +01:00
Ben Arnold
c7cf0a9f8b
Catch's Travis builds are using gcc that doesn't like the auto keyword
2014-08-14 12:53:21 +01:00
Ben Arnold
7b0a84a048
toString handles wchar_t raw strings
2014-08-14 12:28:23 +01:00
James Wilkinson
63005a1d89
Added SCENARIO_METHOD for BDD testing with fixtures.
2014-07-10 10:22:20 +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
23181eeef0
Section no longer relies on copy-elision for correctness
...
- should address #293
- *may* address #271
2014-07-09 07:39:57 +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
d657b1ba52
Removed use of variadic form of SUCCEED from tests
...
- as per #284
2014-06-30 07:53:11 +01:00
Phil Nash
061861d940
Approved tag alias tests
2014-06-30 07:34:27 +01:00
Phil Nash
1d210ebd37
Tag aliases feature
2014-06-30 07:33:17 +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
7cbf74061b
Tweaked rawMemoryToString() along lines of suggestion in #281
2014-05-23 18:41:02 +01:00
Phil Nash
a2d8f774d2
Approved new test output
2014-05-20 18:28:48 +01:00
Phil Nash
2c9e9ac004
Fixed space separated lists of test specs
...
- they form an AND expression. They were forming an OR expression due to changes made to fix -f - so that had to be fixed differently
2014-05-20 18:28:19 +01:00
Phil Nash
baf181f15d
Minor fixes to a couple of test names
2014-05-20 18:11:43 +01:00
Phil Nash
3bdc97d8ad
Suppressed a load of warnings
2014-05-19 18:57:14 +01:00
Phil Nash
7139035906
Updated approvals after adding extra tests
2014-05-19 18:21:01 +01:00
Phil Nash
fcf0deb116
Fixed issue with wildcards at the start of a string
2014-05-19 18:07:53 +01:00
Phil Nash
9bf43e7875
Refactored last usages of old tag parser and removed all the, now redundant, tag parsing code
2014-05-16 18:52:55 +01:00
Phil Nash
766491a7c4
Approved all the changes following name/ tag parser rework
2014-05-16 18:31:15 +01:00
Phil Nash
b1e7d161b5
Moved catch_test_spec.h to catch_test_spec.hpp
2014-05-16 18:28:58 +01:00
Phil Nash
ae75b3774a
Switched over to new name/ tag parser
2014-05-16 18:24:07 +01:00
Phil Nash
56b8d3a5f9
Moved new test spec code into appropriate header
...
- about to remove old test spec code and rewire throughout the codebase!
2014-05-16 07:23:31 +01:00
Phil Nash
72e67693d4
Small test spec parser refactoring
2014-05-16 07:07:28 +01:00
Phil Nash
f8cff10ff6
First cut of new test spec parser code
2014-05-16 06:50:00 +01:00
Phil Nash
5a2df71b41
build 42: “compact” reporter
...
- thanks to Martin Moene
2014-05-01 19:07:02 +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
48153e8e10
Considers endianness when printing raw memory into a string
2014-04-22 08:19:11 +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
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
c98a97cf90
Tweaked Cliche macros/ names
2014-02-10 17:30:12 +00:00
Phil Nash
4554155e3d
Made Clara a “Cliche” header, which will be usable independently of Catch.
...
- This is just a first step. It still has a dependency on catch_text.h, which also needs to be made a Cliche header.
- These then need their own homes on GitHub.
2014-02-10 17:20:30 +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
886d9d397c
Reporter command line parser errors more eagerly
...
- show all “unrecognised option” errors
2013-12-20 19:06:02 +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
b4625208d0
Test for FAIL that doesn’t take an argument
2013-12-14 14:30:58 +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
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
3524321295
Removed some cruft
2013-12-04 07:58:21 +00:00
Phil Nash
c4a089c12b
Refactored a lot of code from headers into impl headers only compiled into one TU
...
- also added noimpl option to single header script - which only generates the non impl code
2013-12-03 18:52:41 +00:00
Phil Nash
ba13f3f098
Restored second arg to a TEST_CASE for non variadic compilers
2013-11-21 08:08:05 +00:00
Phil Nash
ca7292e3a7
Removed redundant MetaTestRunner
2013-11-19 19:03:11 +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
aafed303bb
Added an extra tag test
2013-10-17 18:02:09 +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
41b27af45b
Fix for comma separated tags on the command line
...
- also added more test for tags
2013-09-25 18:40:07 +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
1870ca8455
Some Clara/ command line clean-up and tweaks
2013-08-16 18:57:57 +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
28d3881ff9
Merged TestCaseTracker and SectionTracker and introduced TestCaseTracker::Guard
2013-07-25 08:07:55 +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
6a484fdb02
Reworked SectionTracker and moved into own header
2013-07-23 18:48:36 +01:00
Phil Nash
372a6c6fed
Small fixes and started new section tracking code
2013-07-23 08:15:34 +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
109f46a48b
Fixed broken test
2013-07-01 19:00:55 +01:00
Phil Nash
066a6388d6
Fix for #179
2013-07-01 18:45:19 +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
5d26ca1af7
Static assertion for && and || expressions
2013-06-29 12:07:33 +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
9c39a5e8dd
Support [.] as alias for [hide]
2013-06-28 16:05:13 +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
cb60d130f8
Runner -> RunContext, Runner2 -> Runner and fixed issue with processName
2013-06-05 08:18:52 +01:00
Phil Nash
2ed56c47a6
Removed legacy cli parser
2013-06-04 08:38:40 +01:00
Phil Nash
aee9b75e37
Now fully switched over to Clara-based command line with modified args
2013-06-04 08:37:28 +01:00
Phil Nash
0514fe4f38
Got parseCommandLine ready to use new Clara (but not doing so yet)
2013-05-31 18:48:31 +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
ca9b92f8fa
Most of system now uses Ptr<IConfig const>
2013-05-28 18:51:53 +01:00
Phil Nash
e1459955f1
Refactoring towards interface based config
2013-05-28 18:39:32 +01:00
Phil Nash
10fa0593db
Moved Clara into its (her?) own file
2013-05-27 10:52:58 +01:00
Phil Nash
1e547afe79
Tweaked some option names and added verbosity
2013-05-24 19:23:44 +01:00
Phil Nash
ab6dd55fcf
Clara: formatting and code tweaks
2013-05-23 19:01:10 +01:00
Phil Nash
b7632659f5
Clara: Usage strings for args
2013-05-21 19:21:24 +01:00
Phil Nash
ed79d726be
Clara: support for positional arguments
2013-05-21 08:15:50 +01:00
Phil Nash
30cb460d42
Clara: added test for positional arg
2013-05-20 18:45:33 +01:00
Phil Nash
3dde25be7d
Clara: support for binary functions
2013-05-20 18:40:51 +01:00
Phil Nash
d44f2cf40f
Added binding to free functions (and renamed hierarchy)
2013-05-20 08:31:12 +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
6574f639a3
Refactored CLI tests and converted main one into a scenario
2013-05-17 08:00:57 +01:00
Phil Nash
8d1100daa6
Clara: added -r option
2013-05-17 07:43:58 +01:00
Phil Nash
8333e644f2
Clara: some refactoring
...
- moved all internal stuff into Detail
- moved Parser out of CommandLine, encapsulates tokens.
- allow unused tokens to be feed into different CommandLine processors
2013-05-16 19:07:50 +01:00
Phil Nash
58846c395c
Clara: Added support for compact short opts (e.g. -peb)
2013-05-16 08:21:13 +01:00
Phil Nash
372a8b018d
New CLI parser impl
2013-05-15 19:25:34 +01:00
Phil Nash
597ed1f79d
handle TEST_CASE_METHOD macro consistently
...
- internally define INTERNAL_CATCH_TEST_CASE_METHOD
2013-05-14 19:31:21 +01:00
Phil Nash
0c5626962a
test case for infinite loop
2013-05-13 08:20:45 +01:00
Phil Nash
11e55161e1
Some refactoring of Clara impl and experimental string based interface
2013-05-07 18:53:14 +01:00
Phil Nash
e2f93b6507
Clara: Allow space separator, as well as : and =
2013-05-03 08:08:46 +01:00
Phil Nash
a13ab71cbf
Clara: Some renames and changed the addOption interface
2013-05-02 18:41:08 +01:00
Phil Nash
ed45ceb786
Added support for binding to methods and generating usage strings.
...
Also renamed namespace to Clara
2013-05-01 19:01:48 +01:00
Phil Nash
46846a47f3
More CmdLine work
...
- Support for non string values
- Support for chaining parsers
2013-04-29 19:26:18 +01:00
Phil Nash
26ae11774b
First draft of future opt parser lib
2013-04-27 12:26:13 +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
bf37e6879a
Removed use of compiler specific techniques for denoting non-returning functions
...
- use if( Catch::isTrue( true) ) to guard throws instead
2013-04-23 20:52:49 +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
06548a5b61
Fix for #144
...
- string matchers now work with NULLs
2013-04-23 07:59:56 +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
4dd3f68dd9
Compiler capabilities clean-up
...
- renamed CATCH_SFINAE -> CATCH_CONFIG_SFINAE
- moved variadic macros detection into catch_compiler_capabilities.h
2013-04-22 08:19:17 +01:00
Phil Nash
dd52044374
Build 35
...
- non-SFINAE IsStreamInsertable
2013-04-20 23:20:05 +01:00
Phil Nash
003960dc90
Returned to older version of IsStreamable
...
- this time based on code from Martin Moene
https://gist.github.com/martinmoene/5418947#file-insertionopdetector-cpp
2013-04-20 23:12:17 +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
d37a8e8f98
Revert "Refactored line wrapping in Text constructor a bit"
...
This reverts commit e43d4a2028
.
2013-04-20 18:40:10 +01:00
Phil Nash
e43d4a2028
Refactored line wrapping in Text constructor a bit
2013-04-20 18:37:42 +01:00
Phil Nash
54ca219aad
Text class is now full replacement for LineWrap
2013-04-20 11:27:28 +01:00
Phil Nash
7059c6e1c3
Text class mostly working
...
- tabs not yet working
2013-04-19 19:08:32 +01:00
Phil Nash
052dc18c76
Remove SFINAE support for all unknown compilers
2013-04-18 07:40:19 +01:00
Phil Nash
5062d3e92b
Added (conditional) SFINAE support.
...
Better streamable detection for toString using SFINAE (falls back to non-SFINAE version without)
2013-04-16 22:55:31 +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
a3703faa0a
First cut of new Colour class (to replace TextColour)
2013-04-05 07:47:36 +01:00
Phil Nash
5c7d3d75cc
build 30
2013-04-01 11:27:10 +01:00
Phil Nash
9d15d36748
Changed Xcode search paths for easier sharing of projects with Windows
2013-03-29 21:39:02 +00: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
15fd032608
Use new line wrapper to show test case list, with tags, in columns
2013-03-28 22:13:31 +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
2927c240a1
Fixed line wrap bug
...
Added line wrap tests and modified wrap algo to wrap within words using a -
2013-03-25 09:20:51 +00:00
Phil Nash
29426b6359
Added vector resize test
2013-03-25 08:47:36 +00:00
Phil Nash
2e3c5fa2ad
Addressed some warnings (mostly MSVC)
2013-03-25 08:46:48 +00:00
Phil Nash
6ba2057abd
refactored toLower
2013-03-22 19:00:42 +00:00
Phil Nash
bd7f797e09
build 27
2013-03-21 09:00:24 +00:00
Phil Nash
49d7ce40e8
Minor tidy up
2013-03-21 08:58:22 +00:00
Phil Nash
9390675260
Build 26
2013-03-16 20:21:51 +00:00
Phil Nash
c0b698073e
Initial support for variadic macros
2013-03-16 20:18:52 +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
0db35c0f35
Cleaned up -Wpadded warning handling a bit more
2013-03-13 08:18:30 +00:00
Phil Nash
dc2735c23d
Removed some cruft and warnings
2013-03-13 08:04:50 +00:00
Phil Nash
7542685a2f
Moved "no test cases matched" message to reporter
2013-03-12 19:06:40 +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
35cb97f5e2
Cleaned up some stray tests
2013-02-19 18:45:06 +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
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
42aef1d99c
Fairly major reworking of console reporter (still in progress).
...
Changed reporter interface a bit.
2013-01-13 21:51:44 +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
bcf722eb81
Reporter interface uses value types instead of shared ptrs again
2013-01-03 09:04:46 +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
fe98123d0b
Started new reporter, "console", which will replace "basic" when done.
...
Introduced Option template as part of this.
2012-12-05 08:40:53 +00:00
Phil Nash
2632dca81d
Completed IStreamingInterface abstraction with TestRunInfo and GroupInfo
2012-12-01 23:49:57 +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
8255acf88f
IStreamingReporter is now the default. Use REGISTER_LEGACY_REPORTER to register… you guessed it: legacy reporters
...
The built-in reporters are still legacy at the moment.
2012-11-30 19:29:03 +00:00
Phil Nash
4e12e12c1f
Streaming reporter interface is now used natively.
...
Legacy reporters are adapted by their factories.
2012-11-30 19:15:23 +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
Phil Nash
4b36001698
Tightened up ReporterConfig and added it to LegacyReporterAdapter
2012-11-26 23:28:00 +00:00
Phil Nash
f9d92634f5
First cut of using new streaming reporter interface - using an adapter to map back to the legacy interface
...
Doesn't do sections or the query functions (e.g. shouldRedirectStdOut)
2012-11-25 21:43:36 +00:00
Phil Nash
8baa06c63e
Split TestCaseInfo into a data only component and the test case function and behaviour.
...
Reporters only get to see the former
2012-11-25 11:19:55 +00:00
Phil Nash
06a671a349
Renamed TestCaseInfo -> TestCase
2012-11-22 19:17:20 +00:00
Phil Nash
deb3e9d4c4
Fixed SUCCEED so it logs message in basic reporter
...
Reverted previous change so that tests with no assertions but INFO macros now warn again (but an explicit SUCCEED does not)
2012-11-21 08:49:20 +00:00
Phil Nash
5d248c98bf
Moved code that detects absence of assertions closer to where end of test case is reported (ready for merging).
...
Also now considers info macros when warning (i.e. an empty test case with an INFO() will not warn).
2012-11-21 08:19:23 +00:00
Phil Nash
db48a6dfda
Updated baselines to include NoAssertions warning
2012-11-20 21:13:21 +00:00
Phil Nash
5497cd816f
Expanded baseline to include all tests
2012-11-20 08:28:21 +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
d0cc33f284
Unchecked exceptions don't report previous assertions message (only its line number)
2012-11-17 17:22:37 +00:00
Phil Nash
75b89a9763
New baselines
...
As well as some new tests these baselines were generated using > instead of -o, so includes messages sent to stdout and not visible in the directed output
2012-11-17 10:48:37 +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
Phil Nash
42d1b45386
Squashed commit of the following:
...
commit 70c5ef9eed
Author: Phil Nash <github@philnash.me>
Date: Tue Nov 13 21:46:01 2012 +0000
Regen single include
commit 4ea535e505
Author: Phil Nash <github@philnash.me>
Date: Tue Nov 13 09:56:30 2012 +0000
Tidied up result enums
commit 7717c29072
Author: Phil Nash <github@philnash.me>
Date: Tue Nov 13 09:45:29 2012 +0000
Implemented CHECK_NOFAIL
Previous commit missed some files
commit d539da9030
Author: Phil Nash <github@philnash.me>
Date: Tue Nov 13 09:44:52 2012 +0000
Implemented CHECK_NO_FAIL
commit af1a321860
Author: Phil Nash <github@philnash.me>
Date: Sat Nov 10 18:46:39 2012 +0000
Regen single include
commit f54ac5625e
Author: Phil Nash <github@philnash.me>
Date: Sat Nov 10 18:44:12 2012 +0000
New (combined) baselines
commit defca58566
Author: Phil Nash <github@philnash.me>
Date: Sat Nov 10 18:43:23 2012 +0000
negate() -> endExpression(), takes ResultDisposition
commit b2ef998825
Author: Phil Nash <github@philnash.me>
Date: Sat Nov 10 10:35:09 2012 +0000
Changed shouldNegate boolean to use part of ResultDisposition enum
commit 1af13dba97
Author: Phil Nash <github@philnash.me>
Date: Sat Nov 10 10:20:08 2012 +0000
Changed StopOnFailure boolean to an enum
commit a1dc7e312c
Author: Phil Nash <github@philnash.me>
Date: Tue Nov 6 19:34:35 2012 +0000
Regen single include
commit 20e59ce9d1
Author: Phil Nash <github@philnash.me>
Date: Tue Nov 6 19:34:10 2012 +0000
Added tags docs
commit b5b1b1e430
Author: Phil Nash <github@philnash.me>
Date: Tue Nov 6 19:13:25 2012 +0000
Some expression/ evaluation clean-up
commit ec5956f471
Author: Phil Nash <github@philnash.me>
Date: Tue Nov 6 07:52:28 2012 +0000
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
commit 88b70828f2
Author: Phil Nash <github@philnash.me>
Date: Sun Nov 4 21:39:38 2012 +0000
Regen single include
commit b323fc7e6c
Author: Phil Nash <github@philnash.me>
Date: Sun Nov 4 21:39:16 2012 +0000
Fixed line/no regression for SECTIONs
Unexpected exceptions within a section now get the SECTION's line no. again (instead of TEST_CASE line/no)
commit 78fba28c4b
Author: Phil Nash <github@philnash.me>
Date: Sun Nov 4 21:11:59 2012 +0000
Added className to TestCaseInfo
className is passed through from class based test methods and held in the TestCaseInfo.
For free-function based test cases it is set to "global".
The JUnit reporter uses the className value to populate he class attribute.
commit 81cb69ef18
Author: Phil Nash <github@philnash.me>
Date: Sun Nov 4 21:09:22 2012 +0000
AssertionInfo captures more info (for test cases and sections)
commit a4e088c999
Author: Phil Nash <github@philnash.me>
Date: Fri Nov 2 08:29:03 2012 +0000
Removed __FUNCTION__ from SourceLineInfo
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-13 21:59:50 +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
f54ac5625e
New (combined) baselines
2012-11-10 18:44:12 +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
b323fc7e6c
Fixed line/no regression for SECTIONs
...
Unexpected exceptions within a section now get the SECTION's line no. again (instead of TEST_CASE line/no)
2012-11-04 21:39:16 +00:00
Phil Nash
78fba28c4b
Added className to TestCaseInfo
...
className is passed through from class based test methods and held in the TestCaseInfo.
For free-function based test cases it is set to "global".
The JUnit reporter uses the className value to populate he class attribute.
2012-11-04 21:11:59 +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
Phil Nash
8f4cc541d5
Added regression test baselines
2012-10-29 19:55:34 +00:00
Phil Nash
134e45b3ad
Fixed #132
2012-10-28 20:57:21 +00:00
Phil Nash
c597a893fa
ResultInfo -> AssertionResult filenames and variables
2012-10-16 08:31:05 +01:00
Phil Nash
d16955f63a
Renamed ResultInfo -> AssertionResult
2012-10-16 08:27:21 +01:00
Phil Nash
9444bbcb7b
Added AllOf and AnyOf matchers
2012-10-12 07:58:17 +01:00
Phil Nash
47f679ef21
Disabled WIP code
2012-10-04 08:19:09 +01:00
Phil Nash
803f6b7e4b
Added SCOPED_CAPTURE
2012-10-04 08:14:48 +01:00
Phil Nash
4104fb735e
Random bits of clean-up
2012-10-03 18:12:57 +01:00
Phil Nash
4b93fb81b5
Added some surrogate cpps
...
(and fixed up missing includes they uncovered)
2012-09-28 19:21:14 +01:00
Phil Nash
67ec8709ea
First cut of command line support for tags
2012-09-26 18:38:26 +01:00
Phil Nash
85c0e3d42b
Tag command line parsing implementation
2012-09-21 07:48:03 +01:00
Phil Nash
9d8570ff80
Removed spurious files
2012-09-20 08:20:06 +01:00
Phil Nash
61964881c7
Added copy ctor to ReporterConfig to get rid of warnings
2012-09-20 08:17:52 +01:00
Phil Nash
fc1baac7f5
First cut of tags support
2012-09-15 17:53:27 +01:00
Phil Nash
a70fbe3c1a
Completed NoAssertions warning implementation
2012-08-31 08:10:36 +01:00
Phil Nash
ecf934b045
Option objects now enforce min/ max args generically
2012-08-27 21:42:55 +01:00
Phil Nash
eb775aa7af
Refactored command line parsers into polymorphic classes
2012-08-25 21:26:05 +01:00
Phil Nash
95ae50ad3d
Test for ~ and removed debug print
2012-08-24 19:01:35 +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
d5fbe2ec5d
conditionally compile GCC pragmas
2012-08-16 20:35:52 +01:00
Phil Nash
d178df06ee
First cut of filters implementation
2012-08-16 18:48:32 +01:00
Phil Nash
cda21492a8
Conditionally compile clang pragmas
2012-08-16 18:47:41 +01:00
Phil Nash
c1dbc9c22b
Separated getting test cases to run from running them
2012-08-15 19:12:51 +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
da0ae952fc
Renamed static registries -> registry hub
2012-08-07 07:58:34 +01:00
Phil Nash
1091ca81e6
First cut of StaticRegistries - separate from Context
2012-08-06 20:16:53 +01:00
Phil Nash
b084562b3b
Improved error handling for --abort as per #108
2012-07-28 20:22:40 +01:00
Phil Nash
d2553cdc64
Made ReportConfig a value type
2012-07-20 19:07:42 +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
8fbd8e0f9e
Moved use of reporter into runner (our of Main, directly)
2012-07-16 08:58:28 +01:00
Phil Nash
abf271672f
Added NotImplementedException
2012-07-05 18:37:58 +01:00
Phil Nash
4c73aa5a0e
Factored ConfigData out of data
2012-06-08 08:22:56 +01:00
Phil Nash
46a3476731
Added nothrow command line option
...
Causes _THROWS family of macros to no evaluate expression
2012-06-05 20:50:47 +01:00
Phil Nash
5824b56a5e
Cleaned up some GCC/LLVM warnings
2012-06-05 10:38:18 +01:00
Phil Nash
535edcb73b
changed remaining cmd line checks to cmd.raiseError
2012-06-03 19:03:17 +01:00
Phil Nash
8d02b9306d
Changed --cutoff to --abort
2012-06-02 23:26:32 +01:00
Phil Nash
6d1c11381e
Fixed some signed/ unsigned warnings
2012-06-02 23:08:07 +01:00
Phil Nash
e9e68591a2
qualified #includes
2012-06-02 12:31:55 +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
7035b55832
Matchers macro uses Catch::Matchers namespace internally - so it doesn't have to be declared with "using" first
2012-05-24 08:29:03 +01:00
Phil Nash
73e1bc20bc
Fixed some warnings
2012-05-24 08:23:55 +01:00
Phil Nash
1787da54a7
Reinstated #include that broke single include
2012-05-22 22:21:17 +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
ee18b8c507
Reformatting
2012-05-16 15:02:51 +01:00
Phil Nash
0afa09f7c1
Reformatting
2012-05-16 14:53:59 +01:00
Phil Nash
5ec53b2788
renamed hub -> context
...
(also did some reformatting)
2012-05-10 07:58:48 +01:00
Phil Nash
d06dcedfdc
Some more reformatting.
...
Also fixed some warnings
2012-05-09 08:17:51 +01:00
Phil Nash
e1cb8f25f2
Fix for comparing (const) char* to NULL
2012-05-07 19:45:55 +01:00
Phil Nash
e848a91704
Shifted some of MockReporter into the impl file file
2012-05-07 18:59:33 +01:00
Phil Nash
a976c07b8d
Fixed section ordering issue
...
If a branch section completes without running any inner sections it will no run subsequent sections (until the next isolated run).
2012-05-05 19:32:52 +01:00
Phil Nash
b213202ad7
Added self-test for section ordering
...
Added MockReporter for tracking test runs.
Added intrusive smart pointer. Config holds reporter by smart pointer, so we can route the mock reporter through multiple test runs
2012-05-04 07:55:11 +01:00
Phil Nash
83a66a6255
Removed redundant const
...
(also fixed test counts)
2012-04-28 12:39:15 +01:00
Phil Nash
8fdf7f3a09
Added tests for signed/ unsigned fix
...
Integrated test from @ jweyrich highlighting issue fixed by pull request #79
2012-04-28 12:20:29 +01:00
Phil Nash
53c990a7e1
ARC support for Object-C projects
2012-03-17 18:20:06 +00:00
Phil Nash
966f5dbff2
Added initial built-in matchers for NSString (ObjC)
2012-03-04 21:18:46 +00:00
Phil Nash
a6a40b3ba9
Added a handful of "built-in" matchers
2012-03-04 20:10:36 +00:00
Phil Nash
eca5637c58
First cut of Matcher support
2012-03-04 11:14:21 +00:00
Phil Nash
56a02eede5
Added test for previous change
...
(Test Dragged Development?)
2012-02-29 08:39:22 +00:00
Phil Nash
af8d0b3955
Fixed trim() for single char strings (github #75 )
2012-02-28 20:04:25 +00:00
Phil Nash
9bbaeba3ae
Refactored internal interfaces to use Totals instead of success/ fail
2012-02-23 18:51:21 +00:00
Phil Nash
e1a2480f49
Cleaned up summary reporting
...
Improved newlines and pluralisation
2012-02-22 09:42:34 +00:00
Phil Nash
93b8a39c38
Added new cpp to VS project
...
Moved catch_self_test.cpp and added it to VS2010 project
2012-02-17 09:05:20 +00:00
Phil Nash
7b449f7abe
Ability to register line# for testing
...
Factored file/ line storage and formatting into common class.
Used in a static registry so failure messages can be asserted to have the file/ line in.
2012-02-15 08:20:06 +00:00
Phil Nash
0b09d1c089
Fixed GitHub Issue #70
...
Interleave XML entities are now encoded correctly
2012-02-10 18:58:06 +00:00
Phil Nash
a162e22fa3
Added CHECKED_IF and CHECKED_ELSE
2012-02-10 08:30:13 +00:00
Phil Nash
3fd7dc0218
Prevent duplicate test names from being registered
...
If a test case with the same name as an already registered test case is registered an error is logged to cerr and the program exits (with error level 1)
2012-02-09 08:34:01 +00:00