libdbusmenu-qt

Merge lp:~nick-dedekind/libdbusmenu-qt/Qt5-tests into lp:libdbusmenu-qt

  1. Qt5-tests
  2. Merge into trunk
Proposed by Nick Dedekind
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 270
Merged at revision: 270
Proposed branch: lp:~nick-dedekind/libdbusmenu-qt/Qt5-tests
Merge into: lp:libdbusmenu-qt
Diff against target: 234 lines (+97/-32)
5 files modified
CMakeLists.txt (+17/-2)
src/CMakeLists.txt (+13/-3)
tests/CMakeLists.txt (+65/-27)
tests/dbusmenuexportertest.cpp (+1/-0)
tests/slowmenu.cpp (+1/-0)
To merge this branch: bzr merge lp:~nick-dedekind/libdbusmenu-qt/Qt5-tests
Reviewer Review Type Date Requested Status
David Edmundson (community) Approve
PS Jenkins bot (community) continuous-integration Approve
DBus Menu Team Pending
Review via email: mp+251954@code.launchpad.net

Commit message

Ported tests to Qt5.

Description of the change

Ported tests to Qt5.

To post a comment you must log in.
lp:~nick-dedekind/libdbusmenu-qt/Qt5-tests updated
269. By Nick Dedekind

fixed spacing

270. By Nick Dedekind

moved cflags to root

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:270
http://jenkins.qa.ubuntu.com/job/libdbusmenu-qt-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-qt-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-qt-vivid-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/libdbusmenu-qt-vivid-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libdbusmenu-qt-ci/18/rebuild

review: Approve (continuous-integration)
Revision history for this message
David Edmundson (david.edmundson) wrote :

Looks good to me

Revision history for this message
David Edmundson (david.edmundson) :
review: Approve
Revision history for this message
Vsevolod Velichko (torkvemada) wrote :

