Made unit tests compile again

wesnoth · Mar 21, 2016 · ec7fcee · ec7fcee
1 parent 9ff6d3e
commit ec7fcee
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/tests/gui/test_gui2.cpp b/src/tests/gui/test_gui2.cpp
@@ -51,8 +51,8 @@
 #include "gui/dialogs/gamestate_inspector.hpp"
 #include "gui/dialogs/label_settings.hpp"
 #include "gui/dialogs/language_selection.hpp"
-#include "gui/dialogs/lobby_main.hpp"
-#include "gui/dialogs/lobby_player_info.hpp"
+#include "gui/dialogs/lobby/lobby.hpp"
+#include "gui/dialogs/lobby/player_info.hpp"
 #include "gui/dialogs/lua_interpreter.hpp"
 #include "gui/dialogs/message.hpp"
 #include "gui/dialogs/multiplayer/mp_alerts_options.hpp"

diff --git a/src/tests/test_formula_function.cpp b/src/tests/test_formula_function.cpp
@@ -16,7 +16,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include "formula_function.hpp"
+#include "formula/function.hpp"
 #include "log.hpp"
 
 #include <cmath>

diff --git a/src/tests/test_map_location.cpp b/src/tests/test_map_location.cpp
@@ -18,7 +18,7 @@
 #include <boost/bind.hpp>
 #include <boost/test/unit_test.hpp>
 
-#include "map_location.hpp"
+#include "map/location.hpp"
 
 static std::vector<map_location> preset_locs;
 static map_location va,vb,vc,vz,vt1,vt2,vt3,vs1,vs2,vs3,vs4;

diff --git a/src/tests/test_unit_map.cpp b/src/tests/test_unit_map.cpp
@@ -18,7 +18,7 @@
 
 #include "log.hpp"
 #include "config.hpp"
-#include "unit/unit.hpp"
+#include "units/unit.hpp"
 #include "tests/utils/game_config_manager.hpp"
 #include "units/map.hpp"
 #include "units/id.hpp"

diff --git a/src/tests/utils/play_scenario.hpp b/src/tests/utils/play_scenario.hpp
@@ -17,7 +17,7 @@
 
 #include "tests/utils/fake_event_source.hpp"
 
-#include "map_location.hpp"
+#include "map/location.hpp"
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>