Unity

Merge lp:~robert-ancell/unity/gnome-software into lp:unity

  1. gnome-software
  2. Merge into trunk
Proposed by Robert Ancell
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 4078
Proposed branch: lp:~robert-ancell/unity/gnome-software
Merge into: lp:unity
Diff against target: 308 lines (+50/-51)
8 files modified
com.canonical.Unity.gschema.xml (+1/-1)
tests/data/applications/org.gnome.Software.desktop (+3/-4)
tests/test_application_launcher_icon.cpp (+7/-7)
tests/test_desktop_utilities.cpp (+3/-3)
tests/test_favorite_store.cpp (+1/-1)
tests/test_favorite_store_gsettings.cpp (+1/-1)
tests/test_launcher_controller.cpp (+1/-1)
tests/test_software_center_launcher_icon.cpp (+33/-33)
To merge this branch: bzr merge lp:~robert-ancell/unity/gnome-software
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+286715@code.launchpad.net

Commit message

Switch from Ubuntu Software Center to GNOME Software.

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

There was some remaining code relating to a software-center-agent which I'm not sure about. Is that still applicable?

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:4076
http://jenkins.qa.ubuntu.com/job/unity-ci/1410/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/60/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/60/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/60/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1410/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Fix for build: https://code.launchpad.net/~robert-ancell/unity/libgee/+merge/286719

Revision history for this message
Robert Ancell (robert-ancell) wrote :

