added integration tests for adding/removing players and playback controls

7 files changed, 659 insertions, 22 deletions

diff --git a/src/sound-menu.vala b/src/sound-menu.vala
index fde1a6c..d100be1 100644
--- a/src/sound-menu.vala
+++ b/src/sound-menu.vala
@@ -308,9 +308,6 @@ public class SoundMenu: Object
 	MenuItem create_playback_menu_item (MediaPlayer player) {
 		var playback_item = new MenuItem (null, null);
 		playback_item.set_attribute ("x-canonical-type", "s", "com.canonical.unity.playback-item");
-		playback_item.set_attribute ("x-canonical-play-action", "s", "indicator.play." + player.id + ".disabled");
-		playback_item.set_attribute ("x-canonical-next-action", "s", "indicator.next." + player.id + ".disabled");
-		playback_item.set_attribute ("x-canonical-previous-action", "s", "indicator.previous." + player.id + ".disabled");
 		if (player.is_running) {
 			if (player.can_do_play) {
 				playback_item.set_attribute ("x-canonical-play-action", "s", "indicator.play." + player.id);
diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp
index 91abf42..f61857e 100644
--- a/tests/integration/indicator-sound-test-base.cpp
+++ b/tests/integration/indicator-sound-test-base.cpp
@@ -192,16 +192,53 @@ bool IndicatorSoundTestBase::runProcess(QProcess& proc)
 
 bool IndicatorSoundTestBase::startTestMprisPlayer(QString const& playerName)
 {
-    testPlayer1.terminate();
-    testPlayer1.start(MEDIA_PLAYER_MPRIS_BIN, QStringList()
+    if (!stopTestMprisPlayer(playerName))
+    {
+        return false;
+    }
+    TestPlayer player;
+    player.name = playerName;
+    player.process.reset(new QProcess());
+    player.process->start(MEDIA_PLAYER_MPRIS_BIN, QStringList()
                                         << playerName);
-    if (!testPlayer1.waitForStarted())
+    if (!player.process->waitForStarted())
+    {
+        qWarning() << "ERROR STARTING PLAYER " << playerName;
         return false;
+    }
 
+    testPlayers.push_back(player);
 
     return true;
 }
 
+bool IndicatorSoundTestBase::stopTestMprisPlayer(QString const& playerName)
+{
+    bool terminateOK = true;
+    int index = findRunningTestMprisPlayer(playerName);
+    if (index != -1)
+    {
+        testPlayers[index].process->terminate();
+        if (!testPlayers[index].process->waitForFinished())
+            terminateOK = false;
+        testPlayers.remove(index);
+    }
+
+    return terminateOK;
+}
+
+int IndicatorSoundTestBase::findRunningTestMprisPlayer(QString const& playerName)
+{
+    for (int i = 0; i < testPlayers.size(); i++)
+    {
+        if (testPlayers.at(i).name == playerName)
+        {
+            return i;
+        }
+    }
+    return -1;
+}
+
 bool IndicatorSoundTestBase::setTestMprisPlayerProperty(QString const &testPlayer, QString const &property, bool value)
 {
     QProcess setProperty;
diff --git a/tests/integration/indicator-sound-test-base.h b/tests/integration/indicator-sound-test-base.h
index d9d3289..969fd69 100644
--- a/tests/integration/indicator-sound-test-base.h
+++ b/tests/integration/indicator-sound-test-base.h
@@ -81,6 +81,8 @@ protected:
     bool runProcess(QProcess&);
 
     bool startTestMprisPlayer(QString const& playerName);
+    bool stopTestMprisPlayer(QString const& playerName);
+    int findRunningTestMprisPlayer(QString const& playerName);
 
     bool setTestMprisPlayerProperty(QString const &testPlayer, QString const &property, bool value);
 
@@ -156,6 +158,13 @@ protected:
 
     QProcess testPlayer1;
 
+    struct TestPlayer
+    {
+        std::shared_ptr<QProcess> process;
+        QString name;
+    };
+    QVector<TestPlayer> testPlayers;
+
     std::unique_ptr<MenusInterface> menu_interface_;
 
     std::unique_ptr<DBusPropertiesInterface> accounts_interface_;
diff --git a/tests/integration/test-indicator.cpp b/tests/integration/test-indicator.cpp
index 9224b73..050c306 100644
--- a/tests/integration/test-indicator.cpp
+++ b/tests/integration/test-indicator.cpp
@@ -367,6 +367,574 @@ TEST_F(TestIndicator, DesktopAddMprisPlayer)
                             .label("Sound Settings…")
              )
         ).match());
+
+    // stop the test player
+    EXPECT_TRUE(stopTestMprisPlayer("testplayer1"));
+
+    EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
+            .item(mh::MenuItemMatcher()
+                .action("indicator.root")
+                .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+                .string_attribute("x-canonical-secondary-action", "indicator.mute")
+                .mode(mh::MenuItemMatcher::Mode::all)
+                .submenu()
+                .item(mh::MenuItemMatcher()
+                    .section()
+                    .item(mh::MenuItemMatcher().checkbox()
+                        .label("Mute")
+                    )
+                    .item(volumeSlider(INITIAL_VOLUME, "Volume"))
+                )
+                .item(mh::MenuItemMatcher()
+                    .section()
+                    .item(mh::MenuItemMatcher()
+                        .action("indicator.testplayer1.desktop")
+                        .label("TestPlayer1")
+                        .themed_icon("icon", {"testplayer"})
+                        .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    )
+                    .item(mh::MenuItemMatcher()
+                        .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop")
+                        .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
+                        .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop")
+                        .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                    )
+                )
+                .item(mh::MenuItemMatcher()
+                                .label("Sound Settings…")
+                 )
+            ).match());
+}
+
+TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
+{
+    double INITIAL_VOLUME = 0.0;
+
+    ASSERT_NO_THROW(startAccountsService());
+    EXPECT_TRUE(clearGSettingsPlayers());
+    ASSERT_NO_THROW(startPulseDesktop());
+
+    // initialize volumes in pulseaudio
+    EXPECT_FALSE(setStreamRestoreVolume("alert", INITIAL_VOLUME));
+    EXPECT_TRUE(setSinkVolume(INITIAL_VOLUME));
+
+    // start the test player
+    EXPECT_TRUE(startTestMprisPlayer("testplayer1"));
+
+    // start now the indicator, so it picks the new volumes
+    ASSERT_NO_THROW(startIndicator());
+
+    // check that the player is added
+    EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
+        .item(mh::MenuItemMatcher()
+            .action("indicator.root")
+            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-secondary-action", "indicator.mute")
+            .mode(mh::MenuItemMatcher::Mode::all)
+            .submenu()
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(mh::MenuItemMatcher().checkbox()
+                    .label("Mute")
+                )
+                .item(volumeSlider(INITIAL_VOLUME, "Volume"))
+            )
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(mh::MenuItemMatcher()
+                    .action("indicator.testplayer1.desktop")
+                    .label("TestPlayer1")
+                    .themed_icon("icon", {"testplayer"})
+                    .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                )
+                .item(mh::MenuItemMatcher()
+                    .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop")
+                    .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
+                    .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop")
+                    .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                )
+            )
+            .item(mh::MenuItemMatcher()
+                            .label("Sound Settings…")
+             )
+        ).match());
+
+    // start the second test player
+    EXPECT_TRUE(startTestMprisPlayer("testplayer2"));
+
+    // check that the player is added
+    EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
+        .item(mh::MenuItemMatcher()
+            .action("indicator.root")
+            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-secondary-action", "indicator.mute")
+            .mode(mh::MenuItemMatcher::Mode::all)
+            .submenu()
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(mh::MenuItemMatcher().checkbox()
+                    .label("Mute")
+                )
+                .item(volumeSlider(INITIAL_VOLUME, "Volume"))
+            )
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(mh::MenuItemMatcher()
+                    .action("indicator.testplayer1.desktop")
+                    .label("TestPlayer1")
+                    .themed_icon("icon", {"testplayer"})
+                    .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                )
+                .item(mh::MenuItemMatcher()
+                    .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop")
+                    .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
+                    .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop")
+                    .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                )
+            )
+            .item(mh::MenuItemMatcher()
+                        .section()
+                        .item(mh::MenuItemMatcher()
+                            .action("indicator.testplayer2.desktop")
+                            .label("TestPlayer2")
+                            .themed_icon("icon", {"testplayer"})
+                            .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                        )
+                        .item(mh::MenuItemMatcher()
+                            .string_attribute("x-canonical-previous-action","indicator.previous.testplayer2.desktop")
+                            .string_attribute("x-canonical-play-action","indicator.play.testplayer2.desktop")
+                            .string_attribute("x-canonical-next-action","indicator.next.testplayer2.desktop")
+                            .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                        )
+                    )
+            .item(mh::MenuItemMatcher()
+                            .label("Sound Settings…")
+             )
+        ).match());
+
+    // start the third test player
+    EXPECT_TRUE(startTestMprisPlayer("testplayer3"));
+
+    // check that the player is added
+    EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
+        .item(mh::MenuItemMatcher()
+            .action("indicator.root")
+            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-secondary-action", "indicator.mute")
+            .mode(mh::MenuItemMatcher::Mode::all)
+            .submenu()
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(mh::MenuItemMatcher().checkbox()
+                    .label("Mute")
+                )
+                .item(volumeSlider(INITIAL_VOLUME, "Volume"))
+            )
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(mh::MenuItemMatcher()
+                    .action("indicator.testplayer1.desktop")
+                    .label("TestPlayer1")
+                    .themed_icon("icon", {"testplayer"})
+                    .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                )
+                .item(mh::MenuItemMatcher()
+                    .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop")
+                    .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
+                    .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop")
+                    .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                )
+            )
+            .item(mh::MenuItemMatcher()
+                        .section()
+                        .item(mh::MenuItemMatcher()
+                            .action("indicator.testplayer2.desktop")
+                            .label("TestPlayer2")
+                            .themed_icon("icon", {"testplayer"})
+                            .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                        )
+                        .item(mh::MenuItemMatcher()
+                            .string_attribute("x-canonical-previous-action","indicator.previous.testplayer2.desktop")
+                            .string_attribute("x-canonical-play-action","indicator.play.testplayer2.desktop")
+                            .string_attribute("x-canonical-next-action","indicator.next.testplayer2.desktop")
+                            .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                        )
+                    )
+            .item(mh::MenuItemMatcher()
+                        .section()
+                        .item(mh::MenuItemMatcher()
+                            .action("indicator.testplayer3.desktop")
+                            .label("TestPlayer3")
+                            .themed_icon("icon", {"testplayer"})
+                            .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                        )
+                        .item(mh::MenuItemMatcher()
+                            .string_attribute("x-canonical-previous-action","indicator.previous.testplayer3.desktop")
+                            .string_attribute("x-canonical-play-action","indicator.play.testplayer3.desktop")
+                            .string_attribute("x-canonical-next-action","indicator.next.testplayer3.desktop")
+                            .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                        )
+                    )
+            .item(mh::MenuItemMatcher()
+                            .label("Sound Settings…")
+             )
+        ).match());
+
+    // stop the test player
+    EXPECT_TRUE(stopTestMprisPlayer("testplayer3"));
+
+    // check that player 3 is present, but it has no playback controls
+    EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
+        .item(mh::MenuItemMatcher()
+            .action("indicator.root")
+            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-secondary-action", "indicator.mute")
+            .mode(mh::MenuItemMatcher::Mode::all)
+            .submenu()
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(mh::MenuItemMatcher().checkbox()
+                    .label("Mute")
+                )
+                .item(volumeSlider(INITIAL_VOLUME, "Volume"))
+            )
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(mh::MenuItemMatcher()
+                    .action("indicator.testplayer1.desktop")
+                    .label("TestPlayer1")
+                    .themed_icon("icon", {"testplayer"})
+                    .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                )
+                .item(mh::MenuItemMatcher()
+                    .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop")
+                    .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
+                    .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop")
+                    .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                )
+            )
+            .item(mh::MenuItemMatcher()
+                        .section()
+                        .item(mh::MenuItemMatcher()
+                            .action("indicator.testplayer2.desktop")
+                            .label("TestPlayer2")
+                            .themed_icon("icon", {"testplayer"})
+                            .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                        )
+                        .item(mh::MenuItemMatcher()
+                            .string_attribute("x-canonical-previous-action","indicator.previous.testplayer2.desktop")
+                            .string_attribute("x-canonical-play-action","indicator.play.testplayer2.desktop")
+                            .string_attribute("x-canonical-next-action","indicator.next.testplayer2.desktop")
+                            .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                        )
+                    )
+            .item(mh::MenuItemMatcher()
+                        .section()
+                        .item(mh::MenuItemMatcher()
+                            .action("indicator.testplayer3.desktop")
+                            .label("TestPlayer3")
+                            .themed_icon("icon", {"testplayer"})
+                            .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                        )
+                    )
+            .item(mh::MenuItemMatcher()
+                            .label("Sound Settings…")
+             )
+        ).match());
+
+    EXPECT_TRUE(stopTestMprisPlayer("testplayer2"));
+
+    // check that player 2 is present, but it has no playback controls
+    EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
+        .item(mh::MenuItemMatcher()
+            .action("indicator.root")
+            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-secondary-action", "indicator.mute")
+            .mode(mh::MenuItemMatcher::Mode::all)
+            .submenu()
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(mh::MenuItemMatcher().checkbox()
+                    .label("Mute")
+                )
+                .item(volumeSlider(INITIAL_VOLUME, "Volume"))
+            )
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(mh::MenuItemMatcher()
+                    .action("indicator.testplayer1.desktop")
+                    .label("TestPlayer1")
+                    .themed_icon("icon", {"testplayer"})
+                    .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                )
+                .item(mh::MenuItemMatcher()
+                    .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop")
+                    .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
+                    .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop")
+                    .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                )
+            )
+            .item(mh::MenuItemMatcher()
+                        .section()
+                        .item(mh::MenuItemMatcher()
+                            .action("indicator.testplayer2.desktop")
+                            .label("TestPlayer2")
+                            .themed_icon("icon", {"testplayer"})
+                            .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                        )
+                    )
+            .item(mh::MenuItemMatcher()
+                        .section()
+                        .item(mh::MenuItemMatcher()
+                            .action("indicator.testplayer3.desktop")
+                            .label("TestPlayer3")
+                            .themed_icon("icon", {"testplayer"})
+                            .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                        )
+                    )
+            .item(mh::MenuItemMatcher()
+                            .label("Sound Settings…")
+             )
+        ).match());
+
+    EXPECT_TRUE(stopTestMprisPlayer("testplayer1"));
+
+    // check that player 1 is present, and it still has the playback controls
+    // as it was the last one being executed
+    EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
+        .item(mh::MenuItemMatcher()
+            .action("indicator.root")
+            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-secondary-action", "indicator.mute")
+            .mode(mh::MenuItemMatcher::Mode::all)
+            .submenu()
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(mh::MenuItemMatcher().checkbox()
+                    .label("Mute")
+                )
+                .item(volumeSlider(INITIAL_VOLUME, "Volume"))
+            )
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(mh::MenuItemMatcher()
+                    .action("indicator.testplayer1.desktop")
+                    .label("TestPlayer1")
+                    .themed_icon("icon", {"testplayer"})
+                    .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                )
+                .item(mh::MenuItemMatcher()
+                    .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop")
+                    .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
+                    .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop")
+                    .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                )
+            )
+            .item(mh::MenuItemMatcher()
+                        .section()
+                        .item(mh::MenuItemMatcher()
+                            .action("indicator.testplayer2.desktop")
+                            .label("TestPlayer2")
+                            .themed_icon("icon", {"testplayer"})
+                            .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                        )
+                    )
+            .item(mh::MenuItemMatcher()
+                        .section()
+                        .item(mh::MenuItemMatcher()
+                            .action("indicator.testplayer3.desktop")
+                            .label("TestPlayer3")
+                            .themed_icon("icon", {"testplayer"})
+                            .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                        )
+                    )
+            .item(mh::MenuItemMatcher()
+                            .label("Sound Settings…")
+             )
+        ).match());
+
+    // start the third test player
+    EXPECT_TRUE(startTestMprisPlayer("testplayer3"));
+
+    // check that player 3 is the only one with playback controls
+    EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
+        .item(mh::MenuItemMatcher()
+            .action("indicator.root")
+            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-secondary-action", "indicator.mute")
+            .mode(mh::MenuItemMatcher::Mode::all)
+            .submenu()
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(mh::MenuItemMatcher().checkbox()
+                    .label("Mute")
+                )
+                .item(volumeSlider(INITIAL_VOLUME, "Volume"))
+            )
+            .item(mh::MenuItemMatcher()
+                    .section()
+                    .item(mh::MenuItemMatcher()
+                        .action("indicator.testplayer1.desktop")
+                        .label("TestPlayer1")
+                        .themed_icon("icon", {"testplayer"})
+                        .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    )
+            )
+            .item(mh::MenuItemMatcher()
+                    .section()
+                    .item(mh::MenuItemMatcher()
+                        .action("indicator.testplayer2.desktop")
+                        .label("TestPlayer2")
+                        .themed_icon("icon", {"testplayer"})
+                        .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    )
+                )
+            .item(mh::MenuItemMatcher()
+                    .section()
+                    .item(mh::MenuItemMatcher()
+                        .action("indicator.testplayer3.desktop")
+                        .label("TestPlayer3")
+                        .themed_icon("icon", {"testplayer"})
+                        .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    )
+                    .item(mh::MenuItemMatcher()
+                        .string_attribute("x-canonical-previous-action","indicator.previous.testplayer3.desktop")
+                        .string_attribute("x-canonical-play-action","indicator.play.testplayer3.desktop")
+                        .string_attribute("x-canonical-next-action","indicator.next.testplayer3.desktop")
+                        .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                    )
+                )
+            .item(mh::MenuItemMatcher()
+                            .label("Sound Settings…")
+             )
+        ).match());
+
+    // start the rest of players
+    EXPECT_TRUE(startTestMprisPlayer("testplayer1"));
+    EXPECT_TRUE(startTestMprisPlayer("testplayer2"));
+
+    EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
+        .item(mh::MenuItemMatcher()
+            .action("indicator.root")
+            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-secondary-action", "indicator.mute")
+            .mode(mh::MenuItemMatcher::Mode::all)
+            .submenu()
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(mh::MenuItemMatcher().checkbox()
+                    .label("Mute")
+                )
+                .item(volumeSlider(INITIAL_VOLUME, "Volume"))
+            )
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(mh::MenuItemMatcher()
+                    .action("indicator.testplayer1.desktop")
+                    .label("TestPlayer1")
+                    .themed_icon("icon", {"testplayer"})
+                    .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                )
+                .item(mh::MenuItemMatcher()
+                    .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop")
+                    .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
+                    .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop")
+                    .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                )
+            )
+            .item(mh::MenuItemMatcher()
+                        .section()
+                        .item(mh::MenuItemMatcher()
+                            .action("indicator.testplayer2.desktop")
+                            .label("TestPlayer2")
+                            .themed_icon("icon", {"testplayer"})
+                            .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                        )
+                        .item(mh::MenuItemMatcher()
+                            .string_attribute("x-canonical-previous-action","indicator.previous.testplayer2.desktop")
+                            .string_attribute("x-canonical-play-action","indicator.play.testplayer2.desktop")
+                            .string_attribute("x-canonical-next-action","indicator.next.testplayer2.desktop")
+                            .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                        )
+                    )
+            .item(mh::MenuItemMatcher()
+                        .section()
+                        .item(mh::MenuItemMatcher()
+                            .action("indicator.testplayer3.desktop")
+                            .label("TestPlayer3")
+                            .themed_icon("icon", {"testplayer"})
+                            .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                        )
+                        .item(mh::MenuItemMatcher()
+                            .string_attribute("x-canonical-previous-action","indicator.previous.testplayer3.desktop")
+                            .string_attribute("x-canonical-play-action","indicator.play.testplayer3.desktop")
+                            .string_attribute("x-canonical-next-action","indicator.next.testplayer3.desktop")
+                            .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                        )
+                    )
+            .item(mh::MenuItemMatcher()
+                            .label("Sound Settings…")
+             )
+        ).match());
+
+    // stop all players
+    EXPECT_TRUE(stopTestMprisPlayer("testplayer1"));
+    EXPECT_TRUE(stopTestMprisPlayer("testplayer2"));
+    EXPECT_TRUE(stopTestMprisPlayer("testplayer3"));
+
+    // check that player 3 is the only one with playback controls
+    // as it was the last one being stopped
+    EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
+        .item(mh::MenuItemMatcher()
+            .action("indicator.root")
+            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-secondary-action", "indicator.mute")
+            .mode(mh::MenuItemMatcher::Mode::all)
+            .submenu()
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(mh::MenuItemMatcher().checkbox()
+                    .label("Mute")
+                )
+                .item(volumeSlider(INITIAL_VOLUME, "Volume"))
+            )
+            .item(mh::MenuItemMatcher()
+                    .section()
+                    .item(mh::MenuItemMatcher()
+                        .action("indicator.testplayer1.desktop")
+                        .label("TestPlayer1")
+                        .themed_icon("icon", {"testplayer"})
+                        .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    )
+            )
+            .item(mh::MenuItemMatcher()
+                    .section()
+                    .item(mh::MenuItemMatcher()
+                        .action("indicator.testplayer2.desktop")
+                        .label("TestPlayer2")
+                        .themed_icon("icon", {"testplayer"})
+                        .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    )
+                )
+            .item(mh::MenuItemMatcher()
+                    .section()
+                    .item(mh::MenuItemMatcher()
+                        .action("indicator.testplayer3.desktop")
+                        .label("TestPlayer3")
+                        .themed_icon("icon", {"testplayer"})
+                        .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    )
+                    .item(mh::MenuItemMatcher()
+                        .string_attribute("x-canonical-previous-action","indicator.previous.testplayer3.desktop")
+                        .string_attribute("x-canonical-play-action","indicator.play.testplayer3.desktop")
+                        .string_attribute("x-canonical-next-action","indicator.next.testplayer3.desktop")
+                        .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                    )
+                )
+            .item(mh::MenuItemMatcher()
+                            .label("Sound Settings…")
+             )
+        ).match());
 }
 
 TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
