aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/CMakeLists.txt2
-rw-r--r--tests/dbus-types/CMakeLists.txt14
-rw-r--r--tests/dbus-types/org.ayatana.AccountsService.Sound.xml9
-rw-r--r--tests/integration/CMakeLists.txt4
-rw-r--r--tests/integration/utils/dbus-pulse-volume.cpp9
-rw-r--r--tests/service-mocks/CMakeLists.txt4
-rw-r--r--tests/service-mocks/accounts-mock/AccountsDefs.h10
-rw-r--r--tests/service-mocks/accounts-mock/CMakeLists.txt8
-rw-r--r--tests/service-mocks/accounts-mock/org.ayatana.AccountsService.Sound.Mock.xml7
-rw-r--r--tests/service-mocks/media-player-mpris-mock/CMakeLists.txt4
-rw-r--r--tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h10
11 files changed, 26 insertions, 55 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 30b0e13..d0c0ac6 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -322,7 +322,7 @@ add_test(indicator-test
indicator-test
)
-if(LOMIRI_API_FOUND)
+if (LOMIRI_API_FOUND AND EXISTS "/usr/share/glib-2.0/schemas/com.lomiri.sound.gschema.xml")
add_subdirectory(integration)
endif()
add_subdirectory(dbus-types)
diff --git a/tests/dbus-types/CMakeLists.txt b/tests/dbus-types/CMakeLists.txt
index cbe382a..1b6faed 100644
--- a/tests/dbus-types/CMakeLists.txt
+++ b/tests/dbus-types/CMakeLists.txt
@@ -15,14 +15,10 @@ set_source_files_properties(${dbusinterface_accounts_xml} PROPERTIES
CLASSNAME AccountsInterface)
if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml")
- set(dbusinterface_accountssound_xml "com.lomiri.AccountsService.Sound.xml")
-else()
- set(dbusinterface_accountssound_xml "org.ayatana.AccountsService.Sound.xml")
+ set_source_files_properties("com.lomiri.AccountsService.Sound.xml" PROPERTIES
+ CLASSNAME AccountsSoundInterface)
endif()
-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
@@ -41,7 +37,11 @@ set_source_files_properties(${dbusinterface_notifications_xml} PROPERTIES
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)
+
+if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml")
+ qt5_add_dbus_interface("com.lomiri.AccountsService.Sound.xml" dbus_accountssound_interface)
+endif()
+
qt5_add_dbus_interface(interface_files ${dbusinterface_actions_xml} dbus_menus_interface)
qt5_add_dbus_interface(interface_files ${dbusinterface_notifications_xml} dbus_notifications_interface)
diff --git a/tests/dbus-types/org.ayatana.AccountsService.Sound.xml b/tests/dbus-types/org.ayatana.AccountsService.Sound.xml
deleted file mode 100644
index aa05cf3..0000000
--- a/tests/dbus-types/org.ayatana.AccountsService.Sound.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<node>
- <interface name="org.ayatana.AccountsService.Sound">
- <method name="Set">
- <arg direction="in" type="s" name="interface" />
- <arg direction="in" type="s" name="property" />
- <arg direction="out" type="o" name="path" />
- </method>
- </interface>
-</node>
diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt
index a21ce0e..164ab8b 100644
--- a/tests/integration/CMakeLists.txt
+++ b/tests/integration/CMakeLists.txt
@@ -38,10 +38,6 @@ add_definitions(-DSOUND_SERVICE_BIN="${CMAKE_BINARY_DIR}/src/ayatana-indicator-s
-DTEST_HOME="${TEST_HOME}"
)
-if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml")
- add_definitions(-DHAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS)
-endif()
-
set(GLIB_REQUIRED_VERSION 2.26)
pkg_check_modules(
diff --git a/tests/integration/utils/dbus-pulse-volume.cpp b/tests/integration/utils/dbus-pulse-volume.cpp
index 2338de1..fa3ca3e 100644
--- a/tests/integration/utils/dbus-pulse-volume.cpp
+++ b/tests/integration/utils/dbus-pulse-volume.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 Canonical, Ltd.
+ * Copyright (C) 2021 Robert Tari
*
* 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
@@ -13,7 +14,9 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*
- * Author: Xavi Garcia <xavi.garcia.mena@canonical.com>
+ * Authors:
+ * Xavi Garcia <xavi.garcia.mena@canonical.com>
+ * Robert Tari <robert@tari.in>
*/
#include "dbus-pulse-volume.h"
@@ -140,11 +143,7 @@ bool DBusPulseVolume::setVolume(QString const & role, double volume)
{
QDBusVariant dbusVar(QVariant::fromValue(volume));
QDBusReply<void> set_vol = accounts_interface_->call(QLatin1String("Set"),
-#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS
QVariant::fromValue(QString("com.lomiri.AccountsService.Sound")),
-#else
- QVariant::fromValue(QString("org.ayatana.AccountsService.Sound")),
-#endif
QVariant::fromValue(QString("Volume")),
QVariant::fromValue(dbusVar));
if (!set_vol.isValid())
diff --git a/tests/service-mocks/CMakeLists.txt b/tests/service-mocks/CMakeLists.txt
index 9cd8acb..f604986 100644
--- a/tests/service-mocks/CMakeLists.txt
+++ b/tests/service-mocks/CMakeLists.txt
@@ -1,2 +1,4 @@
-add_subdirectory(accounts-mock)
+if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml")
+ add_subdirectory(accounts-mock)
+endif()
add_subdirectory(media-player-mpris-mock)
diff --git a/tests/service-mocks/accounts-mock/AccountsDefs.h b/tests/service-mocks/accounts-mock/AccountsDefs.h
index bf66208..db7cdfe 100644
--- a/tests/service-mocks/accounts-mock/AccountsDefs.h
+++ b/tests/service-mocks/accounts-mock/AccountsDefs.h
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 Canonical, Ltd.
+ * Copyright (C) 2021 Robert Tari
*
* 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
@@ -13,7 +14,9 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*
- * Author: Xavi Garcia <xavi.garcia.mena@canonical.com>
+ * Authors:
+ * Xavi Garcia <xavi.garcia.mena@canonical.com>
+ * Robert Tari <robert@tari.in>
*/
#pragma once
@@ -28,11 +31,8 @@ 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";
-#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS
constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.lomiri.AccountsService.Sound";
-#else
- constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound";
-#endif
+
} // namespace testing
} // namespace indicators
diff --git a/tests/service-mocks/accounts-mock/CMakeLists.txt b/tests/service-mocks/accounts-mock/CMakeLists.txt
index 1549249..da9bc99 100644
--- a/tests/service-mocks/accounts-mock/CMakeLists.txt
+++ b/tests/service-mocks/accounts-mock/CMakeLists.txt
@@ -6,13 +6,7 @@ include_directories(${Qt5DBus_INCLUDE_DIRS}
"${CMAKE_SOURCE_DIR}/tests/service-mocks")
add_definitions(-DQT_NO_KEYWORDS=1)
-
-if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml")
- add_definitions(-DHAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS)
- set(dbusinterface_sound_xml "com.lomiri.AccountsService.Sound.Mock.xml")
-else()
- set(dbusinterface_sound_xml "org.ayatana.AccountsService.Sound.Mock.xml")
-endif()
+set(dbusinterface_sound_xml "com.lomiri.AccountsService.Sound.Mock.xml")
set_source_files_properties(${dbusinterface_sound_xml} PROPERTIES
CLASSNAME AccountsServiceSoundMockInterface)
diff --git a/tests/service-mocks/accounts-mock/org.ayatana.AccountsService.Sound.Mock.xml b/tests/service-mocks/accounts-mock/org.ayatana.AccountsService.Sound.Mock.xml
deleted file mode 100644
index ae9170f..0000000
--- a/tests/service-mocks/accounts-mock/org.ayatana.AccountsService.Sound.Mock.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
- <interface name="org.ayatana.AccountsService.Sound">
- <property name="Volume" type="d" access="readwrite"/>
- <property name="LastRunningPlayer" type="s" access="readwrite"/>
- </interface>
-</node> \ No newline at end of file
diff --git a/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt b/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt
index 08ff68f..b7284bb 100644
--- a/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt
+++ b/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt
@@ -8,10 +8,6 @@ find_package(Qt5DBus REQUIRED)
include_directories(${Qt5DBus_INCLUDE_DIRS}
"${CMAKE_SOURCE_DIR}/tests/service-mocks")
-if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.SecurityPrivacy.xml")
- add_definitions(-DHAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS)
-endif()
-
add_definitions(-DQT_NO_KEYWORDS=1)
set(dbusinterface_mediaplayermpris_xml "org.mpris.MediaPlayer2.Player.xml")
diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h
index 24fa986..214555b 100644
--- a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h
+++ b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 Canonical, Ltd.
+ * Copyright (C) 2021 Robert Tari
*
* 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
@@ -13,7 +14,9 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*
- * Author: Xavi Garcia <xavi.garcia.mena@canonical.com>
+ * Authors:
+ * Xavi Garcia <xavi.garcia.mena@canonical.com>
+ * Robert Tari <robert@tari.in>
*/
#pragma once
@@ -28,11 +31,8 @@ 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";
-#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS
constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.lomiri.AccountsService.Sound";
-#else
- constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound";
-#endif
+
} // namespace testing
} // namespace indicators
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 03:29:45 +0000