From d8d60bc83824359c6e22b9114fc0a6bde45b8eca Mon Sep 17 00:00:00 2001 From: Xavi Garcia Mena Date: Wed, 23 Dec 2015 12:08:16 +0100 Subject: Reverted to release 507 --- tests/CMakeLists.txt | 203 ++--- tests/dbus-types/CMakeLists.txt | 53 -- .../com.ubuntu.AccountsService.Sound.xml | 9 - tests/dbus-types/dbus-types.h | 48 - .../org.PulseAudio.Ext.StreamRestore1.xml | 7 - tests/dbus-types/org.freedesktop.Accounts.xml | 9 - .../dbus-types/org.freedesktop.DBus.Properties.xml | 22 - tests/dbus-types/org.freedesktop.Notifications.xml | 47 - tests/dbus-types/org.gtk.Actions.xml | 13 - tests/dbus-types/pulseaudio-volume.cpp | 156 ---- tests/dbus-types/pulseaudio-volume.h | 69 -- tests/integration/CMakeLists.txt | 132 --- tests/integration/Copy of test-sound.wav | Bin 191989 -> 0 bytes tests/integration/indicator-sound-test-base.cpp | 823 ----------------- tests/integration/indicator-sound-test-base.h | 160 ---- tests/integration/main.cpp | 58 -- tests/integration/test-indicator.cpp | 981 --------------------- tests/integration/test-sound.wav | Bin 7665640 -> 0 bytes tests/integration/touch-stream-restore.table | 4 - tests/integration/utils/dbus-pulse-volume.cpp | 232 ----- tests/integration/utils/dbus-pulse-volume.h | 57 -- tests/integration/utils/get-volume.cpp | 33 - tests/integration/utils/set-volume.cpp | 36 - tests/notifications-test.cc | 6 +- tests/service-mocks/CMakeLists.txt | 2 - tests/service-mocks/DBusPropertiesNotifier.cpp | 41 - tests/service-mocks/DBusPropertiesNotifier.h | 48 - tests/service-mocks/accounts-mock/AccountsDefs.h | 37 - tests/service-mocks/accounts-mock/AccountsMock.cpp | 40 - tests/service-mocks/accounts-mock/AccountsMock.h | 50 -- .../accounts-mock/AccountsServiceSoundMock.cpp | 48 - .../accounts-mock/AccountsServiceSoundMock.h | 58 -- tests/service-mocks/accounts-mock/CMakeLists.txt | 42 - .../com.ubuntu.AccountsService.Sound.Mock.xml | 6 - tests/service-mocks/accounts-mock/main.cpp | 63 -- .../org.freedesktop.Accounts.Mock.xml | 15 - .../media-player-mpris-mock/CMakeLists.txt | 63 -- .../media-player-mpris-mock/MediaPlayerMprisDefs.h | 37 - .../MediaPlayerMprisMock.cpp | 103 --- .../media-player-mpris-mock/MediaPlayerMprisMock.h | 77 -- .../applications/testplayer1.desktop | 21 - .../service-mocks/media-player-mpris-mock/main.cpp | 64 -- .../org.mpris.MediaPlayer2.Player.xml | 24 - .../org.mpris.MediaPlayer2.xml | 6 - .../media-player-mpris-mock/player-update.cpp | 93 -- 45 files changed, 101 insertions(+), 3995 deletions(-) delete mode 100644 tests/dbus-types/CMakeLists.txt delete mode 100644 tests/dbus-types/com.ubuntu.AccountsService.Sound.xml delete mode 100644 tests/dbus-types/dbus-types.h delete mode 100644 tests/dbus-types/org.PulseAudio.Ext.StreamRestore1.xml delete mode 100644 tests/dbus-types/org.freedesktop.Accounts.xml delete mode 100644 tests/dbus-types/org.freedesktop.DBus.Properties.xml delete mode 100644 tests/dbus-types/org.freedesktop.Notifications.xml delete mode 100644 tests/dbus-types/org.gtk.Actions.xml delete mode 100644 tests/dbus-types/pulseaudio-volume.cpp delete mode 100644 tests/dbus-types/pulseaudio-volume.h delete mode 100644 tests/integration/CMakeLists.txt delete mode 100644 tests/integration/Copy of test-sound.wav delete mode 100644 tests/integration/indicator-sound-test-base.cpp delete mode 100644 tests/integration/indicator-sound-test-base.h delete mode 100644 tests/integration/main.cpp delete mode 100644 tests/integration/test-indicator.cpp delete mode 100644 tests/integration/test-sound.wav delete mode 100755 tests/integration/touch-stream-restore.table delete mode 100644 tests/integration/utils/dbus-pulse-volume.cpp delete mode 100644 tests/integration/utils/dbus-pulse-volume.h delete mode 100644 tests/integration/utils/get-volume.cpp delete mode 100644 tests/integration/utils/set-volume.cpp delete mode 100644 tests/service-mocks/CMakeLists.txt delete mode 100644 tests/service-mocks/DBusPropertiesNotifier.cpp delete mode 100644 tests/service-mocks/DBusPropertiesNotifier.h delete mode 100644 tests/service-mocks/accounts-mock/AccountsDefs.h delete mode 100644 tests/service-mocks/accounts-mock/AccountsMock.cpp delete mode 100644 tests/service-mocks/accounts-mock/AccountsMock.h delete mode 100644 tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp delete mode 100644 tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h delete mode 100644 tests/service-mocks/accounts-mock/CMakeLists.txt delete mode 100644 tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml delete mode 100644 tests/service-mocks/accounts-mock/main.cpp delete mode 100644 tests/service-mocks/accounts-mock/org.freedesktop.Accounts.Mock.xml delete mode 100644 tests/service-mocks/media-player-mpris-mock/CMakeLists.txt delete mode 100644 tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h delete mode 100644 tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp delete mode 100644 tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h delete mode 100644 tests/service-mocks/media-player-mpris-mock/applications/testplayer1.desktop delete mode 100644 tests/service-mocks/media-player-mpris-mock/main.cpp delete mode 100644 tests/service-mocks/media-player-mpris-mock/org.mpris.MediaPlayer2.Player.xml delete mode 100644 tests/service-mocks/media-player-mpris-mock/org.mpris.MediaPlayer2.xml delete mode 100644 tests/service-mocks/media-player-mpris-mock/player-update.cpp (limited to 'tests') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f77bcb1..2bbd8c5 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -5,10 +5,10 @@ include_directories(${GTEST_INCLUDE_DIR}) -add_library (gtest-static STATIC +add_library (gtest STATIC ${GTEST_SOURCE_DIR}/gtest-all.cc ${GTEST_SOURCE_DIR}/gtest_main.cc) -target_link_libraries(gtest-static ${GTEST_LIBS}) +target_link_libraries(gtest ${GTEST_LIBS}) ########################### # GSettings Schema @@ -22,8 +22,7 @@ set_source_files_properties (gschemas.compiled GENERATED) # GSettings: # compile the indicator-sound schema into a gschemas.compiled file in this directory, # and help the tests to find that file by setting -DSCHEMA_DIR -set (XDG_DATA_DIRS "${CMAKE_CURRENT_BINARY_DIR}/gsettings-schemas") -set (SCHEMA_DIR "${XDG_DATA_DIRS}/glib-2.0/schemas") +set (SCHEMA_DIR "${CMAKE_CURRENT_BINARY_DIR}/gsettings-schemas") add_definitions(-DSCHEMA_DIR="${SCHEMA_DIR}") execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas OUTPUT_VARIABLE COMPILE_SCHEMA_EXECUTABLE @@ -32,7 +31,6 @@ add_custom_command (OUTPUT gschemas.compiled DEPENDS ${CMAKE_SOURCE_DIR}/data/com.canonical.indicator.sound.gschema.xml COMMAND mkdir -p ${SCHEMA_DIR} COMMAND cp -f ${CMAKE_SOURCE_DIR}/data/*gschema.xml ${SCHEMA_DIR} - COMMAND cp -f /usr/share/glib-2.0/schemas/com.ubuntu.sound.gschema.xml ${SCHEMA_DIR} COMMAND ${COMPILE_SCHEMA_EXECUTABLE} ${SCHEMA_DIR}) ########################### @@ -43,74 +41,74 @@ set(VALA_MOCKS_HEADER_PATH "${CMAKE_CURRENT_BINARY_DIR}/vala-mocks.h") set(VALA_MOCKS_SYMBOLS_PATH "${CMAKE_CURRENT_BINARY_DIR}/vala-mocks.def") vala_init(vala-mocks - DEPENDS - indicator-sound-service-lib - PACKAGES - config - gio-2.0 - gio-unix-2.0 - libxml-2.0 - libpulse - libpulse-mainloop-glib - libnotify - accounts-service - indicator-sound-service - OPTIONS - --ccode - --thread - --vapidir=${CMAKE_BINARY_DIR}/src/ - --vapidir=${CMAKE_SOURCE_DIR}/vapi/ - --vapidir=. + DEPENDS + indicator-sound-service-lib + PACKAGES + config + gio-2.0 + gio-unix-2.0 + libxml-2.0 + libpulse + libpulse-mainloop-glib + libnotify + accounts-service + indicator-sound-service + OPTIONS + --ccode + --thread + --vapidir=${CMAKE_BINARY_DIR}/src/ + --vapidir=${CMAKE_SOURCE_DIR}/vapi/ + --vapidir=. ) vala_add(vala-mocks - media-player-mock.vala + media-player-mock.vala ) vala_add(vala-mocks - media-player-list-mock.vala + media-player-list-mock.vala ) vala_add(vala-mocks - volume-control-mock.vala + volume-control-mock.vala ) vala_finish(vala-mocks - SOURCES - vala_mocks_VALA_SOURCES - OUTPUTS - vala_mocks_VALA_C - GENERATE_HEADER - ${VALA_MOCKS_HEADER_PATH} - GENERATE_SYMBOLS - ${VALA_MOCKS_SYMBOLS_PATH} + SOURCES + vala_mocks_VALA_SOURCES + OUTPUTS + vala_mocks_VALA_C + GENERATE_HEADER + ${VALA_MOCKS_HEADER_PATH} + GENERATE_SYMBOLS + ${VALA_MOCKS_SYMBOLS_PATH} ) set_source_files_properties( - ${vala_mocks_VALA_SOURCES} - PROPERTIES - HEADER_FILE_ONLY TRUE + ${vala_mocks_VALA_SOURCES} + PROPERTIES + HEADER_FILE_ONLY TRUE ) set( - VALA_MOCKS_SOURCES - ${vala_mocks_VALA_SOURCES} - ${vala_mocks_VALA_C} - ${VALA_MOCKS_SYMBOLS_PATH} + VALA_MOCKS_SOURCES + ${vala_mocks_VALA_SOURCES} + ${vala_mocks_VALA_C} + ${VALA_MOCKS_SYMBOLS_PATH} ) add_definitions( - -Wno-unused-but-set-variable + -Wno-unused-but-set-variable ) add_library( - vala-mocks-lib STATIC - ${VALA_MOCKS_SOURCES} + vala-mocks-lib STATIC + ${VALA_MOCKS_SOURCES} ) target_link_libraries( - vala-mocks-lib - indicator-sound-service-lib + vala-mocks-lib + indicator-sound-service-lib ) include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -120,9 +118,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ########################### add_library( - pulse-mock - SHARED - pa-mock.cpp + pulse-mock + SHARED + pa-mock.cpp ) target_link_libraries (pulse-mock ${PULSEAUDIO_LIBRARIES}) @@ -133,7 +131,7 @@ target_link_libraries (pulse-mock ${PULSEAUDIO_LIBRARIES}) include_directories(${CMAKE_SOURCE_DIR}/src) add_executable (name-watch-test name-watch-test.cc ${CMAKE_SOURCE_DIR}/src/bus-watch-namespace.c) -target_link_libraries (name-watch-test gtest-static ${SOUNDSERVICE_LIBRARIES}) +target_link_libraries (name-watch-test gtest ${SOUNDSERVICE_LIBRARIES}) add_test(name-watch-test name-watch-test) ########################### @@ -143,21 +141,21 @@ add_test(name-watch-test name-watch-test) include_directories(${CMAKE_SOURCE_DIR}/src) add_executable (accounts-service-user-test accounts-service-user.cc) target_link_libraries ( - accounts-service-user-test - indicator-sound-service-lib - vala-mocks-lib - gtest-static - ${SOUNDSERVICE_LIBRARIES} - ${TEST_LIBRARIES} + accounts-service-user-test + indicator-sound-service-lib + vala-mocks-lib + gtest + ${SOUNDSERVICE_LIBRARIES} + ${TEST_LIBRARIES} ) # Split tests to work around libaccountservice sucking add_test(accounts-service-user-test-basic - accounts-service-user-test --gtest_filter=AccountsServiceUserTest.BasicObject + accounts-service-user-test --gtest_filter=AccountsServiceUserTest.BasicObject ) add_test(accounts-service-user-test-player - accounts-service-user-test --gtest_filter=AccountsServiceUserTest.SetMediaPlayer + accounts-service-user-test --gtest_filter=AccountsServiceUserTest.SetMediaPlayer ) ########################### @@ -167,11 +165,11 @@ add_test(accounts-service-user-test-player include_directories(${CMAKE_SOURCE_DIR}/src) add_executable (volume-control-test volume-control-test.cc gschemas.compiled) target_link_libraries ( - volume-control-test - indicator-sound-service-lib - pulse-mock - gtest-static - ${TEST_LIBRARIES} + volume-control-test + indicator-sound-service-lib + pulse-mock + gtest + ${TEST_LIBRARIES} ) add_test(volume-control-test volume-control-test) @@ -183,12 +181,12 @@ add_test(volume-control-test volume-control-test) include_directories(${CMAKE_SOURCE_DIR}/src) add_executable (sound-menu-test sound-menu.cc) target_link_libraries ( - sound-menu-test - indicator-sound-service-lib - vala-mocks-lib - gtest-static - ${SOUNDSERVICE_LIBRARIES} - ${TEST_LIBRARIES} + sound-menu-test + indicator-sound-service-lib + vala-mocks-lib + gtest + ${SOUNDSERVICE_LIBRARIES} + ${TEST_LIBRARIES} ) add_test(sound-menu-test sound-menu-test) @@ -200,13 +198,13 @@ add_test(sound-menu-test sound-menu-test) include_directories(${CMAKE_SOURCE_DIR}/src) add_executable (notifications-test notifications-test.cc) target_link_libraries ( - notifications-test - indicator-sound-service-lib - vala-mocks-lib - pulse-mock - gtest-static - ${SOUNDSERVICE_LIBRARIES} - ${TEST_LIBRARIES} + notifications-test + indicator-sound-service-lib + vala-mocks-lib + pulse-mock + gtest + ${SOUNDSERVICE_LIBRARIES} + ${TEST_LIBRARIES} ) add_test(notifications-test notifications-test) @@ -218,23 +216,23 @@ add_test(notifications-test notifications-test) include_directories(${CMAKE_SOURCE_DIR}/src) add_executable (media-player-user-test media-player-user.cc) target_link_libraries ( - media-player-user-test - indicator-sound-service-lib - vala-mocks-lib - gtest-static - ${SOUNDSERVICE_LIBRARIES} - ${TEST_LIBRARIES} + media-player-user-test + indicator-sound-service-lib + vala-mocks-lib + gtest + ${SOUNDSERVICE_LIBRARIES} + ${TEST_LIBRARIES} ) # Split tests to work around libaccountservice sucking add_test(media-player-user-test-basic - media-player-user-test --gtest_filter=MediaPlayerUserTest.BasicObject + media-player-user-test --gtest_filter=MediaPlayerUserTest.BasicObject ) add_test(media-player-user-test-dataset - media-player-user-test --gtest_filter=MediaPlayerUserTest.DataSet + media-player-user-test --gtest_filter=MediaPlayerUserTest.DataSet ) add_test(media-player-user-test-timeout - media-player-user-test --gtest_filter=MediaPlayerUserTest.TimeoutTest + media-player-user-test --gtest_filter=MediaPlayerUserTest.TimeoutTest ) ########################### @@ -244,20 +242,20 @@ add_test(media-player-user-test-timeout include_directories(${CMAKE_SOURCE_DIR}/src) add_executable (greeter-list-test greeter-list.cc) target_link_libraries ( - greeter-list-test - indicator-sound-service-lib - vala-mocks-lib - gtest-static - ${SOUNDSERVICE_LIBRARIES} - ${TEST_LIBRARIES} + greeter-list-test + indicator-sound-service-lib + vala-mocks-lib + gtest + ${SOUNDSERVICE_LIBRARIES} + ${TEST_LIBRARIES} ) # Split tests to work around libaccountservice sucking add_test(greeter-list-test-basic - greeter-list-test --gtest_filter=GreeterListTest.BasicObject + greeter-list-test --gtest_filter=GreeterListTest.BasicObject ) add_test(greeter-list-test-iterator - greeter-list-test --gtest_filter=GreeterListTest.BasicIterator + greeter-list-test --gtest_filter=GreeterListTest.BasicIterator ) ########################### @@ -265,23 +263,18 @@ add_test(greeter-list-test-iterator ########################### add_definitions( - -DINDICATOR_SOUND_SERVICE_BINARY="${CMAKE_BINARY_DIR}/src/indicator-sound-service" - -DPA_MOCK_LIB="${CMAKE_CURRENT_BINARY_DIR}/libpulse-mock.so" + -DINDICATOR_SOUND_SERVICE_BINARY="${CMAKE_BINARY_DIR}/src/indicator-sound-service" + -DPA_MOCK_LIB="${CMAKE_CURRENT_BINARY_DIR}/libpulse-mock.so" ) add_executable (indicator-test indicator-test.cc gschemas.compiled) target_link_libraries ( - indicator-test - gtest-static - ${SOUNDSERVICE_LIBRARIES} - ${TEST_LIBRARIES} + indicator-test + gtest + ${SOUNDSERVICE_LIBRARIES} + ${TEST_LIBRARIES} ) # Split tests to work around libaccountservice sucking add_test(indcator-test - indicator-test + indicator-test ) - -# Disable integration tests -# add_subdirectory(integration) -# add_subdirectory(dbus-types) -# add_subdirectory(service-mocks) diff --git a/tests/dbus-types/CMakeLists.txt b/tests/dbus-types/CMakeLists.txt deleted file mode 100644 index cb7f512..0000000 --- a/tests/dbus-types/CMakeLists.txt +++ /dev/null @@ -1,53 +0,0 @@ -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -find_package(Qt5DBus REQUIRED) -include_directories(${Qt5DBus_INCLUDE_DIRS}) - -add_definitions(-DQT_NO_KEYWORDS=1) - -set(dbusinterface_streamrestore_xml "org.PulseAudio.Ext.StreamRestore1.xml") -set_source_files_properties(${dbusinterface_streamrestore_xml} PROPERTIES - CLASSNAME StreamRestoreInterface) - -set(dbusinterface_accounts_xml "org.freedesktop.Accounts.xml") -set_source_files_properties(${dbusinterface_accounts_xml} PROPERTIES - CLASSNAME AccountsInterface) - -set(dbusinterface_accountssound_xml "com.ubuntu.AccountsService.Sound.xml") -set_source_files_properties(${dbusinterface_accountssound_xml} PROPERTIES - CLASSNAME AccountsSoundInterface) - -set(dbusinterface_properties_xml "org.freedesktop.DBus.Properties.xml") -set_source_files_properties(${dbusinterface_properties_xml} PROPERTIES - CLASSNAME DBusPropertiesInterface - NO_NAMESPACE YES - INCLUDE "dbus-types.h") - -set(dbusinterface_actions_xml "org.gtk.Actions.xml") -set_source_files_properties(${dbusinterface_actions_xml} PROPERTIES - CLASSNAME MenusInterface) - -set(dbusinterface_notifications_xml "org.freedesktop.Notifications.xml") -set_source_files_properties(${dbusinterface_notifications_xml} PROPERTIES - CLASSNAME NotificationsInterface) - -qt5_add_dbus_interface(interface_files ${dbusinterface_streamrestore_xml} stream_restore_interface) -qt5_add_dbus_interface(interface_files ${dbusinterface_properties_xml} dbus_properties_interface) -qt5_add_dbus_interface(interface_files ${dbusinterface_accounts_xml} dbus_accounts_interface) -qt5_add_dbus_interface(interface_files ${dbusinterface_accountssound_xml} dbus_accountssound_interface) -qt5_add_dbus_interface(interface_files ${dbusinterface_actions_xml} dbus_menus_interface) -qt5_add_dbus_interface(interface_files ${dbusinterface_notifications_xml} dbus_notifications_interface) - -add_library( - sound-indicator-dbus-interfaces - STATIC - ${interface_files} - pulseaudio-volume.cpp -) - -qt5_use_modules( - sound-indicator-dbus-interfaces - Core - DBus -) diff --git a/tests/dbus-types/com.ubuntu.AccountsService.Sound.xml b/tests/dbus-types/com.ubuntu.AccountsService.Sound.xml deleted file mode 100644 index 27c915a..0000000 --- a/tests/dbus-types/com.ubuntu.AccountsService.Sound.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/dbus-types/dbus-types.h b/tests/dbus-types/dbus-types.h deleted file mode 100644 index b75acf0..0000000 --- a/tests/dbus-types/dbus-types.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ -#pragma once - -#include -#include "pulseaudio-volume.h" - -namespace DBusTypes -{ - inline void registerMetaTypes() - { - PulseaudioVolume::registerMetaType(); - PulseaudioVolumeArray::registerMetaType(); - } - - static constexpr char const* DBUS_NAME = "com.canonical.indicator.sound"; - - static constexpr char const* DBUS_PULSE = "org.PulseAudio1"; - - static constexpr char const* ACCOUNTS_SERVICE = "org.freedesktop.Accounts"; - - static constexpr char const* STREAM_RESTORE_NAME = "org.PulseAudio.Ext.StreamRestore1"; - - static constexpr char const* STREAM_RESTORE_PATH = "/org/pulseaudio/stream_restore1"; - - static constexpr char const* STREAM_RESTORE_ENTRY_NAME = "org.PulseAudio.Ext.StreamRestore1.RestoreEntry"; - - static constexpr char const* MAIN_SERVICE_PATH = "/com/canonical/indicator/sound"; - - static constexpr char const* ACTIONS_INTERFACE = "org.gtk.Actions"; - -} // namespace DBusTypes - diff --git a/tests/dbus-types/org.PulseAudio.Ext.StreamRestore1.xml b/tests/dbus-types/org.PulseAudio.Ext.StreamRestore1.xml deleted file mode 100644 index bf9af76..0000000 --- a/tests/dbus-types/org.PulseAudio.Ext.StreamRestore1.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/tests/dbus-types/org.freedesktop.Accounts.xml b/tests/dbus-types/org.freedesktop.Accounts.xml deleted file mode 100644 index e308120..0000000 --- a/tests/dbus-types/org.freedesktop.Accounts.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/dbus-types/org.freedesktop.DBus.Properties.xml b/tests/dbus-types/org.freedesktop.DBus.Properties.xml deleted file mode 100644 index bdf6cad..0000000 --- a/tests/dbus-types/org.freedesktop.DBus.Properties.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/dbus-types/org.freedesktop.Notifications.xml b/tests/dbus-types/org.freedesktop.Notifications.xml deleted file mode 100644 index f7d923e..0000000 --- a/tests/dbus-types/org.freedesktop.Notifications.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/dbus-types/org.gtk.Actions.xml b/tests/dbus-types/org.gtk.Actions.xml deleted file mode 100644 index b691f1f..0000000 --- a/tests/dbus-types/org.gtk.Actions.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/tests/dbus-types/pulseaudio-volume.cpp b/tests/dbus-types/pulseaudio-volume.cpp deleted file mode 100644 index 8ee305f..0000000 --- a/tests/dbus-types/pulseaudio-volume.cpp +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ -#include "dbus-types.h" - -PulseaudioVolume::PulseaudioVolume() : - type_(0), - volume_(10) -{ -} - -PulseaudioVolume::PulseaudioVolume(unsigned int type, unsigned int volume) : - type_(type) - , volume_(volume) -{ -} - -PulseaudioVolume::PulseaudioVolume(const PulseaudioVolume &other) : - type_(other.type_), - volume_(other.volume_) -{ -} - -PulseaudioVolume& PulseaudioVolume::operator=(const PulseaudioVolume &other) -{ - type_ = other.type_; - volume_ = other.volume_; - - return *this; -} - -PulseaudioVolume::~PulseaudioVolume() -{ -} - -unsigned int PulseaudioVolume::getType() const -{ - return type_; -} - -unsigned int PulseaudioVolume::getVolume() const -{ - return volume_; -} - -void PulseaudioVolume::registerMetaType() -{ - qRegisterMetaType("PulseaudioVolume"); - - qDBusRegisterMetaType(); -} - -QDBusArgument &operator<<(QDBusArgument &argument, const PulseaudioVolume& volume) -{ - argument.beginStructure(); - argument << volume.type_; - argument << volume.volume_; - argument.endStructure(); - - return argument; -} - -const QDBusArgument &operator>>(const QDBusArgument &argument, PulseaudioVolume &volume) -{ - argument.beginStructure(); - argument >> volume.type_; - argument >> volume.volume_; - argument.endStructure(); - - return argument; -} - -PulseaudioVolumeArray::PulseaudioVolumeArray() -{ -} - -PulseaudioVolumeArray::PulseaudioVolumeArray(const PulseaudioVolumeArray &other) : - volume_array_(other.volume_array_) -{ -} - -PulseaudioVolumeArray& PulseaudioVolumeArray::operator=(const PulseaudioVolumeArray &other) -{ - volume_array_ = other.volume_array_; - - return *this; -} - -PulseaudioVolumeArray::~PulseaudioVolumeArray() -{ -} - -int PulseaudioVolumeArray::getNumItems() const -{ - return volume_array_.size(); -} - -PulseaudioVolume PulseaudioVolumeArray::getItem(int i) const -{ - if (i < volume_array_.size()) - { - return volume_array_[i]; - } - return PulseaudioVolume(); -} - -void PulseaudioVolumeArray::addItem(PulseaudioVolume const &item) -{ - volume_array_.push_back(item); -} - -void PulseaudioVolumeArray::registerMetaType() -{ - qRegisterMetaType("PulseaudioVolumeArray"); - - qDBusRegisterMetaType(); -} - -QDBusArgument &operator<<(QDBusArgument &argument, const PulseaudioVolumeArray& volume) -{ - argument.beginArray( qMetaTypeId() ); - for (int i = 0; i < volume.volume_array_.size(); ++ i) - { - PulseaudioVolume item = volume.getItem(i); - argument << item; - } - argument.endArray(); - return argument; -} - -const QDBusArgument &operator>>(const QDBusArgument &argument, PulseaudioVolumeArray &volume) -{ - argument.beginArray(); - while ( !argument.atEnd() ) { - PulseaudioVolume item; - argument >> item; - volume.volume_array_.push_back(item); - } - argument.endArray(); - - return argument; -} diff --git a/tests/dbus-types/pulseaudio-volume.h b/tests/dbus-types/pulseaudio-volume.h deleted file mode 100644 index 6d5a222..0000000 --- a/tests/dbus-types/pulseaudio-volume.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ -#pragma once - -#include - -class PulseaudioVolume -{ -public: - PulseaudioVolume(); - PulseaudioVolume(unsigned int type, unsigned int volume); - PulseaudioVolume(const PulseaudioVolume &other); - PulseaudioVolume& operator=(const PulseaudioVolume &other); - ~PulseaudioVolume(); - - friend QDBusArgument &operator<<(QDBusArgument &argument, PulseaudioVolume const & volume); - friend const QDBusArgument &operator>>(QDBusArgument const & argument, PulseaudioVolume &volume); - - unsigned int getType() const; - unsigned int getVolume() const; - - //register Message with the Qt type system - static void registerMetaType(); - -private: - unsigned int type_; - unsigned int volume_; -}; - -class PulseaudioVolumeArray -{ -public: - PulseaudioVolumeArray(); - PulseaudioVolumeArray(QString const &interface, QString const &property, QDBusVariant const& value); - PulseaudioVolumeArray(const PulseaudioVolumeArray &other); - PulseaudioVolumeArray& operator=(const PulseaudioVolumeArray &other); - ~PulseaudioVolumeArray(); - - friend QDBusArgument &operator<<(QDBusArgument &argument, PulseaudioVolumeArray const & volume); - friend const QDBusArgument &operator>>(QDBusArgument const & argument, PulseaudioVolumeArray &volume); - - int getNumItems() const; - PulseaudioVolume getItem(int i) const; - void addItem(PulseaudioVolume const &item); - - //register Message with the Qt type system - static void registerMetaType(); - -private: - QVector volume_array_; -}; - -Q_DECLARE_METATYPE(PulseaudioVolume) -Q_DECLARE_METATYPE(PulseaudioVolumeArray) diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt deleted file mode 100644 index 939e329..0000000 --- a/tests/integration/CMakeLists.txt +++ /dev/null @@ -1,132 +0,0 @@ -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -include(FindGMock) - -#pkg_check_modules(GMENUHARNESS REQUIRED libgmenuharness REQUIRED) -#include_directories(${GMENUHARNESS_INCLUDE_DIRS}) -include_directories("${CMAKE_SOURCE_DIR}/include") - -pkg_check_modules(QTDBUSTEST REQUIRED libqtdbustest-1 REQUIRED) -include_directories(${QTDBUSTEST_INCLUDE_DIRS}) - -pkg_check_modules(QTDBUSMOCK REQUIRED libqtdbusmock-1 REQUIRED) -include_directories(${QTDBUSMOCK_INCLUDE_DIRS}) - -find_package(Qt5Test REQUIRED) -include_directories(${Qt5Test_INCLUDE_DIRS}) - -find_package(Qt5DBus REQUIRED) -include_directories(${Qt5DBus_INCLUDE_DIRS}) - -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -include_directories(${GMOCK_INCLUDE_DIRS}) -include_directories(${GTEST_INCLUDE_DIRS}) - -include_directories("${CMAKE_SOURCE_DIR}/tests/dbus-types") -include_directories("${CMAKE_BINARY_DIR}/tests/dbus-types") - -add_definitions(-DSOUND_SERVICE_BIN="${CMAKE_BINARY_DIR}/src/indicator-sound-service" - -DSTREAM_RESTORE_TABLE="${CMAKE_SOURCE_DIR}/tests/integration/touch-stream-restore.table" - -DVOLUME_SET_BIN="${CMAKE_BINARY_DIR}/tests/integration/set-volume" - -DACCOUNTS_SERVICE_BIN="${CMAKE_BINARY_DIR}/tests/service-mocks/accounts-mock/accounts-service-sound" - -DMEDIA_PLAYER_MPRIS_BIN="${CMAKE_BINARY_DIR}/tests/service-mocks/media-player-mpris-mock/media-player-mpris-mock" - -DMEDIA_PLAYER_MPRIS_UPDATE_BIN="${CMAKE_BINARY_DIR}/tests/service-mocks/media-player-mpris-mock/media-player-mpris-mock-update" - -DTEST_SOUND="${CMAKE_SOURCE_DIR}/tests/integration/test-sound.wav" - -DQT_NO_KEYWORDS=1 - -DXDG_DATA_DIRS="${XDG_DATA_DIRS}" -) - -set(GLIB_REQUIRED_VERSION 2.26) - -pkg_check_modules( - GLIB REQUIRED - glib-2.0>=${GLIB_REQUIRED_VERSION} - gio-2.0>=${GLIB_REQUIRED_VERSION} -) -include_directories(${GLIB_INCLUDE_DIRS}) - -set( - INTEGRATION_TESTS_SRC - indicator-sound-test-base.cpp - test-indicator.cpp - utils/dbus-pulse-volume.cpp - main.cpp -) - -add_executable( - integration-tests - ${INTEGRATION_TESTS_SRC} -) - -qt5_use_modules( - integration-tests - Core - DBus - Test -) - -target_link_libraries( - integration-tests - sound-indicator-dbus-interfaces - ${QTDBUSMOCK_LDFLAGS} - ${QTDBUSTEST_LDFLAGS} - ${GTEST_LIBRARIES} - ${GMOCK_LIBRARIES} -# ${GMENUHARNESS_LDFLAGS} - ${GLIB_LDFLAGS} - gmenuharness-shared -) - -add_test( - integration-tests - integration-tests -) - -set( - SET-VOLUME-SRC - utils/dbus-pulse-volume.cpp - utils/set-volume.cpp -) - -set( - GET-VOLUME-SRC - utils/dbus-pulse-volume.cpp - utils/get-volume.cpp -) - -add_executable( - set-volume - ${SET-VOLUME-SRC} -) - -add_executable( - get-volume - ${GET-VOLUME-SRC} -) - -qt5_use_modules( - set-volume - Core - DBus - Test -) - -qt5_use_modules( - get-volume - Core - DBus - Test -) - -target_link_libraries( - get-volume - sound-indicator-dbus-interfaces -) - -target_link_libraries( - set-volume - sound-indicator-dbus-interfaces -) - -#add_subdirectory(utils) \ No newline at end of file diff --git a/tests/integration/Copy of test-sound.wav b/tests/integration/Copy of test-sound.wav deleted file mode 100644 index 709c6eb..0000000 Binary files a/tests/integration/Copy of test-sound.wav and /dev/null differ diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp deleted file mode 100644 index 5005e2c..0000000 --- a/tests/integration/indicator-sound-test-base.cpp +++ /dev/null @@ -1,823 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ - -#include "indicator-sound-test-base.h" - -#include "dbus_menus_interface.h" -#include "dbus_properties_interface.h" -#include "dbus_accounts_interface.h" -#include "dbus_accountssound_interface.h" -#include "dbus_notifications_interface.h" -#include "dbus-types.h" - -#include -#include -#include - -#include -#include "utils/dbus-pulse-volume.h" - -using namespace QtDBusTest; -using namespace QtDBusMock; -using namespace std; -using namespace testing; -namespace mh = unity::gmenuharness; - -namespace -{ - const int MAX_TIME_WAITING_FOR_NOTIFICATIONS = 2000; -} - -IndicatorSoundTestBase::IndicatorSoundTestBase() : - dbusMock(dbusTestRunner) -{ -} - -IndicatorSoundTestBase::~IndicatorSoundTestBase() -{ -} - -void IndicatorSoundTestBase::SetUp() -{ - setenv("XDG_DATA_DIRS", XDG_DATA_DIRS, true); - setenv("DBUS_SYSTEM_BUS_ADDRESS", dbusTestRunner.systemBus().toStdString().c_str(), true); - setenv("DBUS_SESSION_BUS_ADDRESS", dbusTestRunner.sessionBus().toStdString().c_str(), true); - dbusMock.registerNotificationDaemon(); - - dbusTestRunner.startServices(); - - auto& notifications = notificationsMockInterface(); - notifications.AddMethod("org.freedesktop.Notifications", - "GetCapabilities", - "", - "as", - "ret = ['actions', 'body', 'body-markup', 'icon-static', 'image/svg+xml', 'x-canonical-private-synchronous', 'x-canonical-append', 'x-canonical-private-icon-only', 'x-canonical-truncation', 'private-synchronous', 'append', 'private-icon-only', 'truncation']" - ).waitForFinished(); - - int waitedTime = 0; - while (!dbusTestRunner.sessionConnection().interface()->isServiceRegistered("org.freedesktop.Notifications") && waitedTime < MAX_TIME_WAITING_FOR_NOTIFICATIONS) - { - std::this_thread::sleep_for(std::chrono::milliseconds(10)); - waitedTime += 10; - } -} - -void IndicatorSoundTestBase::TearDown() -{ - unsetenv("XDG_DATA_DIRS"); - unsetenv("PULSE_SERVER"); - unsetenv("DBUS_SYSTEM_BUS_ADDRESS"); -} - -void gvariant_deleter(GVariant* varptr) -{ - if (varptr != nullptr) - { - g_variant_unref(varptr); - } -} - -std::shared_ptr IndicatorSoundTestBase::volume_variant(double volume) -{ - GVariantBuilder builder; - - g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT); - g_variant_builder_add(&builder, - "{sv}", - "title", - g_variant_new_string("_Sound")); - - g_variant_builder_add(&builder, - "{sv}", - "accessible-desc", - g_variant_new_string("_Sound")); - - auto icon = g_themed_icon_new("icon"); - g_variant_builder_add(&builder, - "{sv}", - "icon", - g_icon_serialize(icon)); - - g_variant_builder_add(&builder, - "{sv}", - "visible", - g_variant_new_boolean(true)); - return shared_ptr(g_variant_builder_end(&builder), &gvariant_deleter); -} - -bool IndicatorSoundTestBase::setStreamRestoreVolume(QString const &role, double volume) -{ - QProcess setVolume; - setVolume.start(VOLUME_SET_BIN, QStringList() - << role - << QString("%1").arg(volume)); - if (!setVolume.waitForStarted()) - return false; - - if (!setVolume.waitForFinished()) - return false; - - return setVolume.exitCode() == 0; -} - -bool IndicatorSoundTestBase::setSinkVolume(double volume) -{ - QString volume_percentage = QString("%1\%").arg(volume*100); - QProcess setVolume; - setVolume.start("pactl", QStringList() - << "-s" - << "127.0.0.1" - << "set-sink-volume" - << "0" - << volume_percentage); - if (!setVolume.waitForStarted()) - return false; - - if (!setVolume.waitForFinished()) - return false; - - return setVolume.exitCode() == 0; -} - -bool IndicatorSoundTestBase::clearGSettingsPlayers() -{ - QProcess clearPlayers; - - clearPlayers.start("gsettings", QStringList() - << "set" - << "com.canonical.indicator.sound" - << "interested-media-players" - << "[]"); - if (!clearPlayers.waitForStarted()) - return false; - - if (!clearPlayers.waitForFinished()) - return false; - - return clearPlayers.exitCode() == 0; -} - -bool IndicatorSoundTestBase::startTestMprisPlayer(QString const& playerName) -{ - testPlayer1.terminate(); - testPlayer1.start(MEDIA_PLAYER_MPRIS_BIN, QStringList() - << playerName); - if (!testPlayer1.waitForStarted()) - return false; - - - return true; -} - -bool IndicatorSoundTestBase::setTestMprisPlayerProperty(QString const &testPlayer, QString const &property, bool value) -{ - QProcess setProperty; - QString strValue; - strValue = value ? "true" : "false"; - - setProperty.start(MEDIA_PLAYER_MPRIS_UPDATE_BIN, QStringList() - << testPlayer - << property - << strValue); - if (!setProperty.waitForStarted()) - return false; - - if (!setProperty.waitForFinished()) - return false; - - return setProperty.exitCode() == 0; -} - -bool IndicatorSoundTestBase::startTestSound(QString const &role) -{ - testSoundProcess.terminate(); - testSoundProcess.start("paplay", QStringList() - << "-s" - << "127.0.0.1" - << TEST_SOUND - << QString("--property=media.role=%1").arg(role)); - - if (!testSoundProcess.waitForStarted()) - return false; - - return true; -} - -void IndicatorSoundTestBase::stopTestSound() -{ - testSoundProcess.terminate(); -} - -void IndicatorSoundTestBase::startPulseDesktop(DevicePortType speakerPort, DevicePortType headphonesPort) -{ - try - { - pulseaudio.reset( - new QProcessDBusService(DBusTypes::DBUS_PULSE, - QDBusConnection::SessionBus, - "pulseaudio", - QStringList() << "--start" - << "-vvvv" - << "--disable-shm=true" - << "--daemonize=false" - << "--use-pid-file=false" - << "--system=false" - << "--exit-idle-time=-1" - << "-n" - << QString("--load=module-null-sink sink_name=indicator_sound_test_speaker sink_properties=device.bus=%1").arg(getDevicePortString(speakerPort)) - << QString("--load=module-null-sink sink_name=indicator_sound_test_headphones sink_properties=device.bus=%1").arg(getDevicePortString(headphonesPort)) - << "--log-target=file:/tmp/pulse-daemon.log" - << "--load=module-dbus-protocol" - << "--load=module-native-protocol-tcp auth-ip-acl=127.0.0.1" - )); - pulseaudio->start(dbusTestRunner.sessionConnection()); - } - catch (exception const& e) - { - cout << "pulseaudio(): " << e.what() << endl; - throw; - } -} - -void IndicatorSoundTestBase::startPulsePhone(DevicePortType speakerPort, DevicePortType headphonesPort) -{ - try - { - pulseaudio.reset( - new QProcessDBusService(DBusTypes::DBUS_PULSE, - QDBusConnection::SessionBus, - "pulseaudio", - QStringList() << "--start" - << "-vvvv" - << "--disable-shm=true" - << "--daemonize=false" - << "--use-pid-file=false" - << "--system=false" - << "--exit-idle-time=-1" - << "-n" - << QString("--load=module-null-sink sink_name=indicator_sound_test_speaker sink_properties=device.bus=%1").arg(getDevicePortString(speakerPort)) - << QString("--load=module-null-sink sink_name=indicator_sound_test_headphones sink_properties=device.bus=%1").arg(getDevicePortString(headphonesPort)) - << "--log-target=file:/tmp/pulse-daemon.log" - << QString("--load=module-stream-restore restore_device=false restore_muted=false fallback_table=%1").arg(STREAM_RESTORE_TABLE) - << "--load=module-dbus-protocol" - << "--load=module-native-protocol-tcp auth-ip-acl=127.0.0.1" - )); - pulseaudio->start(dbusTestRunner.sessionConnection()); - } - catch (exception const& e) - { - cout << "pulseaudio(): " << e.what() << endl; - throw; - } -} - -void IndicatorSoundTestBase::startAccountsService() -{ - try - { - accountsService.reset( - new QProcessDBusService(DBusTypes::ACCOUNTS_SERVICE, - QDBusConnection::SystemBus, - ACCOUNTS_SERVICE_BIN, - QStringList())); - accountsService->start(dbusTestRunner.systemConnection()); - - initializeAccountsInterface(); - } - catch (exception const& e) - { - cout << "accountsService(): " << e.what() << endl; - throw; - } -} - -void IndicatorSoundTestBase::startIndicator() -{ - try - { - setenv("PULSE_SERVER", "127.0.0.1", true); - indicator.reset( - new QProcessDBusService(DBusTypes::DBUS_NAME, - QDBusConnection::SessionBus, - SOUND_SERVICE_BIN, - QStringList())); - indicator->start(dbusTestRunner.sessionConnection()); - } - catch (exception const& e) - { - cout << "startIndicator(): " << e.what() << endl; - throw; - } -} - -mh::MenuMatcher::Parameters IndicatorSoundTestBase::desktopParameters() -{ - return mh::MenuMatcher::Parameters( - "com.canonical.indicator.sound", - { { "indicator", "/com/canonical/indicator/sound" } }, - "/com/canonical/indicator/sound/desktop"); -} - -mh::MenuMatcher::Parameters IndicatorSoundTestBase::phoneParameters() -{ - return mh::MenuMatcher::Parameters( - "com.canonical.indicator.sound", - { { "indicator", "/com/canonical/indicator/sound" } }, - "/com/canonical/indicator/sound/phone"); -} - -unity::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::volumeSlider(double volume, QString const &label) -{ - return mh::MenuItemMatcher().radio() - .label(label.toStdString()) - .round_doubles(0.1) - .int32_attribute("target", 0) - .double_attribute("min-value", 0.0) - .double_attribute("max-value", 1.0) - .double_attribute("step", 0.01) - .string_attribute("x-canonical-type", "com.canonical.unity.slider") - .themed_icon("max-icon", {"audio-volume-high-panel", "audio-volume-high", "audio-volume", "audio"}) - .themed_icon("min-icon", {"audio-volume-low-zero-panel", "audio-volume-low-zero", "audio-volume-low", "audio-volume", "audio"}) - .pass_through_double_attribute("action", volume); -} - -unity::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::silentModeSwitch(bool toggled) -{ - return mh::MenuItemMatcher::checkbox() - .label("Silent Mode") - .action("indicator.silent-mode") - .toggled(toggled); -} - -bool IndicatorSoundTestBase::waitMenuChange() -{ - if (signal_spy_menu_changed_) - { - return signal_spy_menu_changed_->wait(); - } - return false; -} - -bool IndicatorSoundTestBase::initializeMenuChangedSignal() -{ - if (!menu_interface_) - { - menu_interface_.reset(new MenusInterface("com.canonical.indicator.sound", - "/com/canonical/indicator/sound", - dbusTestRunner.sessionConnection(), 0)); - } - if (menu_interface_) - { - qDebug() << "Waiting for signal"; - signal_spy_menu_changed_.reset(new QSignalSpy(menu_interface_.get(), &MenusInterface::Changed)); - } - if (!menu_interface_ || !signal_spy_menu_changed_) - { - return false; - } - return true; -} - -bool IndicatorSoundTestBase::waitVolumeChangedInIndicator() -{ - if (signal_spy_volume_changed_) - { - return signal_spy_volume_changed_->wait(); - } - return false; -} - -void IndicatorSoundTestBase::initializeAccountsInterface() -{ - auto username = qgetenv("USER"); - if (username != "") - { - main_accounts_interface_.reset(new AccountsInterface("org.freedesktop.Accounts", - "/org/freedesktop/Accounts", - dbusTestRunner.systemConnection(), 0)); - - QDBusReply userResp = main_accounts_interface_->call(QLatin1String("FindUserByName"), - QLatin1String(username)); - - if (!userResp.isValid()) - { - qWarning() << "SetVolume::initializeAccountsInterface(): D-Bus error: " << userResp.error().message(); - } - - auto userPath = userResp.value().path(); - if (userPath != "") - { - std::unique_ptr soundInterface(new AccountsSoundInterface("org.freedesktop.Accounts", - userPath, - dbusTestRunner.systemConnection(), 0)); - - accounts_interface_.reset(new DBusPropertiesInterface("org.freedesktop.Accounts", - userPath, - dbusTestRunner.systemConnection(), 0)); - if (!accounts_interface_->isValid()) - { - qWarning() << "SetVolume::initializeAccountsInterface(): D-Bus error: " << accounts_interface_->lastError().message(); - } - signal_spy_volume_changed_.reset(new QSignalSpy(accounts_interface_.get(),&DBusPropertiesInterface::PropertiesChanged)); - } - } -} - -OrgFreedesktopDBusMockInterface& IndicatorSoundTestBase::notificationsMockInterface() -{ - return dbusMock.mockInterface("org.freedesktop.Notifications", - "/org/freedesktop/Notifications", - "org.freedesktop.Notifications", - QDBusConnection::SessionBus); -} - -bool IndicatorSoundTestBase::setActionValue(const QString & action, QVariant value) -{ - QDBusInterface actionsInterface(DBusTypes::DBUS_NAME, - DBusTypes::MAIN_SERVICE_PATH, - DBusTypes::ACTIONS_INTERFACE, - dbusTestRunner.sessionConnection()); - - QDBusVariant dbusVar(value); - auto resp = actionsInterface.call("SetState", - action, - QVariant::fromValue(dbusVar), - QVariant::fromValue(QVariantMap())); - - if (resp.type() == QDBusMessage::ErrorMessage) - { - qCritical() << "IndicatorSoundTestBase::setActionValue(): Failed to set value for action " - << action - << " " - << resp.errorMessage(); - return false; - } - else - { - return true; - } -} - -bool IndicatorSoundTestBase::pressNotificationButton(int id, const QString & button) -{ - OrgFreedesktopDBusMockInterface actionsInterface("org.freedesktop.Notifications", - "/org/freedesktop/Notifications", - dbusTestRunner.sessionConnection()); - - actionsInterface.EmitSignal( - "org.freedesktop.Notifications", - "ActionInvoked", "us", QVariantList() << id << button); - - return true; -} - -bool IndicatorSoundTestBase::qDBusArgumentToMap(QVariant const& variant, QVariantMap& map) -{ - if (variant.canConvert()) - { - QDBusArgument value(variant.value()); - if (value.currentType() == QDBusArgument::MapType) - { - value >> map; - return true; - } - } - return false; -} - -void IndicatorSoundTestBase::checkVolumeNotification(double volume, QString const& label, bool isLoud, QVariantList call) -{ - QString icon; - if (volume <= 0.0) - { - icon = "audio-volume-muted"; - } - else if (volume <= 0.3) - { - icon = "audio-volume-low"; - } - else if (volume <= 0.7) - { - icon = "audio-volume-medium"; - } - else - { - icon = "audio-volume-high"; - } - - ASSERT_NE(call.size(), 0); - EXPECT_EQ("Notify", call.at(0)); - - QVariantList const& args(call.at(1).toList()); - ASSERT_EQ(8, args.size()); - EXPECT_EQ("indicator-sound", args.at(0)); - EXPECT_EQ(icon, args.at(2)); - EXPECT_EQ("Volume", args.at(3)); - EXPECT_EQ(label, args.at(4)); - EXPECT_EQ(QStringList(), args.at(5)); - - QVariantMap hints; - ASSERT_TRUE(qDBusArgumentToMap(args.at(6), hints)); - ASSERT_TRUE(hints.contains("value")); - ASSERT_TRUE(hints.contains("x-canonical-non-shaped-icon")); - ASSERT_TRUE(hints.contains("x-canonical-value-bar-tint")); - ASSERT_TRUE(hints.contains("x-canonical-private-synchronous")); - - EXPECT_EQ(volume*100, hints["value"]); - EXPECT_EQ(true, hints["x-canonical-non-shaped-icon"]); - EXPECT_EQ(isLoud, hints["x-canonical-value-bar-tint"]); - EXPECT_EQ(true, hints["x-canonical-private-synchronous"]); -} - -void IndicatorSoundTestBase::checkHighVolumeNotification(QVariantList call) -{ - ASSERT_NE(call.size(), 0); - EXPECT_EQ("Notify", call.at(0)); - - QVariantList const& args(call.at(1).toList()); - ASSERT_EQ(8, args.size()); - EXPECT_EQ("indicator-sound", args.at(0)); - EXPECT_EQ("Volume", args.at(3)); -} - -void IndicatorSoundTestBase::checkCloseNotification(int id, QVariantList call) -{ - EXPECT_EQ("CloseNotification", call.at(0)); - QVariantList const& args(call.at(1).toList()); - ASSERT_EQ(1, args.size()); -} - -void IndicatorSoundTestBase::checkNotificationWithNoArgs(QString const& method, QVariantList call) -{ - EXPECT_EQ(method, call.at(0)); - QVariantList const& args(call.at(1).toList()); - ASSERT_EQ(0, args.size()); -} - -int IndicatorSoundTestBase::getNotificationID(QVariantList call) -{ - if (call.size() == 0) - { - return -1; - } - QVariantList const& args(call.at(1).toList()); - if (args.size() != 8) - { - return -1; - } - if (args.at(0) != "indicator-sound") - { - return -1; - } - - bool isInt; - int id = args.at(1).toInt(&isInt); - if (!isInt) - { - return -1; - } - return id; -} - -bool IndicatorSoundTestBase::activateHeadphones(bool headphonesActive) -{ - QProcess pacltProcess; - - QString defaultSinkName = "indicator_sound_test_speaker"; - QString suspendedSinkName = "indicator_sound_test_headphones"; - if (headphonesActive) - { - defaultSinkName = "indicator_sound_test_headphones"; - suspendedSinkName = "indicator_sound_test_speaker"; - } - - pacltProcess.start("pactl", QStringList() << "-s" - << "127.0.0.1" - << "set-default-sink" - << defaultSinkName); - if (!pacltProcess.waitForStarted()) - return false; - - if (!pacltProcess.waitForFinished()) - return false; - - pacltProcess.start("pactl", QStringList() << "-s" - << "127.0.0.1" - << "suspend-sink" - << defaultSinkName - << "0"); - if (!pacltProcess.waitForStarted()) - return false; - - if (!pacltProcess.waitForFinished()) - return false; - - pacltProcess.start("pactl", QStringList() << "-s" - << "127.0.0.1" - << "suspend-sink" - << suspendedSinkName - << "1"); - if (!pacltProcess.waitForStarted()) - return false; - - if (!pacltProcess.waitForFinished()) - return false; - - return pacltProcess.exitCode() == 0; -} - -QString IndicatorSoundTestBase::getDevicePortString(DevicePortType port) -{ - QString portString; - - switch (port) - { - case WIRED: - portString = "wired"; - break; - case BLUETOOTH: - portString = "bluetooth"; - break; - case USB: - portString = "usb"; - break; - case HDMI: - portString = "hdmi"; - break; - default: - portString = "not_defined"; - break; - } - - return portString; -} - -void IndicatorSoundTestBase::checkPortDevicesLabels(DevicePortType speakerPort, DevicePortType headphonesPort) -{ - double INITIAL_VOLUME = 0.0; - - QString speakerString; - QString speakerStringMenu; - switch(speakerPort) - { - case WIRED: - speakerString = "Speakers"; - speakerStringMenu = "Volume"; - break; - case BLUETOOTH: - speakerString = "Bluetooth speaker"; - speakerStringMenu = "Volume (Bluetooth)"; - break; - case USB: - speakerString = "Usb speaker"; - speakerStringMenu = "Volume (Usb)"; - break; - case HDMI: - speakerString = "HDMI speaker"; - speakerStringMenu = "Volume (HDMI)"; - break; - } - - QString headphonesString; - QString headphonesStringMenu; - switch(headphonesPort) - { - case WIRED: - headphonesString = "Headphones"; - headphonesStringMenu = "Volume (Headphones)"; - break; - case BLUETOOTH: - headphonesString = "Bluetooth headphones"; - headphonesStringMenu = "Volume (Bluetooth headphones)"; - break; - case USB: - headphonesString = "Usb headphones"; - headphonesStringMenu = "Volume (Usb headphones)"; - break; - case HDMI: - headphonesString = "HDMI headphones"; - headphonesStringMenu = "Volume (HDMI headphones)"; - break; - } - - QSignalSpy notificationsSpy(¬ificationsMockInterface(), - SIGNAL(MethodCalled(const QString &, const QVariantList &))); - - ASSERT_NO_THROW(startAccountsService()); - ASSERT_NO_THROW(startPulsePhone(speakerPort, headphonesPort)); - - // initialize volumes in pulseaudio - EXPECT_TRUE(setStreamRestoreVolume("alert", INITIAL_VOLUME)); - EXPECT_TRUE(setStreamRestoreVolume("multimedia", INITIAL_VOLUME)); - - // start now the indicator, so it picks the new volumes - ASSERT_NO_THROW(startIndicator()); - - // if the speaker is the normal one it does not emit any notification, as that's - // the default one. - // for the rest it notifies the output - if (speakerPort != WIRED) - { - WAIT_FOR_SIGNALS(notificationsSpy, 3); - - // the first time we also have the calls to - // GetServerInformation and GetCapabilities - checkNotificationWithNoArgs("GetServerInformation", notificationsSpy.at(0)); - checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(1)); - checkVolumeNotification(INITIAL_VOLUME, speakerString, false, notificationsSpy.at(2)); - notificationsSpy.clear(); - } - - notificationsSpy.clear(); - // activate the headphones - EXPECT_TRUE(activateHeadphones(true)); - - if (speakerPort == WIRED) - { - WAIT_FOR_SIGNALS(notificationsSpy, 3); - - // the first time we also have the calls to - // GetServerInformation and GetCapabilities - checkNotificationWithNoArgs("GetServerInformation", notificationsSpy.at(0)); - checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(1)); - checkVolumeNotification(INITIAL_VOLUME, headphonesString, false, notificationsSpy.at(2)); - notificationsSpy.clear(); - } - else - { - WAIT_FOR_SIGNALS(notificationsSpy, 2); - checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0)); - checkVolumeNotification(INITIAL_VOLUME, headphonesString, false, notificationsSpy.at(1)); - notificationsSpy.clear(); - } - - // check the label in the menu - EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .string_attribute("submenu-action", "indicator.indicator-shown") - .mode(mh::MenuItemMatcher::Mode::starts_with) - .submenu() - .item(mh::MenuItemMatcher() - .section() - .item(silentModeSwitch(false)) - .item(volumeSlider(INITIAL_VOLUME, headphonesStringMenu)) - ) - ).match()); - - // deactivate the headphones - EXPECT_TRUE(activateHeadphones(false)); - - WAIT_FOR_SIGNALS(notificationsSpy, 2); - checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0)); - checkVolumeNotification(INITIAL_VOLUME, speakerString, false, notificationsSpy.at(1)); - notificationsSpy.clear(); - - // check the label in the menu - EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .string_attribute("submenu-action", "indicator.indicator-shown") - .mode(mh::MenuItemMatcher::Mode::starts_with) - .submenu() - .item(mh::MenuItemMatcher() - .section() - .item(silentModeSwitch(false)) - .item(volumeSlider(INITIAL_VOLUME, speakerStringMenu)) - ) - ).match()); -} - -bool IndicatorSoundTestBase::setVolumeUntilAccountsIsConnected(double volume) -{ - int RETRY_TIME = 5000; - - setActionValue("volume", QVariant::fromValue(volume)); - while(!signal_spy_volume_changed_->wait(10) && RETRY_TIME) - { - RETRY_TIME -= 10; - setActionValue("volume", QVariant::fromValue(volume)); - } - return (signal_spy_volume_changed_->count() != 0); -} diff --git a/tests/integration/indicator-sound-test-base.h b/tests/integration/indicator-sound-test-base.h deleted file mode 100644 index 41dd1c7..0000000 --- a/tests/integration/indicator-sound-test-base.h +++ /dev/null @@ -1,160 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ - -#pragma once - -#include -#include -#include - -#include -#include - -#include -#include - -class MenusInterface; -class DBusPulseVolume; -class DBusPropertiesInterface; -class AccountsInterface; -class QSignalSpy; - -#define WAIT_FOR_SIGNALS(signalSpy, signalsExpected)\ -{\ - while (signalSpy.size() < signalsExpected)\ - {\ - ASSERT_TRUE(signalSpy.wait());\ - }\ - ASSERT_EQ(signalsExpected, signalSpy.size());\ -} - -#define WAIT_AT_LEAST_SIGNALS(signalSpy, signalsExpected)\ -{\ - while (signalSpy.size() < signalsExpected)\ - {\ - ASSERT_TRUE(signalSpy.wait());\ - }\ - ASSERT_TRUE(signalsExpected <= signalSpy.size());\ -} - -class IndicatorSoundTestBase: public testing::Test -{ -public: - IndicatorSoundTestBase(); - - ~IndicatorSoundTestBase(); - - enum DevicePortType - { - WIRED, - BLUETOOTH, - USB, - HDMI - }; - -protected: - void SetUp() override; - void TearDown() override; - - void startIndicator(); - void startPulseDesktop(DevicePortType speakerPort=WIRED, DevicePortType headphonesPort=WIRED); - void startPulsePhone(DevicePortType speakerPort=WIRED, DevicePortType headphonesPort=WIRED); - void startAccountsService(); - - bool clearGSettingsPlayers(); - - bool startTestMprisPlayer(QString const& playerName); - - bool setTestMprisPlayerProperty(QString const &testPlayer, QString const &property, bool value); - - bool setStreamRestoreVolume(QString const &role, double volume); - - bool setSinkVolume(double volume); - - bool startTestSound(QString const &role); - - void stopTestSound(); - - static std::shared_ptr volume_variant(double volume); - - static unity::gmenuharness::MenuMatcher::Parameters desktopParameters(); - - static unity::gmenuharness::MenuMatcher::Parameters phoneParameters(); - - static unity::gmenuharness::MenuItemMatcher volumeSlider(double volume, QString const &label); - - static unity::gmenuharness::MenuItemMatcher silentModeSwitch(bool toggled); - - bool waitMenuChange(); - - bool initializeMenuChangedSignal(); - - bool waitVolumeChangedInIndicator(); - - void initializeAccountsInterface(); - - OrgFreedesktopDBusMockInterface& notificationsMockInterface(); - - bool setActionValue(const QString & action, QVariant value); - - bool pressNotificationButton(int id, const QString & button); - - bool qDBusArgumentToMap(QVariant const& variant, QVariantMap& map); - - void checkVolumeNotification(double volume, QString const& label, bool isLoud, QVariantList call); - - void checkHighVolumeNotification(QVariantList call); - - void checkCloseNotification(int id, QVariantList call); - - void checkNotificationWithNoArgs(QString const& method, QVariantList call); - - int getNotificationID(QVariantList call); - - bool activateHeadphones(bool headphonesActive); - - QString getDevicePortString(DevicePortType port); - - void checkPortDevicesLabels(DevicePortType speakerPort, DevicePortType headphonesPort); - - bool setVolumeUntilAccountsIsConnected(double volume); - - QtDBusTest::DBusTestRunner dbusTestRunner; - - QtDBusMock::DBusMock dbusMock; - - QtDBusTest::DBusServicePtr indicator; - - QtDBusTest::DBusServicePtr pulseaudio; - - QtDBusTest::DBusServicePtr accountsService; - - QProcess testSoundProcess; - - QProcess testPlayer1; - - std::unique_ptr menu_interface_; - - std::unique_ptr accounts_interface_; - - std::unique_ptr main_accounts_interface_; - - std::unique_ptr signal_spy_volume_changed_; - - std::unique_ptr signal_spy_menu_changed_; -}; diff --git a/tests/integration/main.cpp b/tests/integration/main.cpp deleted file mode 100644 index a29b3b6..0000000 --- a/tests/integration/main.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright © 2014 Canonical Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License version 3, - * as published by the Free Software Foundation. - * - * 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - * - * Authors: - * Pete Woods - */ - -//#include - -#include -#include -#include - -#include - -#include "dbus-types.h" - -using namespace QtDBusMock; - -class Runner: public QObject -{ - Q_OBJECT -public Q_SLOTS: - void run() - { - QCoreApplication::exit(RUN_ALL_TESTS()); - } -}; - -int main(int argc, char **argv) -{ - qputenv("LANG", "C.UTF-8"); - unsetenv("LC_ALL"); - - QCoreApplication application(argc, argv); - DBusMock::registerMetaTypes(); - DBusTypes::registerMetaTypes(); - ::testing::InitGoogleTest(&argc, argv); - - Runner runner; - QTimer::singleShot(0, &runner, SLOT(run())); - - return application.exec(); -} - -#include "main.moc" diff --git a/tests/integration/test-indicator.cpp b/tests/integration/test-indicator.cpp deleted file mode 100644 index 33e62b5..0000000 --- a/tests/integration/test-indicator.cpp +++ /dev/null @@ -1,981 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ - -#include - -#include -#include -#include - -using namespace std; -using namespace testing; -namespace mh = unity::gmenuharness; -namespace -{ - -class TestIndicator: public IndicatorSoundTestBase -{ -}; - -TEST_F(TestIndicator, PhoneChangeRoleVolume) -{ - double INITIAL_VOLUME = 0.0; - - ASSERT_NO_THROW(startAccountsService()); - ASSERT_NO_THROW(startPulsePhone()); - - // initialize volumes in pulseaudio - EXPECT_TRUE(setStreamRestoreVolume("alert", INITIAL_VOLUME)); - EXPECT_TRUE(setStreamRestoreVolume("multimedia", INITIAL_VOLUME)); - - // start now the indicator, so it picks the new volumes - ASSERT_NO_THROW(startIndicator()); - - // Generate a random volume - QTime now = QTime::currentTime(); - qsrand(now.msec()); - int randInt = qrand() % 100; - double randomVolume = randInt / 100.0; - - QSignalSpy &userAccountsSpy = *signal_spy_volume_changed_; - // set an initial volume to the alert role - userAccountsSpy.clear(); - EXPECT_TRUE(setVolumeUntilAccountsIsConnected(1.0)); - userAccountsSpy.clear(); - // play a test sound, it should change the role in the indicator - EXPECT_TRUE(startTestSound("multimedia")); - - // this time we only expect 1 signal as it's only the indicator - // updating the value - WAIT_FOR_SIGNALS(userAccountsSpy, 1); - //EXPECT_TRUE(waitVolumeChangedInIndicator()); - - userAccountsSpy.clear(); - // set the random volume to the multimedia role - setActionValue("volume", QVariant::fromValue(randomVolume)); - if (randomVolume != INITIAL_VOLUME) - { - WAIT_FOR_SIGNALS(userAccountsSpy, 1); - } - - // check the indicator - EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .string_attribute("submenu-action", "indicator.indicator-shown") - .mode(mh::MenuItemMatcher::Mode::starts_with) - .submenu() - .item(mh::MenuItemMatcher() - .section() - .item(silentModeSwitch(false)) - .item(volumeSlider(randomVolume, "Volume")) - ) - ).match()); - - // check that the last item is Sound Settings - EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .mode(mh::MenuItemMatcher::Mode::ends_with) - .submenu() - .item(mh::MenuItemMatcher() - .label("Sound Settings…") - .action("indicator.phone-settings") - ) - ).match()); - - // initialize the signal spy - EXPECT_TRUE(initializeMenuChangedSignal()); - userAccountsSpy.clear(); - // stop the test sound, the role should change again to alert - stopTestSound(); - if (randomVolume != 1.0) - { - // wait for the menu change - EXPECT_TRUE(waitMenuChange()); - } - - // check the initial volume for the alert role - EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .string_attribute("submenu-action", "indicator.indicator-shown") - .mode(mh::MenuItemMatcher::Mode::starts_with) - .submenu() - .item(mh::MenuItemMatcher() - .section() - .item(silentModeSwitch(false)) - .item(volumeSlider(1.0, "Volume")) - ) - ).match()); - - // check that the last item is Sound Settings - EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .mode(mh::MenuItemMatcher::Mode::ends_with) - .submenu() - .item(mh::MenuItemMatcher() - .label("Sound Settings…") - .action("indicator.phone-settings") - ) - ).match()); -} - -TEST_F(TestIndicator, PhoneBasicInitialVolume) -{ - double INITIAL_VOLUME = 0.0; - - ASSERT_NO_THROW(startAccountsService()); - EXPECT_TRUE(clearGSettingsPlayers()); - ASSERT_NO_THROW(startPulsePhone()); - - // initialize volumes in pulseaudio - EXPECT_TRUE(setStreamRestoreVolume("alert", INITIAL_VOLUME)); - - // start now the indicator, so it picks the new volumes - ASSERT_NO_THROW(startIndicator()); - - EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .string_attribute("submenu-action", "indicator.indicator-shown") - .mode(mh::MenuItemMatcher::Mode::all) - .submenu() - .item(mh::MenuItemMatcher() - .section() - .item(silentModeSwitch(false)) - .item(volumeSlider(INITIAL_VOLUME, "Volume")) - ) - .item(mh::MenuItemMatcher() - .label("Sound Settings…") - .action("indicator.phone-settings") - ) - ).match()); -} - -TEST_F(TestIndicator, PhoneAddMprisPlayer) -{ - double INITIAL_VOLUME = 0.0; - - ASSERT_NO_THROW(startAccountsService()); - EXPECT_TRUE(clearGSettingsPlayers()); - ASSERT_NO_THROW(startPulsePhone()); - - // initialize volumes in pulseaudio - EXPECT_TRUE(setStreamRestoreVolume("alert", INITIAL_VOLUME)); - - // start now the indicator, so it picks the new volumes - ASSERT_NO_THROW(startIndicator()); - - EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .string_attribute("submenu-action", "indicator.indicator-shown") - .mode(mh::MenuItemMatcher::Mode::all) - .submenu() - .item(mh::MenuItemMatcher() - .section() - .item(silentModeSwitch(false)) - .item(volumeSlider(INITIAL_VOLUME, "Volume")) - ) - .item(mh::MenuItemMatcher() - .label("Sound Settings…") - .action("indicator.phone-settings") - ) - ).match()); - - // initialize the signal spy - EXPECT_TRUE(initializeMenuChangedSignal()); - - // start the test player - EXPECT_TRUE(startTestMprisPlayer("testplayer1")); - - // wait for the menu change - EXPECT_TRUE(waitMenuChange()); - - // finally verify that the player is added - EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .string_attribute("submenu-action", "indicator.indicator-shown") - .mode(mh::MenuItemMatcher::Mode::all) - .submenu() - .item(mh::MenuItemMatcher() - .section() - .item(silentModeSwitch(false)) - .item(volumeSlider(INITIAL_VOLUME, "Volume")) - ) - .item(mh::MenuItemMatcher() - .section() - .item(mh::MenuItemMatcher() - .action("indicator.testplayer1.desktop") - .label("TestPlayer1") - .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "com.canonical.unity.media-player") - ) - .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop") - .string_attribute("x-canonical-type","com.canonical.unity.playback-item") - ) - ) - .item(mh::MenuItemMatcher() - .label("Sound Settings…") - .action("indicator.phone-settings") - ) - ).match()); -} - -TEST_F(TestIndicator, DesktopBasicInitialVolume) -{ - double INITIAL_VOLUME = 0.0; - - ASSERT_NO_THROW(startAccountsService()); - EXPECT_TRUE(clearGSettingsPlayers()); - ASSERT_NO_THROW(startPulseDesktop()); - - // initialize volumes in pulseaudio - EXPECT_FALSE(setStreamRestoreVolume("alert", INITIAL_VOLUME)); - EXPECT_TRUE(setSinkVolume(INITIAL_VOLUME)); - - // start the test player - EXPECT_TRUE(startTestMprisPlayer("testplayer1")); - - // start now the indicator, so it picks the new volumes - ASSERT_NO_THROW(startIndicator()); - - EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .mode(mh::MenuItemMatcher::Mode::all) - .submenu() - .item(mh::MenuItemMatcher() - .section() - .item(mh::MenuItemMatcher().checkbox() - .label("Mute") - ) - .item(volumeSlider(INITIAL_VOLUME, "Volume")) - ) - .item(mh::MenuItemMatcher() - .section() - .item(mh::MenuItemMatcher() - .action("indicator.testplayer1.desktop") - .label("TestPlayer1") - .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "com.canonical.unity.media-player") - ) - .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop") - .string_attribute("x-canonical-type","com.canonical.unity.playback-item") - ) - ) - .item(mh::MenuItemMatcher() - .label("Sound Settings…") - ) - ).match()); -} - -TEST_F(TestIndicator, DesktopAddMprisPlayer) -{ - double INITIAL_VOLUME = 0.0; - - ASSERT_NO_THROW(startAccountsService()); - EXPECT_TRUE(clearGSettingsPlayers()); - ASSERT_NO_THROW(startPulseDesktop()); - - // initialize volumes in pulseaudio - EXPECT_FALSE(setStreamRestoreVolume("alert", INITIAL_VOLUME)); - EXPECT_TRUE(setSinkVolume(INITIAL_VOLUME)); - - // start the test player - EXPECT_TRUE(startTestMprisPlayer("testplayer1")); - - // start now the indicator, so it picks the new volumes - ASSERT_NO_THROW(startIndicator()); - - // check that the player is added - EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .mode(mh::MenuItemMatcher::Mode::all) - .submenu() - .item(mh::MenuItemMatcher() - .section() - .item(mh::MenuItemMatcher().checkbox() - .label("Mute") - ) - .item(volumeSlider(INITIAL_VOLUME, "Volume")) - ) - .item(mh::MenuItemMatcher() - .section() - .item(mh::MenuItemMatcher() - .action("indicator.testplayer1.desktop") - .label("TestPlayer1") - .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "com.canonical.unity.media-player") - ) - .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop") - .string_attribute("x-canonical-type","com.canonical.unity.playback-item") - ) - ) - .item(mh::MenuItemMatcher() - .label("Sound Settings…") - ) - ).match()); -} - -TEST_F(TestIndicator, DesktopMprisPlayerButtonsState) -{ - double INITIAL_VOLUME = 0.0; - - ASSERT_NO_THROW(startAccountsService()); - EXPECT_TRUE(clearGSettingsPlayers()); - ASSERT_NO_THROW(startPulseDesktop()); - - // initialize volumes in pulseaudio - EXPECT_FALSE(setStreamRestoreVolume("alert", INITIAL_VOLUME)); - EXPECT_TRUE(setSinkVolume(INITIAL_VOLUME)); - - // start the test player - EXPECT_TRUE(startTestMprisPlayer("testplayer1")); - - // start now the indicator, so it picks the new volumes - ASSERT_NO_THROW(startIndicator()); - - // check that the player is added - EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .mode(mh::MenuItemMatcher::Mode::all) - .submenu() - .item(mh::MenuItemMatcher() - .section() - .item(mh::MenuItemMatcher().checkbox() - .label("Mute") - ) - .item(volumeSlider(INITIAL_VOLUME, "Volume")) - ) - .item(mh::MenuItemMatcher() - .section() - .item(mh::MenuItemMatcher() - .action("indicator.testplayer1.desktop") - .label("TestPlayer1") - .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "com.canonical.unity.media-player") - ) - .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop") - .string_attribute("x-canonical-type","com.canonical.unity.playback-item") - ) - ) - .item(mh::MenuItemMatcher() - .label("Sound Settings…") - ) - ).match()); - - // change the state of CanGoNext - EXPECT_TRUE(setTestMprisPlayerProperty("testplayer1", "CanGoNext", false)); - - // verify that the action changes - EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .mode(mh::MenuItemMatcher::Mode::all) - .submenu() - .item(mh::MenuItemMatcher() - .section() - .item(mh::MenuItemMatcher().checkbox() - .label("Mute") - ) - .item(volumeSlider(INITIAL_VOLUME, "Volume")) - ) - .item(mh::MenuItemMatcher() - .section() - .item(mh::MenuItemMatcher() - .action("indicator.testplayer1.desktop") - .label("TestPlayer1") - .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "com.canonical.unity.media-player") - ) - .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop") - .attribute_not_set("x-canonical-next-action") - .string_attribute("x-canonical-type","com.canonical.unity.playback-item") - ) - ) - .item(mh::MenuItemMatcher() - .label("Sound Settings…") - ) - ).match()); - - - // change the state of CanGoPrevious - EXPECT_TRUE(setTestMprisPlayerProperty("testplayer1", "CanGoPrevious", false)); - - // verify that the action changes - EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .mode(mh::MenuItemMatcher::Mode::all) - .submenu() - .item(mh::MenuItemMatcher() - .section() - .item(mh::MenuItemMatcher().checkbox() - .label("Mute") - ) - .item(volumeSlider(INITIAL_VOLUME, "Volume")) - ) - .item(mh::MenuItemMatcher() - .section() - .item(mh::MenuItemMatcher() - .action("indicator.testplayer1.desktop") - .label("TestPlayer1") - .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "com.canonical.unity.media-player") - ) - .item(mh::MenuItemMatcher() - .attribute_not_set("x-canonical-previous-action") - .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop") - .attribute_not_set("x-canonical-next-action") - .string_attribute("x-canonical-type","com.canonical.unity.playback-item") - ) - ) - .item(mh::MenuItemMatcher() - .label("Sound Settings…") - ) - ).match()); - - // set back both to true - EXPECT_TRUE(setTestMprisPlayerProperty("testplayer1", "CanGoNext", true)); - EXPECT_TRUE(setTestMprisPlayerProperty("testplayer1", "CanGoPrevious", true)); - - EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .mode(mh::MenuItemMatcher::Mode::all) - .submenu() - .item(mh::MenuItemMatcher() - .section() - .item(mh::MenuItemMatcher().checkbox() - .label("Mute") - ) - .item(volumeSlider(INITIAL_VOLUME, "Volume")) - ) - .item(mh::MenuItemMatcher() - .section() - .item(mh::MenuItemMatcher() - .action("indicator.testplayer1.desktop") - .label("TestPlayer1") - .themed_icon("icon", {"testplayer"}) - .string_attribute("x-canonical-type", "com.canonical.unity.media-player") - ) - .item(mh::MenuItemMatcher() - .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop") - .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop") - .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop") - .string_attribute("x-canonical-type","com.canonical.unity.playback-item") - ) - ) - .item(mh::MenuItemMatcher() - .label("Sound Settings…") - ) - ).match()); -} - -TEST_F(TestIndicator, DesktopChangeRoleVolume) -{ - double INITIAL_VOLUME = 0.0; - - ASSERT_NO_THROW(startAccountsService()); - ASSERT_NO_THROW(startPulseDesktop()); - - // initialize volumes in pulseaudio - // expect false for stream restore, because the module - // is not loaded in the desktop pulseaudio instance - EXPECT_FALSE(setStreamRestoreVolume("mutimedia", INITIAL_VOLUME)); - EXPECT_FALSE(setStreamRestoreVolume("alert", INITIAL_VOLUME)); - - EXPECT_TRUE(setSinkVolume(INITIAL_VOLUME)); - - // start now the indicator, so it picks the new volumes - ASSERT_NO_THROW(startIndicator()); - - // Generate a random volume - QTime now = QTime::currentTime(); - qsrand(now.msec()); - int randInt = qrand() % 100; - double randomVolume = randInt / 100.0; - - // play a test sound, it should NOT change the role in the indicator - EXPECT_TRUE(startTestSound("multimedia")); - EXPECT_FALSE(waitVolumeChangedInIndicator()); - - // set the random volume - EXPECT_TRUE(setSinkVolume(randomVolume)); - if (randomVolume != INITIAL_VOLUME) - { - EXPECT_TRUE(waitVolumeChangedInIndicator()); - } - - // check the indicator - EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .mode(mh::MenuItemMatcher::Mode::starts_with) - .submenu() - .item(mh::MenuItemMatcher() - .section() - .item(mh::MenuItemMatcher().checkbox() - .label("Mute") - ) - .item(volumeSlider(randomVolume, "Volume")) - ) - ).match()); - - // check that the last item is Sound Settings - EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .mode(mh::MenuItemMatcher::Mode::ends_with) - .submenu() - .item(mh::MenuItemMatcher() - .label("Sound Settings…") - ) - ).match()); - - // stop the test sound, the role should change again to alert - stopTestSound(); - - // although we were playing something in the multimedia role - // the server does not have the streamrestore module, so - // the volume does not change (the role does not change) - EXPECT_FALSE(waitVolumeChangedInIndicator()); - - // check the initial volume for the alert role - EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .string_attribute("submenu-action", "indicator.indicator-shown") - .mode(mh::MenuItemMatcher::Mode::starts_with) - .submenu() - .item(mh::MenuItemMatcher() - .section() - .item(silentModeSwitch(false)) - .item(volumeSlider(randomVolume, "Volume")) - ) - ).match()); - - // check that the last item is Sound Settings - EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .mode(mh::MenuItemMatcher::Mode::ends_with) - .submenu() - .item(mh::MenuItemMatcher() - .label("Sound Settings…") - .action("indicator.phone-settings") - ) - ).match()); -} - -TEST_F(TestIndicator, PhoneNotificationVolume) -{ - double INITIAL_VOLUME = 0.0; - - QSignalSpy notificationsSpy(¬ificationsMockInterface(), - SIGNAL(MethodCalled(const QString &, const QVariantList &))); - - ASSERT_NO_THROW(startAccountsService()); - EXPECT_TRUE(clearGSettingsPlayers()); - ASSERT_NO_THROW(startPulsePhone()); - - // initialize volumes in pulseaudio - EXPECT_TRUE(setStreamRestoreVolume("alert", INITIAL_VOLUME)); - - // start now the indicator, so it picks the new volumes - ASSERT_NO_THROW(startIndicator()); - - // check the initial state - EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .string_attribute("submenu-action", "indicator.indicator-shown") - .mode(mh::MenuItemMatcher::Mode::all) - .submenu() - .item(mh::MenuItemMatcher() - .section() - .item(silentModeSwitch(false)) - .item(volumeSlider(INITIAL_VOLUME, "Volume")) - ) - .item(mh::MenuItemMatcher() - .label("Sound Settings…") - .action("indicator.phone-settings") - ) - ).match()); - - // change volume to 1.0 - setActionValue("volume", QVariant::fromValue(1.0)); - - WAIT_FOR_SIGNALS(notificationsSpy, 3); - - // the first time we also have the calls to - // GetServerInformation and GetCapabilities - checkNotificationWithNoArgs("GetServerInformation", notificationsSpy.at(0)); - checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(1)); - checkVolumeNotification(1.0, "Speakers", false, notificationsSpy.at(2)); - - notificationsSpy.clear(); - setActionValue("volume", QVariant::fromValue(0.0)); - - WAIT_FOR_SIGNALS(notificationsSpy, 2) - - checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0)); - checkVolumeNotification(0.0, "Speakers", false, notificationsSpy.at(1)); - - notificationsSpy.clear(); - setActionValue("volume", QVariant::fromValue(0.5)); - - WAIT_FOR_SIGNALS(notificationsSpy, 2) - - checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0)); - checkVolumeNotification(0.5, "Speakers", false, notificationsSpy.at(1)); -} - -TEST_F(TestIndicator, PhoneNotificationWarningVolume) -{ - double INITIAL_VOLUME = 0.0; - - QSignalSpy notificationsSpy(¬ificationsMockInterface(), - SIGNAL(MethodCalled(const QString &, const QVariantList &))); - - ASSERT_NO_THROW(startAccountsService()); - ASSERT_NO_THROW(startPulsePhone()); - - // initialize volumes in pulseaudio - EXPECT_TRUE(setStreamRestoreVolume("alert", INITIAL_VOLUME)); - EXPECT_TRUE(setStreamRestoreVolume("multimedia", INITIAL_VOLUME)); - - // start now the indicator, so it picks the new volumes - ASSERT_NO_THROW(startIndicator()); - - // activate the headphones - EXPECT_TRUE(activateHeadphones(true)); - - // set an initial volume to the alert role - setStreamRestoreVolume("alert", 1.0); - EXPECT_TRUE(waitVolumeChangedInIndicator()); - - // play a test sound, it should change the role in the indicator - EXPECT_TRUE(startTestSound("multimedia")); - EXPECT_TRUE(waitVolumeChangedInIndicator()); - - WAIT_FOR_SIGNALS(notificationsSpy, 3); - // the first time we also have the calls to - // GetServerInformation and GetCapabilities - checkNotificationWithNoArgs("GetServerInformation", notificationsSpy.at(0)); - checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(1)); - checkVolumeNotification(0.0, "Headphones", false, notificationsSpy.at(2)); - notificationsSpy.clear(); - - // change volume to 0.3... no warning should be emitted - setActionValue("volume", QVariant::fromValue(0.3)); - EXPECT_TRUE(waitVolumeChangedInIndicator()); - - WAIT_FOR_SIGNALS(notificationsSpy, 2); - - checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0)); - checkVolumeNotification(0.3, "Headphones", false, notificationsSpy.at(1)); - notificationsSpy.clear(); - - // change volume to 0.5... no warning should be emitted - setActionValue("volume", QVariant::fromValue(0.5)); - EXPECT_TRUE(waitVolumeChangedInIndicator()); - - WAIT_FOR_SIGNALS(notificationsSpy, 2); - - checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0)); - checkVolumeNotification(0.5, "Headphones", false, notificationsSpy.at(1)); - notificationsSpy.clear(); - - // change volume to 1.0... warning should be emitted - setActionValue("volume", QVariant::fromValue(1.0)); - EXPECT_TRUE(waitVolumeChangedInIndicator()); - - WAIT_FOR_SIGNALS(notificationsSpy, 8); - - // the notification is sent twice (TODO check why) - checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0)); - checkCloseNotification(1, notificationsSpy.at(1)); - checkHighVolumeNotification(notificationsSpy.at(2)); - checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(3)); - checkCloseNotification(1, notificationsSpy.at(4)); - checkHighVolumeNotification(notificationsSpy.at(5)); - - // get the last notification ID - int idNotification = getNotificationID(notificationsSpy.at(5)); - ASSERT_NE(-1, idNotification); - - qWarning() << "XGM: id Notification: " << idNotification; - - // cancel the dialog - pressNotificationButton(idNotification, "cancel"); - - // check that the volume was clamped - EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .string_attribute("submenu-action", "indicator.indicator-shown") - .mode(mh::MenuItemMatcher::Mode::starts_with) - .submenu() - .item(mh::MenuItemMatcher() - .section() - .item(silentModeSwitch(false)) - .item(volumeSlider(0.74, "Volume (Headphones)")) - ) - ).match()); - - // try again... - notificationsSpy.clear(); - - qWarning() << "-----------------------------------------------------------"; - // change volume to 1.0... warning should be emitted - setActionValue("volume", QVariant::fromValue(1.0)); - EXPECT_TRUE(waitVolumeChangedInIndicator()); - - WAIT_FOR_SIGNALS(notificationsSpy, 6); - - checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0)); - checkHighVolumeNotification(notificationsSpy.at(1)); - checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(2)); - checkHighVolumeNotification(notificationsSpy.at(3)); - - // get the last notification ID - idNotification = getNotificationID(notificationsSpy.at(1)); - ASSERT_NE(-1, idNotification); - - // this time we approve - pressNotificationButton(idNotification, "ok"); - - // check that the volume was applied - EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .string_attribute("submenu-action", "indicator.indicator-shown") - .mode(mh::MenuItemMatcher::Mode::starts_with) - .submenu() - .item(mh::MenuItemMatcher() - .section() - .item(silentModeSwitch(false)) - .item(volumeSlider(1.0, "Volume (Headphones)")) - .item(mh::MenuItemMatcher() - .action("indicator.high-volume-warning-item") - .label("High volume can damage your hearing.") - ) - ) - ).match()); - - // after the warning was approved we should be able to modify the volume - // and don't get the warning - notificationsSpy.clear(); - - // change volume to 0.5... no warning should be emitted - setActionValue("volume", QVariant::fromValue(0.5)); - EXPECT_TRUE(waitVolumeChangedInIndicator()); - - WAIT_FOR_SIGNALS(notificationsSpy, 6); - - // check the notification TODO check why the sound indicator sends it twice - checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0)); - checkCloseNotification(idNotification, notificationsSpy.at(1)); - checkVolumeNotification(0.5, "Headphones", false, notificationsSpy.at(2)); - checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(3)); - checkCloseNotification(idNotification, notificationsSpy.at(4)); - checkVolumeNotification(0.5, "Headphones", false, notificationsSpy.at(5)); - - // check that the volume was applied - // and that we don't have the warning item - EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters()) - .item(mh::MenuItemMatcher() - .action("indicator.root") - .string_attribute("x-canonical-type", "com.canonical.indicator.root") - .string_attribute("x-canonical-scroll-action", "indicator.scroll") - .string_attribute("x-canonical-secondary-action", "indicator.mute") - .string_attribute("submenu-action", "indicator.indicator-shown") - .mode(mh::MenuItemMatcher::Mode::starts_with) - .submenu() - .item(mh::MenuItemMatcher() - .section() - .item(silentModeSwitch(false)) - .item(volumeSlider(0.5, "Volume (Headphones)")) - ) - ).match()); - - // now set high volume again, we should not get the warning dialog - // as we already approved it - notificationsSpy.clear(); - - setActionValue("volume", QVariant::fromValue(1.0)); - EXPECT_TRUE(waitVolumeChangedInIndicator()); - - WAIT_FOR_SIGNALS(notificationsSpy, 4); - - // check the notification TODO check why the sound indicator sends it twice - checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0)); - checkVolumeNotification(1.0, "Headphones", true, notificationsSpy.at(1)); - checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(2)); - checkVolumeNotification(1.0, "Headphones", true, notificationsSpy.at(3)); -} - - -TEST_F(TestIndicator, PhoneNotificationWarningVolumeAlertMode) -{ - double INITIAL_VOLUME = 0.0; - - QSignalSpy notificationsSpy(¬ificationsMockInterface(), - SIGNAL(MethodCalled(const QString &, const QVariantList &))); - - ASSERT_NO_THROW(startAccountsService()); - ASSERT_NO_THROW(startPulsePhone()); - - // initialize volumes in pulseaudio - EXPECT_TRUE(setStreamRestoreVolume("alert", INITIAL_VOLUME)); - EXPECT_TRUE(setStreamRestoreVolume("multimedia", INITIAL_VOLUME)); - - // start now the indicator, so it picks the new volumes - ASSERT_NO_THROW(startIndicator()); - - // activate the headphones - EXPECT_TRUE(activateHeadphones(true)); - - // set an initial volume to the alert role - setStreamRestoreVolume("alert", 1.0); - EXPECT_TRUE(waitVolumeChangedInIndicator()); - - // change volume to 0.0... no warning should be emitted - setActionValue("volume", QVariant::fromValue(0.0)); - - WAIT_FOR_SIGNALS(notificationsSpy, 5); - - // the first time we also have the calls to - // GetServerInformation and GetCapabilities - checkNotificationWithNoArgs("GetServerInformation", notificationsSpy.at(0)); - checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(1)); - checkVolumeNotification(0.0, "Headphones", false, notificationsSpy.at(2)); - checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(3)); - checkVolumeNotification(0.0, "Headphones", false, notificationsSpy.at(4)); - notificationsSpy.clear(); - - // change volume to 0.5... no warning should be emitted - setActionValue("volume", QVariant::fromValue(0.5)); - - WAIT_FOR_SIGNALS(notificationsSpy, 2); - - checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0)); - checkVolumeNotification(0.5, "Headphones", false, notificationsSpy.at(1)); - notificationsSpy.clear(); - - // change volume to 1.0... no warning should be emitted, we are in alert mode - setActionValue("volume", QVariant::fromValue(1.0)); - - WAIT_FOR_SIGNALS(notificationsSpy, 2); - - checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0)); - checkVolumeNotification(1.0, "Headphones", false, notificationsSpy.at(1)); - notificationsSpy.clear(); -} - -TEST_F(TestIndicator, PhoneNotificationHeadphoneSpeakerWiredLabels) -{ - checkPortDevicesLabels(WIRED, WIRED); -} - -TEST_F(TestIndicator, PhoneNotificationHeadphoneSpeakerBluetoothLabels) -{ - checkPortDevicesLabels(BLUETOOTH, BLUETOOTH); -} - -TEST_F(TestIndicator, PhoneNotificationHeadphoneSpeakerUSBLabels) -{ - checkPortDevicesLabels(USB, USB); -} - -TEST_F(TestIndicator, PhoneNotificationHeadphoneSpeakerHDMILabels) -{ - checkPortDevicesLabels(HDMI, HDMI); -} - -} // namespace diff --git a/tests/integration/test-sound.wav b/tests/integration/test-sound.wav deleted file mode 100644 index f696657..0000000 Binary files a/tests/integration/test-sound.wav and /dev/null differ diff --git a/tests/integration/touch-stream-restore.table b/tests/integration/touch-stream-restore.table deleted file mode 100755 index 146b02e..0000000 --- a/tests/integration/touch-stream-restore.table +++ /dev/null @@ -1,4 +0,0 @@ -sink-input-by-media-role:multimedia -8 -sink-input-by-media-role:alert -8 -sink-input-by-media-role:alarm -8 -sink-input-by-media-role:phone -15 diff --git a/tests/integration/utils/dbus-pulse-volume.cpp b/tests/integration/utils/dbus-pulse-volume.cpp deleted file mode 100644 index c8b6ae6..0000000 --- a/tests/integration/utils/dbus-pulse-volume.cpp +++ /dev/null @@ -1,232 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ - -#include "dbus-pulse-volume.h" - -#include "dbus_properties_interface.h" -#include "dbus_accounts_interface.h" -#include "dbus_accountssound_interface.h" -#include "stream_restore_interface.h" - -#include - -#include - -unsigned int volumeDoubleToUint(double volume) -{ - double tmp = (double)(PA_VOLUME_NORM - PA_VOLUME_MUTED) * volume; - return (unsigned int)tmp + PA_VOLUME_MUTED; -} - -double volumeUIntToDoulbe(uint volume) -{ - double tmp = (double)(volume - PA_VOLUME_MUTED); - return tmp / (double)(PA_VOLUME_NORM - PA_VOLUME_MUTED); -} - -DBusPulseVolume::DBusPulseVolume() : - QObject() -{ - std::unique_ptr basicConnectionInterface(new DBusPropertiesInterface("org.PulseAudio1", - "/org/pulseaudio/server_lookup1", - QDBusConnection::sessionBus(), 0)); - - QDBusReply connection_string = basicConnectionInterface->call(QLatin1String("Get"), - QLatin1String("org.PulseAudio.ServerLookup1"), - QLatin1String("Address")); - - if (!connection_string.isValid()) - { - qWarning() << "DBusPulseVolume::DBusPulseVolume(): D-Bus error: " << connection_string.error().message(); - } - - connection_.reset(new QDBusConnection(QDBusConnection::connectToPeer(connection_string.value().toString(), "set-volume"))); - - if (connection_->isConnected()) - { - interface_paths_.reset(new StreamRestoreInterface("org.PulseAudio.Ext.StreamRestore1", - "/org/pulseaudio/stream_restore1", - *(connection_.get()), 0)); - if (interface_paths_) - { - // get the role paths - fillRolePath("multimedia"); - fillRolePath("alert"); - fillRolePath("alarm"); - fillRolePath("phone"); - } - - initializeAccountsInterface(); - } - else - { - qWarning() << "DBusPulseVolume::DBusPulseVolume(): Error connecting: " << connection_->lastError().message(); - } -} - -DBusPulseVolume::~DBusPulseVolume() -{ -} - -QString DBusPulseVolume::fillRolePath(QString const &role) -{ - QString role_complete_name = QString("sink-input-by-media-role:") + role; - // get the role paths - QDBusReply objectPath = interface_paths_->call(QLatin1String("GetEntryByName"), role_complete_name); - if (!objectPath.isValid()) - { - qWarning() << "SetVolume::fillRolePath(): D-Bus error: " << objectPath.error().message(); - return ""; - } - - auto role_info = std::make_shared(); - role_info->interface_.reset(new DBusPropertiesInterface("org.PulseAudio.Ext.StreamRestore1.RestoreEntry", - objectPath.value().path(), - *(connection_.get()), 0)); - if (!role_info->interface_) - { - qWarning() << "SetVolume::fillRolePath() - Error obtaining properties interface"; - return ""; - } - role_info->path_ = objectPath.value().path(); - roles_map_[role] = role_info; - return role_info->path_; -} - -bool DBusPulseVolume::setVolume(QString const & role, double volume) -{ - if (!interface_paths_) - { - qWarning() << "SetVolume::setVolume(): error: Volume interfaces are not initialized"; - return false; - } - - RolesMap::const_iterator iter = roles_map_.find(role); - if (iter != roles_map_.end()) - { - QVariant var; - PulseaudioVolumeArray t; - PulseaudioVolume vv(0, volumeDoubleToUint(volume)); - t.addItem(vv); - var.setValue(t); - QDBusVariant dbusVar(var); - QDBusReply set_vol = (*iter).second->interface_->call(QLatin1String("Set"), - QVariant::fromValue(QString("org.PulseAudio.Ext.StreamRestore1.RestoreEntry")), - QVariant::fromValue(QString("Volume")), - QVariant::fromValue(dbusVar)); - - if (!set_vol.isValid()) - { - qWarning() << "SetVolume::setVolume(): D-Bus error: " << set_vol.error().message(); - return false; - } - - if (accounts_interface_) - { - QDBusVariant dbusVar(QVariant::fromValue(volume)); - QDBusReply set_vol = accounts_interface_->call(QLatin1String("Set"), - QVariant::fromValue(QString("com.ubuntu.AccountsService.Sound")), - QVariant::fromValue(QString("Volume")), - QVariant::fromValue(dbusVar)); - if (!set_vol.isValid()) - { - qWarning() << "SetVolume::setVolume(): D-Bus error: " << set_vol.error().message(); - return false; - } - } - } - else - { - qWarning() << "SetVolume::setVolume(): role " << role << " was not found."; - return false; - } - return true; -} - -double DBusPulseVolume::getVolume(QString const & role) -{ - if (interface_paths_) - { - RolesMap::const_iterator iter = roles_map_.find(role); - if (iter != roles_map_.end()) - { - QDBusReply prev_vol = (*iter).second->interface_->call(QLatin1String("Get"), - QLatin1String("org.PulseAudio.Ext.StreamRestore1.RestoreEntry"), - QLatin1String("Volume")); - - if (!prev_vol.isValid()) - { - qWarning() << "SetVolume::setVolume(): D-Bus error: " << prev_vol.error().message(); - } - QDBusArgument arg = prev_vol.value().value(); - PulseaudioVolumeArray element; - arg >> element; - return volumeUIntToDoulbe(element.getItem(0).getVolume()); - } - } - return -1.0; -} - -void DBusPulseVolume::initializeAccountsInterface() -{ - auto username = qgetenv("USER"); - if (username != "") - { - qDebug() << "Setting Accounts interface for user: " << username; - std::unique_ptr setInterface(new AccountsInterface("org.freedesktop.Accounts", - "/org/freedesktop/Accounts", - QDBusConnection::systemBus(), 0)); - - QDBusReply userResp = setInterface->call(QLatin1String("FindUserByName"), - QLatin1String(username)); - - if (!userResp.isValid()) - { - qWarning() << "SetVolume::initializeAccountsInterface(): D-Bus error: " << userResp.error().message(); - } - auto userPath = userResp.value().path(); - if (userPath != "") - { - std::unique_ptr soundInterface(new AccountsSoundInterface("org.freedesktop.Accounts", - userPath, - QDBusConnection::systemBus(), 0)); - - accounts_interface_.reset(new DBusPropertiesInterface("org.freedesktop.Accounts", - userPath, - soundInterface->connection(), 0)); - if (!accounts_interface_->isValid()) - { - qWarning() << "SetVolume::initializeAccountsInterface(): D-Bus error: " << accounts_interface_->lastError().message(); - } - signal_spy_volume_changed_.reset(new QSignalSpy(accounts_interface_.get(),&DBusPropertiesInterface::PropertiesChanged)); - } - } -} - -bool DBusPulseVolume::waitForVolumeChangedInAccountsService() -{ - if (signal_spy_volume_changed_) - { - return signal_spy_volume_changed_->wait(); - } - else - { - qWarning() << "DBusPulseVolume::waitForVolumeChangedInAccountsService(): signal was not instantiated"; - } - return false; -} diff --git a/tests/integration/utils/dbus-pulse-volume.h b/tests/integration/utils/dbus-pulse-volume.h deleted file mode 100644 index 2d55e89..0000000 --- a/tests/integration/utils/dbus-pulse-volume.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ -#pragma once - -#include -#include - -#include -#include - -class StreamRestoreInterface; -class DBusPropertiesInterface; -class AccountsInterface; -class AccountsSoundInterface; -class QSignalSpy; - -struct RoleInformation -{ - std::unique_ptr interface_; - QString path_; -}; - -class DBusPulseVolume : public QObject -{ -public: - DBusPulseVolume(); - ~DBusPulseVolume(); - - bool setVolume(QString const & role, double volume); - double getVolume(QString const & role); - bool waitForVolumeChangedInAccountsService(); - -protected: - QString fillRolePath(QString const &role); - void initializeAccountsInterface(); - std::unique_ptr connection_; - std::unique_ptr interface_paths_; - typedef std::map> RolesMap; - RolesMap roles_map_; - std::unique_ptr accounts_interface_; - std::unique_ptr signal_spy_volume_changed_; -}; diff --git a/tests/integration/utils/get-volume.cpp b/tests/integration/utils/get-volume.cpp deleted file mode 100644 index 309da36..0000000 --- a/tests/integration/utils/get-volume.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ - -#include "dbus-types.h" - -#include -#include "dbus-pulse-volume.h" - -int main(int argc, char **argv) -{ - DBusTypes::registerMetaTypes(); - if (argc == 2) - { - DBusPulseVolume volume; - volume.getVolume(argv[1]); - } - return 0; -} diff --git a/tests/integration/utils/set-volume.cpp b/tests/integration/utils/set-volume.cpp deleted file mode 100644 index d29e5ef..0000000 --- a/tests/integration/utils/set-volume.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ - -#include "dbus-types.h" - -#include -#include "dbus-pulse-volume.h" - -int main(int argc, char **argv) -{ - DBusTypes::registerMetaTypes(); - if (argc == 3) - { - DBusPulseVolume volume; - if(!volume.setVolume(argv[1], std::stod(argv[2]))) - { - return 1; - } - } - return 0; -} diff --git a/tests/notifications-test.cc b/tests/notifications-test.cc index c5d9770..8d5617d 100644 --- a/tests/notifications-test.cc +++ b/tests/notifications-test.cc @@ -345,7 +345,7 @@ TEST_F(NotificationsTest, HighVolume) { auto notev = notifications->getNotifications(); ASSERT_EQ(1, notev.size()); EXPECT_EQ("Volume", notev[0].summary); - EXPECT_EQ("Speakers", notev[0].body); + EXPECT_EQ("", notev[0].body); EXPECT_GVARIANT_EQ("@s 'false'", notev[0].hints["x-canonical-value-bar-tint"]); /* Set high volume with volume change */ @@ -356,7 +356,7 @@ TEST_F(NotificationsTest, HighVolume) { notev = notifications->getNotifications(); ASSERT_LT(0, notev.size()); /* This passes with one or two since it would just be an update to the first if a second was sent */ EXPECT_EQ("Volume", notev[0].summary); - EXPECT_EQ("Speakers", notev[0].body); + EXPECT_EQ("High volume can damage your hearing.", notev[0].body); EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-value-bar-tint"]); /* Move it back */ @@ -372,7 +372,7 @@ TEST_F(NotificationsTest, HighVolume) { notev = notifications->getNotifications(); ASSERT_EQ(1, notev.size()); EXPECT_EQ("Volume", notev[0].summary); - EXPECT_EQ("Speakers", notev[0].body); + EXPECT_EQ("High volume can damage your hearing.", notev[0].body); EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-value-bar-tint"]); } diff --git a/tests/service-mocks/CMakeLists.txt b/tests/service-mocks/CMakeLists.txt deleted file mode 100644 index 9cd8acb..0000000 --- a/tests/service-mocks/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(accounts-mock) -add_subdirectory(media-player-mpris-mock) diff --git a/tests/service-mocks/DBusPropertiesNotifier.cpp b/tests/service-mocks/DBusPropertiesNotifier.cpp deleted file mode 100644 index 686e4e9..0000000 --- a/tests/service-mocks/DBusPropertiesNotifier.cpp +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ - -#include "DBusPropertiesNotifier.h" - -#include - -using namespace ubuntu::indicators::testing; - -void DBusPropertiesNotifier::notifyPropertyChanged(QDBusConnection const & connection, - QString const & interface, - QString const & path, - QString const & propertyName, - QVariant const & propertyValue) -{ - QDBusMessage signal = QDBusMessage::createSignal( - path, - "org.freedesktop.DBus.Properties", - "PropertiesChanged"); - signal << interface; - QVariantMap changedProps; - changedProps.insert(propertyName, propertyValue); - signal << changedProps; - signal << QStringList(); - connection.send(signal); -} diff --git a/tests/service-mocks/DBusPropertiesNotifier.h b/tests/service-mocks/DBusPropertiesNotifier.h deleted file mode 100644 index 9fa013b..0000000 --- a/tests/service-mocks/DBusPropertiesNotifier.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ -#pragma once - -#include - -namespace ubuntu -{ - -namespace indicators -{ - -namespace testing -{ - -class DBusPropertiesNotifier -{ -public: - DBusPropertiesNotifier() = default; - ~DBusPropertiesNotifier() = default; - - void notifyPropertyChanged(QDBusConnection const & connection, - QString const & interface, - QString const & path, - QString const & propertyName, - QVariant const & propertyValue); -}; - -} // namespace testing - -} // namespace indicators - -} // namespace ubuntu diff --git a/tests/service-mocks/accounts-mock/AccountsDefs.h b/tests/service-mocks/accounts-mock/AccountsDefs.h deleted file mode 100644 index 0e4f270..0000000 --- a/tests/service-mocks/accounts-mock/AccountsDefs.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ -#pragma once - -namespace ubuntu -{ - -namespace indicators -{ - -namespace testing -{ - constexpr const char ACCOUNTS_SERVICE[] = "org.freedesktop.Accounts"; - constexpr const char USER_PATH[] = "/org/freedesktop/Accounts/UserTest"; - constexpr const char ACCOUNTS_PATH[] = "/org/freedesktop/Accounts"; - constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.ubuntu.AccountsService.Sound"; -} // namespace testing - -} // namespace indicators - -} // namespace ubuntu - diff --git a/tests/service-mocks/accounts-mock/AccountsMock.cpp b/tests/service-mocks/accounts-mock/AccountsMock.cpp deleted file mode 100644 index 5c92dc5..0000000 --- a/tests/service-mocks/accounts-mock/AccountsMock.cpp +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ -#include - -#include "AccountsMock.h" -#include "AccountsDefs.h" - -using namespace ubuntu::indicators::testing; - -AccountsMock::AccountsMock(QObject* parent) - : QObject(parent) -{ -} - -AccountsMock::~AccountsMock() = default; - -QDBusObjectPath AccountsMock::FindUserByName(QString const & username) const -{ - return QDBusObjectPath(USER_PATH); -} - -QDBusObjectPath AccountsMock::FindUserById(int64_t uid) const -{ - return QDBusObjectPath(USER_PATH); -} diff --git a/tests/service-mocks/accounts-mock/AccountsMock.h b/tests/service-mocks/accounts-mock/AccountsMock.h deleted file mode 100644 index 72372e0..0000000 --- a/tests/service-mocks/accounts-mock/AccountsMock.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ -#pragma once - -#include -#include -#include - -namespace ubuntu -{ - -namespace indicators -{ - -namespace testing -{ - -class AccountsMock : public QObject, protected QDBusContext -{ - Q_OBJECT - -public Q_SLOTS: - QDBusObjectPath FindUserByName(QString const & username) const; - QDBusObjectPath FindUserById(int64_t uid) const; - -public: - AccountsMock(QObject* parent = 0); - virtual ~AccountsMock(); -}; - -} // namespace testing - -} // namespace indicators - -} // namespace ubuntu diff --git a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp b/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp deleted file mode 100644 index 37de377..0000000 --- a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ -#include -#include -#include - -#include "AccountsServiceSoundMock.h" -#include "AccountsDefs.h" - -using namespace ubuntu::indicators::testing; - -AccountsServiceSoundMock::AccountsServiceSoundMock(QObject* parent) - : QObject(parent) - , volume_(0.0) -{ -} - -AccountsServiceSoundMock::~AccountsServiceSoundMock() = default; - -double AccountsServiceSoundMock::volume() const -{ - return volume_; -} - -void AccountsServiceSoundMock::setVolume(double volume) -{ - volume_ = volume; - notifier_.notifyPropertyChanged(QDBusConnection::systemBus(), - ACCOUNTS_SOUND_INTERFACE, - USER_PATH, - "Volume", - property("Volume")); -} diff --git a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h b/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h deleted file mode 100644 index bb3dbe8..0000000 --- a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ -#pragma once - -#include -#include - -#include "DBusPropertiesNotifier.h" - -namespace ubuntu -{ - -namespace indicators -{ - -namespace testing -{ - -class DBusPropertiesNotifier; - -class AccountsServiceSoundMock : public QObject, protected QDBusContext -{ - Q_OBJECT - Q_PROPERTY(double Volume READ volume WRITE setVolume) - -public Q_SLOTS: - double volume() const; - void setVolume(double volume); - -public: - AccountsServiceSoundMock(QObject* parent = 0); - virtual ~AccountsServiceSoundMock(); - -private: - double volume_; - DBusPropertiesNotifier notifier_; -}; - -} // namespace testing - -} // namespace indicators - -} // namespace ubuntu diff --git a/tests/service-mocks/accounts-mock/CMakeLists.txt b/tests/service-mocks/accounts-mock/CMakeLists.txt deleted file mode 100644 index ad858bd..0000000 --- a/tests/service-mocks/accounts-mock/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -find_package(Qt5DBus REQUIRED) -include_directories(${Qt5DBus_INCLUDE_DIRS} - "${CMAKE_SOURCE_DIR}/tests/service-mocks") - -add_definitions(-DQT_NO_KEYWORDS=1) - -set(dbusinterface_sound_xml "com.ubuntu.AccountsService.Sound.Mock.xml") -set_source_files_properties(${dbusinterface_sound_xml} PROPERTIES - CLASSNAME AccountsServiceSoundMockInterface) - -qt5_add_dbus_interface(interface_files ${dbusinterface_sound_xml} accountsservice_sound_interface) - -qt5_add_dbus_adaptor(adaptor_files - com.ubuntu.AccountsService.Sound.Mock.xml - AccountsServiceSoundMock.h - ubuntu::indicators::testing::AccountsServiceSoundMock - AccountsServiceSoundMockAdaptor) - -qt5_add_dbus_adaptor(adaptor_files - ${CMAKE_SOURCE_DIR}/tests/dbus-types/org.freedesktop.Accounts.xml - AccountsMock.h - ubuntu::indicators::testing::AccountsMock - AccountsMockAdaptor) - -add_executable( - accounts-service-sound - ${interface_files} - ${adaptor_files} - AccountsServiceSoundMock.cpp - AccountsMock.cpp - ${CMAKE_SOURCE_DIR}/tests/service-mocks/DBusPropertiesNotifier.cpp - main.cpp -) - -qt5_use_modules( - accounts-service-sound - Core - DBus -) diff --git a/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml b/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml deleted file mode 100644 index 859cd46..0000000 --- a/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tests/service-mocks/accounts-mock/main.cpp b/tests/service-mocks/accounts-mock/main.cpp deleted file mode 100644 index d6cd1d3..0000000 --- a/tests/service-mocks/accounts-mock/main.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ -#include -#include - -#include - -#include "AccountsDefs.h" -#include "AccountsServiceSoundMock.h" -#include "AccountsServiceSoundMockAdaptor.h" -#include "AccountsMock.h" -#include "AccountsMockAdaptor.h" - -using namespace ubuntu::indicators::testing; - -int main(int argc, char *argv[]) -{ - QCoreApplication app(argc, argv); - QDBusConnection connection = QDBusConnection::systemBus(); - if (!connection.interface()->isServiceRegistered(ACCOUNTS_SERVICE)) - { - auto service = new AccountsServiceSoundMock(&app); - new SoundAdaptor(service); - - auto accounts_service = new AccountsMock(&app); - new AccountsAdaptor(accounts_service); - - if (!connection.registerService(ACCOUNTS_SERVICE)) - { - qFatal("Could not register AccountsService Volume service."); - } - - if (!connection.registerObject(USER_PATH, service)) - { - qFatal("Could not register AccountsService Volume object."); - } - - if (!connection.registerObject(ACCOUNTS_PATH, accounts_service)) - { - qFatal("Could not register Accounts object."); - } - } - else - { - qDebug() << "Service is already registered!."; - } - return app.exec(); -} diff --git a/tests/service-mocks/accounts-mock/org.freedesktop.Accounts.Mock.xml b/tests/service-mocks/accounts-mock/org.freedesktop.Accounts.Mock.xml deleted file mode 100644 index f977e7c..0000000 --- a/tests/service-mocks/accounts-mock/org.freedesktop.Accounts.Mock.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt b/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt deleted file mode 100644 index b5f5861..0000000 --- a/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt +++ /dev/null @@ -1,63 +0,0 @@ -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -fPIC -pthread") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -fno-strict-aliasing -Wextra -fPIC -pthread") - -find_package(Qt5DBus REQUIRED) -include_directories(${Qt5DBus_INCLUDE_DIRS} - "${CMAKE_SOURCE_DIR}/tests/service-mocks") - -add_definitions(-DQT_NO_KEYWORDS=1) - -set(dbusinterface_mediaplayermpris_xml "org.mpris.MediaPlayer2.Player.xml") -set_source_files_properties(${dbusinterface_mediaplayermpris_xml} PROPERTIES - CLASSNAME MediaPlayerMprisMockInterface) - -qt5_add_dbus_interface(interface_files ${dbusinterface_mediaplayermpris_xml} MediaPlayerMprisMockInterface) - -qt5_add_dbus_adaptor(adaptor_files - org.mpris.MediaPlayer2.Player.xml - MediaPlayerMprisMock.h - ubuntu::indicators::testing::MediaPlayerMprisMock - MediaPlayerMprisMockAdaptor) - -qt5_add_dbus_adaptor(adaptor_files - org.mpris.MediaPlayer2.xml - MediaPlayerMprisMock.h - ubuntu::indicators::testing::MediaPlayerMprisMock - MediaPlayer2MockAdaptor) - -add_executable( - media-player-mpris-mock - ${adaptor_files} - MediaPlayerMprisMock.cpp - ${CMAKE_SOURCE_DIR}/tests/service-mocks/DBusPropertiesNotifier.cpp - main.cpp - testplayers -) - -add_executable( - media-player-mpris-mock-update - ${interface_files} - player-update.cpp - testplayers -) - -qt5_use_modules( - media-player-mpris-mock - Core - DBus -) - -qt5_use_modules( - media-player-mpris-mock-update - Core - DBus -) - -# test players desktop files -add_custom_command (OUTPUT testplayers - DEPENDS ${CMAKE_SOURCE_DIR}/tests/service-mocks/media-player-mpris-mock/applications - COMMAND mkdir -p ${XDG_DATA_DIRS} - COMMAND cp -r ${CMAKE_SOURCE_DIR}/tests/service-mocks/media-player-mpris-mock/applications ${XDG_DATA_DIRS}) diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h deleted file mode 100644 index 4d28b38..0000000 --- a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ -#pragma once - -namespace ubuntu -{ - -namespace indicators -{ - -namespace testing -{ - constexpr const char MEDIA_PLAYER_MPRIS_SERVICE[] = "org.freedesktop.Accounts"; - constexpr const char USER_PATH[] = "/org/freedesktop/Accounts/UserTest"; - constexpr const char ACCOUNTS_PATH[] = "/org/freedesktop/Accounts"; - constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.ubuntu.AccountsService.Sound"; -} // namespace testing - -} // namespace indicators - -} // namespace ubuntu - diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp deleted file mode 100644 index 25fe0b7..0000000 --- a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ -#include - -#include "MediaPlayerMprisMock.h" - -using namespace ubuntu::indicators::testing; - -MediaPlayerMprisMock::MediaPlayerMprisMock(QString const &playerName, QObject* parent) - : QObject(parent) - , can_play_(true) - , can_pause_(true) - , can_gonext_(true) - , can_goprevious_(true) - , player_name_(playerName) -{ -} - -MediaPlayerMprisMock::~MediaPlayerMprisMock() = default; - -bool MediaPlayerMprisMock::canPlay() const -{ - return can_play_; -} - -void MediaPlayerMprisMock::setCanPlay(bool canPlay) -{ - can_play_ = canPlay; - notifier_.notifyPropertyChanged(QDBusConnection::sessionBus(), - "org.mpris.MediaPlayer2.Player", - "/org/mpris/MediaPlayer2", - "CanPlay", - property("CanPlay")); -} - -bool MediaPlayerMprisMock::canPause() const -{ - return can_pause_; -} - -void MediaPlayerMprisMock::setCanPause(bool canPause) -{ - can_pause_ = canPause; - notifier_.notifyPropertyChanged(QDBusConnection::sessionBus(), - "org.mpris.MediaPlayer2.Player", - "/org/mpris/MediaPlayer2", - "CanPause", - property("CanPause")); -} - -bool MediaPlayerMprisMock::canGoNext() const -{ - return can_gonext_; -} - -void MediaPlayerMprisMock::setCanGoNext(bool canGoNext) -{ - can_gonext_ = canGoNext; - notifier_.notifyPropertyChanged(QDBusConnection::sessionBus(), - "org.mpris.MediaPlayer2.Player", - "/org/mpris/MediaPlayer2", - "CanGoNext", - property("CanGoNext")); -} - -bool MediaPlayerMprisMock::canGoPrevious() const -{ - return can_goprevious_; -} - -void MediaPlayerMprisMock::setCanGoPrevious(bool canGoPrevious) -{ - can_goprevious_ = canGoPrevious; - notifier_.notifyPropertyChanged(QDBusConnection::sessionBus(), - "org.mpris.MediaPlayer2.Player", - "/org/mpris/MediaPlayer2", - "CanGoPrevious", - property("CanGoPrevious")); -} - -QString MediaPlayerMprisMock::desktopEntry() const -{ - return player_name_; -} - -void MediaPlayerMprisMock::setDesktopEntry(QString const &) -{ -} diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h deleted file mode 100644 index 58dce8d..0000000 --- a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ -#pragma once - -#include -#include -#include - -#include "DBusPropertiesNotifier.h" - -namespace ubuntu -{ - -namespace indicators -{ - -namespace testing -{ - -class MediaPlayerMprisMock : public QObject, protected QDBusContext -{ - Q_OBJECT - Q_PROPERTY(bool CanPlay READ canPlay WRITE setCanPlay) - Q_PROPERTY(bool CanPause READ canPause WRITE setCanPause) - Q_PROPERTY(bool CanGoNext READ canGoNext WRITE setCanGoNext) - Q_PROPERTY(bool CanGoPrevious READ canGoPrevious WRITE setCanGoPrevious) - Q_PROPERTY(QString DesktopEntry READ desktopEntry WRITE setDesktopEntry) - -public Q_SLOTS: - bool canPlay() const; - void setCanPlay(bool canPlay); - - bool canPause() const; - void setCanPause(bool canPause); - - bool canGoNext() const; - void setCanGoNext(bool canGoNext); - - bool canGoPrevious() const; - void setCanGoPrevious(bool canGoPrevious); - - QString desktopEntry() const; - void setDesktopEntry(QString const &destopEntry); - -public: - MediaPlayerMprisMock(QString const &playerName, QObject* parent = 0); - virtual ~MediaPlayerMprisMock(); - -private: - bool can_play_; - bool can_pause_; - bool can_gonext_; - bool can_goprevious_; - DBusPropertiesNotifier notifier_; - QString player_name_; -}; - -} // namespace testing - -} // namespace indicators - -} // namespace ubuntu diff --git a/tests/service-mocks/media-player-mpris-mock/applications/testplayer1.desktop b/tests/service-mocks/media-player-mpris-mock/applications/testplayer1.desktop deleted file mode 100644 index 2ed5008..0000000 --- a/tests/service-mocks/media-player-mpris-mock/applications/testplayer1.desktop +++ /dev/null @@ -1,21 +0,0 @@ -[Desktop Entry] -Name=TestPlayer1 -GenericName=Test Player 1 -X-GNOME-FullName=Test Player 1 -Comment=Play and organize your music collection -Keywords=Audio;Song;MP3;CD;Podcast;MTP;iPod;Playlist;Last.fm;UPnP;DLNA;Radio; -Exec=echo %U -Terminal=false -Type=Application -Icon=testplayer -X-GNOME-DocPath=testplayer/testplayer.xml -Categories=GNOME;GTK;AudioVideo;Audio;Player; -MimeType=application/x-ogg;application/ogg;audio/x-vorbis+ogg;audio/x-scpls;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-mpegurl;audio/x-flac;audio/mp4;x-scheme-handler/itms;x-scheme-handler/itmss; -StartupNotify=true -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=testplayer -X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-OtherBinaries=rhythmbox-client;rhythmbox-metadata; -X-GNOME-Bugzilla-Version=3.1 -X-GNOME-UsesNotifications=true - diff --git a/tests/service-mocks/media-player-mpris-mock/main.cpp b/tests/service-mocks/media-player-mpris-mock/main.cpp deleted file mode 100644 index 8945673..0000000 --- a/tests/service-mocks/media-player-mpris-mock/main.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ -#include -#include - -#include - -#include "MediaPlayerMprisDefs.h" -#include "MediaPlayerMprisMock.h" -#include "MediaPlayerMprisMockAdaptor.h" -#include "MediaPlayer2MockAdaptor.h" - -using namespace ubuntu::indicators::testing; - -int main(int argc, char *argv[]) -{ - if (argc != 2) - { - qWarning() << "usage: " << argv[0] << "TEST_PLAYER_NAME"; - return 1; - } - QString playerName = QString(argv[1]); - - QCoreApplication app(argc, argv); - QString playerService = QString("org.mpris.MediaPlayer2.") + playerName; - QDBusConnection connection = QDBusConnection::sessionBus(); - if (!connection.interface()->isServiceRegistered(playerService)) - { - auto service = new MediaPlayerMprisMock(playerName, &app); - new PlayerAdaptor(service); - new MediaPlayer2Adaptor(service); - - if (!connection.registerService(playerService)) - { - qDebug() << connection.lastError(); - qFatal("Could not register MediaPlayerMprisMock service."); - } - - if (!connection.registerObject("/org/mpris/MediaPlayer2", service)) - { - qFatal("Could not register MediaPlayerMprisMock object."); - } - } - else - { - qDebug() << "Service is already registered!."; - } - return app.exec(); -} diff --git a/tests/service-mocks/media-player-mpris-mock/org.mpris.MediaPlayer2.Player.xml b/tests/service-mocks/media-player-mpris-mock/org.mpris.MediaPlayer2.Player.xml deleted file mode 100644 index 3efd002..0000000 --- a/tests/service-mocks/media-player-mpris-mock/org.mpris.MediaPlayer2.Player.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/service-mocks/media-player-mpris-mock/org.mpris.MediaPlayer2.xml b/tests/service-mocks/media-player-mpris-mock/org.mpris.MediaPlayer2.xml deleted file mode 100644 index 489c68a..0000000 --- a/tests/service-mocks/media-player-mpris-mock/org.mpris.MediaPlayer2.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/tests/service-mocks/media-player-mpris-mock/player-update.cpp b/tests/service-mocks/media-player-mpris-mock/player-update.cpp deleted file mode 100644 index 5768372..0000000 --- a/tests/service-mocks/media-player-mpris-mock/player-update.cpp +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (C) 2015 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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 . - * - * Author: Xavi Garcia - */ -#include "MediaPlayerMprisMockInterface.h" - -#include - -QMap getPropertiesMap() -{ - QMap retMap; - - retMap["CANPLAY"] = "setCanPlay"; - retMap["CANPAUSE"] = "setCanPause"; - retMap["CANGONEXT"] = "setCanGoNext"; - retMap["CANGOPREVIOUS"] = "setCanGoPrevious"; - - return retMap; -} - -bool getBoolValue(QString const & str) -{ - if (str == "TRUE") - { - return true; - } - return false; -} - -QTextStream& qStdErr() -{ - static QTextStream ts( stderr ); - return ts; -} - -int main(int argc, char **argv) -{ - QCoreApplication app(argc, argv); - - if (argc != 4) - { - qStdErr() << "usage: " << argv[0] << "TEST_PLAYER_NAME PropertyName true|false\n"; - return 1; - } - - QString state = QString(argv[3]).toUpper(); - QString property = QString(argv[2]).toUpper(); - QString playerName = QString(argv[1]); - - auto propertiesMap = getPropertiesMap(); - - std::shared_ptr iface( - new MediaPlayerMprisMockInterface("org.mpris.MediaPlayer2." + playerName, - "/org/mpris/MediaPlayer2", - QDBusConnection::sessionBus())); - if (!iface) - { - qWarning() << argv[0] << ": error creating interface"; - return 1; - } - - QMap::iterator iter = propertiesMap.find(property); - if (iter == propertiesMap.end()) - { - qWarning() << argv[0] << ": property " << property << " was not found."; - return 1; - } - - QDBusReply set_prop = iface->call(QLatin1String((*iter).toStdString().c_str()), - QVariant::fromValue(getBoolValue(state))); - - if (!set_prop.isValid()) - { - qWarning() << argv[0] << ": D-Bus error: " << set_prop.error().message(); - return 1; - } - - return 0; -} - -- cgit v1.2.3