Merge lp:~macslow/unity/remote-add into lp:unity/5.0

[Mirco Müller]

Backported remote-add feature from unity 6.x series to 5.x and added a unit-test for it.

[Conor Curran (cjcurran)]

Good work !

review: Approve

[Andrea Azzarone (azzar1)]

There are several indentation issues.

Also I know there is already a friend class to test the LauncherController but I'd prefer to do something like it:

* launcher_addrequest_special.emit(...)
* check if everthing is ok.

size_after = lc.launchers().size();
107 + EXPECT_EQ(size_before, size_after);

I think you need to get the number of icons in the launcher. lc.launcher() return a list of Launcher::Ptr (or something like that). Maybe you need something like that:

auto launcher = lc.launcher();
auto model = launcher.modeel() (or GetModel())
etc.

Unmerged revisions

2401. By Mirco Müller on 2012-08-24

Merged unit-test fixes for the backported remote-add functionality from unity 6.x

2400. By Mirco Müller on 2012-08-22

Backported remote-add functionality from 6.x to 5.x unity

=== modified file 'plugins/unityshell/src/LauncherController.cpp'
--- plugins/unityshell/src/LauncherController.cpp	2012-07-26 13:12:26 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2012-08-24 11:17:32 +0000
@@ -323,7 +323,11 @@
   for (auto icon : bamf_icons)
   {
     if (icon->DesktopFile() == path)
-      return;
+    {
+       icon->Stick();
+       Save();
+       return;
+    }
   }
 
  // Check if desktop file was supplied, or if it's set to SC's agent
@@ -331,17 +335,27 @@
   if (path.empty() || path == "software-center-agent")
     return;
 
-  SoftwareCenterLauncherIcon::Ptr result = CreateSCLauncherIcon(path, aptdaemon_trans_id, icon_path);
-
-  launcher_->ForceReveal(true);
-
-  if (result)
-  {
-    result->SetQuirk(AbstractLauncherIcon::QUIRK_VISIBLE, false);
-    result->Animate(launcher_, icon_x, icon_y, icon_size);
-    RegisterIcon(result);
-    Save();
-  }
+  if (aptdaemon_trans_id.empty())
+  {
+    AbstractLauncherIcon::Ptr result = CreateFavorite(path.c_str());
+    if (result)
+      RegisterIcon(result);
+  }
+  else
+  {
+    SoftwareCenterLauncherIcon::Ptr result = CreateSCLauncherIcon(path, aptdaemon_trans_id, icon_path);
+
+    launcher_->ForceReveal(true);
+
+    if (result)
+    {
+      result->SetQuirk(AbstractLauncherIcon::QUIRK_VISIBLE, false);
+      result->Animate(launcher_, icon_x, icon_y, icon_size);
+      RegisterIcon(result);
+    }
+  }
+
+  Save();
 }
 
 void Controller::Impl::OnSCIconAnimationComplete(AbstractLauncherIcon::Ptr icon)

=== modified file 'tests/test_launcher_controller.cpp'
--- tests/test_launcher_controller.cpp	2012-07-26 13:12:26 +0000
+++ tests/test_launcher_controller.cpp	2012-08-24 11:17:32 +0000
@@ -70,6 +70,19 @@
     return lc.pimpl->edge_barriers_;
   }
 
+  // set of proxy functions to call private methods on the _Impl class
+  AbstractLauncherIcon::Ptr CallImplCreateFavorite(const char *file_path)
+  {
+	return lc.pimpl->CreateFavorite(file_path);
+  }
+
+  void CallImplOnLauncherAddRequestSpecial(std::string const& path, AbstractLauncherIcon::Ptr before,
+										   std::string const& aptdaemon_trans_id, std::string const& icon_path,
+										   int icon_x, int icon_y, int icon_size)
+  {
+    lc.pimpl->OnLauncherAddRequestSpecial(path, before, aptdaemon_trans_id, icon_path, icon_x, icon_y, icon_size);
+  }
+
   MockUScreen uscreen;
   dash::Settings settings;
   panel::Style panel_style;
@@ -199,4 +212,68 @@
   }
 }
 
+TEST_F(TestLauncherController, OnLauncherAddRequestSpecial)
+{
+  std::string               path               = "nautilus";
+  AbstractLauncherIcon::Ptr before             = CallImplCreateFavorite("nautilus");
+  std::string               aptdaemon_trans_id = "aptdaemon_trans_id";
+  std::string               icon_path          = "/usr/share/icons/ubuntu-mono-light/places/48/folder-home.svg";
+  int                       x                  = 0;
+  int                       y                  = 0;
+  int                       size               = 48;
+  unsigned int              size_before        = 0;
+  unsigned int              size_after         = 0;
+
+  size_before = lc.launchers().size();
+  path.clear();
+  aptdaemon_trans_id.clear();
+  CallImplOnLauncherAddRequestSpecial(path,
+                                 before,
+                                 aptdaemon_trans_id,
+                                 icon_path,
+                                 x,
+                                 y,
+                                 size);
+  size_after = lc.launchers().size();
+  EXPECT_EQ(size_before, size_after);
+
+  size_before = size_after;
+  path = "software-center-agent";
+  CallImplOnLauncherAddRequestSpecial(path,
+                                 before,
+                                 aptdaemon_trans_id,
+                                 icon_path,
+                                 x,
+                                 y,
+                                 size);
+  size_after = lc.launchers().size();
+  EXPECT_EQ(size_before, size_after);
+
+  size_before = size_after;
+  path = "nautilus";
+  CallImplOnLauncherAddRequestSpecial(path,
+                                 before,
+                                 aptdaemon_trans_id,
+                                 icon_path,
+                                 x,
+                                 y,
+                                 size);
+  size_after = lc.launchers().size();
+  ASSERT_EQ(size_before, size_after);
+
+  size_before = size_after;
+  aptdaemon_trans_id = "aptdaemon_trans_id";
+  CallImplOnLauncherAddRequestSpecial(path,
+                                 before,
+                                 aptdaemon_trans_id,
+                                 icon_path,
+                                 x,
+                                 y,
+                                 size);
+  size_after = lc.launchers().size();
+  ASSERT_EQ(size_before, size_after);
+
+  // delete before;
+}
+
 }