From 384e727b89627fdb381500be29fc3880493ed634 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 8 Nov 2021 12:30:56 +0100
Subject: Rename com.ubuntu.AccountsService.Sound

---
 tests/service-mocks/accounts-mock/AccountsDefs.h                  | 2 +-
 tests/service-mocks/accounts-mock/CMakeLists.txt                  | 4 ++--
 .../accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml       | 8 ++++++++
 .../accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml       | 8 --------
 .../service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h  | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 tests/service-mocks/accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml
 delete mode 100644 tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml

(limited to 'tests/service-mocks')

diff --git a/tests/service-mocks/accounts-mock/AccountsDefs.h b/tests/service-mocks/accounts-mock/AccountsDefs.h
index 0a1806d..9726a9a 100644
--- a/tests/service-mocks/accounts-mock/AccountsDefs.h
+++ b/tests/service-mocks/accounts-mock/AccountsDefs.h
@@ -29,7 +29,7 @@ namespace testing
     constexpr const char USER_PATH[] = "/org/freedesktop/Accounts/UserTest";
     constexpr const char ACCOUNTS_PATH[] = "/org/freedesktop/Accounts";
 #ifdef HAS_UT_ACCTSERVICE_SOUND_SETTINGS
-    constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.ubuntu.AccountsService.Sound";
+    constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.lomiri.AccountsService.Sound";
 #else
     constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound";
 #endif
diff --git a/tests/service-mocks/accounts-mock/CMakeLists.txt b/tests/service-mocks/accounts-mock/CMakeLists.txt
index 421e155..e737a07 100644
--- a/tests/service-mocks/accounts-mock/CMakeLists.txt
+++ b/tests/service-mocks/accounts-mock/CMakeLists.txt
@@ -7,9 +7,9 @@ include_directories(${Qt5DBus_INCLUDE_DIRS}
 
 add_definitions(-DQT_NO_KEYWORDS=1)
 
-if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml")
+if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml")
     add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS)
-    set(dbusinterface_sound_xml "com.ubuntu.AccountsService.Sound.Mock.xml")
+    set(dbusinterface_sound_xml "com.lomiri.AccountsService.Sound.Mock.xml")
 else()
     set(dbusinterface_sound_xml "org.ayatana.AccountsService.Sound.Mock.xml")
 endif()
diff --git a/tests/service-mocks/accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml b/tests/service-mocks/accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml
new file mode 100644
index 0000000..d51abd2
--- /dev/null
+++ b/tests/service-mocks/accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml
@@ -0,0 +1,8 @@
+<!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.lomiri.AccountsService.Sound">
+    <property name="Volume" type="d" access="readwrite"/>
+    <property name="LastRunningPlayer" type="s" access="readwrite"/>
+  </interface>
+</node>
+
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 da9e8aa..0000000
--- a/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml
+++ /dev/null
@@ -1,8 +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="com.ubuntu.AccountsService.Sound">
-    <property name="Volume" type="d" access="readwrite"/>
-    <property name="LastRunningPlayer" type="s" access="readwrite"/>
-  </interface>
-</node>
-
diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h
index 8a19db8..b43f162 100644
--- a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h
+++ b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h
@@ -29,7 +29,7 @@ namespace testing
     constexpr const char USER_PATH[] = "/org/freedesktop/Accounts/UserTest";
     constexpr const char ACCOUNTS_PATH[] = "/org/freedesktop/Accounts";
 #ifdef HAS_UT_ACCTSERVICE_SOUND_SETTINGS
-    constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.ubuntu.AccountsService.Sound";
+    constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.lomiri.AccountsService.Sound";
 #else
     constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound";
 #endif
-- 
cgit v1.2.3