From b7e432eadc4366225dbb43907fd41e118d99963f Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Wed, 20 Aug 2014 19:07:46 +0100 Subject: [PATCH 1/2] Updated version for develop branch --- README.md | 2 +- include/internal/catch_version.hpp | 2 +- single_include/catch.hpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 47d85c18..9b35b6b4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![catch logo](catch-logo-small.png) -*v1.0 build 53 (master branch)* +*v1.1 build 1 (develop branch)* Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch) diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index db7a7ec8..d1bdbb19 100644 --- a/include/internal/catch_version.hpp +++ b/include/internal/catch_version.hpp @@ -13,7 +13,7 @@ namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 1, 0, 53, "master" ); + Version libraryVersion( 1, 1, 1, "develop" ); } #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 6b8dfb5e..06a6f141 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * CATCH v1.0 build 53 (master branch) - * Generated: 2014-08-20 08:08:19.533804 + * CATCH v1.1 build 1 (develop branch) + * Generated: 2014-08-20 19:07:01.206746 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -6417,7 +6417,7 @@ namespace Catch { namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 1, 0, 53, "master" ); + Version libraryVersion( 1, 1, 1, "develop" ); } // #included from: catch_message.hpp From b3ece7e75d6b1983ab711151190f9a3a2b6e6e2e Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Thu, 21 Aug 2014 07:22:35 +0100 Subject: [PATCH 2/2] Tweaked wording around ability to do BDD --- docs/why-catch.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/why-catch.md b/docs/why-catch.md index 2b08edc5..d90ee012 100644 --- a/docs/why-catch.md +++ b/docs/why-catch.md @@ -10,7 +10,7 @@ So what does Catch bring to the party that differentiates it from these? Apart f * No external dependencies. As long as you can compile C++98 and have a C++ standard library available. * Write test cases as, self-registering, functions or methods. * Divide test cases into sections, each of which is run in isolation (eliminates the need for fixtures!) -* Use BDD-style GIVEN-WHEN-THEN in place of test cases and sections. +* Use BDD-style Given-When-Then sections as well as traditional unit test cases. * Only one core assertion macro for comparisons. Standard C/C++ operators are used for the comparison - yet the full expression is decomposed and lhs and rhs values are logged. ## Other core features