summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-11 21:29:26 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-11 21:31:10 +0300
commitb9cb3b1e94a16425025dd251955f57ca7da5f637 (patch)
tree11ea79db51f96a2fe571e9c27aa178766a247302 /src/gui
parent84cdb48df045cae55356b3d6156794c9e0343f54 (diff)
downloadmanaplus-b9cb3b1e94a16425025dd251955f57ca7da5f637.tar.gz
manaplus-b9cb3b1e94a16425025dd251955f57ca7da5f637.tar.bz2
manaplus-b9cb3b1e94a16425025dd251955f57ca7da5f637.tar.xz
manaplus-b9cb3b1e94a16425025dd251955f57ca7da5f637.zip
Fix issues in tests after adding some asserts.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/windowmanager_unittest.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc
index ffaa00d67..200d2178c 100644
--- a/src/gui/windowmanager_unittest.cc
+++ b/src/gui/windowmanager_unittest.cc
@@ -20,6 +20,7 @@
#include "catch.hpp"
#include "client.h"
+#include "configuration.h"
#include "graphicsmanager.h"
#include "settings.h"
@@ -73,6 +74,7 @@ TEST_CASE("Windows tests", "windowmanager")
ResourceManager::init();
resourceManager->addToSearchPath("data", Append_false);
resourceManager->addToSearchPath("../data", Append_false);
+ branding.setValue("onlineServerFile", "test/serverlistplus.xml");
mainGraphics = new SDLGraphics;
imageHelper = new SDLImageHelper;
userPalette = new UserPalette;
@@ -142,6 +144,7 @@ TEST_CASE("Windows tests", "windowmanager")
SECTION("serversDialog")
{
ServerInfo mCurrentServer;
+ settings.configDir = PhysFs::getRealDir("test/serverlistplus.xml");;
ServerDialog *serverDialog = CREATEWIDGETR(ServerDialog,
&mCurrentServer,
settings.configDir);