This branch modifies the sound indicator on the desktop to only show the playback controls for those players that are active or (if any is running) the last one being active. Fixes: #1213907

Approved by: Charles Kerr, PS Jenkins bot

1 files changed, 568 insertions, 1 deletions

diff --git a/tests/integration/test-indicator.cpp b/tests/integration/test-indicator.cpp
index 9224b73..33a27af 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)
@@ -817,7 +1385,6 @@ TEST_F(TestIndicator, DISABLED_PhoneNotificationWarningVolume)
     // try again...
     notificationsSpy.clear();
 
-    qWarning() << "-----------------------------------------------------------";
     // change volume to 1.0... warning should be emitted
     setActionValue("volume", QVariant::fromValue(1.0));
     EXPECT_TRUE(waitVolumeChangedInIndicator());