Messaging Menu

Merge lp:~seb128/indicator-messages/symbolic-icons-tests into lp:indicator-messages

  1. symbolic-icons-tests
  2. Merge into trunk.16.10
Proposed by Sebastien Bacher
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 457
Merged at revision: 459
Proposed branch: lp:~seb128/indicator-messages/symbolic-icons-tests
Merge into: lp:indicator-messages
Diff against target: 22 lines (+3/-3)
1 file modified
tests/indicator-test.cpp (+3/-3)
To merge this branch: bzr merge lp:~seb128/indicator-messages/symbolic-icons-tests
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Review via email: mp+355144@code.launchpad.net

Commit message

Update tests to include symbolic icons

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

I've to reject this as this will be fixed by new glib version.

See https://gitlab.gnome.org/GNOME/glib/commit/ad26f4c75d996b3c79acc947a348248cbb30ec93

review: Disapprove
Revision history for this message
Sebastien Bacher (seb128) wrote :

great, even better, I was unsure why it changed so good to know it's a bug

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Need to go back with this, apparently.

Already building at https://bileto.ubuntu.com/#/ticket/3420

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/indicator-test.cpp'
2--- tests/indicator-test.cpp 2015-03-10 21:18:02 +0000
3+++ tests/indicator-test.cpp 2018-09-17 14:14:54 +0000
4@@ -64,7 +64,7 @@
5
6 EXPECT_EVENTUALLY_ACTION_EXISTS("messages");
7 EXPECT_ACTION_STATE_TYPE("messages", G_VARIANT_TYPE("a{sv}"));
8- EXPECT_ACTION_STATE("messages", g_variant_new_parsed("{'icon': <('themed', <['indicator-messages-offline', 'indicator-messages', 'indicator']>)>, 'title': <'Notifications'>, 'accessible-desc': <'Messages'>, 'visible': <false>}"));
9+ EXPECT_ACTION_STATE("messages", g_variant_new_parsed("{'icon': <('themed', <['indicator-messages-offline', 'indicator-messages', 'indicator', 'indicator-messages-offline-symbolic', 'indicator-messages-symbolic', 'indicator-symbolic']>)>, 'title': <'Notifications'>, 'accessible-desc': <'Messages'>, 'visible': <false>}"));
10 }
11
12 TEST_F(IndicatorTest, SingleMessage) {
13@@ -146,8 +146,8 @@
14 }
15
16 TEST_F(IndicatorTest, IconNotification) {
17- auto normalicon = std::shared_ptr<GVariant>(g_variant_ref_sink(g_variant_new_parsed("{'icon': <('themed', <['indicator-messages-offline', 'indicator-messages', 'indicator']>)>, 'title': <'Notifications'>, 'accessible-desc': <'Messages'>, 'visible': <true>}")), [](GVariant *var) {if (var != nullptr) g_variant_unref(var); });
18- auto blueicon = std::shared_ptr<GVariant>(g_variant_ref_sink(g_variant_new_parsed("{'icon': <('themed', <['indicator-messages-new-offline', 'indicator-messages-new', 'indicator-messages', 'indicator']>)>, 'title': <'Notifications'>, 'accessible-desc': <'New Messages'>, 'visible': <true>}")), [](GVariant *var) {if (var != nullptr) g_variant_unref(var); });
19+ auto normalicon = std::shared_ptr<GVariant>(g_variant_ref_sink(g_variant_new_parsed("{'icon': <('themed', <['indicator-messages-offline', 'indicator-messages', 'indicator', 'indicator-messages-offline-symbolic', 'indicator-messages-symbolic', 'indicator-symbolic']>)>, 'title': <'Notifications'>, 'accessible-desc': <'Messages'>, 'visible': <true>}")), [](GVariant *var) {if (var != nullptr) g_variant_unref(var); });
20+ auto blueicon = std::shared_ptr<GVariant>(g_variant_ref_sink(g_variant_new_parsed("{'icon': <('themed', <['indicator-messages-new-offline', 'indicator-messages-new', 'indicator-messages', 'indicator', 'indicator-messages-new-offline-symbolic', 'indicator-messages-new-symbolic', 'indicator-messages-symbolic', 'indicator-symbolic']>)>, 'title': <'Notifications'>, 'accessible-desc': <'New Messages'>, 'visible': <true>}")), [](GVariant *var) {if (var != nullptr) g_variant_unref(var); });
21
22 setActions("/com/canonical/indicator/messages");
23

Subscribers

People subscribed via source and target branches