diff options
| author | Andrea Azzarone <azzaronea@gmail.com> | 2016-07-21 14:37:19 +0200 |
|---|---|---|
| committer | Andrea Azzarone <azzaronea@gmail.com> | 2016-07-21 14:37:19 +0200 |
| commit | d198163682f21400cf8708995ef2632ccac2a87a (patch) | |
| tree | 19d1b16dc7225c4e55fbb6763d12be890cc3b635 /tests | |
| parent | c1f5463c91a7528ae013182ad0bc8b832d934fa6 (diff) | |
Use the standard notification-device-eject in the "device eject" notificaiton. This allows us to scale it properly on high-dpi setups.
Fixes LP: #1605231 (bzr r4153.3.1)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_mock_devices.h | 2 | ||||
| -rw-r--r-- | tests/test_volume_launcher_icon.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_mock_devices.h b/tests/test_mock_devices.h index d429b569b..7dc0fcef4 100644 --- a/tests/test_mock_devices.h +++ b/tests/test_mock_devices.h @@ -101,7 +101,7 @@ struct MockDeviceNotificationDisplay : DeviceNotificationDisplay typedef std::shared_ptr<MockDeviceNotificationDisplay> Ptr; typedef testing::NiceMock<MockDeviceNotificationDisplay> Nice; - MOCK_METHOD2(Display, void(std::string const& icon_name, std::string const& volume_name)); + MOCK_METHOD1(Display, void(std::string const& volume_name)); }; } // anonymous namespace diff --git a/tests/test_volume_launcher_icon.cpp b/tests/test_volume_launcher_icon.cpp index 1bd4f5a56..d5f0f1f88 100644 --- a/tests/test_volume_launcher_icon.cpp +++ b/tests/test_volume_launcher_icon.cpp @@ -481,7 +481,7 @@ TEST_F(TestVolumeLauncherIcon, TestEjectMenuItem) auto menuitem = GetMenuItemAtIndex(5); EXPECT_CALL(*volume_, Eject()); - EXPECT_CALL(*notifications_, Display(volume_->GetIconName(), volume_->GetName())); + EXPECT_CALL(*notifications_, Display(volume_->GetName())); ASSERT_STREQ(dbusmenu_menuitem_property_get(menuitem, DBUSMENU_MENUITEM_PROP_LABEL), "Eject"); EXPECT_TRUE(dbusmenu_menuitem_property_get_bool(menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE)); @@ -573,7 +573,7 @@ TEST_F(TestVolumeLauncherIcon, TestEject) .WillRepeatedly(Return(true)); EXPECT_CALL(*volume_, Eject()); - EXPECT_CALL(*notifications_, Display(volume_->GetIconName(), volume_->GetName())); + EXPECT_CALL(*notifications_, Display(volume_->GetName())); icon_->EjectAndShowNotification(); } |