See also https://code.launchpad.net/~azzar1/unity/gs-integration/+merge/286653

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'com.canonical.Unity.gschema.xml'
2--- com.canonical.Unity.gschema.xml 2015-11-23 09:24:10 +0000
3+++ com.canonical.Unity.gschema.xml 2016-02-19 22:04:59 +0000
4@@ -117,7 +117,7 @@
5 'application://libreoffice-writer.desktop',
6 'application://libreoffice-calc.desktop',
7 'application://libreoffice-impress.desktop',
8- 'application://ubuntu-software-center.desktop',
9+ 'application://org.gnome.Software.desktop',
10 'application://ubuntu-amazon-default.desktop',
11 'application://unity-control-center.desktop',
12 'unity://running-apps',
13
14=== renamed file 'tests/data/applications/ubuntu-software-center.desktop' => 'tests/data/applications/org.gnome.Software.desktop'
15--- tests/data/applications/ubuntu-software-center.desktop 2013-06-28 12:52:58 +0000
16+++ tests/data/applications/org.gnome.Software.desktop 2016-02-19 22:04:59 +0000
17@@ -1,9 +1,8 @@
18 [Desktop Entry]
19-Name=Ubuntu Software Center
20-GenericName=Software Center
21-Comment=Lets you choose from thousands of applications available for Ubuntu
22+Name=Software
23+Comment=Add, remove or update software on this computer
24 Exec=/bin/true
25-Icon=softwarecenter
26+Icon=org.gnome.Software
27 Terminal=false
28 Type=Application
29 Categories=PackageManager;GTK;System;Settings;
30
31=== modified file 'tests/test_application_launcher_icon.cpp'
32--- tests/test_application_launcher_icon.cpp 2015-12-08 14:34:55 +0000
33+++ tests/test_application_launcher_icon.cpp 2016-02-19 22:04:59 +0000
34@@ -41,7 +41,7 @@
35 namespace
36 {
37 const std::string DEFAULT_EMPTY_ICON = "application-default-icon";
38-const std::string USC_DESKTOP = BUILDDIR"/tests/data/applications/ubuntu-software-center.desktop";
39+const std::string GS_DESKTOP = BUILDDIR"/tests/data/applications/org.gnome.Software.desktop";
40 const std::string UM_DESKTOP = BUILDDIR"/tests/data/applications/update-manager.desktop";
41 const std::string NO_ICON_DESKTOP = BUILDDIR"/tests/data/applications/no-icon.desktop";
42
43@@ -93,9 +93,9 @@
44
45 virtual void SetUp() override
46 {
47- usc_app = std::make_shared<MockApplication::Nice>(USC_DESKTOP, "softwarecenter");
48+ usc_app = std::make_shared<MockApplication::Nice>(GS_DESKTOP, "org.gnome.Software");
49 usc_icon = new MockApplicationLauncherIcon(usc_app);
50- ASSERT_EQ(usc_icon->DesktopFile(), USC_DESKTOP);
51+ ASSERT_EQ(usc_icon->DesktopFile(), GS_DESKTOP);
52
53 empty_app = std::make_shared<MockApplication::Nice>(NO_ICON_DESKTOP);
54 empty_icon = new MockApplicationLauncherIcon(empty_app);
55@@ -175,7 +175,7 @@
56
57 TEST_F(TestApplicationLauncherIcon, ApplicationSignalDisconnection)
58 {
59- std::shared_ptr<MockApplication> app = std::make_shared<MockApplication::Nice>(USC_DESKTOP);
60+ std::shared_ptr<MockApplication> app = std::make_shared<MockApplication::Nice>(GS_DESKTOP);
61 {
62 MockApplicationLauncherIcon::Ptr icon(new MockApplicationLauncherIcon(app));
63 EXPECT_FALSE(app->closed.empty());
64@@ -201,7 +201,7 @@
65
66 TEST_F(TestApplicationLauncherIcon, TestDefaultIcon)
67 {
68- EXPECT_EQ(usc_icon->icon_name(), "softwarecenter");
69+ EXPECT_EQ(usc_icon->icon_name(), "org.gnome.Software");
70 EXPECT_EQ(empty_icon->icon_name(), DEFAULT_EMPTY_ICON);
71 EXPECT_EQ(mock_icon->icon_name(), DEFAULT_EMPTY_ICON);
72 }
73@@ -267,7 +267,7 @@
74
75 TEST_F(TestApplicationLauncherIcon, StickStickedDesktopApp)
76 {
77- auto app = std::make_shared<MockApplication::Nice>(USC_DESKTOP);
78+ auto app = std::make_shared<MockApplication::Nice>(GS_DESKTOP);
79 app->sticky = true;
80 app->desktop_file_ = UM_DESKTOP;
81 MockApplicationLauncherIcon::Ptr icon(new MockApplicationLauncherIcon(app));
82@@ -542,7 +542,7 @@
83
84 TEST_F(TestApplicationLauncherIcon, RemoteUri)
85 {
86- EXPECT_EQ(usc_icon->RemoteUri(), FavoriteStore::URI_PREFIX_APP + USC_DESKTOP);
87+ EXPECT_EQ(usc_icon->RemoteUri(), FavoriteStore::URI_PREFIX_APP + GS_DESKTOP);
88 EXPECT_TRUE(mock_icon->RemoteUri().empty());
89 }
90
91
92=== modified file 'tests/test_desktop_utilities.cpp'
93--- tests/test_desktop_utilities.cpp 2013-03-21 14:01:06 +0000
94+++ tests/test_desktop_utilities.cpp 2016-02-19 22:04:59 +0000
95@@ -184,17 +184,17 @@
96 g_setenv("XDG_DATA_DIRS", LOCAL_DATA_DIR.c_str(), TRUE);
97 g_setenv("XDG_DATA_HOME", "UnityUserConfig", TRUE);
98
99- std::string const& file = DesktopUtilities::GetDesktopPathById("ubuntu-software-center.desktop");
100+ std::string const& file = DesktopUtilities::GetDesktopPathById("org.gnome.Software.desktop");
101
102 g_setenv("XDG_DATA_DIRS", old_dirs.c_str(), TRUE);
103 g_setenv("XDG_DATA_HOME", old_dirs.c_str(), TRUE);
104
105- EXPECT_EQ(file, LOCAL_DATA_DIR + "/applications/ubuntu-software-center.desktop");
106+ EXPECT_EQ(file, LOCAL_DATA_DIR + "/applications/org.gnome.Software.desktop");
107 }
108
109 TEST(TestDesktopUtilities, TestGetBackgroundColor)
110 {
111- std::string const& color = DesktopUtilities::GetBackgroundColor(LOCAL_DATA_DIR+"/applications/ubuntu-software-center.desktop");
112+ std::string const& color = DesktopUtilities::GetBackgroundColor(LOCAL_DATA_DIR+"/applications/org.gnome.Software.desktop");
113
114 EXPECT_EQ(color, "#aabbcc");
115 }
116
117=== modified file 'tests/test_favorite_store.cpp'
118--- tests/test_favorite_store.cpp 2012-09-18 15:47:49 +0000
119+++ tests/test_favorite_store.cpp 2016-02-19 22:04:59 +0000
120@@ -87,7 +87,7 @@
121
122 TEST_F(TestFavoriteStore, ParseFavoriteFromUri)
123 {
124- const std::string VALID_DESKTOP_PATH = BUILDDIR"/tests/data/applications/ubuntu-software-center.desktop";
125+ const std::string VALID_DESKTOP_PATH = BUILDDIR"/tests/data/applications/org.gnome.Software.desktop";
126 EXPECT_EQ(favorite_store.ParseFavoriteFromUri("file.desktop"), "application://file.desktop");
127 EXPECT_EQ(favorite_store.ParseFavoriteFromUri(VALID_DESKTOP_PATH), "application://"+VALID_DESKTOP_PATH);
128
129
130=== modified file 'tests/test_favorite_store_gsettings.cpp'
131--- tests/test_favorite_store_gsettings.cpp 2014-03-21 03:42:28 +0000
132+++ tests/test_favorite_store_gsettings.cpp 2016-02-19 22:04:59 +0000
133@@ -38,7 +38,7 @@
134 const gchar* SETTINGS_KEY = "favorites";
135
136 const char* base_store_favs[] = { BUILDDIR"/tests/data/applications/ubuntuone-installer.desktop",
137- "file://" BUILDDIR "/tests/data/applications/ubuntu-software-center.desktop",
138+ "file://" BUILDDIR "/tests/data/applications/org.gnome.Software.desktop",
139 "application://" BUILDDIR "/tests/data/applications/update-manager.desktop",
140 "unity://test-icon",
141 "device://uuid",
142
143=== modified file 'tests/test_launcher_controller.cpp'
144--- tests/test_launcher_controller.cpp 2015-12-08 14:34:55 +0000
145+++ tests/test_launcher_controller.cpp 2016-02-19 22:04:59 +0000
146@@ -61,7 +61,7 @@
147 namespace app
148 {
149 const std::string UBUNTU_ONE = BUILDDIR "/tests/data/applications/ubuntuone-installer.desktop";
150- const std::string SW_CENTER = BUILDDIR "/tests/data/applications/ubuntu-software-center.desktop";
151+ const std::string SW_CENTER = BUILDDIR "/tests/data/applications/org.gnome.Software.desktop";
152 const std::string UPDATE_MANAGER = BUILDDIR "/tests/data/applications/update-manager.desktop";
153 const std::string BZR_HANDLE_PATCH = BUILDDIR "/tests/data/applications/bzr-handle-patch.desktop";
154 const std::string NO_ICON = BUILDDIR "/tests/data/applications/no-icon.desktop";
155
156=== modified file 'tests/test_software_center_launcher_icon.cpp'
157--- tests/test_software_center_launcher_icon.cpp 2015-12-08 14:34:55 +0000
158+++ tests/test_software_center_launcher_icon.cpp 2016-02-19 22:04:59 +0000
159@@ -42,19 +42,19 @@
160 {
161 namespace
162 {
163-const std::string PRE_INSTALL_ICON = "sw-center-launcher-icon";
164-const std::string FINAL_ICON = "softwarecenter";
165-const std::string APP_NAME = "Ubuntu Software Center";
166+const std::string PRE_INSTALL_ICON = "software-launcher-icon";
167+const std::string FINAL_ICON = "org.gnome.Software";
168+const std::string APP_NAME = "Software";
169 const std::string LOCAL_DATA_DIR = BUILDDIR"/tests/data";
170-const std::string USC_DESKTOP = LOCAL_DATA_DIR+"/applications/ubuntu-software-center.desktop";
171-const std::string USC_APP_INSTALL_DESKTOP = "/usr/share/app-install/desktop/software-center:ubuntu-software-center.desktop";
172+const std::string GS_DESKTOP = LOCAL_DATA_DIR+"/applications/org.gnome.Software.desktop";
173+const std::string GS_APP_INSTALL_DESKTOP = "/usr/share/app-install/desktop/software-center:org.gnome.Software.desktop";
174 }
175
176 struct TestSoftwareCenterLauncherIcon : testmocks::TestUnityAppBase
177 {
178 TestSoftwareCenterLauncherIcon()
179- : usc(std::make_shared<MockApplication::Nice>(USC_APP_INSTALL_DESKTOP, FINAL_ICON, APP_NAME))
180- , icon(usc, "/com/canonical/unity/test/object/path", PRE_INSTALL_ICON)
181+ : gs(std::make_shared<MockApplication::Nice>(GS_APP_INSTALL_DESKTOP, FINAL_ICON, APP_NAME))
182+ , icon(gs, "/com/canonical/unity/test/object/path", PRE_INSTALL_ICON)
183 {}
184
185 struct MockSoftwareCenterLauncherIcon : SoftwareCenterLauncherIcon
186@@ -86,7 +86,7 @@
187
188 panel::Style panel;
189 nux::ObjectPtr<MockableBaseWindow> launcher_win;
190- MockApplication::Ptr usc;
191+ MockApplication::Ptr gs;
192 MockSoftwareCenterLauncherIcon icon;
193 };
194
195@@ -102,23 +102,23 @@
196 TEST_F(TestSoftwareCenterLauncherIcon, DesktopFileTransformTrivial)
197 {
198 // no transformation needed
199- usc->desktop_file_ = USC_DESKTOP;
200- EXPECT_EQ(icon.GetActualDesktopFileAfterInstall(), USC_DESKTOP);
201+ gs->desktop_file_ = GS_DESKTOP;
202+ EXPECT_EQ(icon.GetActualDesktopFileAfterInstall(), GS_DESKTOP);
203 }
204
205 TEST_F(TestSoftwareCenterLauncherIcon, DesktopFileTransformAppInstall)
206 {
207 // ensure that tranformation from app-install data desktop files works
208- usc->desktop_file_ = "/usr/share/app-install/desktop/pkgname:kde4__afile.desktop";
209+ gs->desktop_file_ = "/usr/share/app-install/desktop/pkgname:kde4__afile.desktop";
210 EXPECT_EQ(icon.GetActualDesktopFileAfterInstall(),
211 LOCAL_DATA_DIR+"/applications/kde4/afile.desktop");
212 }
213
214 TEST_F(TestSoftwareCenterLauncherIcon, DesktopFileTransformSCAgent)
215 {
216- // now simualte data coming from the sc-agent
217- usc->desktop_file_ = "/tmp/software-center-agent:VP2W9M:ubuntu-software-center.desktop";
218- EXPECT_EQ(icon.GetActualDesktopFileAfterInstall(), USC_DESKTOP);
219+ // now simualte data coming from the software-center-agent
220+ gs->desktop_file_ = "/tmp/software-center-agent:VP2W9M:org.gnome.Software.desktop";
221+ EXPECT_EQ(icon.GetActualDesktopFileAfterInstall(), GS_DESKTOP);
222 }
223
224 // simulate a OnFinished signal from a /usr/share/app-install location
225@@ -128,41 +128,41 @@
226 {
227 icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
228
229- EXPECT_EQ(USC_DESKTOP, icon.DesktopFile());
230+ EXPECT_EQ(GS_DESKTOP, icon.DesktopFile());
231 }
232
233 TEST_F(TestSoftwareCenterLauncherIcon, OnFinishedUpdatesRemoteURI)
234 {
235 icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
236
237- ASSERT_EQ(USC_DESKTOP, icon.DesktopFile());
238- EXPECT_EQ(FavoriteStore::URI_PREFIX_APP + USC_DESKTOP, icon.GetRemoteUri());
239+ ASSERT_EQ(GS_DESKTOP, icon.DesktopFile());
240+ EXPECT_EQ(FavoriteStore::URI_PREFIX_APP + GS_DESKTOP, icon.GetRemoteUri());
241 }
242
243 TEST_F(TestSoftwareCenterLauncherIcon, DisconnectsOldAppSignals)
244 {
245- ASSERT_FALSE(usc->closed.empty());
246+ ASSERT_FALSE(gs->closed.empty());
247
248 icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
249
250- EXPECT_TRUE(usc->closed.empty());
251- EXPECT_TRUE(usc->window_opened.empty());
252- EXPECT_TRUE(usc->window_moved.empty());
253- EXPECT_TRUE(usc->window_closed.empty());
254- EXPECT_TRUE(usc->visible.changed.empty());
255- EXPECT_TRUE(usc->active.changed.empty());
256- EXPECT_TRUE(usc->running.changed.empty());
257- EXPECT_TRUE(usc->urgent.changed.empty());
258- EXPECT_TRUE(usc->desktop_file.changed.empty());
259- EXPECT_TRUE(usc->title.changed.empty());
260- EXPECT_TRUE(usc->icon.changed.empty());
261+ EXPECT_TRUE(gs->closed.empty());
262+ EXPECT_TRUE(gs->window_opened.empty());
263+ EXPECT_TRUE(gs->window_moved.empty());
264+ EXPECT_TRUE(gs->window_closed.empty());
265+ EXPECT_TRUE(gs->visible.changed.empty());
266+ EXPECT_TRUE(gs->active.changed.empty());
267+ EXPECT_TRUE(gs->running.changed.empty());
268+ EXPECT_TRUE(gs->urgent.changed.empty());
269+ EXPECT_TRUE(gs->desktop_file.changed.empty());
270+ EXPECT_TRUE(gs->title.changed.empty());
271+ EXPECT_TRUE(gs->icon.changed.empty());
272 }
273
274 TEST_F(TestSoftwareCenterLauncherIcon, OnFinishedRemoveInvalidNewAppIcon)
275 {
276 // Using an icon ptr, to get the removed signal to be properly emitted
277 nux::ObjectPtr<MockSoftwareCenterLauncherIcon> icon_ptr(
278- new MockSoftwareCenterLauncherIcon(usc, "/com/canonical/unity/test/object/path", PRE_INSTALL_ICON));
279+ new MockSoftwareCenterLauncherIcon(gs, "/com/canonical/unity/test/object/path", PRE_INSTALL_ICON));
280
281 bool removed = false;
282 auto& app_manager = unity::ApplicationManager::Default();
283@@ -201,7 +201,7 @@
284 icon.LauncherIconUnstick();
285
286 bool saved = false;
287- usc->sticky = true;
288+ gs->sticky = true;
289 icon.position_saved.connect([&saved] {saved = true;});
290 ASSERT_FALSE(icon.IsSticky());
291
292@@ -214,14 +214,14 @@
293 {
294 icon.tooltip_text = "FooText";
295 icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
296- EXPECT_EQ(icon.tooltip_text(), usc->title());
297+ EXPECT_EQ(icon.tooltip_text(), gs->title());
298 }
299
300 TEST_F(TestSoftwareCenterLauncherIcon, OnFinishedUpdatesIcon)
301 {
302 icon.icon_name = "foo-icon";
303 icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
304- EXPECT_EQ(icon.icon_name(), usc->icon());
305+ EXPECT_EQ(icon.icon_name(), gs->icon());
306 }
307
308 TEST_F(TestSoftwareCenterLauncherIcon, OnFinishedLogsEvent)