aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2015-02-05 09:39:27 -0600
committerTed Gould <ted@gould.cx>2015-02-05 09:39:27 -0600
commitca507bc64f0ad0aa399fc7e54bf7a13cc2d94678 (patch)
tree886e6f8ed65f289365ef65543a400feb81f3b39b
parent32b8de20e6633f60ad24f2c8570b7474a5c45fb5 (diff)
downloadayatana-indicator-sound-ca507bc64f0ad0aa399fc7e54bf7a13cc2d94678.tar.gz
ayatana-indicator-sound-ca507bc64f0ad0aa399fc7e54bf7a13cc2d94678.tar.bz2
ayatana-indicator-sound-ca507bc64f0ad0aa399fc7e54bf7a13cc2d94678.zip
Connecting into the indicator test
-rw-r--r--tests/indicator-test.cc6
-rw-r--r--tests/notifications-mock.h12
2 files changed, 11 insertions, 7 deletions
diff --git a/tests/indicator-test.cc b/tests/indicator-test.cc
index 636db1d..97c4948 100644
--- a/tests/indicator-test.cc
+++ b/tests/indicator-test.cc
@@ -22,6 +22,7 @@
#include "indicator-fixture.h"
#include "accounts-service-mock.h"
+#include "notifications-mock.h"
class IndicatorTest : public IndicatorFixture
{
@@ -32,6 +33,7 @@ protected:
}
std::shared_ptr<AccountsServiceMock> as;
+ std::shared_ptr<NotificationsMock> notification;
virtual void SetUp() override
{
@@ -45,12 +47,16 @@ protected:
as = std::make_shared<AccountsServiceMock>();
addMock(*as);
+ notification = std::make_shared<NotificationsMock>();
+ addMock(*notification);
+
IndicatorFixture::SetUp();
}
virtual void TearDown() override
{
as.reset();
+ notification.reset();
IndicatorFixture::TearDown();
}
diff --git a/tests/notifications-mock.h b/tests/notifications-mock.h
index 5b7206a..ef5acd4 100644
--- a/tests/notifications-mock.h
+++ b/tests/notifications-mock.h
@@ -24,18 +24,20 @@ class NotificationsMock
DbusTestDbusMock * mock = nullptr;
public:
- AccountsServiceMock () {
+ NotificationsMock () {
mock = dbus_test_dbus_mock_new("org.freedesktop.Notifications");
dbus_test_task_set_bus(DBUS_TEST_TASK(mock), DBUS_TEST_SERVICE_BUS_SESSION);
+ dbus_test_task_set_name(DBUS_TEST_TASK(mock), "Notifications");
}
- ~AccountsServiceMock () {
+ ~NotificationsMock () {
g_debug("Destroying the Accounts Service Mock");
g_clear_object(&mock);
}
operator std::shared_ptr<DbusTestTask> () {
- return std::make_shared<DbusTestTask>(g_object_ref(mock), [](DbusTestTask * task) { g_clear_object(&task); });
+ std::shared_ptr<DbusTestTask> retval(DBUS_TEST_TASK(g_object_ref(mock)), [](DbusTestTask * task) { g_clear_object(&task); });
+ return retval;
}
operator DbusTestTask* () {
@@ -45,8 +47,4 @@ class NotificationsMock
operator DbusTestDbusMock* () {
return mock;
}
-
- DbusTestDbusMockObject * get_sound () {
- return soundobj;
- }
};