← Back to branch summary

~ci-train-bot/indicator-sound/indicator-sound-ubuntu-zesty-2138

« back to all changes in this revision

Viewing changes to tests/sound-menu.cc

  • Committer: CI Train Bot
  • Author(s): Xavi Garcia Mena
  • Date: 2016-03-07 10:13:38 UTC
  • mfrom: (529.1.8 last-runnin-player-charles)
  • Revision ID: ci-train-bot@canonical.com-20160307101338-x2wynmsb4sch7jag
This branch sets the last running player using accounts service instead of gsettings.
It also includes a new class AccountsServiceAccess, to centralize all accesses to account service properties.
Approved by: PS Jenkins bot, Charles Kerr

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/sound-menu.cc
62
62
 
63
63
        void check_player_control_buttons(bool canPlay, bool canNext, bool canPrev)
64
64
        {
65
 
            SoundMenu * menu = sound_menu_new (nullptr, SOUND_MENU_DISPLAY_FLAGS_NONE, "");
 
65
            SoundMenu * menu = sound_menu_new (nullptr, SOUND_MENU_DISPLAY_FLAGS_NONE);
66
66
 
67
67
            MediaPlayerTrack * track = media_player_track_new("Artist", "Title", "Album", "http://art.url");
68
68
 
96
96
 
97
97
            /* Player control */
98
98
            verify_item_attribute(section, 1, "x-canonical-type", g_variant_new_string("com.canonical.unity.playback-item"));
99
 
            //verify_item_attribute(section, 1, "x-canonical-play-action", g_variant_new_string(""));
100
 
            if (!canPlay) {
 
99
        //verify_item_attribute(section, 1, "x-canonical-play-action", g_variant_new_string(""));
 
100
        if (!canPlay) {
101
101
                verify_item_attribute_is_not_set(section, 1, "x-canonical-play-action", G_VARIANT_TYPE_STRING);
102
 
            } else {
103
 
                verify_item_attribute(section, 1, "x-canonical-play-action", g_variant_new_string("indicator.play.player-id"));
104
 
            }
105
 
            if (!canNext) {
 
102
        } else {
 
103
            verify_item_attribute(section, 1, "x-canonical-play-action", g_variant_new_string("indicator.play.player-id"));
 
104
        }
 
105
        if (!canNext) {
106
106
                verify_item_attribute_is_not_set(section, 1, "x-canonical-next-action", G_VARIANT_TYPE_STRING);
107
 
            } else {
108
 
                verify_item_attribute(section, 1, "x-canonical-next-action", g_variant_new_string("indicator.next.player-id"));
109
 
            }
110
 
            if (!canPrev) {
 
107
        } else {
 
108
            verify_item_attribute(section, 1, "x-canonical-next-action", g_variant_new_string("indicator.next.player-id"));
 
109
        }
 
110
        if (!canPrev) {
111
111
                verify_item_attribute_is_not_set(section, 1, "x-canonical-previous-action", G_VARIANT_TYPE_STRING);
112
 
            } else {
113
 
                verify_item_attribute(section, 1, "x-canonical-previous-action", g_variant_new_string("indicator.previous.player-id"));
114
 
            }
 
112
        } else {
 
113
            verify_item_attribute(section, 1, "x-canonical-previous-action", g_variant_new_string("indicator.previous.player-id"));
 
114
        }
115
115
 
116
116
            g_clear_object(&section);
117
117
 
125
125
};
126
126
 
127
127
TEST_F(SoundMenuTest, BasicObject) {
128
 
    SoundMenu * menu = sound_menu_new (nullptr, SOUND_MENU_DISPLAY_FLAGS_NONE, "");
 
128
    SoundMenu * menu = sound_menu_new (nullptr, SOUND_MENU_DISPLAY_FLAGS_NONE);
129
129
 
130
130
    ASSERT_NE(nullptr, menu);
131
131
 
134
134
}
135
135
 
136
136
TEST_F(SoundMenuTest, AddRemovePlayer) {
137
 
    SoundMenu * menu = sound_menu_new (nullptr, SOUND_MENU_DISPLAY_FLAGS_NONE, "");
 
137
    SoundMenu * menu = sound_menu_new (nullptr, SOUND_MENU_DISPLAY_FLAGS_NONE);
138
138
 
139
139
    MediaPlayerTrack * track = media_player_track_new("Artist", "Title", "Album", "http://art.url");
140
140