0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #656 from shikadilord/backport/1.12-Aginor-bug-24234

Browse source 
Fix bug #24234: Add Boost 1.60.0 support to unit tests
This commit is contained in:
Ignacio R. Morelle 2016-05-13 17:27:09 -03:00
commit 8de39e81ae
4 changed files with 57 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -16,6 +16,7 @@ Version 1.12.5+dev:
* Fixed possible assertion failues in mp. * Fixed possible assertion failues in mp.
* Fixed false positive OOS messages in replay when replaying games from an older * Fixed false positive OOS messages in replay when replaying games from an older
wesnoth version.. wesnoth version..
* Fixed unit test compilation against Boost 1.60 and later (bug #24234).
Version 1.12.5: Version 1.12.5:
* Campaigns: * Campaigns:

20
src/tests/main.cpp
View file

@ -16,11 +16,19 @@
#define BOOST_TEST_MODULE wesnoth unit tests master suite #define BOOST_TEST_MODULE wesnoth unit tests master suite
#include <boost/version.hpp>
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/test/unit_test_monitor.hpp> #include <boost/test/unit_test_monitor.hpp>
#if BOOST_VERSION >= 106000
#include <boost/test/unit_test_parameters.hpp>
#else
#include <boost/test/detail/unit_test_parameters.hpp> #include <boost/test/detail/unit_test_parameters.hpp>
#endif
#include <boost/test/results_reporter.hpp> #include <boost/test/results_reporter.hpp>
#include <fstream> #include <fstream>
#include "SDL.h" #include "SDL.h"
@ -80,6 +88,15 @@ struct wesnoth_global_fixture {
// Set more report as default // Set more report as default
#if BOOST_VERSION >= 106000
if (boost::unit_test::runtime_config::get<boost::unit_test::log_level>(boost::unit_test::runtime_config::LOG_LEVEL) == boost::unit_test::invalid_log_level)
boost::unit_test::unit_test_log.set_threshold_level( boost::unit_test::log_messages );
if (boost::unit_test::runtime_config::get<boost::unit_test::report_level>(boost::unit_test::runtime_config::REPORT_LEVEL) == boost::unit_test::INV_REPORT_LEVEL)
boost::unit_test::results_reporter::set_level(boost::unit_test::SHORT_REPORT);
boost::unit_test::unit_test_monitor.register_exception_translator<game::error>(&exception_translator_game);
boost::unit_test::unit_test_monitor.register_exception_translator<network::error>(&exception_translator_network);
boost::unit_test::unit_test_monitor.register_exception_translator<config::error>(&exception_translator_config);
#else
if (boost::unit_test::runtime_config::log_level() == boost::unit_test::invalid_log_level) if (boost::unit_test::runtime_config::log_level() == boost::unit_test::invalid_log_level)
boost::unit_test::unit_test_log.set_threshold_level( boost::unit_test::log_messages ); boost::unit_test::unit_test_log.set_threshold_level( boost::unit_test::log_messages );
if (boost::unit_test::runtime_config::report_level() == boost::unit_test::INV_REPORT_LEVEL) if (boost::unit_test::runtime_config::report_level() == boost::unit_test::INV_REPORT_LEVEL)
@ -87,6 +104,7 @@ struct wesnoth_global_fixture {
boost::unit_test::unit_test_monitor.register_exception_translator<game::error>(&exception_translator_game); boost::unit_test::unit_test_monitor.register_exception_translator<game::error>(&exception_translator_game);
boost::unit_test::unit_test_monitor.register_exception_translator<network::error>(&exception_translator_network); boost::unit_test::unit_test_monitor.register_exception_translator<network::error>(&exception_translator_network);
boost::unit_test::unit_test_monitor.register_exception_translator<config::error>(&exception_translator_config); boost::unit_test::unit_test_monitor.register_exception_translator<config::error>(&exception_translator_config);
#endif
} }
~wesnoth_global_fixture() ~wesnoth_global_fixture()
{ {
@ -94,7 +112,7 @@ struct wesnoth_global_fixture {
} }
}; };
BOOST_GLOBAL_FIXTURE(wesnoth_global_fixture) BOOST_GLOBAL_FIXTURE(wesnoth_global_fixture);
/* /*
* This is a main compilation unit for the test program. * This is a main compilation unit for the test program.

4
src/tests/test_mp_connect.cpp
View file

@ -121,8 +121,8 @@ static mp::side_engine* create_mp_side_engine(const config& defaults,
/* Tests */ /* Tests */
BOOST_GLOBAL_FIXTURE( mp_connect_fixture ) BOOST_GLOBAL_FIXTURE( mp_connect_fixture );
BOOST_AUTO_TEST_SUITE( mp_connect ) BOOST_AUTO_TEST_SUITE( mp_connect );
BOOST_AUTO_TEST_CASE( flg_map_settings ) BOOST_AUTO_TEST_CASE( flg_map_settings )

