From 3fe72f66ea76fe6a20e57d904bc64e12592a8975 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Mon, 24 Jan 2022 19:11:08 +0100 Subject: [PATCH] Don't use MOCK_*_EXT in tests This is not really part of the public interface anymore as the variadic functions are enough. --- include/turtle/detail/mock_impl.hpp | 2 + include/turtle/mock.hpp | 27 ++++++------- ...fail_constraint_functor_not_compatible.cpp | 2 +- test/fail_constraint_value_not_comparable.cpp | 2 +- ...ue_of_wrong_type_in_builtin_constraint.cpp | 2 +- ...il_mismatch_type_in_returns_int_action.cpp | 2 +- ...mismatch_type_in_returns_string_action.cpp | 2 +- ...l_mismatch_type_in_returns_void_action.cpp | 2 +- ...fail_wrong_number_of_arguments_in_with.cpp | 2 +- test/test_integration.cpp | 40 +++++++++---------- test/test_max_args.cpp | 4 +- test/test_mock.cpp | 24 +++++------ 12 files changed, 55 insertions(+), 56 deletions(-) diff --git a/include/turtle/detail/mock_impl.hpp b/include/turtle/detail/mock_impl.hpp index 822f7a7..6c50a29 100644 --- a/include/turtle/detail/mock_impl.hpp +++ b/include/turtle/detail/mock_impl.hpp @@ -17,6 +17,8 @@ #include #include +#define MOCK_REPLACED_MACRO_ERROR(oldName, newName) static_assert(false, #oldName " has been replaced by " #newName) + // Internal compatibility macro if function signature is passed via BOOST_IDENTITY_TYPE // TODO: Remove support for doing that and move remove_pointer_t to MOCK_PROTECT_FUNCTION_SIG #define MOCK_FUNCTION_TYPE(...) std::remove_pointer_t<__VA_ARGS__> diff --git a/include/turtle/mock.hpp b/include/turtle/mock.hpp index 991691b..0a0e9ac 100644 --- a/include/turtle/mock.hpp +++ b/include/turtle/mock.hpp @@ -114,24 +114,21 @@ #define MOCK_VERIFY(identifier) MOCK_HELPER(identifier).verify(__FILE__, __LINE__) // Replaced macros -#define MOCK_DETAIL_REPLACED_MACRO_ERROR(oldName, newName) \ - static_assert(false, #oldName " has been replaced by " #newName) #define MOCK_CONST_CONVERSION_OPERATOR_TPL(...) \ - MOCK_DETAIL_REPLACED_MACRO_ERROR(MOCK_CONST_CONVERSION_OPERATOR_TPL, MOCK_CONST_CONVERSION_OPERATOR) -#define MOCK_CONST_METHOD_EXT_TPL(...) MOCK_DETAIL_REPLACED_MACRO_ERROR(MOCK_CONST_METHOD_EXT_TPL, MOCK_CONST_METHOD) -#define MOCK_CONST_METHOD_TPL(...) MOCK_DETAIL_REPLACED_MACRO_ERROR(MOCK_CONST_METHOD_TPL, MOCK_CONST_METHOD) + MOCK_REPLACED_MACRO_ERROR(MOCK_CONST_CONVERSION_OPERATOR_TPL, MOCK_CONST_CONVERSION_OPERATOR) +#define MOCK_CONST_METHOD_EXT_TPL(...) MOCK_REPLACED_MACRO_ERROR(MOCK_CONST_METHOD_EXT_TPL, MOCK_CONST_METHOD) +#define MOCK_CONST_METHOD_TPL(...) MOCK_REPLACED_MACRO_ERROR(MOCK_CONST_METHOD_TPL, MOCK_CONST_METHOD) #define MOCK_CONVERSION_OPERATOR_TPL(...) \ - MOCK_DETAIL_REPLACED_MACRO_ERROR(MOCK_CONVERSION_OPERATOR_TPL, MOCK_CONVERSION_OPERATOR) -#define MOCK_FUNCTOR_TPL(...) MOCK_DETAIL_REPLACED_MACRO_ERROR(MOCK_FUNCTOR_TPL, MOCK_FUNCTOR) -#define MOCK_METHOD_EXT_TPL(...) MOCK_DETAIL_REPLACED_MACRO_ERROR(MOCK_METHOD_EXT_TPL, MOCK_METHOD) -#define MOCK_METHOD_TPL(...) MOCK_DETAIL_REPLACED_MACRO_ERROR(MOCK_METHOD_TPL, MOCK_METHOD) + MOCK_REPLACED_MACRO_ERROR(MOCK_CONVERSION_OPERATOR_TPL, MOCK_CONVERSION_OPERATOR) +#define MOCK_FUNCTOR_TPL(...) MOCK_REPLACED_MACRO_ERROR(MOCK_FUNCTOR_TPL, MOCK_FUNCTOR) +#define MOCK_METHOD_EXT_TPL(...) MOCK_REPLACED_MACRO_ERROR(MOCK_METHOD_EXT_TPL, MOCK_METHOD) +#define MOCK_METHOD_TPL(...) MOCK_REPLACED_MACRO_ERROR(MOCK_METHOD_TPL, MOCK_METHOD) #define MOCK_NON_CONST_CONVERSION_OPERATOR_TPL(...) \ - MOCK_DETAIL_REPLACED_MACRO_ERROR(MOCK_NON_CONST_CONVERSION_OPERATOR_TPL, MOCK_NON_CONST_CONVERSION_OPERATOR) + MOCK_REPLACED_MACRO_ERROR(MOCK_NON_CONST_CONVERSION_OPERATOR_TPL, MOCK_NON_CONST_CONVERSION_OPERATOR) #define MOCK_NON_CONST_METHOD_EXT_TPL(...) \ - MOCK_DETAIL_REPLACED_MACRO_ERROR(MOCK_NON_CONST_METHOD_EXT_TPL, MOCK_NON_CONST_METHOD) -#define MOCK_NON_CONST_METHOD_TPL(...) \ - MOCK_DETAIL_REPLACED_MACRO_ERROR(MOCK_NON_CONST_METHOD_TPL, MOCK_NON_CONST_METHOD) -#define MOCK_STATIC_METHOD_TPL(...) MOCK_DETAIL_REPLACED_MACRO_ERROR(MOCK_STATIC_METHOD_TPL, MOCK_STATIC_METHOD) -#define MOCK_CONSTRUCTOR_TPL(...) MOCK_DETAIL_REPLACED_MACRO_ERROR(MOCK_CONSTRUCTOR_TPL, MOCK_CONSTRUCTOR) + MOCK_REPLACED_MACRO_ERROR(MOCK_NON_CONST_METHOD_EXT_TPL, MOCK_NON_CONST_METHOD) +#define MOCK_NON_CONST_METHOD_TPL(...) MOCK_REPLACED_MACRO_ERROR(MOCK_NON_CONST_METHOD_TPL, MOCK_NON_CONST_METHOD) +#define MOCK_STATIC_METHOD_TPL(...) MOCK_REPLACED_MACRO_ERROR(MOCK_STATIC_METHOD_TPL, MOCK_STATIC_METHOD) +#define MOCK_CONSTRUCTOR_TPL(...) MOCK_REPLACED_MACRO_ERROR(MOCK_CONSTRUCTOR_TPL, MOCK_CONSTRUCTOR) #endif // MOCK_MOCK_HPP_INCLUDED diff --git a/test/fail_constraint_functor_not_compatible.cpp b/test/fail_constraint_functor_not_compatible.cpp index 0fc5d83..d5534f8 100644 --- a/test/fail_constraint_functor_not_compatible.cpp +++ b/test/fail_constraint_functor_not_compatible.cpp @@ -10,7 +10,7 @@ MOCK_CLASS(my_class) { - MOCK_METHOD_EXT(my_method, 1, void(int), my_method) + MOCK_METHOD(my_method, 1, void(int), my_method) }; bool constraint(int, int) { diff --git a/test/fail_constraint_value_not_comparable.cpp b/test/fail_constraint_value_not_comparable.cpp index ee8b81d..1e97da6 100644 --- a/test/fail_constraint_value_not_comparable.cpp +++ b/test/fail_constraint_value_not_comparable.cpp @@ -10,7 +10,7 @@ MOCK_CLASS(my_class) { - MOCK_METHOD_EXT(my_method, 1, void(int), my_method) + MOCK_METHOD(my_method, 1, void(int), my_method) }; void test_case() { diff --git a/test/fail_constraint_value_of_wrong_type_in_builtin_constraint.cpp b/test/fail_constraint_value_of_wrong_type_in_builtin_constraint.cpp index 4deaea0..67c97ab 100644 --- a/test/fail_constraint_value_of_wrong_type_in_builtin_constraint.cpp +++ b/test/fail_constraint_value_of_wrong_type_in_builtin_constraint.cpp @@ -10,7 +10,7 @@ MOCK_CLASS(my_class) { - MOCK_METHOD_EXT(my_method, 1, void(int), my_method) + MOCK_METHOD(my_method, 1, void(int), my_method) }; void test_case() { diff --git a/test/fail_mismatch_type_in_returns_int_action.cpp b/test/fail_mismatch_type_in_returns_int_action.cpp index 8b5df96..79386f3 100644 --- a/test/fail_mismatch_type_in_returns_int_action.cpp +++ b/test/fail_mismatch_type_in_returns_int_action.cpp @@ -10,7 +10,7 @@ MOCK_CLASS(my_class) { - MOCK_METHOD_EXT(my_method, 0, int(), my_method) + MOCK_METHOD(my_method, 0, int(), my_method) }; void test_case() { diff --git a/test/fail_mismatch_type_in_returns_string_action.cpp b/test/fail_mismatch_type_in_returns_string_action.cpp index dadcc33..b3cea88 100644 --- a/test/fail_mismatch_type_in_returns_string_action.cpp +++ b/test/fail_mismatch_type_in_returns_string_action.cpp @@ -10,7 +10,7 @@ MOCK_CLASS(my_class) { - MOCK_METHOD_EXT(my_method, 0, std::string(), my_method) + MOCK_METHOD(my_method, 0, std::string(), my_method) }; void test_case() { diff --git a/test/fail_mismatch_type_in_returns_void_action.cpp b/test/fail_mismatch_type_in_returns_void_action.cpp index ea7afd3..7a09043 100644 --- a/test/fail_mismatch_type_in_returns_void_action.cpp +++ b/test/fail_mismatch_type_in_returns_void_action.cpp @@ -10,7 +10,7 @@ MOCK_CLASS(my_class) { - MOCK_METHOD_EXT(my_method, 0, void(), my_method) + MOCK_METHOD(my_method, 0, void(), my_method) }; void test_case() { diff --git a/test/fail_wrong_number_of_arguments_in_with.cpp b/test/fail_wrong_number_of_arguments_in_with.cpp index d653265..f527e68 100644 --- a/test/fail_wrong_number_of_arguments_in_with.cpp +++ b/test/fail_wrong_number_of_arguments_in_with.cpp @@ -10,7 +10,7 @@ MOCK_CLASS(my_class) { - MOCK_METHOD_EXT(my_method, 1, void(int), my_method) + MOCK_METHOD(my_method, 1, void(int), my_method) }; void test_case() { diff --git a/test/test_integration.cpp b/test/test_integration.cpp index 11aea83..2442b8f 100644 --- a/test/test_integration.cpp +++ b/test/test_integration.cpp @@ -17,7 +17,7 @@ namespace { struct my_custom_mock { - MOCK_METHOD_EXT(my_method, 0, void(), my_tag) + MOCK_METHOD(my_method, 0, void(), my_tag) }; } // namespace @@ -32,7 +32,7 @@ BOOST_FIXTURE_TEST_CASE(custom_mock_object_without_macros_and_without_inheriting namespace { struct my_custom_mock_object { - MOCK_METHOD_EXT(my_method, 0, void(), my_tag) + MOCK_METHOD(my_method, 0, void(), my_tag) }; } // namespace @@ -47,7 +47,7 @@ BOOST_FIXTURE_TEST_CASE(custom_mock_object_without_macros, mock_error_fixture) namespace { MOCK_CLASS(my_mock) { - MOCK_METHOD_EXT(my_method, 1, int(int), my_tag) + MOCK_METHOD(my_method, 1, int(int), my_tag) }; } // namespace @@ -89,8 +89,8 @@ public: MOCK_BASE_CLASS(my_ambiguited_mock, my_ambiguited_interface) { - MOCK_METHOD_EXT(my_method, 0, void(), my_tag1) - MOCK_METHOD_EXT(my_method, 1, void(int), my_tag_2) + MOCK_METHOD(my_method, 0, void(), my_tag1) + MOCK_METHOD(my_method, 1, void(int), my_tag_2) }; } // namespace @@ -116,8 +116,8 @@ public: MOCK_BASE_CLASS(my_const_ambiguited_mock, my_const_ambiguited_interface) { - MOCK_NON_CONST_METHOD_EXT(my_method, 0, void(), tag1) - MOCK_CONST_METHOD_EXT(my_method, 0, void(), tag_2) + MOCK_NON_CONST_METHOD(my_method, 0, void(), tag1) + MOCK_CONST_METHOD(my_method, 0, void(), tag_2) }; } // namespace @@ -133,7 +133,7 @@ BOOST_FIXTURE_TEST_CASE(mock_object_method_const_disambiguation, mock_error_fixt namespace { MOCK_CLASS(my_undefined_mock) { - MOCK_METHOD_EXT(m, 1, void(undefined&), t) + MOCK_METHOD(m, 1, void(undefined&), t) }; } // namespace @@ -186,9 +186,9 @@ namespace { template struct my_template_mock { - MOCK_METHOD_EXT(my_method, 0, void(), my_tag) - MOCK_METHOD_EXT(my_method, 2, void(T, std::string), my_tpl_tag) - MOCK_METHOD_EXT(my_other_method, 0, void(), my_other_tag) + MOCK_METHOD(my_method, 0, void(), my_tag) + MOCK_METHOD(my_method, 2, void(T, std::string), my_tpl_tag) + MOCK_METHOD(my_other_method, 0, void(), my_other_tag) }; } // namespace @@ -212,8 +212,8 @@ struct my_template_base_class template MOCK_BASE_CLASS(my_template_base_class_mock, my_template_base_class) { - MOCK_METHOD_EXT(my_method, 1, void(T), my_method) - MOCK_METHOD_EXT(my_other_method, 0, void(), my_other_method) + MOCK_METHOD(my_method, 1, void(T), my_method) + MOCK_METHOD(my_other_method, 0, void(), my_other_method) }; } // namespace @@ -366,7 +366,7 @@ BOOST_FIXTURE_TEST_CASE(failed_sequence_in_mocked_destructor_does_not_throw, moc namespace { MOCK_CLASS(boost_optional) { - MOCK_METHOD_EXT(method, 0, boost::optional(), tag) + MOCK_METHOD(method, 0, boost::optional(), tag) }; } // namespace @@ -451,7 +451,7 @@ void nothing(T) struct member_pointer_mock_class { - MOCK_CONST_METHOD_EXT(my_method, 0, void(), my_method) + MOCK_CONST_METHOD(my_method, 0, void(), my_method) }; } // namespace @@ -532,7 +532,7 @@ BOOST_FIXTURE_TEST_CASE(a_static_method_in_a_template_class_can_be_mocked, mock_ namespace { MOCK_CLASS(mock_class) { - MOCK_METHOD_EXT(m, 0, void(), t); + MOCK_METHOD(m, 0, void(), t); }; } // namespace @@ -550,7 +550,7 @@ BOOST_FIXTURE_TEST_CASE(resetting_referenced_mock_class_does_not_crash, mock_err namespace { MOCK_CLASS(mock_class2) { - MOCK_METHOD_EXT(m, 0, mock_class2(), t); + MOCK_METHOD(m, 0, mock_class2(), t); }; } // namespace @@ -646,8 +646,8 @@ BOOST_FIXTURE_TEST_CASE(mock_class_is_thread_safe, mock_error_fixture) namespace { MOCK_CLASS(my_multi_mock) { - MOCK_METHOD_EXT(m1, 1, void(int), m1); - MOCK_METHOD_EXT(m2, 2, void(int, int), m2); + MOCK_METHOD(m1, 1, void(int), m1); + MOCK_METHOD(m2, 2, void(int, int), m2); }; } // namespace @@ -742,6 +742,6 @@ BOOST_FIXTURE_TEST_CASE(std_unique_ptr_argument_is_supported_in_retrieve_constra struct my_unique_ptr_class { MOCK_CONSTRUCTOR(my_unique_ptr_class, 1, (std::unique_ptr), constructor) - MOCK_METHOD_EXT(m, 1, void(std::unique_ptr), m) + MOCK_METHOD(m, 1, void(std::unique_ptr), m) MOCK_STATIC_METHOD(ms, 1, void(std::unique_ptr), ms) }; diff --git a/test/test_max_args.cpp b/test/test_max_args.cpp index 14ac35e..147089c 100644 --- a/test/test_max_args.cpp +++ b/test/test_max_args.cpp @@ -16,8 +16,8 @@ namespace { struct my_custom_mock { - MOCK_METHOD_EXT(method, MOCK_MAX_ARGS, void(BOOST_PP_ENUM(MOCK_MAX_ARGS, IDENTITY, int)), tag) - MOCK_METHOD_EXT(method2, MOCK_MAX_ARGS, int(BOOST_PP_ENUM(MOCK_MAX_ARGS, IDENTITY, int)), tag_2) + MOCK_METHOD(method, MOCK_MAX_ARGS, void(BOOST_PP_ENUM(MOCK_MAX_ARGS, IDENTITY, int)), tag) + MOCK_METHOD(method2, MOCK_MAX_ARGS, int(BOOST_PP_ENUM(MOCK_MAX_ARGS, IDENTITY, int)), tag_2) }; } // namespace diff --git a/test/test_mock.cpp b/test/test_mock.cpp index 5460838..51f6620 100644 --- a/test/test_mock.cpp +++ b/test/test_mock.cpp @@ -19,7 +19,7 @@ void my_function(T& t) } MOCK_CLASS(mock_class) { - MOCK_METHOD_EXT(my_method, 1, void(const std::string&), my_tag) + MOCK_METHOD(my_method, 1, void(const std::string&), my_tag) }; } // namespace @@ -34,7 +34,7 @@ BOOST_FIXTURE_TEST_CASE(mock_object_for_static_polymorphism, mock_error_fixture) namespace { MOCK_CLASS(mock_class_with_operator) { - MOCK_CONST_METHOD_EXT(operator+=, 1, mock_class_with_operator &(int), addition) + MOCK_CONST_METHOD(operator+=, 1, mock_class_with_operator &(int), addition) }; } // namespace @@ -144,12 +144,12 @@ BOOST_FIXTURE_TEST_CASE(mock_template_non_const_conversion_operator, mock_error_ namespace { MOCK_CLASS(my_mock) { - MOCK_CONST_METHOD_EXT(my_method, 1, void(int), my_method) - MOCK_CONST_METHOD_EXT(my_method_2, 1, void(int), my_method_2) + MOCK_CONST_METHOD(my_method, 1, void(int), my_method) + MOCK_CONST_METHOD(my_method_2, 1, void(int), my_method_2) }; } // namespace -BOOST_FIXTURE_TEST_CASE(MOCK_CONST_METHOD_EXT_macro_defines_a_bindable_method, mock_error_fixture) +BOOST_FIXTURE_TEST_CASE(MOCK_CONST_METHOD_macro_defines_a_bindable_method, mock_error_fixture) { my_mock m; const auto f = std::bind(&my_mock::my_method, &m, 42); @@ -218,8 +218,8 @@ BOOST_FIXTURE_TEST_CASE(mock_object_const_shared_pointer_is_named, mock_error_fi namespace { struct my_custom_mock { - MOCK_METHOD_EXT(my_method, 0, void(), my_tag) - MOCK_METHOD_EXT(my_method_2, 0, void(), my_tag_2) + MOCK_METHOD(my_method, 0, void(), my_tag) + MOCK_METHOD(my_method_2, 0, void(), my_tag_2) }; } // namespace @@ -238,8 +238,8 @@ BOOST_FIXTURE_TEST_CASE(custom_mock_object_without_macros_and_without_inheriting namespace { struct my_custom_mock_object : mock::object { - MOCK_METHOD_EXT(my_method, 0, void(), my_tag) - MOCK_METHOD_EXT(my_method_2, 0, void(), my_tag_2) + MOCK_METHOD(my_method, 0, void(), my_tag) + MOCK_METHOD(my_method_2, 0, void(), my_tag_2) }; } // namespace @@ -312,7 +312,7 @@ BOOST_FIXTURE_TEST_CASE(mock_static_function_is_named, mock_error_fixture) namespace { MOCK_CLASS(round_parenthesized_signature) { - MOCK_METHOD_EXT(m0, 0, MOCK_PROTECT_FUNCTION_SIG(std::map()), m0) + MOCK_METHOD(m0, 0, MOCK_PROTECT_FUNCTION_SIG(std::map()), m0) MOCK_STATIC_METHOD(m1, 0, MOCK_PROTECT_FUNCTION_SIG(std::map()), m1) MOCK_FUNCTOR(f0, MOCK_PROTECT_FUNCTION_SIG(std::map())); }; @@ -387,8 +387,8 @@ MOCK_BASE_CLASS(derived, base) MOCK_CONSTRUCTOR(MOCK_STDCALL derived, 0, (), derived) MOCK_DESTRUCTOR(MOCK_STDCALL ~derived, derived) MOCK_CONVERSION_OPERATOR(MOCK_STDCALL operator, int, to_int) - MOCK_METHOD_EXT(MOCK_STDCALL m1, 0, void(), m1) - MOCK_METHOD_EXT(MOCK_STDCALL m2, 0, void(), m2) + MOCK_METHOD(MOCK_STDCALL m1, 0, void(), m1) + MOCK_METHOD(MOCK_STDCALL m2, 0, void(), m2) MOCK_METHOD(MOCK_STDCALL m3, 0, void(), m3) MOCK_STATIC_METHOD(MOCK_STDCALL m4, 0, void(), m4) };