git.iko.soy/unity8
on xenial help sign in
Use the refactored macros in mocks. Only remaining installed mocks: Unity, Unity.Application, and LightDM.
b6e654aMichał Sawicz
tests/mocks/AccountsService/CMakeLists.txt+1−12
compare with xenial
unifiedsplit
@@ -7,15 +7,4 @@ add_library(MockAccountsService-qml MODULE
7
7
8qt5_use_modules(MockAccountsService-qml DBus Qml)
8qt5_use_modules(MockAccountsService-qml DBus Qml)
9
9
10−# copy files into build directory for shadow builds
11−file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
12− DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
13− )
14−
15−install(TARGETS MockAccountsService-qml
10+add_unity8_mock(AccountsService 0.1 AccountsService TARGETS MockAccountsService-qml)
16− DESTINATION ${SHELL_INSTALL_QML}/mocks/AccountsService
17− )
18−
19−install(FILES qmldir
20− DESTINATION ${SHELL_INSTALL_QML}/mocks/AccountsService
21− )
tests/mocks/AccountsService/qmldir+1
@@ -1,2 +1,3 @@
1module AccountsService
1module AccountsService
2plugin MockAccountsService-qml
2plugin MockAccountsService-qml
3+typeinfo AccountsService.qmltypes
tests/mocks/CMakeLists.txt+30
@@ -1,3 +1,33 @@
1+include(QmlPlugins)
2+
3+# Set up and optionally install a mock plugin for unity8.
4+#
5+# add_unity8_mock(plugin version path
6+# [PREFIX string] # Install the plugin to the specified prefix under unity8 private plugin directory
7+# [...] # See export_qmlfiles and export_qmlplugin documentation for more options
8+# )
9+
10+macro(add_unity8_mock PLUGIN VERSION PATH)
11+ set(single PREFIX)
12+ cmake_parse_arguments(MOCK "" "${single}" "" ${ARGN})
13+
14+ if(MOCK_PREFIX)
15+ export_qmlfiles(${PLUGIN} ${PATH}
16+ DESTINATION ${SHELL_INSTALL_QML}/${MOCK_PREFIX}
17+ TARGET_PREFIX ${MOCK_PREFIX}-Mock
18+ ${MOCK_UNPARSED_ARGUMENTS}
19+ )
20+ export_qmlplugin(${PLUGIN} ${VERSION} ${PATH}
21+ DESTINATION ${SHELL_INSTALL_QML}/${MOCK_PREFIX}
22+ TARGET_PREFIX ${MOCK_PREFIX}-Mock
23+ ${MOCK_UNPARSED_ARGUMENTS}
24+ )
25+ else()
26+ export_qmlfiles(${PLUGIN} ${PATH} TARGET_PREFIX Mock ${MOCK_UNPARSED_ARGUMENTS})
27+ export_qmlplugin(${PLUGIN} ${VERSION} ${PATH} TARGET_PREFIX Mock ${MOCK_UNPARSED_ARGUMENTS})
28+ endif()
29+endmacro()
30+
1add_subdirectory(AccountsService)
31add_subdirectory(AccountsService)
2add_subdirectory(GSettings.1.0)
32add_subdirectory(GSettings.1.0)
3add_subdirectory(HudClient)
33add_subdirectory(HudClient)
tests/mocks/GSettings.1.0/CMakeLists.txt+1−4
@@ -17,7 +17,4 @@ target_link_libraries(FakeGSettingsQml
17
17
18qt5_use_modules(FakeGSettingsQml Qml)
18qt5_use_modules(FakeGSettingsQml Qml)
19
19
20−# copy qmldir file into build directory for shadow builds
20+add_unity8_mock(GSettings 1.0 GSettings.1.0 TARGETS FakeGSettingsQml)
21−file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
22− DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
23− )
tests/mocks/GSettings.1.0/qmldir+1
@@ -1,2 +1,3 @@
1module GSettings
1module GSettings
2plugin FakeGSettingsQml
2plugin FakeGSettingsQml
3+typeinfo GSettings.qmltypes
tests/mocks/HudClient/CMakeLists.txt+1−4
@@ -35,7 +35,4 @@ target_link_libraries(FakeHudClientQml
35
35
36qt5_use_modules(FakeHudClientQml Qml)
36qt5_use_modules(FakeHudClientQml Qml)
37
37
38−# copy qmldir file into build directory for shadow builds
38+add_unity8_mock(HudClient 0.1 HudClient TARGETS FakeHudClientQml)
39−file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
40− DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
41− )
tests/mocks/HudClient/qmldir+2
@@ -1 +1,3 @@
1+module HudClient
1plugin FakeHudClientQml
2plugin FakeHudClientQml
3+typeinfo HudClient.qmltypes
tests/mocks/LightDM/CMakeLists.txt+5−12
@@ -43,15 +43,8 @@ target_link_libraries(MockLightDM-qml
43
43
44qt5_use_modules(MockLightDM-qml DBus Gui Qml)
44qt5_use_modules(MockLightDM-qml DBus Gui Qml)
45
45
46−# copy qmldir file into build directory for shadow builds
46+add_unity8_mock(LightDM 0.1 LightDM
47−file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
47+ PREFIX mocks
48− DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
49− )
50−
51−install(TARGETS MockLightDM-qml
48+ TARGETS MockLightDM-qml
52− DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM
49+ ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/full"
53− )
54−
55−install(FILES qmldir
56− DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM
57− )
50+)
tests/mocks/LightDM/qmldir+1
@@ -1,2 +1,3 @@
1module LightDM
1module LightDM
2plugin MockLightDM-qml
2plugin MockLightDM-qml
3+typeinfo LightDM.qmltypes
tests/mocks/Powerd/CMakeLists.txt+1−12
@@ -7,15 +7,4 @@ add_library(MockPowerd-qml MODULE
7
7
8qt5_use_modules(MockPowerd-qml Qml)
8qt5_use_modules(MockPowerd-qml Qml)
9
9
10−# copy qmldir file into build directory for shadow builds
11−file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
12− DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
13− )
14−
15−install(TARGETS MockPowerd-qml
10+add_unity8_mock(Powerd 0.1 Powerd TARGETS MockPowerd-qml)
16− DESTINATION ${SHELL_INSTALL_QML}/mocks/Powerd
17− )
18−
19−install(FILES qmldir
20− DESTINATION ${SHELL_INSTALL_QML}/mocks/Powerd
21− )
tests/mocks/Powerd/qmldir+1
@@ -1,2 +1,3 @@
1module Powerd
1module Powerd
2plugin MockPowerd-qml
2plugin MockPowerd-qml
3+typeinfo Powerd.qmltypes
tests/mocks/QMenuModel/CMakeLists.txt+2−12
@@ -1,15 +1,3 @@
1−file(GLOB QMLFILES
2− *.qml
3− *.js
4− qmldir
5−)
6−
7−# copy files into build directory for shadow builds
8−add_custom_target(QMenuModelQmlFiles ALL
9− COMMAND cp ${QMLFILES} ${CMAKE_CURRENT_BINARY_DIR}
10− DEPENDS ${QMLFILES}
11−)
12−
13include_directories(
1include_directories(
14 ${Qt5Core_INCLUDE_DIRS}
2 ${Qt5Core_INCLUDE_DIRS}
15 ${Qt5Quick_INCLUDE_DIRS}
3 ${Qt5Quick_INCLUDE_DIRS}
@@ -32,3 +20,5 @@ qt5_use_modules(QMenuModelQml Core Quick)
32set_target_properties(QMenuModelQml PROPERTIES
20set_target_properties(QMenuModelQml PROPERTIES
33 OUTPUT_NAME qmenumodel
21 OUTPUT_NAME qmenumodel
34 VERSION 0)
22 VERSION 0)
23+
24+add_unity8_mock(QMenuModel 0.1 QMenuModel TARGETS QMenuModelQml)
tests/mocks/QMenuModel/qmldir+1
@@ -1,5 +1,6 @@
1module QMenuModel
1module QMenuModel
2plugin qmenumodel
2plugin qmenumodel
3+typeinfo QMenuModel.qmltypes
3
4
4QDBusActionGroup 0.1 QDBusActionGroup.qml
5QDBusActionGroup 0.1 QDBusActionGroup.qml
5UnityMenuAction 0.1 UnityMenuAction.qml
6UnityMenuAction 0.1 UnityMenuAction.qml
tests/mocks/QtMultimedia/CMakeLists.txt+1−12
@@ -5,15 +5,4 @@ add_library(QtMultimedia-qml MODULE
5
5
6qt5_use_modules(QtMultimedia-qml Qml)
6qt5_use_modules(QtMultimedia-qml Qml)
7
7
8−# copy qmldir file into build directory for shadow builds
9−file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
10− DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
11− )
12−
13−install(TARGETS QtMultimedia-qml
8+add_unity8_mock(QtMultimedia 5.0 QtMultimedia TARGETS QtMultimedia-qml)
14− DESTINATION ${SHELL_INSTALL_QML}/mocks/QtMultimedia
15− )
16−
17−install(FILES qmldir
18− DESTINATION ${SHELL_INSTALL_QML}/mocks/QtMultimedia
19− )
tests/mocks/QtMultimedia/qmldir+1
@@ -1,2 +1,3 @@
1module QtMultimedia
1module QtMultimedia
2plugin QtMultimedia-qml
2plugin QtMultimedia-qml
3+typeinfo QtMultimedia.qmltypes
tests/mocks/Ubuntu/DownloadDaemonListener/CMakeLists.txt+1−9
@@ -7,12 +7,4 @@ add_library(FakeUbuntuDownloadDaemonListenerQml MODULE ${FakeUbuntuDownloadDaemo
7
7
8qt5_use_modules(FakeUbuntuDownloadDaemonListenerQml Core Quick)
8qt5_use_modules(FakeUbuntuDownloadDaemonListenerQml Core Quick)
9
9
10−# copy files into build directory for shadow builds
11−add_custom_target(UbuntuDownloadQmlDirFile ALL
12− COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" ${CMAKE_CURRENT_BINARY_DIR}
13− DEPENDS qmldir
14−)
15−
16−install(TARGETS FakeUbuntuDownloadDaemonListenerQml
10+add_unity8_mock(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS FakeUbuntuDownloadDaemonListenerQml)
17− DESTINATION ${SHELL_INSTALL_QML}/mocks/Ubuntu/DownloadDaemonListener
18− )
tests/mocks/Ubuntu/DownloadDaemonListener/qmldir+1
@@ -1,2 +1,3 @@
1module Ubuntu.DownloadDaemonListener
1module Ubuntu.DownloadDaemonListener
2plugin FakeUbuntuDownloadDaemonListenerQml
2plugin FakeUbuntuDownloadDaemonListenerQml
3+typeinfo DownloadDaemonListener.qmltypes
tests/mocks/Ubuntu/Thumbnailer/CMakeLists.txt+1−7
@@ -1,7 +1 @@
1−# copy files into build directory for shadow builds
1+add_unity8_mock(Ubuntu.Thumbnailer 0.1 Ubuntu/Thumbnailer)
2−add_custom_target(UbuntuThumbnailerQmlDirFile ALL
3− COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" ${CMAKE_CURRENT_BINARY_DIR}
4− DEPENDS qmldir
5−)
6−
7−install(FILES qmldir DESTINATION ${SHELL_INSTALL_QML}/mocks/Ubuntu/Thumbnailer)
tests/mocks/Ubuntu/Thumbnailer/qmldir+2
@@ -1,2 +1,4 @@
1module Ubuntu.Thumbnailer
1module Ubuntu.Thumbnailer
2+typeinfo Thumbnailer.qmltypes
3+
2Dummy 0.1 Dummy.qml
4Dummy 0.1 Dummy.qml
tests/mocks/Unity/Application/CMakeLists.txt+2−35
@@ -14,38 +14,5 @@ add_library(FakeUnityApplicationQml MODULE ${FakeUnityApplicationQml_SOURCES})
14
14
15qt5_use_modules(FakeUnityApplicationQml Core Quick)
15qt5_use_modules(FakeUnityApplicationQml Core Quick)
16
16
17−# copy files into build directory for shadow builds
18−add_custom_target(UnityAppQmlDirFile ALL
19− COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" ${CMAKE_CURRENT_BINARY_DIR}
20− DEPENDS qmldir
21−)
22−add_custom_target(InputFilterAreaQmlFile ALL
23− COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/InputFilterArea.qml" ${CMAKE_CURRENT_BINARY_DIR}
24− DEPENDS InputFilterArea.qml
25−)
26−add_custom_target(OSKControllerQmlFile ALL
27− COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/OSKController.qml" ${CMAKE_CURRENT_BINARY_DIR}
28− DEPENDS OSKController.qml
29−)
30−
31−install(TARGETS FakeUnityApplicationQml
17+add_unity8_mock(Unity.Application 0.1 Unity/Application PREFIX mocks TARGETS FakeUnityApplicationQml)
32− DESTINATION ${SHELL_INSTALL_QML}/mocks/Unity/Application
33− )
34−
35−install(FILES qmldir InputFilterArea.qml OSKController.qml
36− DESTINATION ${SHELL_INSTALL_QML}/mocks/Unity/Application
37− )
38−
39−# Duplicate the mock to nonmirplugins
40−# In shadow builds we just link it, in real installs we also install it to the other path
41−add_custom_target(OSKControllerQmlFile2 ALL
42− COMMAND mkdir -p ${CMAKE_BINARY_DIR}/nonmirplugins/Unity && rm -f ${CMAKE_BINARY_DIR}/nonmirplugins/Unity/Application && ln -s ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR}/nonmirplugins/Unity
43− DEPENDS qmldir
44−)
45−install(TARGETS FakeUnityApplicationQml
18+add_unity8_mock(Unity.Application 0.1 Unity/Application PREFIX nonmirplugins TARGETS FakeUnityApplicationQml)
46− DESTINATION ${SHELL_INSTALL_QML}/nonmirplugins/Unity/Application
47− )
48−
49−install(FILES qmldir InputFilterArea.qml OSKController.qml
50− DESTINATION ${SHELL_INSTALL_QML}/nonmirplugins/Unity/Application
51− )
tests/mocks/Unity/Application/qmldir+2
@@ -1,4 +1,6 @@
1module Unity.Application
1module Unity.Application
2plugin FakeUnityApplicationQml
2plugin FakeUnityApplicationQml
3+typeinfo Application.qmltypes
4+
3InputFilterArea 0.1 InputFilterArea.qml
5InputFilterArea 0.1 InputFilterArea.qml
4OSKController 0.1 OSKController.qml
6OSKController 0.1 OSKController.qml
tests/mocks/Unity/CMakeLists.txt+1−12
@@ -39,15 +39,4 @@ target_link_libraries(FakeUnityQml
39
39
40qt5_use_modules(FakeUnityQml Qml)
40qt5_use_modules(FakeUnityQml Qml)
41
41
42−# copy qmldir file into build directory for shadow builds
43−file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
44− DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
45− )
46−
47−install(TARGETS FakeUnityQml
42+add_unity8_mock(Unity 0.2 Unity PREFIX scopefakes TARGETS FakeUnityQml)
48− DESTINATION ${SHELL_INSTALL_QML}/scopefakes/Unity
49− )
50−
51−install(FILES qmldir
52− DESTINATION ${SHELL_INSTALL_QML}/scopefakes/Unity
53− )
tests/mocks/Unity/Indicators/qmldir+1
@@ -1,5 +1,6 @@
1module Unity.Indicators
1module Unity.Indicators
2plugin IndicatorsFakeQml
2plugin IndicatorsFakeQml
3+typeinfo Indicators.qmltypes
3
4
4CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml
5CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml
5IndicatorBase 0.1 IndicatorBase.qml
6IndicatorBase 0.1 IndicatorBase.qml
tests/mocks/Unity/Launcher/qmldir+1
@@ -1,2 +1,3 @@
1module Unity.Launcher
1module Unity.Launcher
2plugin MockLauncherPlugin
2plugin MockLauncherPlugin
3+typeinfo Launcher.qmltypes
tests/mocks/Unity/Notifications/qmldir+1
@@ -1,2 +1,3 @@
1module Unity.Notifications
1module Unity.Notifications
2Notification 1.0 notification.js
2Notification 1.0 notification.js
3+typeinfo Notifications.qmltypes
tests/mocks/Unity/qmldir+1
@@ -1,2 +1,3 @@
1module Unity
1module Unity
2plugin FakeUnityQml
2plugin FakeUnityQml
3+typeinfo Unity.qmltypes