diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-09-01 04:05:51 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-09-01 04:05:51 +0300 |
| commit | 59d9b799fa5bf3c8ba99cc6f703b83751f1d3497 (patch) | |
| tree | 16b29e2afda9f223f36e6a7d3f4659fb72d3d7e6 /src/unittests/gui/windowmanager.cc | |
| parent | b9ce7a70632f31a3a4b29841ab034dbb297b295d (diff) | |
| download | plus-59d9b799fa5bf3c8ba99cc6f703b83751f1d3497.tar.gz plus-59d9b799fa5bf3c8ba99cc6f703b83751f1d3497.tar.bz2 plus-59d9b799fa5bf3c8ba99cc6f703b83751f1d3497.tar.xz plus-59d9b799fa5bf3c8ba99cc6f703b83751f1d3497.zip | |
Fix unit tests after last changes in configuration.cpp
Diffstat (limited to 'src/unittests/gui/windowmanager.cc')
| -rw-r--r-- | src/unittests/gui/windowmanager.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/unittests/gui/windowmanager.cc b/src/unittests/gui/windowmanager.cc index 9c04237a6..41e2e755b 100644 --- a/src/unittests/gui/windowmanager.cc +++ b/src/unittests/gui/windowmanager.cc @@ -168,8 +168,6 @@ TEST_CASE("Windows tests", "windowmanager") userPalette = new UserPalette; config.setValue("fontSize", 16); - theme = new Theme; - Theme::selectSkin(); Dirs::initRootDir(); Dirs::initHomeDir(); @@ -181,8 +179,12 @@ TEST_CASE("Windows tests", "windowmanager") ConfigManager::initConfiguration(); setConfigDefaults2(config); setBrandingDefaults(branding); + setFeaturesDefaults(features); ConfigManager::initServerConfig("nonexistserver"); + theme = new Theme; + Theme::selectSkin(); + localPlayer = new LocalPlayer(static_cast<BeingId>(1), BeingTypeId_zero); @@ -334,7 +336,7 @@ TEST_CASE("Windows tests", "windowmanager") { ConfirmDialog *dialog; CREATEWIDGETV(dialog, ConfirmDialog, - "", "", "", false, Modal_false, nullptr); + "", "", SOUND_REQUEST, false, Modal_false, nullptr); gui->draw(); mainGraphics->updateScreen(); delete2(dialog); @@ -850,8 +852,6 @@ TEST_CASE("WindowManager", "create windows") #endif // USE_SDL2 config.setValue("fontSize", 16); - theme = new Theme; - Theme::selectSkin(); Dirs::initRootDir(); Dirs::initHomeDir(); @@ -865,6 +865,9 @@ TEST_CASE("WindowManager", "create windows") setBrandingDefaults(branding); ConfigManager::initServerConfig("nonexistserver"); + theme = new Theme; + Theme::selectSkin(); + localPlayer = new LocalPlayer(static_cast<BeingId>(1), BeingTypeId_zero); |