TestLauncherModel: move to XTests

(bzr r3844.9.20)

2 files changed, 5 insertions, 6 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 99dfd975f..50aca16b6 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -131,7 +131,6 @@ if (GMOCK_LIB AND
 test_favorite_store_gsettings.cpp
 test_favorite_store_private.cpp
 test_launcher_entry_remote.cpp
- test_launcher_model.cpp
 test_launcher_options.cpp
 test_layout_system.cpp
 test_model_iterator.cpp
@@ -242,6 +241,7 @@ if (ENABLE_X_SUPPORT)
 test_launcher_hover_machine.cpp
 test_launcher_icon.cpp
 test_launcher_minimize_speed.cpp
+ test_launcher_model.cpp
 test_launcher_tooltip.cpp
 test_lockscreen_controller.cpp
 test_panel_controller.cpp
diff --git a/tests/test_main_xless.cpp b/tests/test_main_xless.cpp
index a8039928d..e3764c19f 100644
--- a/tests/test_main_xless.cpp
+++ b/tests/test_main_xless.cpp
@@ -3,18 +3,17 @@
 #include <NuxCore/Logger.h>
 #include <Nux/Nux.h>
 #include <config.h>
-
+#include "test_utils.h"
 
 const gchar* LOCAL_DATA_DIR = BUILDDIR"/tests/data:/usr/share";
 
 int main(int argc, char** argv)
 {
 ::testing::InitGoogleTest(&argc, argv);
-#if G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34
- g_type_init();
-#endif
- setlocale(LC_ALL, "C");
 
+ setlocale(LC_ALL, "C");
+ g_setenv("LC_ALL", "C", TRUE);
+ Utils::init_gsettings_test_environment();
 g_setenv("XDG_DATA_DIRS", LOCAL_DATA_DIR, TRUE);
 
 // Slightly higher as we're more likely to test things we know will fail