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

Fix names

Browse source
This commit is contained in:
Alexander Grund 2018-11-16 08:35:53 +01:00
parent 2a1623ee35
commit 72518b6297
6 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/turtle/detail/functor.hpp
View file

@ -18,11 +18,11 @@ namespace mock
{ {
namespace detail namespace detail
{ {
class functor_mutex_t : class functor_mutex :
public singleton< functor_mutex_t >, public singleton< functor_mutex >,
public mutex public mutex
{ {
MOCK_SINGLETON_CONS( functor_mutex_t ); MOCK_SINGLETON_CONS( functor_mutex );
}; };
template< typename Signature > template< typename Signature >

4
include/turtle/detail/mutex.hpp
View file

@ -93,10 +93,10 @@ namespace mock
{ {
namespace detail namespace detail
{ {
class error_mutex_t : public singleton< error_mutex_t >, class error_mutex : public singleton< error_mutex >,
public mutex public mutex
{ {
MOCK_SINGLETON_CONS( error_mutex_t ); MOCK_SINGLETON_CONS( error_mutex );
}; };
#ifdef BOOST_MSVC #ifdef BOOST_MSVC

4
include/turtle/detail/root.hpp
View file

@ -24,7 +24,7 @@ namespace mock
{ {
namespace detail namespace detail
{ {
class root_t : public singleton< root_t >, public context class root : public singleton< root >, public context
{ {
public: public:
virtual void add( const void* p, verifiable& v, virtual void add( const void* p, verifiable& v,
@ -128,7 +128,7 @@ namespace detail
group group_; group group_;
mutable mutex mutex_; mutable mutex mutex_;
MOCK_SINGLETON_CONS( root_t ); MOCK_SINGLETON_CONS( root );
}; };
} }
} // mock } // mock

2
include/turtle/detail/singleton.hpp
View file

@ -36,4 +36,4 @@ type() {}
} // detail } // detail
} // mock } // mock
#endif // MOCK_SINGLETON_HPP #endif // MOCK_SINGLETON_HPP

4
test/detail/test_function.cpp
View file

@ -907,8 +907,8 @@ BOOST_FIXTURE_TEST_CASE( adding_file_and_line_number_information, mock_error_fix
mock::detail::function< void() > f; mock::detail::function< void() > f;
f.expect( "file name", 42 ).once(); f.expect( "file name", 42 ).once();
CHECK_ERROR( f.verify(), "verification failed", 0, "?\n. once()" ); CHECK_ERROR( f.verify(), "verification failed", 0, "?\n. once()" );
BOOST_CHECK_EQUAL( "file name", mock_error_data.last_file ); BOOST_CHECK_EQUAL( "file name", mock_error_data::inst().last_file );
BOOST_CHECK_EQUAL( 42, mock_error_data.last_line ); BOOST_CHECK_EQUAL( 42, mock_error_data::inst().last_line );
} }
#ifdef MOCK_THREAD_SAFE #ifdef MOCK_THREAD_SAFE

4
test/mock_error.hpp
View file

@ -15,7 +15,7 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <stdexcept> #include <stdexcept>
struct mock_error_data_t : turtle::detail::singleton< mock_error_data_t > struct mock_error_data : mock::detail::singleton< mock_error_data >
{ {
void reset() void reset()
{ {
@ -53,7 +53,7 @@ struct mock_error_data_t : turtle::detail::singleton< mock_error_data_t >
std::string last_file; std::string last_file;
int last_line; int last_line;
MOCK_SINGLETON_CONS( mock_error_data_t ); MOCK_SINGLETON_CONS( mock_error_data );
}; };
template< typename Result > template< typename Result >