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

[Robert Ancell]

Switch from Ubuntu Software Center to GNOME Software.

[Robert Ancell (robert-ancell)]

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

[PS Jenkins bot (ps-jenkins)]

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)

[Robert Ancell (robert-ancell)]

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

[Robert Ancell (robert-ancell)]

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

[Marco Trevisan (Treviño) (3v1n0)]

+1

review: Approve

=== modified file 'com.canonical.Unity.gschema.xml'
--- com.canonical.Unity.gschema.xml	2015-11-23 09:24:10 +0000
+++ com.canonical.Unity.gschema.xml	2016-02-19 22:04:59 +0000
@@ -117,7 +117,7 @@
         'application://libreoffice-writer.desktop',
         'application://libreoffice-calc.desktop',
         'application://libreoffice-impress.desktop',
-        'application://ubuntu-software-center.desktop',
+        'application://org.gnome.Software.desktop',
         'application://ubuntu-amazon-default.desktop',
         'application://unity-control-center.desktop',
         'unity://running-apps',
 
=== renamed file 'tests/data/applications/ubuntu-software-center.desktop' => 'tests/data/applications/org.gnome.Software.desktop'
--- tests/data/applications/ubuntu-software-center.desktop	2013-06-28 12:52:58 +0000
+++ tests/data/applications/org.gnome.Software.desktop	2016-02-19 22:04:59 +0000
@@ -1,9 +1,8 @@
 [Desktop Entry]
-Name=Ubuntu Software Center
-GenericName=Software Center
-Comment=Lets you choose from thousands of applications available for Ubuntu
+Name=Software
+Comment=Add, remove or update software on this computer
 Exec=/bin/true
-Icon=softwarecenter
+Icon=org.gnome.Software
 Terminal=false
 Type=Application
 Categories=PackageManager;GTK;System;Settings;
 
