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

Removed default error policy keeping only Boost.Test integration

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@534 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2012-07-30 14:25:14 +00:00
parent cd3886aede
commit 0601689503
4 changed files with 46 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
turtle/config.hpp
View file

@ -12,6 +12,11 @@
#include <boost/preprocessor/arithmetic/inc.hpp> #include <boost/preprocessor/arithmetic/inc.hpp>
#include <boost/preprocessor/comparison/less.hpp> #include <boost/preprocessor/comparison/less.hpp>
#ifndef MOCK_ERROR_POLICY
# define MOCK_ERROR_POLICY mock::error
# define MOCK_USE_BOOST_TEST
#endif
#ifndef MOCK_MAX_ARGS #ifndef MOCK_MAX_ARGS
# define MOCK_MAX_ARGS 9 # define MOCK_MAX_ARGS 9
#elif BOOST_PP_LESS(9, MOCK_MAX_ARGS) #elif BOOST_PP_LESS(9, MOCK_MAX_ARGS)

37
turtle/detail/cleanup.hpp Normal file
View file

@ -0,0 +1,37 @@
// http://turtle.sourceforge.net
//
// Copyright Mathieu Champlon 2011
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
#ifndef MOCK_CLEANUP_HPP_INCLUDED
#define MOCK_CLEANUP_HPP_INCLUDED
#include "../config.hpp"
#ifdef MOCK_USE_BOOST_TEST
#include "verify.hpp"
#include "reset.hpp"
#include <boost/test/unit_test_suite.hpp>
namespace mock
{
namespace detail
{
struct cleanup
{
~cleanup()
{
// see https://svn.boost.org/trac/boost/ticket/5563
//mock::verify();
mock::reset();
}
};
BOOST_GLOBAL_FIXTURE( cleanup );
}
} // mock
#endif // MOCK_USE_BOOST_TEST
#endif // MOCK_CLEANUP_HPP_INCLUDED

24
turtle/error.hpp
View file

@ -9,9 +9,8 @@
#ifndef MOCK_ERROR_HPP_INCLUDED #ifndef MOCK_ERROR_HPP_INCLUDED
#define MOCK_ERROR_HPP_INCLUDED #define MOCK_ERROR_HPP_INCLUDED
#ifndef MOCK_ERROR_POLICY #include "config.hpp"
#define MOCK_ERROR_POLICY mock::error #ifdef MOCK_USE_BOOST_TEST
#include <boost/test/framework.hpp> #include <boost/test/framework.hpp>
#include <boost/test/test_tools.hpp> #include <boost/test/test_tools.hpp>
#include <boost/test/unit_test_suite.hpp> #include <boost/test/unit_test_suite.hpp>
@ -96,25 +95,8 @@ namespace mock
fail( "untriggered expectation", context, file, line ); fail( "untriggered expectation", context, file, line );
} }
}; };
bool verify();
void reset();
namespace detail
{
struct cleanup
{
~cleanup()
{
// see https://svn.boost.org/trac/boost/ticket/5563
//mock::verify();
mock::reset();
}
};
BOOST_GLOBAL_FIXTURE( cleanup );
}
} // mock } // mock
#endif // MOCK_ERROR_POLICY #endif // MOCK_USE_BOOST_TEST
#endif // MOCK_ERROR_HPP_INCLUDED #endif // MOCK_ERROR_HPP_INCLUDED

1
turtle/mock.hpp
View file

@ -18,6 +18,7 @@
#include "detail/type_name.hpp" #include "detail/type_name.hpp"
#include "detail/signature.hpp" #include "detail/signature.hpp"
#include "detail/parameter.hpp" #include "detail/parameter.hpp"
#include "detail/cleanup.hpp"
#include <boost/preprocessor/repetition/repeat.hpp> #include <boost/preprocessor/repetition/repeat.hpp>
#include <boost/preprocessor/stringize.hpp> #include <boost/preprocessor/stringize.hpp>
#include <boost/mpl/assert.hpp> #include <boost/mpl/assert.hpp>