summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-18 01:55:23 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-18 01:55:23 +0300
commitbe8edccc37bb2ce0b17cc950129cd57d65aac49a (patch)
tree00badff35ec2ea5797043ec2b4bcec5496c883e2 /src/gui
parent91cd49664d1dbe1bdea78541fcdf4bd3ec94f22a (diff)
downloadManaVerse-be8edccc37bb2ce0b17cc950129cd57d65aac49a.tar.gz
ManaVerse-be8edccc37bb2ce0b17cc950129cd57d65aac49a.tar.bz2
ManaVerse-be8edccc37bb2ce0b17cc950129cd57d65aac49a.tar.xz
ManaVerse-be8edccc37bb2ce0b17cc950129cd57d65aac49a.zip
Fix unit tests after default theme was changed.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/browserbox_unittest.cc1
-rw-r--r--src/gui/windowmanager_unittest.cc2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/widgets/browserbox_unittest.cc b/src/gui/widgets/browserbox_unittest.cc
index 1be712783..f151e1524 100644
--- a/src/gui/widgets/browserbox_unittest.cc
+++ b/src/gui/widgets/browserbox_unittest.cc
@@ -84,6 +84,7 @@ TEST_CASE("BrowserBox tests", "browserbox")
ConfigManager::initConfiguration();
getConfigDefaults2(config.getDefaultValues());
+ branding.setDefaultValues(getBrandingDefaults());
ActorSprite::load();
gui = new Gui();
diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc
index 8f280036a..2c17de6b6 100644
--- a/src/gui/windowmanager_unittest.cc
+++ b/src/gui/windowmanager_unittest.cc
@@ -186,6 +186,7 @@ TEST_CASE("Windows tests", "windowmanager")
ConfigManager::initConfiguration();
getConfigDefaults2(config.getDefaultValues());
+ branding.setDefaultValues(getBrandingDefaults());
ConfigManager::initServerConfig("nonexistserver");
localPlayer = new LocalPlayer(static_cast<BeingId>(1),
@@ -846,6 +847,7 @@ TEST_CASE("WindowManager", "create windows")
ConfigManager::initConfiguration();
getConfigDefaults2(config.getDefaultValues());
+ branding.setDefaultValues(getBrandingDefaults());
ConfigManager::initServerConfig("nonexistserver");
localPlayer = new LocalPlayer(static_cast<BeingId>(1),