diff options
Diffstat (limited to 'boost/test/unit_test_monitor.hpp')
| -rw-r--r-- | boost/test/unit_test_monitor.hpp | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/boost/test/unit_test_monitor.hpp b/boost/test/unit_test_monitor.hpp index 9ac1e139f3..b0358352e9 100644 --- a/boost/test/unit_test_monitor.hpp +++ b/boost/test/unit_test_monitor.hpp @@ -1,16 +1,14 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2014. // Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at +// (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) // See http://www.boost.org/libs/test for the library home page. // -// File : $RCSfile$ -// -// Version : $Revision$ -// -// Description : defines specific version of execution monitor used to managed -// run unit of test cases. Translates execution exception into error level +/// @file +/// @brief defines specific version of execution monitor used to managed run unit of test cases +/// +/// Translates execution exception into error level // *************************************************************************** #ifndef BOOST_TEST_UNIT_TEST_MONITOR_HPP_020905GER @@ -20,14 +18,12 @@ #include <boost/test/execution_monitor.hpp> #include <boost/test/detail/fwd_decl.hpp> #include <boost/test/utils/trivial_singleton.hpp> -#include <boost/test/utils/callback.hpp> #include <boost/test/detail/suppress_warnings.hpp> //____________________________________________________________________________// namespace boost { - namespace unit_test { // ************************************************************************** // @@ -36,34 +32,29 @@ namespace unit_test { class BOOST_TEST_DECL unit_test_monitor_t : public singleton<unit_test_monitor_t>, public execution_monitor { public: - enum error_level { - test_fail = 1, + enum error_level { test_ok = 0, - constructor_error = -1, - unexpected_exception = -2, - os_exception = -3, - os_timeout = -4, - fatal_error = -5, // includes both system and user - destructor_error = -6 + precondition_failure = -1, + unexpected_exception = -2, + os_exception = -3, + os_timeout = -4, + fatal_error = -5 // includes both system and user }; static bool is_critical_error( error_level e ) { return e <= fatal_error; } // monitor method - error_level execute_and_translate( test_case const& ); + error_level execute_and_translate( boost::function<void ()> const& func, unsigned timeout = 0 ); private: - BOOST_TEST_SINGLETON_CONS( unit_test_monitor_t ); + BOOST_TEST_SINGLETON_CONS( unit_test_monitor_t ) }; BOOST_TEST_SINGLETON_INST( unit_test_monitor ) } // namespace unit_test - } // namespace boost -//____________________________________________________________________________// - #include <boost/test/detail/enable_warnings.hpp> #endif // BOOST_TEST_UNIT_TEST_MONITOR_HPP_020905GER |