diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/dbus-types/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/dbus-types/org.ayatana.sound.AccountsService.xml (renamed from tests/dbus-types/com.ubuntu.AccountsService.Sound.xml) | 2 | ||||
-rw-r--r-- | tests/service-mocks/accounts-mock/AccountsDefs.h | 2 | ||||
-rw-r--r-- | tests/service-mocks/accounts-mock/CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/service-mocks/accounts-mock/org.ayatana.AccountsService.Sound.Mock.xml (renamed from tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml) | 2 | ||||
-rw-r--r-- | tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/tests/dbus-types/CMakeLists.txt b/tests/dbus-types/CMakeLists.txt index a50a5bb..aadc940 100644 --- a/tests/dbus-types/CMakeLists.txt +++ b/tests/dbus-types/CMakeLists.txt @@ -14,7 +14,7 @@ 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(dbusinterface_accountssound_xml "org.ayatana.AccountsService.Sound.xml") set_source_files_properties(${dbusinterface_accountssound_xml} PROPERTIES CLASSNAME AccountsSoundInterface) diff --git a/tests/dbus-types/com.ubuntu.AccountsService.Sound.xml b/tests/dbus-types/org.ayatana.sound.AccountsService.xml index 27c915a..aa05cf3 100644 --- a/tests/dbus-types/com.ubuntu.AccountsService.Sound.xml +++ b/tests/dbus-types/org.ayatana.sound.AccountsService.xml @@ -1,5 +1,5 @@ <node> - <interface name="com.ubuntu.AccountsService.Sound"> + <interface name="org.ayatana.AccountsService.Sound"> <method name="Set"> <arg direction="in" type="s" name="interface" /> <arg direction="in" type="s" name="property" /> diff --git a/tests/service-mocks/accounts-mock/AccountsDefs.h b/tests/service-mocks/accounts-mock/AccountsDefs.h index 0e4f270..9933af0 100644 --- a/tests/service-mocks/accounts-mock/AccountsDefs.h +++ b/tests/service-mocks/accounts-mock/AccountsDefs.h @@ -28,7 +28,7 @@ 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"; + constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound"; } // namespace testing } // namespace indicators diff --git a/tests/service-mocks/accounts-mock/CMakeLists.txt b/tests/service-mocks/accounts-mock/CMakeLists.txt index ad858bd..6eb9fb5 100644 --- a/tests/service-mocks/accounts-mock/CMakeLists.txt +++ b/tests/service-mocks/accounts-mock/CMakeLists.txt @@ -7,14 +7,14 @@ include_directories(${Qt5DBus_INCLUDE_DIRS} add_definitions(-DQT_NO_KEYWORDS=1) -set(dbusinterface_sound_xml "com.ubuntu.AccountsService.Sound.Mock.xml") +set(dbusinterface_sound_xml "org.ayatana.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 + org.ayatana.AccountsService.Sound.Mock.xml AccountsServiceSoundMock.h ubuntu::indicators::testing::AccountsServiceSoundMock AccountsServiceSoundMockAdaptor) diff --git a/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml b/tests/service-mocks/accounts-mock/org.ayatana.AccountsService.Sound.Mock.xml index daf82e5..ae9170f 100644 --- a/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml +++ b/tests/service-mocks/accounts-mock/org.ayatana.AccountsService.Sound.Mock.xml @@ -1,6 +1,6 @@ <!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="com.ubuntu.AccountsService.Sound"> + <interface name="org.ayatana.AccountsService.Sound"> <property name="Volume" type="d" access="readwrite"/> <property name="LastRunningPlayer" type="s" access="readwrite"/> </interface> diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h index 4d28b38..a000c4e 100644 --- a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h +++ b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h @@ -28,7 +28,7 @@ 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"; + constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound"; } // namespace testing } // namespace indicators |