=== modified file 'tests/test_application_launcher_icon.cpp'
--- tests/test_application_launcher_icon.cpp	2015-12-08 14:34:55 +0000
+++ tests/test_application_launcher_icon.cpp	2016-02-19 22:04:59 +0000
@@ -41,7 +41,7 @@
 namespace
 {
 const std::string DEFAULT_EMPTY_ICON = "application-default-icon";
-const std::string USC_DESKTOP = BUILDDIR"/tests/data/applications/ubuntu-software-center.desktop";
+const std::string GS_DESKTOP = BUILDDIR"/tests/data/applications/org.gnome.Software.desktop";
 const std::string UM_DESKTOP = BUILDDIR"/tests/data/applications/update-manager.desktop";
 const std::string NO_ICON_DESKTOP = BUILDDIR"/tests/data/applications/no-icon.desktop";
 
@@ -93,9 +93,9 @@
 
   virtual void SetUp() override
   {
-    usc_app = std::make_shared<MockApplication::Nice>(USC_DESKTOP, "softwarecenter");
+    usc_app = std::make_shared<MockApplication::Nice>(GS_DESKTOP, "org.gnome.Software");
     usc_icon = new MockApplicationLauncherIcon(usc_app);
-    ASSERT_EQ(usc_icon->DesktopFile(), USC_DESKTOP);
+    ASSERT_EQ(usc_icon->DesktopFile(), GS_DESKTOP);
 
     empty_app = std::make_shared<MockApplication::Nice>(NO_ICON_DESKTOP);
     empty_icon = new MockApplicationLauncherIcon(empty_app);
@@ -175,7 +175,7 @@
 
 TEST_F(TestApplicationLauncherIcon, ApplicationSignalDisconnection)
 {
-  std::shared_ptr<MockApplication> app = std::make_shared<MockApplication::Nice>(USC_DESKTOP);
+  std::shared_ptr<MockApplication> app = std::make_shared<MockApplication::Nice>(GS_DESKTOP);
   {
     MockApplicationLauncherIcon::Ptr icon(new MockApplicationLauncherIcon(app));
     EXPECT_FALSE(app->closed.empty());
@@ -201,7 +201,7 @@
 
 TEST_F(TestApplicationLauncherIcon, TestDefaultIcon)
 {
-  EXPECT_EQ(usc_icon->icon_name(), "softwarecenter");
+  EXPECT_EQ(usc_icon->icon_name(), "org.gnome.Software");
   EXPECT_EQ(empty_icon->icon_name(), DEFAULT_EMPTY_ICON);
   EXPECT_EQ(mock_icon->icon_name(), DEFAULT_EMPTY_ICON);
 }
@@ -267,7 +267,7 @@
 
 TEST_F(TestApplicationLauncherIcon, StickStickedDesktopApp)
 {
-  auto app = std::make_shared<MockApplication::Nice>(USC_DESKTOP);
+  auto app = std::make_shared<MockApplication::Nice>(GS_DESKTOP);
   app->sticky = true;
   app->desktop_file_ = UM_DESKTOP;
   MockApplicationLauncherIcon::Ptr icon(new MockApplicationLauncherIcon(app));
@@ -542,7 +542,7 @@
 
 TEST_F(TestApplicationLauncherIcon, RemoteUri)
 {
-  EXPECT_EQ(usc_icon->RemoteUri(), FavoriteStore::URI_PREFIX_APP + USC_DESKTOP);
+  EXPECT_EQ(usc_icon->RemoteUri(), FavoriteStore::URI_PREFIX_APP + GS_DESKTOP);
   EXPECT_TRUE(mock_icon->RemoteUri().empty());
 }
 
 
=== modified file 'tests/test_desktop_utilities.cpp'
--- tests/test_desktop_utilities.cpp	2013-03-21 14:01:06 +0000
+++ tests/test_desktop_utilities.cpp	2016-02-19 22:04:59 +0000
@@ -184,17 +184,17 @@
   g_setenv("XDG_DATA_DIRS", LOCAL_DATA_DIR.c_str(), TRUE);
   g_setenv("XDG_DATA_HOME", "UnityUserConfig", TRUE);
 
-  std::string const& file = DesktopUtilities::GetDesktopPathById("ubuntu-software-center.desktop");
+  std::string const& file = DesktopUtilities::GetDesktopPathById("org.gnome.Software.desktop");
 
   g_setenv("XDG_DATA_DIRS", old_dirs.c_str(), TRUE);
   g_setenv("XDG_DATA_HOME", old_dirs.c_str(), TRUE);
 
-  EXPECT_EQ(file, LOCAL_DATA_DIR + "/applications/ubuntu-software-center.desktop");
+  EXPECT_EQ(file, LOCAL_DATA_DIR + "/applications/org.gnome.Software.desktop");
 }
 
 TEST(TestDesktopUtilities, TestGetBackgroundColor)
 {
-  std::string const& color = DesktopUtilities::GetBackgroundColor(LOCAL_DATA_DIR+"/applications/ubuntu-software-center.desktop");
+  std::string const& color = DesktopUtilities::GetBackgroundColor(LOCAL_DATA_DIR+"/applications/org.gnome.Software.desktop");
 
   EXPECT_EQ(color, "#aabbcc");
 }
 
=== modified file 'tests/test_favorite_store.cpp'
--- tests/test_favorite_store.cpp	2012-09-18 15:47:49 +0000
+++ tests/test_favorite_store.cpp	2016-02-19 22:04:59 +0000
@@ -87,7 +87,7 @@
 
 TEST_F(TestFavoriteStore, ParseFavoriteFromUri)
 {
-  const std::string VALID_DESKTOP_PATH = BUILDDIR"/tests/data/applications/ubuntu-software-center.desktop";
+  const std::string VALID_DESKTOP_PATH = BUILDDIR"/tests/data/applications/org.gnome.Software.desktop";
   EXPECT_EQ(favorite_store.ParseFavoriteFromUri("file.desktop"), "application://file.desktop");
   EXPECT_EQ(favorite_store.ParseFavoriteFromUri(VALID_DESKTOP_PATH), "application://"+VALID_DESKTOP_PATH);
 
 
=== modified file 'tests/test_favorite_store_gsettings.cpp'
--- tests/test_favorite_store_gsettings.cpp	2014-03-21 03:42:28 +0000
+++ tests/test_favorite_store_gsettings.cpp	2016-02-19 22:04:59 +0000
@@ -38,7 +38,7 @@
 const gchar* SETTINGS_KEY = "favorites";
 
 const char* base_store_favs[] = { BUILDDIR"/tests/data/applications/ubuntuone-installer.desktop",
-                                  "file://" BUILDDIR "/tests/data/applications/ubuntu-software-center.desktop",
+                                  "file://" BUILDDIR "/tests/data/applications/org.gnome.Software.desktop",
                                   "application://" BUILDDIR "/tests/data/applications/update-manager.desktop",
                                   "unity://test-icon",
                                   "device://uuid",
 
=== modified file 'tests/test_launcher_controller.cpp'
--- tests/test_launcher_controller.cpp	2015-12-08 14:34:55 +0000
+++ tests/test_launcher_controller.cpp	2016-02-19 22:04:59 +0000
@@ -61,7 +61,7 @@
 namespace app
 {
  const std::string UBUNTU_ONE = BUILDDIR "/tests/data/applications/ubuntuone-installer.desktop";
- const std::string SW_CENTER = BUILDDIR "/tests/data/applications/ubuntu-software-center.desktop";
+ const std::string SW_CENTER = BUILDDIR "/tests/data/applications/org.gnome.Software.desktop";
  const std::string UPDATE_MANAGER = BUILDDIR "/tests/data/applications/update-manager.desktop";
  const std::string BZR_HANDLE_PATCH = BUILDDIR "/tests/data/applications/bzr-handle-patch.desktop";
  const std::string NO_ICON = BUILDDIR "/tests/data/applications/no-icon.desktop";
 
=== modified file 'tests/test_software_center_launcher_icon.cpp'
--- tests/test_software_center_launcher_icon.cpp	2015-12-08 14:34:55 +0000
+++ tests/test_software_center_launcher_icon.cpp	2016-02-19 22:04:59 +0000
@@ -42,19 +42,19 @@
 {
 namespace
 {
-const std::string PRE_INSTALL_ICON = "sw-center-launcher-icon";
-const std::string FINAL_ICON = "softwarecenter";
-const std::string APP_NAME = "Ubuntu Software Center";
+const std::string PRE_INSTALL_ICON = "software-launcher-icon";
+const std::string FINAL_ICON = "org.gnome.Software";
+const std::string APP_NAME = "Software";
 const std::string LOCAL_DATA_DIR = BUILDDIR"/tests/data";
-const std::string USC_DESKTOP = LOCAL_DATA_DIR+"/applications/ubuntu-software-center.desktop";
-const std::string USC_APP_INSTALL_DESKTOP = "/usr/share/app-install/desktop/software-center:ubuntu-software-center.desktop";
+const std::string GS_DESKTOP = LOCAL_DATA_DIR+"/applications/org.gnome.Software.desktop";
+const std::string GS_APP_INSTALL_DESKTOP = "/usr/share/app-install/desktop/software-center:org.gnome.Software.desktop";
 }
 
 struct TestSoftwareCenterLauncherIcon : testmocks::TestUnityAppBase
 {
   TestSoftwareCenterLauncherIcon()
-     : usc(std::make_shared<MockApplication::Nice>(USC_APP_INSTALL_DESKTOP, FINAL_ICON, APP_NAME))
-     , icon(usc, "/com/canonical/unity/test/object/path", PRE_INSTALL_ICON)
+     : gs(std::make_shared<MockApplication::Nice>(GS_APP_INSTALL_DESKTOP, FINAL_ICON, APP_NAME))
+     , icon(gs, "/com/canonical/unity/test/object/path", PRE_INSTALL_ICON)
   {}
 
   struct MockSoftwareCenterLauncherIcon : SoftwareCenterLauncherIcon
@@ -86,7 +86,7 @@
 
   panel::Style panel;
   nux::ObjectPtr<MockableBaseWindow> launcher_win;
-  MockApplication::Ptr usc;
+  MockApplication::Ptr gs;
   MockSoftwareCenterLauncherIcon icon;
 };
 
@@ -102,23 +102,23 @@
 TEST_F(TestSoftwareCenterLauncherIcon, DesktopFileTransformTrivial)
 {
   // no transformation needed
-  usc->desktop_file_ = USC_DESKTOP;
-  EXPECT_EQ(icon.GetActualDesktopFileAfterInstall(), USC_DESKTOP);
+  gs->desktop_file_ = GS_DESKTOP;
+  EXPECT_EQ(icon.GetActualDesktopFileAfterInstall(), GS_DESKTOP);
 }
 
 TEST_F(TestSoftwareCenterLauncherIcon, DesktopFileTransformAppInstall)
 {
   // ensure that tranformation from app-install data desktop files works
-  usc->desktop_file_ = "/usr/share/app-install/desktop/pkgname:kde4__afile.desktop";
+  gs->desktop_file_ = "/usr/share/app-install/desktop/pkgname:kde4__afile.desktop";
    EXPECT_EQ(icon.GetActualDesktopFileAfterInstall(),
              LOCAL_DATA_DIR+"/applications/kde4/afile.desktop");
 }
 
 TEST_F(TestSoftwareCenterLauncherIcon, DesktopFileTransformSCAgent)
 {
-  // now simualte data coming from the sc-agent
-  usc->desktop_file_ = "/tmp/software-center-agent:VP2W9M:ubuntu-software-center.desktop";
-  EXPECT_EQ(icon.GetActualDesktopFileAfterInstall(), USC_DESKTOP);
+  // now simualte data coming from the software-center-agent
+  gs->desktop_file_ = "/tmp/software-center-agent:VP2W9M:org.gnome.Software.desktop";
+  EXPECT_EQ(icon.GetActualDesktopFileAfterInstall(), GS_DESKTOP);
 }
 
 // simulate a OnFinished signal from a /usr/share/app-install location
@@ -128,41 +128,41 @@
 {
   icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
 
-  EXPECT_EQ(USC_DESKTOP, icon.DesktopFile());
+  EXPECT_EQ(GS_DESKTOP, icon.DesktopFile());
 }
 
 TEST_F(TestSoftwareCenterLauncherIcon, OnFinishedUpdatesRemoteURI)
 {
   icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
 
-  ASSERT_EQ(USC_DESKTOP, icon.DesktopFile());
-  EXPECT_EQ(FavoriteStore::URI_PREFIX_APP + USC_DESKTOP, icon.GetRemoteUri());
+  ASSERT_EQ(GS_DESKTOP, icon.DesktopFile());
+  EXPECT_EQ(FavoriteStore::URI_PREFIX_APP + GS_DESKTOP, icon.GetRemoteUri());
 }
 
 TEST_F(TestSoftwareCenterLauncherIcon, DisconnectsOldAppSignals)
 {
-  ASSERT_FALSE(usc->closed.empty());
+  ASSERT_FALSE(gs->closed.empty());
 
   icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
 
-  EXPECT_TRUE(usc->closed.empty());
-  EXPECT_TRUE(usc->window_opened.empty());
-  EXPECT_TRUE(usc->window_moved.empty());
-  EXPECT_TRUE(usc->window_closed.empty());
-  EXPECT_TRUE(usc->visible.changed.empty());
-  EXPECT_TRUE(usc->active.changed.empty());
-  EXPECT_TRUE(usc->running.changed.empty());
-  EXPECT_TRUE(usc->urgent.changed.empty());
-  EXPECT_TRUE(usc->desktop_file.changed.empty());
-  EXPECT_TRUE(usc->title.changed.empty());
-  EXPECT_TRUE(usc->icon.changed.empty());
+  EXPECT_TRUE(gs->closed.empty());
+  EXPECT_TRUE(gs->window_opened.empty());
+  EXPECT_TRUE(gs->window_moved.empty());
+  EXPECT_TRUE(gs->window_closed.empty());
+  EXPECT_TRUE(gs->visible.changed.empty());
+  EXPECT_TRUE(gs->active.changed.empty());
+  EXPECT_TRUE(gs->running.changed.empty());
+  EXPECT_TRUE(gs->urgent.changed.empty());
+  EXPECT_TRUE(gs->desktop_file.changed.empty());
+  EXPECT_TRUE(gs->title.changed.empty());
+  EXPECT_TRUE(gs->icon.changed.empty());
 }
 
 TEST_F(TestSoftwareCenterLauncherIcon, OnFinishedRemoveInvalidNewAppIcon)
 {
   // Using an icon ptr, to get the removed signal to be properly emitted
   nux::ObjectPtr<MockSoftwareCenterLauncherIcon> icon_ptr(
-    new MockSoftwareCenterLauncherIcon(usc, "/com/canonical/unity/test/object/path", PRE_INSTALL_ICON));
+    new MockSoftwareCenterLauncherIcon(gs, "/com/canonical/unity/test/object/path", PRE_INSTALL_ICON));
 
   bool removed = false;
   auto& app_manager = unity::ApplicationManager::Default();
@@ -201,7 +201,7 @@
   icon.LauncherIconUnstick();
 
   bool saved = false;
-  usc->sticky = true;
+  gs->sticky = true;
   icon.position_saved.connect([&saved] {saved = true;});
   ASSERT_FALSE(icon.IsSticky());
 
@@ -214,14 +214,14 @@
 {
   icon.tooltip_text = "FooText";
   icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
-  EXPECT_EQ(icon.tooltip_text(), usc->title());
+  EXPECT_EQ(icon.tooltip_text(), gs->title());
 }
 
 TEST_F(TestSoftwareCenterLauncherIcon, OnFinishedUpdatesIcon)
 {
   icon.icon_name = "foo-icon";
   icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
-  EXPECT_EQ(icon.icon_name(), usc->icon());
+  EXPECT_EQ(icon.icon_name(), gs->icon());
 }
 
 TEST_F(TestSoftwareCenterLauncherIcon, OnFinishedLogsEvent)