Commit Graph

220 Commits

Author SHA1 Message Date
Phil Nash b5b1b1e430 Some expression/ evaluation clean-up 2012-11-06 19:13:25 +00:00
Phil Nash ec5956f471 Fix for #134
The INTERNAL_CATCH_MSG macro, which is used by INFO, WARN and FAIL places its lines in a do…while block so it can be used after an if statement with no block
2012-11-06 07:52:28 +00:00
Phil Nash 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 81cb69ef18 AssertionInfo captures more info (for test cases and sections) 2012-11-04 21:09:22 +00:00
Phil Nash a4e088c999 Removed __FUNCTION__ from SourceLineInfo 2012-11-02 08:29:03 +00:00
Phil Nash 2a1e8bfc6e Updated colour comments 2012-11-01 08:16:15 +00:00
Phil Nash f0f407fc3e Manually applied merge #133 from Master 2012-10-31 18:28:21 +00:00
Phil Nash 355b95fda1 Cleaned up ANSI colour code impl a bit 2012-10-31 18:04:22 +00:00
Phil Nash 778f9c4fc7 Removed "no-" from Wno-global-constructors when disabling 2012-10-30 09:09:30 +00:00
Phil Nash 108f1937d8 Added terminal colour codes for POSIX
With thanks to Adam Strzelecki
2012-10-29 20:46:45 +00:00
Phil Nash 2e203a1834 Fixed remaining reporting regressions 2012-10-29 19:55:13 +00:00
Phil Nash 134e45b3ad Fixed #132 2012-10-28 20:57:21 +00:00
Phil Nash fe1d7c1d08 Small fixes and tweaks 2012-10-28 10:27:44 +00:00
Phil Nash 355b5e546d Some tidy-up 2012-10-26 09:05:36 +01:00
Phil Nash f847186ebb AssertionResultBuilder -> ExpressionResultBuilder 2012-10-26 08:45:23 +01:00
Phil Nash 8cca2f1369 ExpressionBuilder ->ExpressionDecomposer
Expression -> ExpressionLhs
2012-10-24 22:09:01 +01:00
Phil Nash e04e74f896 More AssertionResult refactoring 2012-10-24 21:59:47 +01:00
Phil Nash 1dd56d4d2b AssertionResultBuilder can be constructed from result type 2012-10-19 08:01:34 +01:00
Phil Nash f2d5f1b3e4 Expression has its own result builder - not passed in from expression builder 2012-10-19 08:01:05 +01:00
Phil Nash e3b111a39a streamlined acceptResult 2012-10-18 22:59:16 +01:00
Phil Nash 3ad13256e1 Refactored assertion builder stuff out of expression builder 2012-10-18 08:39:44 +01:00
Phil Nash c96f9330a0 Collect assertion info up front 2012-10-17 08:14:22 +01:00
Phil Nash a5fa78284d ResultData -> AssertionResultData 2012-10-16 08:33:13 +01: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 9902ac9f1a Cleaned up ResultInfoBuilder a bit 2012-10-09 20:58:33 +01:00
Phil Nash 71edf8b727 isNot -> isFalse 2012-10-09 11:59:11 +01:00
Phil Nash 6730512afa Refactoring ResultData out of ResultInfo/ Builder pt2 2012-10-09 11:48:55 +01:00
Phil Nash 86e1915099 Refactoring ResultData out of ResultInfo/ Builder pt1 2012-10-05 18:35:01 +01:00
Phil Nash 803f6b7e4b Added SCOPED_CAPTURE 2012-10-04 08:14:48 +01:00
Phil Nash 36d0da0194 Started refactoring ResultInfo/Builder 2012-10-04 08:09:09 +01:00
Phil Nash 4104fb735e Random bits of clean-up 2012-10-03 18:12:57 +01:00
Phil Nash e82b564c3a Merge branch 'master' of github.com:philsquared/Catch 2012-09-29 20:35:14 +01:00
Phil Nash 4b93fb81b5 Added some surrogate cpps
(and fixed up missing includes they uncovered)
2012-09-28 19:21:14 +01:00
Matt Wozniski 07e20aa706 Merge remote-tracking branch 'phil' into include-guard-fixes
Conflicts:
	single_include/catch.hpp
2012-09-26 21:42:44 -04:00
Phil Nash 67ec8709ea First cut of command line support for tags 2012-09-26 18:38:26 +01:00
Phil Nash c4160e9ef8 Fixed alternate stream bugs 2012-09-26 18:36:58 +01:00
Phil Nash 60fb60f5e0 Updated help help 2012-09-25 07:43:37 +01:00
Phil Nash ec2fccf6b8 Fixed SCOPED_INFO (#123) 2012-09-24 08:28:23 +01:00
Phil Nash 5f66d1d001 Added cleanup as per #125 2012-09-21 18:44:22 +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
Matt Wozniski f29c898443 Normalize include guards for all *.h and *.hpp
Some files had include guards that didn't match the file name, and
others were missing the include guards entirely.

Standardized this so that every include file has an include guard, and
all the guards are of the form TWOBLUECUBES_<FILENAME>_<EXT>_INCLUDED
2012-09-17 01:53:39 -04:00
Phil Nash fc1baac7f5 First cut of tags support 2012-09-15 17:53:27 +01:00
Phil Nash dea756f699 Capture test case hidden status in member variable 2012-09-12 18:40:24 +01:00
Phil Nash f7418eb2dd Completed embedded docs 2012-09-09 11:44:30 +01:00
Phil Nash dae5808666 Output option description lines that don't end in newline 2012-09-09 11:25:02 +01:00