aboutsummaryrefslogtreecommitdiff
path: root/tests/integration/test-indicator.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/integration/test-indicator.cpp')
-rw-r--r--tests/integration/test-indicator.cpp196
1 files changed, 98 insertions, 98 deletions
diff --git a/tests/integration/test-indicator.cpp b/tests/integration/test-indicator.cpp
index bb08c40..5e2d918 100644
--- a/tests/integration/test-indicator.cpp
+++ b/tests/integration/test-indicator.cpp
@@ -51,7 +51,7 @@ TEST_F(TestIndicator, PhoneCheckRootIcon)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.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("submenu-action", "indicator.indicator-shown")
@@ -111,7 +111,7 @@ TEST_F(TestIndicator, PhoneTestExternalMicInOut)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.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("submenu-action", "indicator.indicator-shown")
@@ -134,7 +134,7 @@ TEST_F(TestIndicator, PhoneTestExternalMicInOut)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.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("submenu-action", "indicator.indicator-shown")
@@ -160,7 +160,7 @@ TEST_F(TestIndicator, PhoneTestExternalMicInOut)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.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("submenu-action", "indicator.indicator-shown")
@@ -196,7 +196,7 @@ TEST_F(TestIndicator, DesktopTestExternalMicInOut)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -217,7 +217,7 @@ TEST_F(TestIndicator, DesktopTestExternalMicInOut)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -239,7 +239,7 @@ TEST_F(TestIndicator, DesktopTestExternalMicInOut)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -301,7 +301,7 @@ TEST_F(TestIndicator, DISABLED_PhoneChangeRoleVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.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("submenu-action", "indicator.indicator-shown")
@@ -318,7 +318,7 @@ TEST_F(TestIndicator, DISABLED_PhoneChangeRoleVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::ends_with)
.submenu()
@@ -343,7 +343,7 @@ TEST_F(TestIndicator, DISABLED_PhoneChangeRoleVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.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("submenu-action", "indicator.indicator-shown")
@@ -360,7 +360,7 @@ TEST_F(TestIndicator, DISABLED_PhoneChangeRoleVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::ends_with)
.submenu()
@@ -388,7 +388,7 @@ TEST_F(TestIndicator, PhoneBasicInitialVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.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("submenu-action", "indicator.indicator-shown")
@@ -423,7 +423,7 @@ TEST_F(TestIndicator, PhoneAddMprisPlayer)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.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("submenu-action", "indicator.indicator-shown")
@@ -453,7 +453,7 @@ TEST_F(TestIndicator, PhoneAddMprisPlayer)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.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("submenu-action", "indicator.indicator-shown")
@@ -470,13 +470,13 @@ TEST_F(TestIndicator, PhoneAddMprisPlayer)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -507,7 +507,7 @@ TEST_F(TestIndicator, DesktopBasicInitialVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -524,13 +524,13 @@ TEST_F(TestIndicator, DesktopBasicInitialVolume)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -561,7 +561,7 @@ TEST_F(TestIndicator, DesktopAddMprisPlayer)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -578,13 +578,13 @@ TEST_F(TestIndicator, DesktopAddMprisPlayer)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -598,7 +598,7 @@ TEST_F(TestIndicator, DesktopAddMprisPlayer)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -615,11 +615,11 @@ TEST_F(TestIndicator, DesktopAddMprisPlayer)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
)
.item(mh::MenuItemMatcher()
.string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
- .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -650,7 +650,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -667,13 +667,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -688,7 +688,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -705,13 +705,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-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", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -741,7 +741,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -758,13 +758,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-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", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-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", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -809,7 +809,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -826,13 +826,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-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", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-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", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
)
)
.item(mh::MenuItemMatcher()
@@ -870,7 +870,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -887,13 +887,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-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", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
)
)
.item(mh::MenuItemMatcher()
@@ -926,7 +926,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -943,13 +943,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-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", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
)
)
.item(mh::MenuItemMatcher()
@@ -982,7 +982,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -999,7 +999,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -1038,7 +1038,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -1055,13 +1055,13 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-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", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-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", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -1109,7 +1109,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -1126,7 +1126,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
)
.item(mh::MenuItemMatcher()
.string_attribute("x-canonical-play-action","indicator.play.testplayer3.desktop")
- .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -1169,7 +1169,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -1186,11 +1186,11 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
.action("indicator.testplayer3.desktop")
.label("TestPlayer3")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
)
.item(mh::MenuItemMatcher()
.string_attribute("x-canonical-play-action","indicator.play.testplayer3.desktop")
- .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-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", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-type", "org.ayatana.unity.media-player")
)
)
.item(mh::MenuItemMatcher()
@@ -1240,7 +1240,7 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -1257,13 +1257,13 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -1278,7 +1278,7 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -1295,13 +1295,13 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -1317,7 +1317,7 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -1334,13 +1334,13 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -1355,7 +1355,7 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::all)
.submenu()
@@ -1372,13 +1372,13 @@ TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
.action("indicator.testplayer1.desktop")
.label("TestPlayer1")
.themed_icon("icon", {"testplayer"})
- .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+ .string_attribute("x-canonical-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","com.canonical.unity.playback-item")
+ .string_attribute("x-canonical-type","org.ayatana.unity.playback-item")
)
)
.item(mh::MenuItemMatcher()
@@ -1427,7 +1427,7 @@ TEST_F(TestIndicator, DesktopChangeRoleVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::starts_with)
.submenu()
@@ -1444,7 +1444,7 @@ TEST_F(TestIndicator, DesktopChangeRoleVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::ends_with)
.submenu()
@@ -1465,7 +1465,7 @@ TEST_F(TestIndicator, DesktopChangeRoleVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.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("submenu-action", "indicator.indicator-shown")
@@ -1482,7 +1482,7 @@ TEST_F(TestIndicator, DesktopChangeRoleVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+ .string_attribute("x-canonical-type", "org.ayatana.indicator.root")
.string_attribute("x-canonical-secondary-action", "indicator.mute")
.mode(mh::MenuItemMatcher::Mode::ends_with)
.submenu()
@@ -1514,7 +1514,7 @@ TEST_F(TestIndicator, DISABLED_PhoneNotificationVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.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("submenu-action", "indicator.indicator-shown")
@@ -1645,7 +1645,7 @@ TEST_F(TestIndicator, DISABLED_PhoneNotificationWarningVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.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("submenu-action", "indicator.indicator-shown")
@@ -1688,7 +1688,7 @@ TEST_F(TestIndicator, DISABLED_PhoneNotificationWarningVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.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("submenu-action", "indicator.indicator-shown")
@@ -1728,7 +1728,7 @@ TEST_F(TestIndicator, DISABLED_PhoneNotificationWarningVolume)
EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
.item(mh::MenuItemMatcher()
.action("indicator.root")
- .string_attribute("x-canonical-type", "com.canonical.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("submenu-action", "indicator.indicator-shown")