Merge lp:~townsend/unity/fix-lp1223561 into lp:unity

Proposed by Christopher Townsend
Status: Merged
Approved by: Stephen M. Webb
Approved revision: no longer in the source branch.
Merged at revision: 3495
Proposed branch: lp:~townsend/unity/fix-lp1223561
Merge into: lp:unity
Diff against target: 260 lines (+34/-34)
1 file modified
tests/test_launcher_entry_remote.cpp (+34/-34)
To merge this branch: bzr merge lp:~townsend/unity/fix-lp1223561
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Marco Trevisan (Treviño) Approve
Review via email: mp+185086@code.launchpad.net

Commit message

Due to a change libdbusmenu, need to use a fully qualified name for the Dbus object name.

Description of the change

= Issue =
Some TestLauncherEntryRemote unit tests began failing recently due to a change in libdbusmenu.

= Fix =
Use a fully qualified name for the Dbus object name.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/test_launcher_entry_remote.cpp'
2--- tests/test_launcher_entry_remote.cpp 2013-07-18 04:16:50 +0000
3+++ tests/test_launcher_entry_remote.cpp 2013-09-11 15:31:50 +0000
4@@ -55,9 +55,9 @@
5
6 TEST(TestLauncherEntryRemote, DummyConstruction)
7 {
8- LauncherEntryRemote entry("TestName", nullptr);
9+ LauncherEntryRemote entry("com.canonical.unity.TestName", nullptr);
10
11- EXPECT_EQ(entry.DBusName(), "TestName");
12+ EXPECT_EQ(entry.DBusName(), "com.canonical.unity.TestName");
13 EXPECT_TRUE(entry.AppUri().empty());
14 EXPECT_TRUE(entry.Emblem().empty());
15 EXPECT_EQ(entry.Count(), 0);
16@@ -71,9 +71,9 @@
17
18 TEST(TestLauncherEntryRemote, Construction)
19 {
20- LauncherEntryRemote entry("TestName", BuildVariantParameters());
21+ LauncherEntryRemote entry("com.canonical.unity.TestName", BuildVariantParameters());
22
23- EXPECT_EQ(entry.DBusName(), "TestName");
24+ EXPECT_EQ(entry.DBusName(), "com.canonical.unity.TestName");
25 EXPECT_EQ(entry.AppUri(), "app_uri");
26 EXPECT_EQ(entry.Emblem(), "emblem");
27 EXPECT_EQ(entry.Count(), 0);
28@@ -90,9 +90,9 @@
29 GVariant* parameters;
30 parameters = BuildVariantParameters("Uri", "TestEmblem", true, 55, true, 31.12f,
31 true, true, "/My/DBus/Menu/For/QL");
32- LauncherEntryRemote entry("CustomName", parameters);
33+ LauncherEntryRemote entry("com.canonical.unity.CustomName", parameters);
34
35- EXPECT_EQ(entry.DBusName(), "CustomName");
36+ EXPECT_EQ(entry.DBusName(), "com.canonical.unity.CustomName");
37 EXPECT_EQ(entry.AppUri(), "Uri");
38 EXPECT_EQ(entry.Emblem(), "TestEmblem");
39 EXPECT_EQ(entry.Count(), 55);
40@@ -106,9 +106,9 @@
41
42 TEST(TestLauncherEntryRemote, UpdateFromOther)
43 {
44- LauncherEntryRemote entry1("Entry1", BuildVariantParameters("AppURI1"));
45+ LauncherEntryRemote entry1("com.canonical.unity.Entry1", BuildVariantParameters("AppURI1"));
46
47- ASSERT_EQ(entry1.DBusName(), "Entry1");
48+ ASSERT_EQ(entry1.DBusName(), "com.canonical.unity.Entry1");
49 ASSERT_EQ(entry1.AppUri(), "AppURI1");
50 auto old_ql1 = entry1.Quicklist();
51 ASSERT_THAT(old_ql1.RawPtr(), NotNull());
52@@ -117,12 +117,12 @@
53 parameters = BuildVariantParameters("Uri2", "TestEmblem", false, 5, true, 0.12f,
54 true, false, "/My/DBus/Menu/For/QL");
55
56- LauncherEntryRemote::Ptr entry2(new LauncherEntryRemote("Entry2", parameters));
57+ LauncherEntryRemote::Ptr entry2(new LauncherEntryRemote("com.canonical.unity.Entry2", parameters));
58 ASSERT_EQ(entry2->AppUri(), "Uri2");
59
60 entry1.Update(entry2);
61
62- EXPECT_EQ(entry1.DBusName(), "Entry2");
63+ EXPECT_EQ(entry1.DBusName(), "com.canonical.unity.Entry2");
64 EXPECT_EQ(entry1.AppUri(), "AppURI1");
65 EXPECT_EQ(entry1.Emblem(), "TestEmblem");
66 EXPECT_EQ(entry1.Count(), 5);
67@@ -137,9 +137,9 @@
68
69 TEST(TestLauncherEntryRemote, UpdateFromVariantIter)
70 {
71- LauncherEntryRemote entry1("Entry1", BuildVariantParameters("AppURI1"));
72+ LauncherEntryRemote entry1("com.canonical.unity.Entry1", BuildVariantParameters("AppURI1"));
73
74- ASSERT_EQ(entry1.DBusName(), "Entry1");
75+ ASSERT_EQ(entry1.DBusName(), "com.canonical.unity.Entry1");
76 ASSERT_EQ(entry1.AppUri(), "AppURI1");
77 auto old_ql1 = entry1.Quicklist();
78 ASSERT_THAT(old_ql1.RawPtr(), NotNull());
79@@ -155,7 +155,7 @@
80 g_variant_iter_free(prop_iter);
81 g_variant_unref(parameters);
82
83- EXPECT_EQ(entry1.DBusName(), "Entry1");
84+ EXPECT_EQ(entry1.DBusName(), "com.canonical.unity.Entry1");
85 EXPECT_EQ(entry1.AppUri(), "AppURI1");
86 EXPECT_EQ(entry1.Emblem(), "TestEmblem");
87 EXPECT_EQ(entry1.Count(), 5);
88@@ -170,7 +170,7 @@
89
90 TEST(TestLauncherEntryRemote, ChangeDBusName)
91 {
92- LauncherEntryRemote entry("Entry", BuildVariantParameters("AppURI"));
93+ LauncherEntryRemote entry("com.canonical.unity.Entry", BuildVariantParameters("AppURI"));
94
95 bool name_changed = false;
96 std::string old_name;
97@@ -181,16 +181,16 @@
98
99 auto old_ql = entry.Quicklist();
100 ASSERT_THAT(old_ql.RawPtr(), NotNull());
101- ASSERT_EQ(entry.DBusName(), "Entry");
102+ ASSERT_EQ(entry.DBusName(), "com.canonical.unity.Entry");
103
104- entry.SetDBusName("NewEntryName");
105- ASSERT_EQ(entry.DBusName(), "NewEntryName");
106+ entry.SetDBusName("com.canonical.unity.NewEntryName");
107+ ASSERT_EQ(entry.DBusName(), "com.canonical.unity.NewEntryName");
108
109 EXPECT_THAT(entry.Quicklist().RawPtr(), IsNull());
110 EXPECT_NE(old_ql, entry.Quicklist());
111
112 EXPECT_TRUE(name_changed);
113- EXPECT_EQ(old_name, "Entry");
114+ EXPECT_EQ(old_name, "com.canonical.unity.Entry");
115 }
116
117 TEST(TestLauncherEntryRemote, EmblemChangedSignal)
118@@ -199,7 +199,7 @@
119 parameters = BuildVariantParameters("Uri", "TestEmblem1", true, 55, true, 31.12f,
120 true, true, "/My/DBus/Menu/For/QL");
121
122- LauncherEntryRemote entry1("Entry1", parameters);
123+ LauncherEntryRemote entry1("com.canonical.unity.Entry1", parameters);
124
125 bool value_changed = false;
126 entry1.emblem_changed.connect([&] (LauncherEntryRemote*) { value_changed = true; });
127@@ -207,7 +207,7 @@
128 parameters = BuildVariantParameters("Uri", "TestEmblem2", true, 55, true, 31.12f,
129 true, true, "/My/DBus/Menu/For/QL");
130
131- LauncherEntryRemote::Ptr entry2(new LauncherEntryRemote("Entry2", parameters));
132+ LauncherEntryRemote::Ptr entry2(new LauncherEntryRemote("com.canonical.unity.Entry2", parameters));
133
134 ASSERT_EQ(entry1.Emblem(), "TestEmblem1");
135
136@@ -223,7 +223,7 @@
137 parameters = BuildVariantParameters("Uri", "TestEmblem", true, 55, true, 31.12f,
138 true, true, "/My/DBus/Menu/For/QL");
139
140- LauncherEntryRemote entry1("Entry1", parameters);
141+ LauncherEntryRemote entry1("com.canonical.unity.Entry1", parameters);
142
143 bool value_changed = false;
144 entry1.count_changed.connect([&] (LauncherEntryRemote*) { value_changed = true; });
145@@ -231,7 +231,7 @@
146 parameters = BuildVariantParameters("Uri", "TestEmblem", true, 155, true, 31.12f,
147 true, true, "/My/DBus/Menu/For/QL");
148
149- LauncherEntryRemote::Ptr entry2(new LauncherEntryRemote("Entry2", parameters));
150+ LauncherEntryRemote::Ptr entry2(new LauncherEntryRemote("com.canonical.unity.Entry2", parameters));
151
152 ASSERT_EQ(entry1.Count(), 55);
153
154@@ -247,7 +247,7 @@
155 parameters = BuildVariantParameters("Uri", "TestEmblem", true, 55, true, 0.12f,
156 true, true, "/My/DBus/Menu/For/QL");
157
158- LauncherEntryRemote entry1("Entry1", parameters);
159+ LauncherEntryRemote entry1("com.canonical.unity.Entry1", parameters);
160
161 bool value_changed = false;
162 entry1.progress_changed.connect([&] (LauncherEntryRemote*) { value_changed = true; });
163@@ -255,7 +255,7 @@
164 parameters = BuildVariantParameters("Uri", "TestEmblem", true, 55, true, 31.12f,
165 true, true, "/My/DBus/Menu/For/QL");
166
167- LauncherEntryRemote::Ptr entry2(new LauncherEntryRemote("Entry2", parameters));
168+ LauncherEntryRemote::Ptr entry2(new LauncherEntryRemote("com.canonical.unity.Entry2", parameters));
169
170 ASSERT_EQ(entry1.Progress(), 0.12f);
171
172@@ -271,7 +271,7 @@
173 parameters = BuildVariantParameters("Uri", "TestEmblem", true, 55, true, 31.12f,
174 true, true, "/My/DBus/Menu/For/QL1");
175
176- LauncherEntryRemote entry1("Entry1", parameters);
177+ LauncherEntryRemote entry1("com.canonical.unity.Entry1", parameters);
178
179 bool value_changed = false;
180 entry1.quicklist_changed.connect([&] (LauncherEntryRemote*) { value_changed = true; });
181@@ -279,7 +279,7 @@
182 parameters = BuildVariantParameters("Uri", "TestEmblem", true, 55, true, 31.12f,
183 true, true, "/My/DBus/Menu/For/QL2");
184
185- LauncherEntryRemote::Ptr entry2(new LauncherEntryRemote("Entry2", parameters));
186+ LauncherEntryRemote::Ptr entry2(new LauncherEntryRemote("com.canonical.unity.Entry2", parameters));
187
188 auto old_ql1 = entry1.Quicklist();
189 ASSERT_THAT(old_ql1.RawPtr(), NotNull());
190@@ -297,7 +297,7 @@
191 parameters = BuildVariantParameters("Uri", "TestEmblem", false, 55, true, 31.12f,
192 true, true, "/My/DBus/Menu/For/QL");
193
194- LauncherEntryRemote entry1("Entry1", parameters);
195+ LauncherEntryRemote entry1("com.canonical.unity.Entry1", parameters);
196
197 bool value_changed = false;
198 entry1.emblem_visible_changed.connect([&] (LauncherEntryRemote*) { value_changed = true; });
199@@ -305,7 +305,7 @@
200 parameters = BuildVariantParameters("Uri", "TestEmblem", true, 55, true, 31.12f,
201 true, true, "/My/DBus/Menu/For/QL");
202
203- LauncherEntryRemote::Ptr entry2(new LauncherEntryRemote("Entry2", parameters));
204+ LauncherEntryRemote::Ptr entry2(new LauncherEntryRemote("com.canonical.unity.Entry2", parameters));
205
206 ASSERT_FALSE(entry1.EmblemVisible());
207
208@@ -321,7 +321,7 @@
209 parameters = BuildVariantParameters("Uri", "TestEmblem", false, 55, false, 31.12f,
210 true, true, "/My/DBus/Menu/For/QL");
211
212- LauncherEntryRemote entry1("Entry1", parameters);
213+ LauncherEntryRemote entry1("com.canonical.unity.Entry1", parameters);
214
215 bool value_changed = false;
216 entry1.count_visible_changed.connect([&] (LauncherEntryRemote*) { value_changed = true; });
217@@ -329,7 +329,7 @@
218 parameters = BuildVariantParameters("Uri", "TestEmblem", false, 55, true, 31.12f,
219 true, true, "/My/DBus/Menu/For/QL");
220
221- LauncherEntryRemote::Ptr entry2(new LauncherEntryRemote("Entry2", parameters));
222+ LauncherEntryRemote::Ptr entry2(new LauncherEntryRemote("com.canonical.unity.Entry2", parameters));
223
224 ASSERT_FALSE(entry1.CountVisible());
225
226@@ -345,7 +345,7 @@
227 parameters = BuildVariantParameters("Uri", "TestEmblem", false, 55, false, 31.12f,
228 false, true, "/My/DBus/Menu/For/QL");
229
230- LauncherEntryRemote entry1("Entry1", parameters);
231+ LauncherEntryRemote entry1("com.canonical.unity.Entry1", parameters);
232
233 bool value_changed = false;
234 entry1.progress_visible_changed.connect([&] (LauncherEntryRemote*) { value_changed = true; });
235@@ -353,7 +353,7 @@
236 parameters = BuildVariantParameters("Uri", "TestEmblem", false, 55, false, 31.12f,
237 true, true, "/My/DBus/Menu/For/QL");
238
239- LauncherEntryRemote::Ptr entry2(new LauncherEntryRemote("Entry2", parameters));
240+ LauncherEntryRemote::Ptr entry2(new LauncherEntryRemote("com.canonical.unity.Entry2", parameters));
241
242 ASSERT_FALSE(entry1.ProgressVisible());
243
244@@ -369,7 +369,7 @@
245 parameters = BuildVariantParameters("Uri", "TestEmblem", false, 55, false, 31.12f,
246 false, false, "/My/DBus/Menu/For/QL");
247
248- LauncherEntryRemote entry1("Entry1", parameters);
249+ LauncherEntryRemote entry1("com.canonical.unity.Entry1", parameters);
250
251 bool value_changed = false;
252 entry1.urgent_changed.connect([&] (LauncherEntryRemote*) { value_changed = true; });
253@@ -377,7 +377,7 @@
254 parameters = BuildVariantParameters("Uri", "TestEmblem", false, 55, false, 31.12f,
255 false, true, "/My/DBus/Menu/For/QL");
256
257- LauncherEntryRemote::Ptr entry2(new LauncherEntryRemote("Entry2", parameters));
258+ LauncherEntryRemote::Ptr entry2(new LauncherEntryRemote("com.canonical.unity.Entry2", parameters));
259
260 ASSERT_FALSE(entry1.Urgent());
261