Subject: [Boost-commit] svn:boost r84519 - branches/release/boost/detail
From: igaztanaga_at_[hidden]
Date: 2013-05-26 17:10:27
Author: igaztanaga
Date: 2013-05-26 17:10:27 EDT (Sun, 26 May 2013)
New Revision: 84519
URL: http://svn.boost.org/trac/boost/changeset/84519
Log:
Merged BOOST_TEST_THROWS from trunk, as it's been working fine for two months
Text files modified:
branches/release/boost/detail/lightweight_test.hpp | 65 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 0 deletions(-)
Modified: branches/release/boost/detail/lightweight_test.hpp
==============================================================================
--- branches/release/boost/detail/lightweight_test.hpp (original)
+++ branches/release/boost/detail/lightweight_test.hpp 2013-05-26 17:10:27 EDT (Sun, 26 May 2013)
@@ -12,21 +12,61 @@
//
// Copyright (c) 2002, 2009 Peter Dimov
// Copyright (2) Beman Dawes 2010, 2011
+// Copyright (3) Ion Gaztanaga 2013
//
// 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
//
+// ---------------
+//
+// If expression is false increases the error count
+// and outputs a message containing 'expression'
+//
// BOOST_TEST(expression)
+//
+// ---------------
+//
+// Increases error count and outputs a message containing 'message'
+//
// BOOST_ERROR(message)
+//
+// ---------------
+//
+// If 'expr1' != 'expr2' increases the error count
+// and outputs a message containing both expressions
+//
// BOOST_TEST_EQ(expr1, expr2)
//
+// ---------------
+//
+// If 'expr1' == 'expr2' increases the error count
+// and outputs a message containing both expressions
+//
+// BOOST_TEST_NE(expr1, expr2)
+//
+// ---------------
+//
+// If BOOST_NO_EXCEPTIONS is NOT defined and if 'expr' does not
+// throw an exception of type 'excep', increases the error count
+// and outputs a message containing the expression.
+//
+// If BOOST_NO_EXCEPTIONS is defined, this macro expands to nothing
+// and 'expr' is not evaluated.
+//
+// BOOST_TEST_THROWS(expr, excep)
+//
+// ---------------
+//
+// Returns the error count
+//
// int boost::report_errors()
//
#include <iostream>
#include <boost/current_function.hpp>
#include <boost/assert.hpp>
+#include <boost/detail/no_exceptions_support.hpp>
// IDE's like Visual Studio perform better if output goes to std::cout or
// some other stream, so allow user to configure output stream:
@@ -79,6 +119,14 @@
++test_errors();
}
+inline void throw_failed_impl(char const * excep, char const * file, int line, char const * function)
+{
+ BOOST_LIGHTWEIGHT_TEST_OSTREAM
+ << file << "(" << line << "): Exception '" << excep << "' not thrown in function '"
+ << function << "'" << std::endl;
+ ++test_errors();
+}
+
template<class T, class U> inline void test_eq_impl( char const * expr1, char const * expr2,
char const * file, int line, char const * function, T const & t, U const & u )
{
@@ -139,5 +187,22 @@
#define BOOST_ERROR(msg) ::boost::detail::error_impl(msg, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION)
#define BOOST_TEST_EQ(expr1,expr2) ( ::boost::detail::test_eq_impl(#expr1, #expr2, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, expr1, expr2) )
#define BOOST_TEST_NE(expr1,expr2) ( ::boost::detail::test_ne_impl(#expr1, #expr2, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, expr1, expr2) )
+#ifndef BOOST_NO_EXCEPTIONS
+ #define BOOST_TEST_THROWS( EXPR, EXCEP ) \
+ try { \
+ EXPR; \
+ ::boost::detail::throw_failed_impl \
+ (#EXCEP, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION); \
+ } \
+ catch(EXCEP const&) { \
+ } \
+ catch(...) { \
+ ::boost::detail::throw_failed_impl \
+ (#EXCEP, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION); \
+ } \
+ //
+#else
+ #define BOOST_TEST_THROWS( EXPR, EXCEP )
+#endif
#endif // #ifndef BOOST_DETAIL_LIGHTWEIGHT_TEST_HPP_INCLUDED