summaryrefslogtreecommitdiff
path: root/tests
diff options
authorMarco Trevisan (TreviƱo) <mail@3v1n0.net>2016-03-10 10:09:21 +0000
committerCI Train Bot <ci-train-bot@canonical.com>2016-03-10 10:09:21 +0000
commit7aff5c5e617272b6d0ea210262028db65641b56d (patch)
treedc53e96254dd41d9e5a058d9b3703d4db0c96c06 /tests
parent5f80ae026ab548701840da293a8f755f79dbd244 (diff)
parent1dc7c9ee2b706a85558d9a05243265259a4bae82 (diff)
LauncherController: add overlay shortcut to all the WindowedLauncherIcon's we have
This includes device icons now. Approved by: Andrea Azzarone, PS Jenkins bot (bzr r4084)
Diffstat (limited to 'tests')
-rw-r--r--tests/test_launcher_controller.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/test_launcher_controller.cpp b/tests/test_launcher_controller.cpp
index eee05c0bf..456c556b7 100644
--- a/tests/test_launcher_controller.cpp
+++ b/tests/test_launcher_controller.cpp
@@ -1455,7 +1455,10 @@ TEST_F(TestLauncherController, SortAndUpdate)
for (auto const& icon : *(lc.Impl()->model_))
{
- if (icon->IsVisible() && icon->GetIconType() == AbstractLauncherIcon::IconType::APPLICATION && expected_shortcut <= 10)
+ if (icon->IsVisible() &&
+ (icon->GetIconType() == AbstractLauncherIcon::IconType::APPLICATION ||
+ icon->GetIconType() == AbstractLauncherIcon::IconType::DEVICE) &&
+ expected_shortcut <= 10)
{
ASSERT_EQ(icon->GetShortcut(), std::to_string(expected_shortcut % 10)[0]);
++expected_shortcut;