mirrors/turtle
3
0
Fork 0
mirror of https://github.com/mat007/turtle.git synced 2026-06-22 12:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reduce exposed interface (macros)

Browse source 
Move implementation details to mock_impl.hpp and remove MOCK_*_TPL macros.
Make sure all exposed macros (in mock.hpp) are properly documented.
Closes #105
This commit is contained in:
Alexander Grund 2022-01-24 19:03:15 +01:00
parent 3dda0bf328
commit bd0a4cfc73
No known key found for this signature in database
GPG key ID: AA48A0760367A42B
9 changed files with 191 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

12
test/test_integration.cpp
View file

@ -187,8 +187,8 @@ template<typename T>
struct my_template_mock
{
MOCK_METHOD_EXT(my_method, 0, void(), my_tag)
MOCK_METHOD_EXT_TPL(my_method, 2, void(T, std::string), my_tpl_tag)
MOCK_METHOD_EXT_TPL(my_other_method, 0, void(), my_other_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)
};
} // namespace
@ -212,8 +212,8 @@ struct my_template_base_class
template<typename T>
MOCK_BASE_CLASS(my_template_base_class_mock, my_template_base_class<T>)
{
MOCK_METHOD_EXT_TPL(my_method, 1, void(T), my_method)
MOCK_METHOD_EXT_TPL(my_other_method, 0, void(), my_other_method)
MOCK_METHOD_EXT(my_method, 1, void(T), my_method)
MOCK_METHOD_EXT(my_other_method, 0, void(), my_other_method)
};
} // namespace
@ -307,7 +307,7 @@ namespace {
template<typename T>
MOCK_CLASS(my_constructed_template_class)
{
MOCK_CONSTRUCTOR_TPL(my_constructed_template_class, 2, (T, const std::string&), constructor)
MOCK_CONSTRUCTOR(my_constructed_template_class, 2, (T, const std::string&), constructor)
};
} // namespace
@ -511,7 +511,7 @@ namespace {
template<typename T>
struct some_template_class
{
MOCK_STATIC_METHOD_TPL(some_static_method, 1, void(T), some_static_method)
MOCK_STATIC_METHOD(some_static_method, 1, void(T), some_static_method)
};
} // namespace

24
test/test_mock.cpp
View file

@ -64,7 +64,9 @@ BOOST_FIXTURE_TEST_CASE(mock_conversion_operator, mock_error_fixture)
namespace {
template<typename T>
MOCK_CLASS(mock_template_class_with_conversion_operator)
{ MOCK_CONVERSION_OPERATOR_TPL(operator, T, conversion) };
{
MOCK_CONVERSION_OPERATOR(operator, T, conversion)
};
} // namespace
BOOST_FIXTURE_TEST_CASE(mock_template_conversion_operator, mock_error_fixture)
@ -111,7 +113,7 @@ namespace {
template<typename T>
MOCK_CLASS(mock_template_class_with_const_conversion_operator)
{
MOCK_CONST_CONVERSION_OPERATOR_TPL(operator, T, conversion)
MOCK_CONST_CONVERSION_OPERATOR(operator, T, conversion)
};
} // namespace
@ -127,7 +129,7 @@ namespace {
template<typename T>
MOCK_CLASS(mock_template_class_with_non_const_conversion_operator)
{
MOCK_NON_CONST_CONVERSION_OPERATOR_TPL(operator, T, conversion)
MOCK_NON_CONST_CONVERSION_OPERATOR(operator, T, conversion)
};
} // namespace
@ -346,14 +348,14 @@ template<typename T>
MOCK_BASE_CLASS(variadic_tpl, base)
{
MOCK_METHOD(m1, 0, void())
MOCK_METHOD_TPL(m2, 0, T())
MOCK_METHOD_TPL(m3, 0, T(), m3)
MOCK_CONST_METHOD_TPL(m4, 0, T())
MOCK_CONST_METHOD_TPL(m5, 0, T(), m5)
MOCK_NON_CONST_METHOD_TPL(m6, 0, T())
MOCK_NON_CONST_METHOD_TPL(m7, 0, T(), m7)
MOCK_STATIC_METHOD_TPL(m8, 0, T())
MOCK_STATIC_METHOD_TPL(m9, 0, T(), m9)
MOCK_METHOD(m2, 0, T())
MOCK_METHOD(m3, 0, T(), m3)
MOCK_CONST_METHOD(m4, 0, T())
MOCK_CONST_METHOD(m5, 0, T(), m5)
MOCK_NON_CONST_METHOD(m6, 0, T())
MOCK_NON_CONST_METHOD(m7, 0, T(), m7)
MOCK_STATIC_METHOD(m8, 0, T())
MOCK_STATIC_METHOD(m9, 0, T(), m9)
};
MOCK_BASE_CLASS(comma_base, std::map<int, int>)