aboutsummaryrefslogtreecommitdiff
path: root/tests/integration/test-indicator.cpp
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2020-08-11 12:20:04 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-08-11 21:29:33 +0200
commit11ea05685763cd7a233b56e11cd231c7774f69e1 (patch)
treea5277807f5f415486fb0134dc994e32dd268734d /tests/integration/test-indicator.cpp
parenta3bc5a97496f357c47ddf069bd8c67af9143d2bf (diff)
downloadayatana-indicator-sound-11ea05685763cd7a233b56e11cd231c7774f69e1.tar.gz
ayatana-indicator-sound-11ea05685763cd7a233b56e11cd231c7774f69e1.tar.bz2
ayatana-indicator-sound-11ea05685763cd7a233b56e11cd231c7774f69e1.zip
Replace x-canonical attributes
Diffstat (limited to 'tests/integration/test-indicator.cpp')
-rw-r--r--tests/integration/test-indicator.cpp434
1 files changed, 217 insertions, 217 deletions
diff --git a/tests/integration/test-indicator.cpp b/tests/integration/test-indicator.cpp
index 5e74636..36b299e 100644
--- a/tests/integration/test-indicator.cpp
+++ b/tests/integration/test-indicator.cpp
@@ -51,9 +51,9 @@ TEST_F(TestIndicator, PhoneCheckRootIcon)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-scroll-action", "indicator.scroll")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-scroll-action", "indicator.scroll")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.string_attribute("submenu-action", "indicator.indicator-shown")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -111,9 +111,9 @@ TEST_F(TestIndicator, PhoneTestExternalMicInOut)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-scroll-action", "indicator.scroll")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-scroll-action", "indicator.scroll")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.string_attribute("submenu-action", "indicator.indicator-shown")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -134,9 +134,9 @@ TEST_F(TestIndicator, PhoneTestExternalMicInOut)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-scroll-action", "indicator.scroll")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-scroll-action", "indicator.scroll")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.string_attribute("submenu-action", "indicator.indicator-shown")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -160,9 +160,9 @@ TEST_F(TestIndicator, PhoneTestExternalMicInOut)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-scroll-action", "indicator.scroll")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-scroll-action", "indicator.scroll")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.string_attribute("submenu-action", "indicator.indicator-shown")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -196,8 +196,8 @@ TEST_F(TestIndicator, DesktopTestExternalMicInOut)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
.item(mh::MenuItemMatcher()
@@ -217,8 +217,8 @@ TEST_F(TestIndicator, DesktopTestExternalMicInOut)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
.item(mh::MenuItemMatcher()
@@ -239,8 +239,8 @@ TEST_F(TestIndicator, DesktopTestExternalMicInOut)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
.item(mh::MenuItemMatcher()
@@ -301,9 +301,9 @@ TEST_F(TestIndicator, PhoneChangeRoleVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-scroll-action", "indicator.scroll")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-scroll-action", "indicator.scroll")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.string_attribute("submenu-action", "indicator.indicator-shown")
.mode(mh::MenuItemMatcher::Mode::starts_with)
.submenu()
@@ -318,8 +318,8 @@ TEST_F(TestIndicator, PhoneChangeRoleVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::ends_with)
.submenu()
.item(mh::MenuItemMatcher()
@@ -343,9 +343,9 @@ TEST_F(TestIndicator, PhoneChangeRoleVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-scroll-action", "indicator.scroll")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-scroll-action", "indicator.scroll")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.string_attribute("submenu-action", "indicator.indicator-shown")
.mode(mh::MenuItemMatcher::Mode::starts_with)
.submenu()
@@ -360,8 +360,8 @@ TEST_F(TestIndicator, PhoneChangeRoleVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::ends_with)
.submenu()
.item(mh::MenuItemMatcher()
@@ -388,9 +388,9 @@ TEST_F(TestIndicator, PhoneBasicInitialVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-scroll-action", "indicator.scroll")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-scroll-action", "indicator.scroll")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.string_attribute("submenu-action", "indicator.indicator-shown")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -423,9 +423,9 @@ TEST_F(TestIndicator, PhoneAddMprisPlayer)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-scroll-action", "indicator.scroll")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-scroll-action", "indicator.scroll")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.string_attribute("submenu-action", "indicator.indicator-shown")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -453,9 +453,9 @@ TEST_F(TestIndicator, PhoneAddMprisPlayer)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-scroll-action", "indicator.scroll")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-scroll-action", "indicator.scroll")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.string_attribute("submenu-action", "indicator.indicator-shown")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -470,13 +470,13 @@ TEST_F(TestIndicator, PhoneAddMprisPlayer)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.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","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
+ .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -507,8 +507,8 @@ TEST_F(TestIndicator, DesktopBasicInitialVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
.item(mh::MenuItemMatcher()
@@ -524,13 +524,13 @@ TEST_F(TestIndicator, DesktopBasicInitialVolume)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.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","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
+ .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -561,8 +561,8 @@ TEST_F(TestIndicator, DesktopAddMprisPlayer)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
.item(mh::MenuItemMatcher()
@@ -578,13 +578,13 @@ TEST_F(TestIndicator, DesktopAddMprisPlayer)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.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","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
+ .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -598,8 +598,8 @@ TEST_F(TestIndicator, DesktopAddMprisPlayer)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
.item(mh::MenuItemMatcher()
@@ -615,11 +615,11 @@ TEST_F(TestIndicator, DesktopAddMprisPlayer)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
)
.item(mh::MenuItemMatcher()
- .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
- .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -650,8 +650,8 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
.item(mh::MenuItemMatcher()
@@ -667,13 +667,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.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","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
+ .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -688,8 +688,8 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
.item(mh::MenuItemMatcher()
@@ -705,13 +705,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.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","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
+ .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -720,13 +720,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer2.desktop")
.label("TestPlayer2")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.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","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer2.desktop")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer2.desktop")
+ .string_attribute("x-ayatana-next-action","indicator.next.testplayer2.desktop")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -741,8 +741,8 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
.item(mh::MenuItemMatcher()
@@ -758,13 +758,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.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","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
+ .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -773,13 +773,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer2.desktop")
.label("TestPlayer2")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.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","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer2.desktop")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer2.desktop")
+ .string_attribute("x-ayatana-next-action","indicator.next.testplayer2.desktop")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -788,13 +788,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer3.desktop")
.label("TestPlayer3")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.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","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer3.desktop")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer3.desktop")
+ .string_attribute("x-ayatana-next-action","indicator.next.testplayer3.desktop")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -809,8 +809,8 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
.item(mh::MenuItemMatcher()
@@ -826,13 +826,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.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","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
+ .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -841,13 +841,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer2.desktop")
.label("TestPlayer2")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.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","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer2.desktop")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer2.desktop")
+ .string_attribute("x-ayatana-next-action","indicator.next.testplayer2.desktop")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -856,7 +856,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer3.desktop")
.label("TestPlayer3")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
)
)
.item(mh::MenuItemMatcher()
@@ -870,8 +870,8 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
.item(mh::MenuItemMatcher()
@@ -887,13 +887,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.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","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
+ .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -902,7 +902,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer2.desktop")
.label("TestPlayer2")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
)
)
.item(mh::MenuItemMatcher()
@@ -911,7 +911,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer3.desktop")
.label("TestPlayer3")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
)
)
.item(mh::MenuItemMatcher()
@@ -926,8 +926,8 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
.item(mh::MenuItemMatcher()
@@ -943,13 +943,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.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","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
+ .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -958,7 +958,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer2.desktop")
.label("TestPlayer2")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
)
)
.item(mh::MenuItemMatcher()
@@ -967,7 +967,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer3.desktop")
.label("TestPlayer3")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
)
)
.item(mh::MenuItemMatcher()
@@ -982,8 +982,8 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
.item(mh::MenuItemMatcher()
@@ -999,7 +999,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
)
)
.item(mh::MenuItemMatcher()
@@ -1008,7 +1008,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer2.desktop")
.label("TestPlayer2")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
)
)
.item(mh::MenuItemMatcher()
@@ -1017,13 +1017,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer3.desktop")
.label("TestPlayer3")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.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","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer3.desktop")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer3.desktop")
+ .string_attribute("x-ayatana-next-action","indicator.next.testplayer3.desktop")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -1038,8 +1038,8 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
.item(mh::MenuItemMatcher()
@@ -1055,13 +1055,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.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","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
+ .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -1070,13 +1070,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer2.desktop")
.label("TestPlayer2")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.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","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer2.desktop")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer2.desktop")
+ .string_attribute("x-ayatana-next-action","indicator.next.testplayer2.desktop")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -1085,13 +1085,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer3.desktop")
.label("TestPlayer3")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.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","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer3.desktop")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer3.desktop")
+ .string_attribute("x-ayatana-next-action","indicator.next.testplayer3.desktop")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -1109,8 +1109,8 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
.item(mh::MenuItemMatcher()
@@ -1126,7 +1126,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
)
)
.item(mh::MenuItemMatcher()
@@ -1135,7 +1135,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer2.desktop")
.label("TestPlayer2")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
)
)
.item(mh::MenuItemMatcher()
@@ -1144,11 +1144,11 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer3.desktop")
.label("TestPlayer3")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
)
.item(mh::MenuItemMatcher()
- .string_attribute("x-canonical-play-action","indicator.play.testplayer3.desktop")
- .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer3.desktop")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -1169,8 +1169,8 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
.item(mh::MenuItemMatcher()
@@ -1186,11 +1186,11 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer3.desktop")
.label("TestPlayer3")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
)
.item(mh::MenuItemMatcher()
- .string_attribute("x-canonical-play-action","indicator.play.testplayer3.desktop")
- .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer3.desktop")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -1199,7 +1199,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
)
)
.item(mh::MenuItemMatcher()
@@ -1208,7 +1208,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer2.desktop")
.label("TestPlayer2")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
)
)
.item(mh::MenuItemMatcher()
@@ -1240,8 +1240,8 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
.item(mh::MenuItemMatcher()
@@ -1257,13 +1257,13 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.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","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
+ .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -1278,8 +1278,8 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
.item(mh::MenuItemMatcher()
@@ -1295,13 +1295,13 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.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")
- .attribute_not_set("x-canonical-next-action")
- .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
+ .attribute_not_set("x-ayatana-next-action")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -1317,8 +1317,8 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
.item(mh::MenuItemMatcher()
@@ -1334,13 +1334,13 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.unity.media-player")
)
.item(mh::MenuItemMatcher()
- .attribute_not_set("x-canonical-previous-action")
- .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
- .attribute_not_set("x-canonical-next-action")
- .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
+ .attribute_not_set("x-ayatana-previous-action")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
+ .attribute_not_set("x-ayatana-next-action")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -1355,8 +1355,8 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
.item(mh::MenuItemMatcher()
@@ -1372,13 +1372,13 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
+ .string_attribute("x-ayatana-type", "org.ayatana.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","org.ayatana.unity.playback-item")
+ .string_attribute("x-ayatana-previous-action","indicator.previous.testplayer1.desktop")
+ .string_attribute("x-ayatana-play-action","indicator.play.testplayer1.desktop")
+ .string_attribute("x-ayatana-next-action","indicator.next.testplayer1.desktop")
+ .string_attribute("x-ayatana-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -1427,8 +1427,8 @@ TEST_F(TestIndicator, DesktopChangeRoleVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::starts_with)
.submenu()
.item(mh::MenuItemMatcher()
@@ -1444,8 +1444,8 @@ TEST_F(TestIndicator, DesktopChangeRoleVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::ends_with)
.submenu()
.item(mh::MenuItemMatcher()
@@ -1465,9 +1465,9 @@ TEST_F(TestIndicator, DesktopChangeRoleVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-scroll-action", "indicator.scroll")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-scroll-action", "indicator.scroll")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.string_attribute("submenu-action", "indicator.indicator-shown")
.mode(mh::MenuItemMatcher::Mode::starts_with)
.submenu()
@@ -1482,8 +1482,8 @@ TEST_F(TestIndicator, DesktopChangeRoleVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::ends_with)
.submenu()
.item(mh::MenuItemMatcher()
@@ -1514,9 +1514,9 @@ TEST_F(TestIndicator, PhoneNotificationVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-scroll-action", "indicator.scroll")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-scroll-action", "indicator.scroll")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.string_attribute("submenu-action", "indicator.indicator-shown")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -1645,9 +1645,9 @@ TEST_F(TestIndicator, PhoneNotificationWarningVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-scroll-action", "indicator.scroll")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-scroll-action", "indicator.scroll")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.string_attribute("submenu-action", "indicator.indicator-shown")
.mode(mh::MenuItemMatcher::Mode::starts_with)
.submenu()
@@ -1688,9 +1688,9 @@ TEST_F(TestIndicator, PhoneNotificationWarningVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-scroll-action", "indicator.scroll")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-scroll-action", "indicator.scroll")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.string_attribute("submenu-action", "indicator.indicator-shown")
.mode(mh::MenuItemMatcher::Mode::starts_with)
.submenu()
@@ -1728,9 +1728,9 @@ TEST_F(TestIndicator, PhoneNotificationWarningVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
- .string_attribute("x-canonical-scroll-action", "indicator.scroll")
- .string_attribute("x-canonical-secondary-action", "indicator.mute")
+ .string_attribute("x-ayatana-type", "org.ayatana.indicator.root")
+ .string_attribute("x-ayatana-scroll-action", "indicator.scroll")
+ .string_attribute("x-ayatana-secondary-action", "indicator.mute")
.string_attribute("submenu-action", "indicator.indicator-shown")
.mode(mh::MenuItemMatcher::Mode::starts_with)
.submenu()