git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@56 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2009-09-27 20:52:53 +00:00
parent 8e1499ee61
commit 30480d031a
2 changed files with 3 additions and 11 deletions

View file

@ -10,7 +10,6 @@
#define MOCK_OBJECT_HPP_INCLUDED #define MOCK_OBJECT_HPP_INCLUDED
#include "node.hpp" #include "node.hpp"
#include "root.hpp"
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <ostream> #include <ostream>
#include <string> #include <string>
@ -20,8 +19,8 @@ namespace mock
class object class object
{ {
public: public:
explicit object( const std::string& name = "" ) object()
: impl_( new object_impl( name ) ) : impl_( new object_impl() )
{} {}
void tag( const std::string& name ) void tag( const std::string& name )
@ -52,10 +51,6 @@ namespace mock
class object_impl : public node class object_impl : public node
{ {
public: public:
explicit object_impl( const std::string& name )
: name_( name )
{}
std::string name_; std::string name_;
private: private:

View file

@ -36,11 +36,8 @@ BOOST_AUTO_TEST_CASE( custom_mock_object_without_macros_and_without_inheriting_f
namespace namespace
{ {
struct my_custom_mock_object : mock::object struct my_custom_mock_object
{ {
my_custom_mock_object()
: mock::object( "my_custom_mock_object" )
{}
MOCK_METHOD_EXT( my_method, 0, void(), my_method ) MOCK_METHOD_EXT( my_method, 0, void(), my_method )
}; };
} }