Fix GameUI flag value regression introduced by a78659ed0529226ad937f5e241ad72ba93702959

Added more strong unittests on that part to prevent future regression

diff --git a/src/client/gameui.cpp b/src/client/gameui.cpp
index 7e0a7ef67736a6fba20f4218e61c157cbd08268e..0a0fc2bcf323d24d068b8b77f901649ac4644d58 100644 (file)
--- a/src/client/gameui.cpp
+++ b/src/client/gameui.cpp
@@ -189,8 +189,6 @@ void GameUI::update(const RunStats &stats, Client *client, MapDrawControl *draw_
 void GameUI::initFlags()
 {
        m_flags = GameUI::Flags();
-       m_flags.show_chat = true;
-       m_flags.show_hud = true;
        m_flags.show_debug = g_settings->getBool("show_debug");
 }
 

diff --git a/src/client/gameui.h b/src/client/gameui.h
index 04946084e8e52bacdaf4c51f4db59cbf8b3e0bfe..b6b54562a714ee76f7d6929576fa180a944cc1b9 100644 (file)
--- a/src/client/gameui.h
+++ b/src/client/gameui.h
@@ -54,9 +54,9 @@ public:
        {
                bool show_chat = true;
                bool show_hud = true;
-               bool show_minimap = true;
+               bool show_minimap = false;
                bool show_debug = true;
-               bool show_profiler_graph = true;
+               bool show_profiler_graph = false;
        };
 
        void init();

diff --git a/src/unittest/test_gameui.cpp b/src/unittest/test_gameui.cpp
index 9bc9d8cf5aa22af93483f4c5e3a9b3f4b7f86cbf..d7fb622be06ba1a5013b3b7232eed3af78b460f6 100644 (file)
--- a/src/unittest/test_gameui.cpp
+++ b/src/unittest/test_gameui.cpp
@@ -48,9 +48,18 @@ void TestGameUI::runTests(IGameDef *gamedef)
 void TestGameUI::testInit()
 {
        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();
        UASSERT(gui.getFlags().show_chat)
        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
        // gui.init();