From 3a8c3b5d56db253b8f40017cd4125a04c318cd95 Mon Sep 17 00:00:00 2001 From: Mathieu Champlon Date: Sun, 17 Jul 2016 23:22:52 +0200 Subject: [PATCH 1/5] Updated example to use BOOST_IDENTITY_TYPE --- doc/example/reference.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/example/reference.cpp b/doc/example/reference.cpp index 29de8ad..42cec9d 100644 --- a/doc/example/reference.cpp +++ b/doc/example/reference.cpp @@ -234,7 +234,7 @@ namespace member_function_example_8 //[ member_function_example_8 MOCK_CLASS( mock_class ) { - MOCK_METHOD( method, 0, (std::map< int, int >()) ) // the signature must be surrounded with round parenthesis if the return type contains a comma + MOCK_METHOD( method, 0, BOOST_IDENTITY_TYPE((std::map< int, int >())) ) // the signature must be wrapped in [@http://www.boost.org/libs/utility/identity_type/doc/html/index.html BOOST_IDENTITY_TYPE] if the return type contains a comma }; //] } From 0bf55ff7f5a4cff2c9ec57cd552d5978e872b369 Mon Sep 17 00:00:00 2001 From: Mathieu Champlon Date: Sun, 17 Jul 2016 23:23:15 +0200 Subject: [PATCH 2/5] Fixed links to Boost.Test documentation --- doc/reference.qbk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/reference.qbk b/doc/reference.qbk index c872cc2..eeb4d48 100644 --- a/doc/reference.qbk +++ b/doc/reference.qbk @@ -390,9 +390,9 @@ Constraints : [[mock::less_equal( ['expected] )] [['actual] <= ['expected]] [compares ['actual] to ['expected] using operator <=]] [[mock::greater_equal( ['expected] )] [['actual] >= ['expected]] [compares ['actual] to ['expected] using operator >=]] [[mock::near( ['expected], ['tolerance] )] [std::abs( ['actual] - ['expected] ) < ['tolerance]] [checks whether ['actual] is near ['expected] within ['tolerance]]] - [[mock::close( ['expected], ['tolerance] )] [boost::test_tools::check_is_close( ['actual], ['expected], boost::test_tools::percent_tolerance( ['arg] ) )] [checks whether ['actual] is close to ['expected], see [@http://www.boost.org/libs/test/doc/html/utf/testing-tools/floating_point_comparison.html Floating-point comparison algorithms] ]] - [[mock::close_fraction( ['expected], ['tolerance] )] [boost::test_tools::check_is_close( ['actual], ['expected], boost::test_tools::fraction_tolerance( ['arg] ) )] [checks whether ['actual] is close to ['expected], see [@http://www.boost.org/libs/test/doc/html/utf/testing-tools/floating_point_comparison.html Floating-point comparison algorithms] ]] - [[mock::small( ['tolerance] )] [boost::test_tools::check_is_small( ['actual], ['expected] ) )] [checks whether ['actual] is small within ['tolerance], see [@http://www.boost.org/libs/test/doc/html/utf/testing-tools/floating_point_comparison.html Floating-point comparison algorithms] ]] + [[mock::close( ['expected], ['tolerance] )] [boost::test_tools::check_is_close( ['actual], ['expected], boost::test_tools::percent_tolerance( ['arg] ) )] [checks whether ['actual] is close to ['expected], see [@http://www.boost.org/libs/test/doc/html/boost_test/testing_tools/extended_comparison/floating_point.html Floating-point comparison algorithms] ]] + [[mock::close_fraction( ['expected], ['tolerance] )] [boost::test_tools::check_is_close( ['actual], ['expected], boost::test_tools::fraction_tolerance( ['arg] ) )] [checks whether ['actual] is close to ['expected], see [@http://www.boost.org/libs/test/doc/html/boost_test/testing_tools/extended_comparison/floating_point.html Floating-point comparison algorithms] ]] + [[mock::small( ['tolerance] )] [boost::test_tools::check_is_small( ['actual], ['expected] ) )] [checks whether ['actual] is small within ['tolerance], see [@http://www.boost.org/libs/test/doc/html/boost_test/testing_tools/extended_comparison/floating_point.html Floating-point comparison algorithms] ]] [[mock::call( ['expected] )] [['expected]( ['actual] )] [calls ['expected] as a functor returning a ['bool] and accepting ['actual] as parameter]] [[mock::same( ['expected] )] [&['actual] == &['expected]] [compares ['actual] to ['expected] by comparing their pointers]] [[mock::assign( ['expected] )] [['actual] = ['expected], true From 28b010cff2417357256f58eb3214cefcd673b6bc Mon Sep 17 00:00:00 2001 From: Mathieu Champlon Date: Sun, 17 Jul 2016 23:23:35 +0200 Subject: [PATCH 3/5] Updated version number --- doc/changelog.qbk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/changelog.qbk b/doc/changelog.qbk index 39888cc..86aeb2b 100644 --- a/doc/changelog.qbk +++ b/doc/changelog.qbk @@ -7,8 +7,8 @@ [section Changelog] -[section unreleased] -Not yet released +[section 1.3.0] +Released 17 July 2016 * Fixed MOCK_FUNCTOR compilation with VS2015 * Removed round parenthesis in signature support for compilers without variadic macros From 779d695490e0045ae3d4bf0e2d8f41f38c3742f4 Mon Sep 17 00:00:00 2001 From: Mathieu Champlon Date: Sun, 17 Jul 2016 23:28:05 +0200 Subject: [PATCH 4/5] Fixed line length greater than 80 characters --- include/turtle/constraints.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/turtle/constraints.hpp b/include/turtle/constraints.hpp index 6a814a2..77a142f 100644 --- a/include/turtle/constraints.hpp +++ b/include/turtle/constraints.hpp @@ -69,7 +69,8 @@ namespace detail # define MOCK_SMALL() \ detail::is_small( actual, tolerance ) # define MOCK_PERCENT_TOLERANCE() \ - detail::is_close( actual, expected, boost::math::fpc::percent_tolerance( tolerance ) ) + detail::is_close( actual, expected, \ + boost::math::fpc::percent_tolerance( tolerance ) ) # define MOCK_FRACTION_TOLERANCE() \ detail::is_close( actual, expected, tolerance ) From 5d22e09c14ac5b04c485c39b250373eadb250167 Mon Sep 17 00:00:00 2001 From: Mathieu Champlon Date: Mon, 18 Jul 2016 07:38:37 +0200 Subject: [PATCH 5/5] Clarified target description to include packaging --- build/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.xml b/build/build.xml index 39f009d..f5fcdaa 100644 --- a/build/build.xml +++ b/build/build.xml @@ -121,6 +121,6 @@ - +