diff --git a/tests/service-mocks/media-player-mpris-mock/applications/testplayer2.desktop b/tests/service-mocks/media-player-mpris-mock/applications/testplayer2.desktop
new file mode 100644
index 0000000..579a0bf
--- /dev/null
+++ b/tests/service-mocks/media-player-mpris-mock/applications/testplayer2.desktop
@@ -0,0 +1,21 @@
+[Desktop Entry]
+Name=TestPlayer2
+GenericName=Test Player 2
+X-GNOME-FullName=Test Player 2
+Comment=Play and organize your music collection
+Keywords=Audio;Song;MP3;CD;Podcast;MTP;iPod;Playlist;Last.fm;UPnP;DLNA;Radio;
+Exec=echo %U
+Terminal=false
+Type=Application
+Icon=testplayer
+X-GNOME-DocPath=testplayer/testplayer.xml
+Categories=GNOME;GTK;AudioVideo;Audio;Player;
+MimeType=application/x-ogg;application/ogg;audio/x-vorbis+ogg;audio/x-scpls;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-mpegurl;audio/x-flac;audio/mp4;x-scheme-handler/itms;x-scheme-handler/itmss;
+StartupNotify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=testplayer
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-OtherBinaries=rhythmbox-client;rhythmbox-metadata;
+X-GNOME-Bugzilla-Version=3.1
+X-GNOME-UsesNotifications=true
+
diff --git a/tests/service-mocks/media-player-mpris-mock/applications/testplayer3.desktop b/tests/service-mocks/media-player-mpris-mock/applications/testplayer3.desktop
new file mode 100644
index 0000000..b3bfc6b
--- /dev/null
+++ b/tests/service-mocks/media-player-mpris-mock/applications/testplayer3.desktop
@@ -0,0 +1,21 @@
+[Desktop Entry]
+Name=TestPlayer3
+GenericName=Test Player 3
+X-GNOME-FullName=Test Player 3
+Comment=Play and organize your music collection
+Keywords=Audio;Song;MP3;CD;Podcast;MTP;iPod;Playlist;Last.fm;UPnP;DLNA;Radio;
+Exec=echo %U
+Terminal=false
+Type=Application
+Icon=testplayer
+X-GNOME-DocPath=testplayer/testplayer.xml
+Categories=GNOME;GTK;AudioVideo;Audio;Player;
+MimeType=application/x-ogg;application/ogg;audio/x-vorbis+ogg;audio/x-scpls;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-mpegurl;audio/x-flac;audio/mp4;x-scheme-handler/itms;x-scheme-handler/itmss;
+StartupNotify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=testplayer
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-OtherBinaries=rhythmbox-client;rhythmbox-metadata;
+X-GNOME-Bugzilla-Version=3.1
+X-GNOME-UsesNotifications=true
+
diff --git a/tests/sound-menu.cc b/tests/sound-menu.cc
index 75a661b..9f0181c 100644
--- a/tests/sound-menu.cc
+++ b/tests/sound-menu.cc
@@ -170,20 +170,4 @@ TEST_F(SoundMenuTest, AddRemovePlayer) {
     return;
 }
 
-TEST_F(SoundMenuTest, AddRemovePlayerNoPlayNextPrev) {
-    check_player_control_buttons(false, false, false);
-}
-
-TEST_F(SoundMenuTest, AddRemovePlayerNoNext) {
-    check_player_control_buttons(true, false, true);
-}
-
-TEST_F(SoundMenuTest, AddRemovePlayerNoPrev) {
-    check_player_control_buttons(true, true, false);
-}
-
-TEST_F(SoundMenuTest, AddRemovePlayerNoPlay) {
-    check_player_control_buttons(false, true, true);
-}
-
 //