← Back to branch summary

~azzar1/unity/scale-eject-notification

« back to all changes in this revision

Viewing changes to tests/test_volume_launcher_icon.cpp

  • Committer: Andrea Azzarone
  • Date: 2016-07-21 12:37:19 UTC
  • Revision ID: azzaronea@gmail.com-20160721123719-g7tnzt5krpenq5kd
https://launchpad.net/bugs/1605231
Use the standard notification-device-eject in the "device eject" notificaiton. This allows us to scale it properly on high-dpi setups.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_volume_launcher_icon.cpp
481
481
  auto menuitem = GetMenuItemAtIndex(5);
482
482
 
483
483
  EXPECT_CALL(*volume_, Eject());
484
 
  EXPECT_CALL(*notifications_, Display(volume_->GetIconName(), volume_->GetName()));
 
484
  EXPECT_CALL(*notifications_, Display(volume_->GetName()));
485
485
 
486
486
  ASSERT_STREQ(dbusmenu_menuitem_property_get(menuitem, DBUSMENU_MENUITEM_PROP_LABEL), "Eject");
487
487
  EXPECT_TRUE(dbusmenu_menuitem_property_get_bool(menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE));
573
573
    .WillRepeatedly(Return(true));
574
574
 
575
575
  EXPECT_CALL(*volume_, Eject());
576
 
  EXPECT_CALL(*notifications_, Display(volume_->GetIconName(), volume_->GetName()));
 
576
  EXPECT_CALL(*notifications_, Display(volume_->GetName()));
577
577
  icon_->EjectAndShowNotification();
578
578
}
579
579