Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-30 11:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix GameUI flag value regression introduced by a78659ed0529226ad937f5e241ad72ba93702959

Browse Source 
Added more strong unittests on that part to prevent future regression
This commit is contained in:
Loic Blot 2018-05-29 08:34:09 +02:00
parent 67ed56be3b
commit 75aa41c6de
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/gameui.cpp
View File

@ -189,8 +189,6 @@ void GameUI::update(const RunStats &stats, Client *client, MapDrawControl *draw_
void GameUI::initFlags() void GameUI::initFlags()
{ {
m_flags = GameUI::Flags(); m_flags = GameUI::Flags();
m_flags.show_chat = true;
m_flags.show_hud = true;
m_flags.show_debug = g_settings->getBool("show_debug"); m_flags.show_debug = g_settings->getBool("show_debug");
} }

4
src/client/gameui.h
View File

@ -54,9 +54,9 @@ public:
{ {
bool show_chat = true; bool show_chat = true;
bool show_hud = true; bool show_hud = true;
bool show_minimap = true; bool show_minimap = false;
bool show_debug = true; bool show_debug = true;
bool show_profiler_graph = true; bool show_profiler_graph = false;
}; };
void init(); void init();

9
src/unittest/test_gameui.cpp
View File

@ -48,9 +48,18 @@ void TestGameUI::runTests(IGameDef *gamedef)
void TestGameUI::testInit() void TestGameUI::testInit()
{ {
GameUI gui{}; GameUI gui{};
// Ensure flags on GameUI init
UASSERT(gui.getFlags().show_chat)
UASSERT(gui.getFlags().show_hud)
UASSERT(!gui.getFlags().show_minimap)
UASSERT(!gui.getFlags().show_profiler_graph)
// And after the initFlags init stage
gui.initFlags(); gui.initFlags();
UASSERT(gui.getFlags().show_chat) UASSERT(gui.getFlags().show_chat)
UASSERT(gui.getFlags().show_hud) UASSERT(gui.getFlags().show_hud)
UASSERT(!gui.getFlags().show_minimap)
UASSERT(!gui.getFlags().show_profiler_graph)
// @TODO verify if we can create non UI nulldevice to test this function // @TODO verify if we can create non UI nulldevice to test this function
// gui.init(); // gui.init();