Merge lp:~aacid/unity-2d/unity-2d-shell-shaped_bring_back_launcher_tests into lp:~unity-2d-team/unity-2d/unity-2d-shell-shaped

[Albert Astals Cid]

bring back launcher/tests as shell/tests

[lp:~aacid/unity-2d/unity-2d-shell-shaped_bring_back_launcher_tests]

917. By Albert Astals Cid on 2012-01-17

merge

[Michał Sawicz (saviq)]

Lets do that against unity-2d-shell (non-shaped).

review: Abstain

Unmerged revisions

917. By Albert Astals Cid on 2012-01-17

merge

916. By Albert Astals Cid on 2012-01-16

bring back launcher/tests as shell/tests

=== modified file 'shell/CMakeLists.txt'
--- shell/CMakeLists.txt	2011-12-02 16:12:19 +0000
+++ shell/CMakeLists.txt	2012-01-17 11:08:26 +0000
@@ -2,6 +2,7 @@
 
 # Source
 add_subdirectory(app)
+add_subdirectory(tests)
 
 file(GLOB shell_QML *.qml *.js)
 

=== added directory 'shell/tests'
=== added file 'shell/tests/CMakeLists.txt'
--- shell/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ shell/tests/CMakeLists.txt	2012-01-17 11:08:26 +0000
@@ -0,0 +1,29 @@
+macro(launcher_tests)
+    set(_test_list "")
+    foreach(_test ${ARGN})
+        add_test(NAME ${_test} 
+            COMMAND /bin/bash ${CMAKE_SOURCE_DIR}/tests/misc/run-with-xvfb.sh ./${_test}
+            )
+        add_executable(${_test} ${_test}.cpp ${_test}.moc)
+        qt4_generate_moc(${_test}.cpp ${_test}.moc)
+        target_link_libraries(${_test}
+            ${QT_QTTEST_LIBRARIES}
+            uqlauncher
+            )
+        set(_test_list "${_test_list};${_test}")
+    endforeach(_test)
+endmacro(launcher_tests)
+
+include_directories(
+    ${CMAKE_SOURCE_DIR}/tests
+    ${CMAKE_CURRENT_SOURCE_DIR}/../app
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${QT_QTTEST_INCLUDE_DIR}
+    ${QTGCONF_INCLUDE_DIRS}
+    )
+
+launcher_tests(
+# FIXME: test need a mock dbus object to message with via dbus-test-runner
+#    launcherviewtest
+    )
+

=== added file 'shell/tests/launcherviewtest.cpp'
--- shell/tests/launcherviewtest.cpp	1970-01-01 00:00:00 +0000
+++ shell/tests/launcherviewtest.cpp	2012-01-17 11:08:26 +0000
@@ -0,0 +1,42 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Local
+#include <unitytestmacro.h>
+#include <launcherview.h>
+
+// Qt
+#include <QtTestGui>
+
+class LauncherViewTest : public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+    void testCreate()
+    {
+        LauncherView view;
+    }
+};
+
+QAPP_TEST_MAIN(LauncherViewTest)
+
+#include "launcherviewtest.moc"
+