Is there any life here?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2014-06-18 07:41:27 +0000
+++ CMakeLists.txt 2015-03-05 14:54:53 +0000
@@ -57,6 +57,23 @@
57 set(QT_SUFFIX "qt")57 set(QT_SUFFIX "qt")
58endif()58endif()
5959
60include (CheckCXXCompilerFlag)
61# Check some compiler flags
62check_cxx_compiler_flag(-fvisibility=hidden __DBUSMENU_HAVE_GCC_VISIBILITY)
63if (__DBUSMENU_HAVE_GCC_VISIBILITY AND NOT WIN32)
64 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
65endif (__DBUSMENU_HAVE_GCC_VISIBILITY AND NOT WIN32)
66
67check_cxx_compiler_flag(-Woverloaded-virtual __DBUSMENU_HAVE_W_OVERLOADED_VIRTUAL)
68if (__DBUSMENU_HAVE_W_OVERLOADED_VIRTUAL)
69 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual")
70endif (__DBUSMENU_HAVE_W_OVERLOADED_VIRTUAL)
71
72check_cxx_compiler_flag(-std=c++11 __DBUSMENU_HAVE_CXX11)
73if (__DBUSMENU_HAVE_CXX11)
74 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
75endif (__DBUSMENU_HAVE_CXX11)
76
60include(CMakePackageConfigHelpers)77include(CMakePackageConfigHelpers)
61include(GNUInstallDirs)78include(GNUInstallDirs)
62set(LIB_DESTINATION "${CMAKE_INSTALL_LIBDIR}")79set(LIB_DESTINATION "${CMAKE_INSTALL_LIBDIR}")
@@ -90,9 +107,7 @@
90 )107 )
91108
92add_subdirectory(src)109add_subdirectory(src)
93if (NOT USE_QT5) # TODO port tests to Qt5
94add_subdirectory(tests)110add_subdirectory(tests)
95endif()
96add_subdirectory(tools)111add_subdirectory(tools)
97112
98if(WITH_DOC)113if(WITH_DOC)
99114
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2014-06-19 09:07:07 +0000
+++ src/CMakeLists.txt 2015-03-05 14:54:53 +0000
@@ -1,5 +1,9 @@
1include(CheckCXXSourceCompiles)1include(CheckCXXSourceCompiles)
2include (CheckCXXCompilerFlag)2
3check_cxx_compiler_flag(-Wall __DBUSMENU_HAVE_W_ALL)
4if (__DBUSMENU_HAVE_W_ALL)
5 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
6endif (__DBUSMENU_HAVE_W_ALL)
37
4# Check some compiler flags8# Check some compiler flags
5check_cxx_compiler_flag(-fvisibility=hidden __DBUSMENU_HAVE_GCC_VISIBILITY)9check_cxx_compiler_flag(-fvisibility=hidden __DBUSMENU_HAVE_GCC_VISIBILITY)
@@ -24,8 +28,14 @@
2428
25# Check whether QIcon::name() exists. It was added in late Qt 4.7 cycle, and is29# Check whether QIcon::name() exists. It was added in late Qt 4.7 cycle, and is
26# not present in betas.30# not present in betas.
27set(CMAKE_REQUIRED_INCLUDES "${QT_INCLUDE_DIR}")31
28set(CMAKE_REQUIRED_LIBRARIES "${QT_QTGUI_LIBRARIES};${QT_QTCORE_LIBRARIES}")32if (NOT USE_QT5)
33 set(CMAKE_REQUIRED_INCLUDES "${QT_INCLUDE_DIR}")
34 set(CMAKE_REQUIRED_LIBRARIES "${QT_QTGUI_LIBRARIES};${QT_QTCORE_LIBRARIES}")
35else()
36 set(CMAKE_REQUIRED_INCLUDES "${Qt5Gui_INCLUDE_DIRS};${Qt5Core_INCLUDE_DIRS}")
37 set(CMAKE_REQUIRED_LIBRARIES "${Qt5Gui_LIBRARIES};${Qt5Core_LIBRARIES}")
38endif()
29check_cxx_source_compiles("39check_cxx_source_compiles("
30#include <QtGui/QIcon>40#include <QtGui/QIcon>
31int main() {41int main() {
3242
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt 2010-06-22 15:07:11 +0000
+++ tests/CMakeLists.txt 2015-03-05 14:54:53 +0000
@@ -1,12 +1,57 @@
1qt4_automoc(slowmenu.cpp)1if (NOT USE_QT5)
2 qt4_automoc(slowmenu.cpp)
3endif()
2add_executable(slowmenu slowmenu.cpp)4add_executable(slowmenu slowmenu.cpp)
3target_link_libraries(5
4 slowmenu6if (NOT USE_QT5)
5 ${QT_QTGUI_LIBRARY}7 target_link_libraries(slowmenu
6 ${QT_QTCORE_LIBRARY}8 ${QT_QTGUI_LIBRARIES}
7 ${QT_QTDBUS_LIBRARY}9 ${QT_QTDBUS_LIBRARIES}
8 dbusmenu-qt10 ${QT_QTCORE_LIBRARIES}
9 )11 dbusmenu-qt
12 )
13
14 set(test_LIBRARIES
15 ${QT_QTGUI_LIBRARY}
16 ${QT_QTCORE_LIBRARY}
17 ${QT_QTDBUS_LIBRARY}
18 ${QT_QTTEST_LIBRARY}
19 dbusmenu-qt
20 )
21
22 include_directories(
23 ${CMAKE_CURRENT_SOURCE_DIR}/../src
24 ${CMAKE_CURRENT_BINARY_DIR}/../src
25 ${CMAKE_CURRENT_BINARY_DIR}
26 ${QT_QTTEST_INCLUDE_DIR}
27 ${QT_QTDBUS_INCLUDE_DIR}
28 )
29else()
30 find_package(Qt5Test REQUIRED)
31
32 target_link_libraries(slowmenu
33 ${Qt5Gui_LIBRARIES}
34 ${Qt5Core_LIBRARIES}
35 ${Qt5DBus_LIBRARIES}
36 dbusmenu-qt5
37 )
38
39 set(test_LIBRARIES
40 ${Qt5Gui_LIBRARIES}
41 ${Qt5Core_LIBRARIES}
42 ${Qt5DBus_LIBRARIES}
43 ${Qt5Test_LIBRARIES}
44 dbusmenu-qt5
45 )
46
47 include_directories(
48 ${CMAKE_CURRENT_SOURCE_DIR}/../src
49 ${CMAKE_CURRENT_BINARY_DIR}/../src
50 ${CMAKE_CURRENT_BINARY_DIR}
51 ${Qt5Test_INCLUDE_DIRS}
52 ${Qt5DBus_INCLUDE_DIRS}
53 )
54endif()
1055
11# Macros to create "check" target56# Macros to create "check" target
12set(_test_executable_list "")57set(_test_executable_list "")
@@ -23,31 +68,18 @@
23 DEPENDS ${_test_executable_list})68 DEPENDS ${_test_executable_list})
24endmacro(create_check_target)69endmacro(create_check_target)
2570
26include_directories(
27 ${CMAKE_CURRENT_SOURCE_DIR}/../src
28 ${CMAKE_CURRENT_BINARY_DIR}/../src
29 ${CMAKE_CURRENT_BINARY_DIR}
30 ${QT_QTTEST_INCLUDE_DIR}
31 ${QT_QTDBUS_INCLUDE_DIR}
32 )
33
34set(test_LIBRARIES
35 ${QT_QTGUI_LIBRARY}
36 ${QT_QTCORE_LIBRARY}
37 ${QT_QTDBUS_LIBRARY}
38 ${QT_QTTEST_LIBRARY}
39 dbusmenu-qt
40 )
41
42enable_testing()71enable_testing()
4372
73
44# dbusmenuexportertest74# dbusmenuexportertest
45set(dbusmenuexportertest_SRCS75set(dbusmenuexportertest_SRCS
46 dbusmenuexportertest.cpp76 dbusmenuexportertest.cpp
47 testutils.cpp77 testutils.cpp
48 )78 )
4979
50qt4_automoc(${dbusmenuexportertest_SRCS})80if (NOT USE_QT5)
81 qt4_automoc(${dbusmenuexportertest_SRCS})
82endif()
5183
52add_test_executable(dbusmenuexportertest ${dbusmenuexportertest_SRCS})84add_test_executable(dbusmenuexportertest ${dbusmenuexportertest_SRCS})
5385
@@ -55,13 +87,16 @@
55 ${test_LIBRARIES}87 ${test_LIBRARIES}
56 )88 )
5789
90
58# dbusmenuimportertest91# dbusmenuimportertest
59set(dbusmenuimportertest_SRCS92set(dbusmenuimportertest_SRCS
60 dbusmenuimportertest.cpp93 dbusmenuimportertest.cpp
61 testutils.cpp94 testutils.cpp
62 )95 )
6396
64qt4_automoc(${dbusmenuimportertest_SRCS})97if (NOT USE_QT5)
98 qt4_automoc(${dbusmenuimportertest_SRCS})
99endif()
65100
66add_test_executable(dbusmenuimportertest ${dbusmenuimportertest_SRCS})101add_test_executable(dbusmenuimportertest ${dbusmenuimportertest_SRCS})
67102
@@ -69,12 +104,15 @@
69 ${test_LIBRARIES}104 ${test_LIBRARIES}
70 )105 )
71106
107
72# dbusmenushortcuttest108# dbusmenushortcuttest
73set(dbusmenushortcuttest_SRCS109set(dbusmenushortcuttest_SRCS
74 dbusmenushortcuttest.cpp110 dbusmenushortcuttest.cpp
75 )111 )
76112
77qt4_automoc(${dbusmenushortcuttest_SRCS})113if (NOT USE_QT5)
114 qt4_automoc(${dbusmenushortcuttest_SRCS})
115endif()
78116
79add_test_executable(dbusmenushortcuttest ${dbusmenushortcuttest_SRCS})117add_test_executable(dbusmenushortcuttest ${dbusmenushortcuttest_SRCS})
80118
81119
=== modified file 'tests/dbusmenuexportertest.cpp'
--- tests/dbusmenuexportertest.cpp 2012-01-23 14:02:42 +0000
+++ tests/dbusmenuexportertest.cpp 2015-03-05 14:54:53 +0000
@@ -138,6 +138,7 @@
138 << "label"138 << "label"
139 << "enabled"139 << "enabled"
140 << "icon-name"140 << "icon-name"
141 << "icon-data" // Icon data is always provided if the icon is valid.
141 << "visible"142 << "visible"
142 ;143 ;
143144
144145
=== modified file 'tests/slowmenu.cpp'
--- tests/slowmenu.cpp 2010-09-20 08:55:12 +0000
+++ tests/slowmenu.cpp 2015-03-05 14:54:53 +0000
@@ -24,6 +24,7 @@
2424
25#include <QtDBus>25#include <QtDBus>
26#include <QtGui>26#include <QtGui>
27#include <QApplication>
2728
28static const char *TEST_SERVICE = "org.kde.dbusmenu-qt-test";29static const char *TEST_SERVICE = "org.kde.dbusmenu-qt-test";
29static const char *TEST_OBJECT_PATH = "/TestMenuBar";30static const char *TEST_OBJECT_PATH = "/TestMenuBar";

Subscribers

People subscribed via source and target branches

to all changes: