Fix GameUI flag value regression introduced by a78659e

Added more strong unittests on that part to prevent future regression
minetest · May 29, 2018 · 75aa41c · 75aa41c
1 parent 67ed56b
commit 75aa41c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git 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
@@ -54,9 +54,9 @@ class GameUI
 	{
 		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
@@ -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();