38
src/tests/utils/auto_parameterized.hpp
View file

@ -15,15 +15,22 @@
#ifndef TESTS_UTILS_AUTO_PARAMETERIZED_HPP_INCLUDED #ifndef TESTS_UTILS_AUTO_PARAMETERIZED_HPP_INCLUDED
#define TESTS_UTILS_AUTO_PARAMETERIZED_HPP_INCLUDED #define TESTS_UTILS_AUTO_PARAMETERIZED_HPP_INCLUDED
#include <boost/version.hpp>
#include <boost/test/unit_test_suite.hpp> #include <boost/test/unit_test_suite.hpp>
#include <boost/test/parameterized_test.hpp> #include <boost/test/parameterized_test.hpp>
#if BOOST_VERSION >= 106000
#include <boost/test/tree/auto_registration.hpp>
#endif
namespace test_utils { namespace test_utils {
#ifndef BOOST_AUTO_TU_REGISTRAR #ifndef BOOST_AUTO_TU_REGISTRAR
#define BOOST_AUTO_TU_REGISTRAR BOOST_AUTO_TC_REGISTRAR #define BOOST_AUTO_TU_REGISTRAR BOOST_AUTO_TC_REGISTRAR
#endif #endif
#if BOOST_VERSION >= 106000
#define WESNOTH_PARAMETERIZED_TEST_CASE( test_name, type_name, values, param_name ) \ #define WESNOTH_PARAMETERIZED_TEST_CASE( test_name, type_name, values, param_name ) \
struct test_name : public BOOST_AUTO_TEST_CASE_FIXTURE \ struct test_name : public BOOST_AUTO_TEST_CASE_FIXTURE \
{ void test_method(const type_name&); }; \ { void test_method(const type_name&); }; \
@ -39,12 +46,37 @@ static void BOOST_AUTO_TC_INVOKER( test_name )(const type_name& param_name ) \
struct BOOST_AUTO_TC_UNIQUE_ID( test_name ) {}; \ struct BOOST_AUTO_TC_UNIQUE_ID( test_name ) {}; \
\ \
BOOST_AUTO_TU_REGISTRAR( test_name )( \ BOOST_AUTO_TU_REGISTRAR( test_name )( \
boost::unit_test::make_test_case(&BOOST_AUTO_TC_INVOKER( test_name ), \ boost::unit_test::make_test_case(&BOOST_AUTO_TC_INVOKER( test_name ), \
BOOST_TEST_STRINGIZE( test_name ),\ BOOST_TEST_STRINGIZE( test_name ), \
BOOST_JOIN(test_name, _begin), BOOST_JOIN(test_name, _end))); \ BOOST_TEST_STRINGIZE(__FILE__), __LINE__, \
BOOST_JOIN(test_name, _begin), BOOST_JOIN(test_name, _end)), \
boost::unit_test::decorator::collector::instance()); \
\ \
void test_name::test_method(const type_name& param_name) \ void test_name::test_method(const type_name& param_name) \
/**/ /**/
#else
#define WESNOTH_PARAMETERIZED_TEST_CASE( test_name, type_name, values, param_name ) \
struct test_name : public BOOST_AUTO_TEST_CASE_FIXTURE \
{ void test_method(const type_name&); }; \
\
type_name* BOOST_JOIN(test_name, _begin) = &values[0]; \
type_name* BOOST_JOIN(test_name, _end) = BOOST_JOIN(test_name, _begin) + (sizeof(values)/sizeof(values[0])); \
static void BOOST_AUTO_TC_INVOKER( test_name )(const type_name& param_name ) \
{ \
test_name t; \
t.test_method(param_name); \
} \
\
struct BOOST_AUTO_TC_UNIQUE_ID( test_name ) {}; \
\
BOOST_AUTO_TU_REGISTRAR( test_name )( \
boost::unit_test::make_test_case(&BOOST_AUTO_TC_INVOKER( test_name ), \
BOOST_TEST_STRINGIZE( test_name ), \
BOOST_JOIN(test_name, _begin), BOOST_JOIN(test_name, _end))); \
\
void test_name::test_method(const type_name& param_name) \
/**/
#endif
} }
#endif #endif