Commit Graph

2038 Commits

Author SHA1 Message Date
Phil Nash
85b4e94192 build 6 2014-10-02 18:51:05 +01:00
Phil Nash
4b3fa4742b Use reset instead of assignment when updating auto_ptr/unique_ptr 2014-10-02 18:47:07 +01:00
Phil Nash
b1936d3b0e Calls method of FatalConditionHandler (to avoid warnings) 2014-10-02 18:28:45 +01:00
Phil Nash
8ec9a5a547 Updated project for Xcode 6 2014-10-02 18:25:05 +01:00
Phil Nash
ee3b265aa1 build 5 2014-09-18 18:25:10 +01:00
Phil Nash
b62a1b5334 Moved RandomNumberGenerator out of function and pass in a named instance instead of a temporary - both for C++03 compatibility reasons 2014-09-18 18:24:41 +01:00
Phil Nash
16a7db036f enable nullptr for VS2010 2014-09-18 18:23:47 +01:00
Phil Nash
73a0744452 Backed out PR #307 (use nullptr from VS2005) as it seems clr specific 2014-09-17 18:06:47 +01:00
Phil Nash
6492560394 Made sorting functors const 2014-09-15 23:36:39 +01:00
Phil Nash
9630454b0f Added missing #include 2014-09-15 23:32:13 +01:00
Phil Nash
6a8e8ada0d build 4 2014-09-15 18:40:24 +01:00
Phil Nash
fa0122bf54 Allow testing ordering to be specified as declaration, lexicographical, or random. Allow random seed to be specified 2014-09-15 18:39:31 +01:00
Anthony Super
c9746634c4 Documentation Changes
Modified several sentences for clarity and fixed a few typos.
2014-09-12 17:12:43 -06:00
Phil Nash
d4e5f18436 Merged group name commit from develop 2014-09-08 08:42:36 +01:00
Phil Nash
ea33961b43 Factored out mention of "unprintable string" ("{?}") 2014-09-08 08:14:59 +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
Andy Sawyer
022a0b4fcb catch_tostring: toString for std::tuple 2014-09-04 00:31:11 +01:00
Andy Sawyer
3196937343 catch_tostring: Add includes for tuple, type_traits 2014-09-04 00:17:36 +01:00
Andy Sawyer
95956444b7 catch_tostring: Move toString overload declarations
- Put all the declarations of the overloads early in the file, so they
  get seen by the templates later on
2014-09-04 00:12:25 +01:00
Phil Nash
4caabfa45e build 3 2014-09-03 19:23:22 +01:00
Phil Nash
5ea3266857 Added baselines for new test cases 2014-09-03 19:22:47 +01:00
Phil Nash
fcf5ef0db6 Changed time function name to reflect that it actually returns Microseconds as reported in #323 2014-09-03 19:20:23 +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
a9d14c8f7c Merge pull request #319 from PureAbstract/to_string_tests
To string tests
2014-09-03 08:42:32 +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
Phil Nash
9721296694 Merge pull request #318 from PureAbstract/enum_to_string
Enum to string (for #317)
2014-09-03 08:36:24 +01:00
Phil Nash
3eefa7f537 use nullptr in MSVC from 2005+
(based on PR #307 - thanks alex85k)
2014-09-02 08:30:57 +01:00
Andy Sawyer
fdbbb2c9bd Updated CMakeLists.txt for toString work 2014-09-01 18:27:29 +01:00
Andy Sawyer
abf9ffc982 A bunch of Catch::toString tests 2014-09-01 18:09:37 +01:00
Andy Sawyer
cd2a5aa688 catch_tostring: tostring for enum class types 2014-09-01 17:38:17 +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
341a9c4443 Merge branch 'master' of github.com:philsquared/Catch into develop
# By Andy Balaam
# Via Phil Nash (2) and Andy Balaam (1)
* 'master' of github.com:philsquared/Catch:
  Fix a typo (missing "n")

Conflicts:
	README.md
	include/internal/catch_version.hpp
	single_include/catch.hpp
2014-08-22 19:36:53 +01:00
Phil Nash
93b61e1194 v1.1 build 2 (develop branch)
- Signal hander support
2014-08-22 19:35:41 +01:00
Phil Nash
05743eeaa1 FatalErrorConditions now full close reporter states
- so the console reporter(s) show final summary and the xml reporters close their tags
2014-08-22 19:33:28 +01:00
Phil Nash
85d33e2cbd Merge pull request #306 from andybalaam/master
Fix a typo (missing "n")
2014-08-22 19:21:45 +01:00
Andy Balaam
389f3f5be8 Fix a typo (missing "n") 2014-08-22 15:18:33 +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
4f4b44e3a2 Merge branch 'develop' of github.com:philsquared/Catch
Tweaked wording around ability to do BDD
2014-08-21 07:25:27 +01:00
Phil Nash
aa31d1c275 Merge branch 'master' of github.com:philsquared/Catch into develop
* 'master' of github.com:philsquared/Catch:
  Updated “contributing” docs to reflect new develop branch
2014-08-21 07:23:45 +01:00
Phil Nash
b3ece7e75d Tweaked wording around ability to do BDD 2014-08-21 07:22:35 +01:00
Phil Nash
b7e432eadc Updated version for develop branch 2014-08-20 19:07:46 +01:00
Phil Nash
76edbc104c Updated “contributing” docs to reflect new develop branch 2014-08-20 19:03:31 +01:00
Phil Nash
6e00e5e86f Merge branch 'master' of github.com:philsquared/Catch
# By Martin Moene
# Via Martin Moene
* 'master' of github.com:philsquared/Catch:
  Added bundled compact reporter
  Fixed link to reference section
2014-08-20 08:11:04 +01:00
Phil Nash
544bf33e73 build 53
includes wchar_t toString overloads and SCENARIO_METHOD macros
2014-08-20 08:09:32 +01:00