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

attempt to fix boost unit tests

Browse source 
the boost units tests created 2 CVideo and 2 game_display objects which
causes assertion failures.
This commit is contained in:
gfgtdf 2016-01-16 23:40:51 +01:00
parent 2369d3f9ae
commit c31189e580
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/tests/test_mp_connect.cpp
View file

@ -23,6 +23,7 @@
#include "hotkey/hotkey_manager.hpp"
#include "mt_rng.hpp"
#include "saved_game.hpp"
#include "tests/utils/fake_display.hpp"
#include <boost/foreach.hpp>
#include <boost/scoped_ptr.hpp>
@ -42,7 +43,7 @@ public:
class test_connect_engine : public ng::connect_engine {
public:
test_connect_engine(game_display& /*disp*/, saved_game& gamestate) :
test_connect_engine(saved_game& gamestate) :
ng::connect_engine(gamestate, true, NULL)
{}
};
@ -52,7 +53,6 @@ public:
namespace {
boost::scoped_ptr<game_display> disp;
boost::scoped_ptr<saved_game> state;
boost::scoped_ptr<rand_rng::mt_rng> rng;
@ -63,17 +63,13 @@ boost::scoped_ptr<rand_rng::mt_rng> rng;
struct mp_connect_fixture {
mp_connect_fixture() :
video(),
dummy_args(boost::assign::list_of("wesnoth")("--noaddons").convert_to_container<std::vector<std::string> >()),
cmdline_opts(dummy_args),
hotkey_manager(),
config_manager()
{
video.make_fake();
disp.reset(game_display::create_dummy_display(video));
config_manager.reset(new game_config_manager(cmdline_opts, video,
false));
config_manager.reset(new game_config_manager(cmdline_opts, test_utils::get_fake_display(1000,1000).video(), false));
config_manager->init_game_config(game_config_manager::NO_FORCE_RELOAD);
state.reset(new saved_game());
@ -95,7 +91,6 @@ struct mp_connect_fixture {
~mp_connect_fixture()
{
}
CVideo video;
std::vector<std::string> dummy_args;
commandline_options cmdline_opts;
hotkey::manager hotkey_manager;
@ -108,7 +103,7 @@ struct mp_connect_fixture {
static test_connect_engine* create_test_connect_engine()
{
test_connect_engine* connect_engine =
new test_connect_engine(*disp, *state);
new test_connect_engine(*state);
return connect_engine;
}