Unity

Merge lp:~azzar1/unity/fix-lc-failing-tests-2 into lp:unity

  1. fix-lc-failing-tests-2
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 3038
Proposed branch: lp:~azzar1/unity/fix-lc-failing-tests-2
Merge into: lp:unity
Prerequisite: lp:~azzar1/unity/fix-lc-failing-tests
Diff against target: 229 lines (+30/-29)
1 file modified
tests/test_launcher_controller.cpp (+30/-29)
To merge this branch: bzr merge lp:~azzar1/unity/fix-lc-failing-tests-2
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+143203@code.launchpad.net

This proposal supersedes a proposal from 2013-01-14.

Commit message

fix failing launcher controller tests.

Description of the change

With https://code.launchpad.net/~mvo/unity/sc-launcher-integration-fixes/+merge/134931 the directory used to store test desktop files has been added to XDG_DESKTOP_DATA_DIRS, so ApplicationLauncherIcon::RemoteUri returns just the desktop file name without the full path.

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Awesome, fixes 18 failures for me :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/test_launcher_controller.cpp'
2--- tests/test_launcher_controller.cpp 2013-01-14 21:38:00 +0000
3+++ tests/test_launcher_controller.cpp 2013-01-14 23:13:22 +0000
4@@ -24,6 +24,7 @@
5 #include "LauncherControllerPrivate.h"
6 #include "ExpoLauncherIcon.h"
7 #include "DesktopLauncherIcon.h"
8+#include "DesktopUtilities.h"
9 #include "MockLauncherIcon.h"
10 #include "BFBLauncherIcon.h"
11 #include "HudLauncherIcon.h"
12@@ -444,7 +445,7 @@
13 EXPECT_CALL(*bamf_icon, UnStick());
14 EXPECT_CALL(*bamf_icon, Quit()).Times(0);
15
16- favorite_store.favorite_removed.emit(FavoriteStore::URI_PREFIX_APP + desktop);
17+ favorite_store.favorite_removed.emit(bamf_icon->RemoteUri());
18 }
19
20 TEST_F(TestLauncherController, EnabledStrutsByDefault)
21@@ -533,7 +534,7 @@
22 TEST_F(TestLauncherController, CreateFavoriteDesktopFile)
23 {
24 std::string desktop_file = app::BZR_HANDLE_PATCH;
25- std::string icon_uri = FavoriteStore::URI_PREFIX_APP + desktop_file;
26+ std::string icon_uri = FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(desktop_file);
27 auto const& fav = lc.Impl()->CreateFavoriteIcon(icon_uri);
28
29 ASSERT_TRUE(fav.IsValid());
30@@ -728,7 +729,7 @@
31 }
32
33 std::string desktop = app::BZR_HANDLE_PATCH;
34- std::string icon_uri = FavoriteStore::URI_PREFIX_APP + desktop;
35+ std::string icon_uri = FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(desktop);
36 auto const& fav = lc.Impl()->CreateFavoriteIcon(icon_uri);
37 lc.Impl()->RegisterIcon(fav);
38 EXPECT_EQ(fav, lc.Impl()->GetIconByUri(icon_uri));
39@@ -789,16 +790,16 @@
40 lc.Impl()->SetupIcons();
41 lc.DisconnectSignals();
42
43- auto fav = lc.Impl()->GetIconByUri(FavoriteStore::URI_PREFIX_APP + app::UBUNTU_ONE);
44+ auto fav = lc.Impl()->GetIconByUri(FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(app::UBUNTU_ONE));
45 EXPECT_EQ(model->IconIndex(fav), icon_index);
46
47- fav = lc.Impl()->GetIconByUri(FavoriteStore::URI_PREFIX_APP + app::SW_CENTER);
48+ fav = lc.Impl()->GetIconByUri(FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(app::SW_CENTER));
49 EXPECT_EQ(model->IconIndex(fav), ++icon_index);
50
51 for (auto const& device : lc.Impl()->device_section_.GetIcons())
52 ASSERT_EQ(model->IconIndex(device), ++icon_index);
53
54- fav = lc.Impl()->GetIconByUri(FavoriteStore::URI_PREFIX_APP + app::UPDATE_MANAGER);
55+ fav = lc.Impl()->GetIconByUri(FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(app::UPDATE_MANAGER));
56 EXPECT_EQ(model->IconIndex(fav), ++icon_index);
57
58 for (auto& app : ApplicationManager::Default().GetRunningApplications())
59@@ -831,10 +832,10 @@
60 lc.DisconnectSignals();
61
62 favorite_store.SetFavorites({ places::DEVICES_URI,
63- FavoriteStore::URI_PREFIX_APP + app::SW_CENTER,
64+ FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(app::SW_CENTER),
65 places::APPS_URI,
66- FavoriteStore::URI_PREFIX_APP + app::UBUNTU_ONE,
67- FavoriteStore::URI_PREFIX_APP + app::UPDATE_MANAGER });
68+ FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(app::UBUNTU_ONE),
69+ FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(app::UPDATE_MANAGER) });
70 lc.Impl()->ResetIconPriorities();
71
72 int icon_index = -1;
73@@ -842,7 +843,7 @@
74 for (auto const& device : lc.Impl()->device_section_.GetIcons())
75 ASSERT_EQ(model->IconIndex(device), ++icon_index);
76
77- auto fav = lc.Impl()->GetIconByUri(FavoriteStore::URI_PREFIX_APP + app::SW_CENTER);
78+ auto fav = lc.Impl()->GetIconByUri(FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(app::SW_CENTER));
79 EXPECT_EQ(model->IconIndex(fav), ++icon_index);
80
81 for (auto& app : ApplicationManager::Default().GetRunningApplications())
82@@ -860,10 +861,10 @@
83 ASSERT_EQ(model->IconIndex(icon), ++icon_index);
84 }
85
86- fav = lc.Impl()->GetIconByUri(FavoriteStore::URI_PREFIX_APP + app::UBUNTU_ONE);
87+ fav = lc.Impl()->GetIconByUri(FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(app::UBUNTU_ONE));
88 EXPECT_EQ(model->IconIndex(fav), ++icon_index);
89
90- fav = lc.Impl()->GetIconByUri(FavoriteStore::URI_PREFIX_APP + app::UPDATE_MANAGER);
91+ fav = lc.Impl()->GetIconByUri(FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(app::UPDATE_MANAGER));
92 EXPECT_EQ(model->IconIndex(fav), ++icon_index);
93 }
94
95@@ -941,20 +942,20 @@
96 lc.Impl()->device_section_ = MockDeviceLauncherSection(0);
97
98 favorite_store.SetFavorites({ places::DEVICES_URI,
99- FavoriteStore::URI_PREFIX_APP + app::SW_CENTER });
100+ FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(app::SW_CENTER) });
101 lc.Impl()->SetupIcons();
102
103- auto first_icon = lc.Impl()->GetIconByUri(FavoriteStore::URI_PREFIX_APP + app::SW_CENTER);
104+ auto first_icon = lc.Impl()->GetIconByUri(FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(app::SW_CENTER));
105 ASSERT_TRUE(first_icon);
106
107 int last_priority = lc.Impl()->GetLastIconPriority<VolumeLauncherIcon>(places::DEVICES_URI);
108 EXPECT_EQ(last_priority, first_icon->SortPriority() - 1);
109
110- favorite_store.SetFavorites({ FavoriteStore::URI_PREFIX_APP + app::SW_CENTER,
111+ favorite_store.SetFavorites({ FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(app::SW_CENTER),
112 places::DEVICES_URI });
113 favorite_store.reordered.emit();
114
115- first_icon = lc.Impl()->GetIconByUri(FavoriteStore::URI_PREFIX_APP + app::SW_CENTER);
116+ first_icon = lc.Impl()->GetIconByUri(FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(app::SW_CENTER));
117
118 last_priority = lc.Impl()->GetLastIconPriority<VolumeLauncherIcon>(places::DEVICES_URI);
119 EXPECT_EQ(last_priority, first_icon->SortPriority());
120@@ -1028,7 +1029,7 @@
121 {
122 auto const& model = lc.Impl()->model_;
123 std::string desktop = app::BZR_HANDLE_PATCH;
124- std::string icon_uri = FavoriteStore::URI_PREFIX_APP + desktop;
125+ std::string icon_uri = FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(desktop);
126 ASSERT_FALSE(lc.Impl()->GetIconByUri(icon_uri).IsValid());
127
128 auto app_icons = model->GetSublist<ApplicationLauncherIcon>();
129@@ -1139,7 +1140,7 @@
130 TEST_F(TestLauncherController, LauncherAddRequestSpecial)
131 {
132 std::string desktop = app::BZR_HANDLE_PATCH;
133- std::string icon_uri = FavoriteStore::URI_PREFIX_APP + desktop;
134+ std::string icon_uri = FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(desktop);
135 ASSERT_FALSE(lc.Impl()->GetIconByUri(icon_uri).IsValid());
136
137 lc.Impl()->OnLauncherAddRequestSpecial(desktop, "", "", 0, 0, 32);
138@@ -1152,7 +1153,7 @@
139 TEST_F(TestLauncherController, LauncherAddRequestSpecialIgnored)
140 {
141 std::string desktop = app::BZR_HANDLE_PATCH;
142- std::string icon_uri = FavoriteStore::URI_PREFIX_APP + desktop;
143+ std::string icon_uri = FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(desktop);
144
145 MockApplicationLauncherIcon::Ptr bamf_icon(new MockApplicationLauncherIcon(desktop));
146 lc.Impl()->RegisterIcon(bamf_icon, std::numeric_limits<int>::max());
147@@ -1314,7 +1315,7 @@
148
149 TEST_F(TestLauncherController, OnFavoriteStoreFavoriteAddedNew)
150 {
151- std::string icon_uri = FavoriteStore::URI_PREFIX_APP + app::BZR_HANDLE_PATCH;
152+ std::string icon_uri = FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(app::BZR_HANDLE_PATCH);
153
154 favorite_store.favorite_added.emit(icon_uri, "", true);
155
156@@ -1325,7 +1326,7 @@
157
158 TEST_F(TestLauncherController, OnFavoriteStoreFavoriteAddedNewBeforeIcon)
159 {
160- std::string icon_uri = FavoriteStore::URI_PREFIX_APP + app::BZR_HANDLE_PATCH;
161+ std::string icon_uri = FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(app::BZR_HANDLE_PATCH);
162 auto const& model = lc.Impl()->model_;
163
164 auto app_icons = model->GetSublist<ApplicationLauncherIcon>();
165@@ -1341,7 +1342,7 @@
166
167 TEST_F(TestLauncherController, OnFavoriteStoreFavoriteAddedNewAfterIcon)
168 {
169- std::string icon_uri = FavoriteStore::URI_PREFIX_APP + app::BZR_HANDLE_PATCH;
170+ std::string icon_uri = FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(app::BZR_HANDLE_PATCH);
171 auto const& model = lc.Impl()->model_;
172
173 auto app_icons = model->GetSublist<ApplicationLauncherIcon>();
174@@ -1358,7 +1359,7 @@
175 TEST_F(TestLauncherController, OnFavoriteStoreFavoriteAddedStick)
176 {
177 std::string desktop = app::BZR_HANDLE_PATCH;
178- std::string icon_uri = FavoriteStore::URI_PREFIX_APP + desktop;
179+ std::string icon_uri = FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(desktop);
180
181 MockApplicationLauncherIcon::Ptr app_icon(new MockApplicationLauncherIcon(desktop));
182 lc.Impl()->RegisterIcon(app_icon, std::numeric_limits<int>::max());
183@@ -1372,7 +1373,7 @@
184 {
185 auto const& model = lc.Impl()->model_;
186 std::string desktop = app::BZR_HANDLE_PATCH;
187- std::string icon_uri = FavoriteStore::URI_PREFIX_APP + desktop;
188+ std::string icon_uri = FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(desktop);
189
190 MockApplicationLauncherIcon::Ptr app_icon(new MockApplicationLauncherIcon(desktop));
191 lc.Impl()->RegisterIcon(app_icon, std::numeric_limits<int>::max());
192@@ -1392,7 +1393,7 @@
193 {
194 auto const& model = lc.Impl()->model_;
195 std::string desktop = app::BZR_HANDLE_PATCH;
196- std::string icon_uri = FavoriteStore::URI_PREFIX_APP + desktop;
197+ std::string icon_uri = FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(desktop);
198
199 MockApplicationLauncherIcon::Ptr app_icon(new MockApplicationLauncherIcon(desktop));
200 lc.Impl()->RegisterIcon(app_icon, std::numeric_limits<int>::max());
201@@ -1418,7 +1419,7 @@
202 auto const& device_icon2(*(std::next(icons.begin())));
203
204 favorite_store.SetFavorites({ lc.Impl()->expo_icon_->RemoteUri(),
205- FavoriteStore::URI_PREFIX_APP + app::UBUNTU_ONE });
206+ FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(app::UBUNTU_ONE) });
207 lc.Impl()->SetupIcons();
208 lc.DisconnectSignals();
209
210@@ -1455,9 +1456,9 @@
211 auto const& device_icon(*(icons.begin()));
212
213 favorite_store.SetFavorites({ lc.Impl()->expo_icon_->RemoteUri(),
214- FavoriteStore::URI_PREFIX_APP + app::UBUNTU_ONE,
215+ FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(app::UBUNTU_ONE),
216 device_icon->RemoteUri(),
217- FavoriteStore::URI_PREFIX_APP + app::UPDATE_MANAGER });
218+ FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(app::UPDATE_MANAGER) });
219 lc.Impl()->SetupIcons();
220 lc.DisconnectSignals();
221
222@@ -1482,7 +1483,7 @@
223 auto const& device_icon2(*(std::next(icons.begin())));
224
225 favorite_store.SetFavorites({ lc.Impl()->expo_icon_->RemoteUri(), places::DEVICES_URI,
226- FavoriteStore::URI_PREFIX_APP + app::UBUNTU_ONE });
227+ FavoriteStore::URI_PREFIX_APP + DesktopUtilities::GetDesktopID(app::UBUNTU_ONE) });
228 lc.Impl()->SetupIcons();
229 lc.DisconnectSignals();
230