From c63d90da0f1d9cbd1eee5dd66a9828c51cc8dcc9 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 17 Mar 2016 09:59:32 -0500
Subject: de-dupe use of dbus names

---
 tests/integration/usb-manager-test.cpp | 13 +++++++------
 tests/unit/usb-snap-test.cpp           | 13 +++++++------
 tests/utils/dbus-types.h               |  5 -----
 3 files changed, 14 insertions(+), 17 deletions(-)

(limited to 'tests')

diff --git a/tests/integration/usb-manager-test.cpp b/tests/integration/usb-manager-test.cpp
index 5e3377d..82c170e 100644
--- a/tests/integration/usb-manager-test.cpp
+++ b/tests/integration/usb-manager-test.cpp
@@ -25,6 +25,7 @@
 #include <tests/utils/gtest-qt-print-helpers.h>
 #include <tests/utils/qdbus-helpers.h>
 
+#include <src/dbus-names.h>
 #include <src/usb-manager.h>
 
 #include <libqtdbustest/DBusTestRunner.h>
@@ -93,10 +94,10 @@ protected:
 
     OrgFreedesktopDBusMockInterface& notificationsMockInterface()
     {
-        return dbusMock.mockInterface("org.freedesktop.Notifications",
-                                      "/org/freedesktop/Notifications",
-                                      "org.freedesktop.Notifications",
-                                       QDBusConnection::SessionBus);
+        return dbusMock.mockInterface(DBusNames::Notify::NAME,
+                                      DBusNames::Notify::PATH,
+                                      DBusNames::Notify::INTERFACE,
+                                      QDBusConnection::SessionBus);
     }
 
     QtDBusTest::DBusTestRunner dbusTestRunner;
@@ -151,8 +152,8 @@ TEST_F(UsbManagerFixture, Allow)
 
     // click on allow in the notification
     notificationsMockInterface().EmitSignal(
-        DBusTypes::NOTIFY_DBUS_INTERFACE,
-        "ActionInvoked",
+        DBusNames::Notify::INTERFACE,
+        DBusNames::Notify::ActionInvoked::NAME,
         "us",
         QVariantList() << uint32_t(1) << "allow"
     );
diff --git a/tests/unit/usb-snap-test.cpp b/tests/unit/usb-snap-test.cpp
index e8f8bb2..dc17696 100644
--- a/tests/unit/usb-snap-test.cpp
+++ b/tests/unit/usb-snap-test.cpp
@@ -23,6 +23,7 @@
 #include <tests/utils/glib-fixture.h>
 #include <tests/utils/gtest-qt-print-helpers.h>
 
+#include <src/dbus-names.h>
 #include <src/usb-snap.h>
 
 #include <glib.h>
@@ -75,10 +76,10 @@ protected:
 
     OrgFreedesktopDBusMockInterface& notificationsMockInterface()
     {
-        return dbusMock.mockInterface("org.freedesktop.Notifications",
-                                      "/org/freedesktop/Notifications",
-                                      "org.freedesktop.Notifications",
-                                       QDBusConnection::SessionBus);
+        return dbusMock.mockInterface(DBusNames::Notify::NAME,
+                                      DBusNames::Notify::PATH,
+                                      DBusNames::Notify::INTERFACE,
+                                      QDBusConnection::SessionBus);
     }
 
     QtDBusTest::DBusTestRunner dbusTestRunner;
@@ -144,8 +145,8 @@ TEST_F(UsbSnapFixture, TestRoundTrip)
 
         // fake a user interaction with the fdo notification
         notificationsMockInterface().EmitSignal(
-            DBusTypes::NOTIFY_DBUS_INTERFACE,
-            "ActionInvoked",
+            DBusNames::Notify::INTERFACE,
+            DBusNames::Notify::ActionInvoked::NAME,
             "us",
             QVariantList() << id << test.action_to_invoke);
 
diff --git a/tests/utils/dbus-types.h b/tests/utils/dbus-types.h
index c2dfb81..3b3a02d 100644
--- a/tests/utils/dbus-types.h
+++ b/tests/utils/dbus-types.h
@@ -39,9 +39,4 @@ namespace DBusTypes
         qDBusRegisterMetaType<QVariantDictMap>();
         qDBusRegisterMetaType<QStringMap>();
     }
-    static constexpr char const* NOTIFY_DBUS_NAME = "org.freedesktop.Notifications";
-
-    static constexpr char const* NOTIFY_DBUS_INTERFACE = "org.freedesktop.Notifications";
-
-    static constexpr char const* NOTIFY_DBUS_PATH = "/org/freedesktop/Notifications";
 }
-- 
cgit v1.2.3