Merge lp:~3v1n0/unity/icon-dragging-cancellation into lp:unity

[Marco Trevisan (Treviño)]

LauncherDragWindow: emit cancelled signal when the Escape key has been pressed during drag

Launcher: restore an icon position after that the dragging has been cancelled

Added drag-n-drop cancellation for the launcher icons: now a LauncherDragWindow grabs the keyboard and emits a signal when the escape key is pressed; at this point the launcher set the dragged icon to its original position. This is done by saving this position when the dragging has begun (thanks to a new utility function I added to the model).

Unit tests added and improved.

[Brandon Schaefer (brandontschaefer)]

Looks good and works.

review: Approve

[Unity Merger (unity-merger)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Brandon Schaefer (brandontschaefer)]

...

review: Approve

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-08-31 09:05:57 +0000
+++ launcher/Launcher.cpp	2012-08-31 20:16:18 +0000
@@ -1102,7 +1102,6 @@
   {
     RenderArg arg;
     AbstractLauncherIcon::Ptr icon = *it;
-
     FillRenderArg(icon, arg, center, parent_abs_geo, folding_threshold, folded_size, folded_spacing,
                   autohide_offset, folded_z_distance, animation_neg_rads, current);
     arg.colorify = colorify;
@@ -1773,9 +1772,8 @@
   if (_drag_icon && _render_drag_window)
   {
     RenderIconToTexture(GfxContext, _drag_icon, _offscreen_drag_texture);
-    _drag_window->ShowWindow(true);
-
     _render_drag_window = false;
+    ShowDragWindow();
   }
 
   // clear region
@@ -1970,9 +1968,7 @@
 
 void Launcher::OnDragWindowAnimCompleted()
 {
-  if (_drag_window)
-    _drag_window->ShowWindow(false);
-
+  HideDragWindow();
   EnsureAnimation();
 }
 
@@ -2018,12 +2014,8 @@
   }
   else
   {
-    _drag_icon = NULL;
-    if (_drag_window)
-    {
-      _drag_window->ShowWindow(false);
-      _drag_window = nullptr;
-    }
+    _drag_icon = nullptr;
+    HideDragWindow();
   }
 }
 
@@ -2035,11 +2027,7 @@
   _hide_machine.SetQuirk(LauncherHideMachine::INTERNAL_DND_ACTIVE, true);
   _drag_icon = icon;
 
-  if (_drag_window)
-  {
-    _drag_window->ShowWindow(false);
-  }
-
+  HideDragWindow();
   _offscreen_drag_texture = nux::GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(_icon_size, _icon_size, 1, nux::BITFMT_R8G8B8A8);
   _drag_window = new LauncherDragWindow(_offscreen_drag_texture);
 
@@ -2052,7 +2040,10 @@
 {
   if (_drag_window)
   {
-    AbstractLauncherIcon::Ptr hovered_icon = MouseIconIntersection(_mouse_position.x, _mouse_position.y);
+    AbstractLauncherIcon::Ptr hovered_icon;
+
+    if (!_drag_window->Cancelled())
+      hovered_icon = MouseIconIntersection(_mouse_position.x, _mouse_position.y);
 
     if (hovered_icon && hovered_icon->GetIconType() == AbstractLauncherIcon::IconType::TRASH)
     {
@@ -2060,20 +2051,21 @@
 
       launcher_removerequest.emit(_drag_icon);
 
-      _drag_window->ShowWindow(false);
+      HideDragWindow();
       EnsureAnimation();
     }
     else
     {
-      _model->Save();
-
-      _drag_window->SetAnimationTarget((int)(_drag_icon->GetCenter(monitor).x),
-                                       (int)(_drag_icon->GetCenter(monitor).y));
-      _drag_window->StartAnimation();
+      if (!_drag_window->Cancelled())
+        _model->Save();
 
       if (_drag_window->on_anim_completed.connected())
         _drag_window->on_anim_completed.disconnect();
       _drag_window->on_anim_completed = _drag_window->anim_completed.connect(sigc::mem_fun(this, &Launcher::OnDragWindowAnimCompleted));
+
+      auto const& icon_center = _drag_icon->GetCenter(monitor);
+      _drag_window->SetAnimationTarget(icon_center.x, icon_center.y),
+      _drag_window->StartAnimation();
     }
   }
 
@@ -2086,6 +2078,37 @@
   ubus_.SendMessage(UBUS_LAUNCHER_ICON_END_DND);
 }
 
+void Launcher::ShowDragWindow()
+{
+  if (!_drag_window || _drag_window->IsVisible())
+    return;
+
+  _drag_window->GrabKeyboard();
+  _drag_window->ShowWindow(true);
+  _drag_window->PushToFront();
+
+  bool is_before;
+  AbstractLauncherIcon::Ptr const& closer = _model->GetClosestIcon(_drag_icon, is_before);
+  _drag_window->drag_cancel_request.connect([this, closer, is_before] {
+    if (is_before)
+      _model->ReorderAfter(_drag_icon, closer);
+    else
+      _model->ReorderBefore(_drag_icon, closer, true);
+
+    ResetMouseDragState();
+  });
+}
+
+void Launcher::HideDragWindow()
+{
+  if (!_drag_window)
+    return;
+
+  _drag_window->UnGrabKeyboard();
+  _drag_window->ShowWindow(false);
+  _drag_window = nullptr;
+}
+
 void Launcher::UpdateDragWindowPosition(int x, int y)
 {
   if (!_drag_window)

=== modified file 'launcher/Launcher.h'
--- launcher/Launcher.h	2012-08-25 15:54:29 +0000
+++ launcher/Launcher.h	2012-08-31 20:16:18 +0000
@@ -294,7 +294,7 @@
 
   void OnActionDone(GVariant* data);
 
-  AbstractLauncherIcon::Ptr MouseIconIntersection(int x, int y);
+  virtual AbstractLauncherIcon::Ptr MouseIconIntersection(int x, int y);
   void EventLogic();
   void MouseDownLogic(int x, int y, unsigned long button_flags, unsigned long key_flags);
   void MouseUpLogic(int x, int y, unsigned long button_flags, unsigned long key_flags);
@@ -302,7 +302,9 @@
   void StartIconDragRequest(int x, int y);
   void StartIconDrag(AbstractLauncherIcon::Ptr icon);
   void EndIconDrag();
+  void ShowDragWindow();
   void UpdateDragWindowPosition(int x, int y);
+  void HideDragWindow();
 
   void ResetMouseDragState();
 

=== modified file 'launcher/LauncherDragWindow.cpp'
--- launcher/LauncherDragWindow.cpp	2012-06-18 02:57:23 +0000
+++ launcher/LauncherDragWindow.cpp	2012-08-31 20:16:18 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
-* Copyright (C) 2010 Canonical Ltd
+* Copyright (C) 2010-2012 Canonical Ltd
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 3 as
@@ -15,6 +15,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 * Authored by: Jason Smith <[e-mail]>
+*              Marco Trevisan <[e-mail]>
 */
 
 #include <Nux/Nux.h>
@@ -33,22 +34,38 @@
 
 LauncherDragWindow::LauncherDragWindow(nux::ObjectPtr<nux::IOpenGLBaseTexture> icon)
   : nux::BaseWindow("")
+  , _cancelled(false)
   , _icon(icon)
 {
   SetBaseSize(_icon->GetWidth(), _icon->GetHeight());
+
+  key_down.connect([this] (unsigned long, unsigned long keysym, unsigned long, const char*, unsigned short) {
+    if (keysym == NUX_VK_ESCAPE)
+    {
+      _cancelled = true;
+      drag_cancel_request.emit();
+    }
+  });
 }
 
 LauncherDragWindow::~LauncherDragWindow()
 {
   if (on_anim_completed.connected())
     on_anim_completed.disconnect();
+
+  UnGrabKeyboard();
 }
 
-bool LauncherDragWindow::Animating()
+bool LauncherDragWindow::Animating() const
 {
   return bool(animation_timer_);
 }
 
+bool LauncherDragWindow::Cancelled() const
+{
+  return _cancelled;
+}
+
 void LauncherDragWindow::SetAnimationTarget(int x, int y)
 {
   _animation_target = nux::Point2(x, y);
@@ -86,8 +103,8 @@
 
   if (new_geo.x == target_x && new_geo.y == target_y)
   {
+    animation_timer_.reset();
     anim_completed.emit();
-    animation_timer_.reset();
 
     return false;
   }
@@ -118,5 +135,15 @@
   GfxContext.PopClippingRectangle();
 }
 
+bool LauncherDragWindow::InspectKeyEvent(unsigned int event_type, unsigned int keysym, const char* character)
+{
+  return (event_type == nux::NUX_KEYDOWN);
+}
+
+bool LauncherDragWindow::AcceptKeyNavFocus()
+{
+  return true;
+}
+
 } // namespace launcher
 } // namespace unity

=== modified file 'launcher/LauncherDragWindow.h'
--- launcher/LauncherDragWindow.h	2012-06-18 02:57:23 +0000
+++ launcher/LauncherDragWindow.h	2012-08-31 20:16:18 +0000
@@ -37,7 +37,6 @@
   NUX_DECLARE_OBJECT_TYPE(LauncherDragWindow, nux::BaseWindow);
 public:
   LauncherDragWindow(nux::ObjectPtr<nux::IOpenGLBaseTexture> icon);
-
   ~LauncherDragWindow();
 
   void DrawContent(nux::GraphicsEngine& gfxContext, bool forceDraw);
@@ -45,14 +44,21 @@
   void SetAnimationTarget(int x, int y);
   void StartAnimation();
 
-  bool Animating();
+  bool Animating() const;
+  bool Cancelled() const;
 
   sigc::signal<void> anim_completed;
+  sigc::signal<void> drag_cancel_request;
   sigc::connection on_anim_completed;
 
+protected:
+  bool InspectKeyEvent(unsigned int event_type, unsigned int keysym, const char* character);
+  bool AcceptKeyNavFocus();
+
 private:
   bool OnAnimationTimeout();
 
+  bool _cancelled;
   nux::ObjectPtr<nux::IOpenGLBaseTexture> _icon;
   nux::Point2 _animation_target;
   glib::Source::UniquePtr animation_timer_;

=== modified file 'launcher/LauncherModel.cpp'
--- launcher/LauncherModel.cpp	2012-08-10 09:58:49 +0000
+++ launcher/LauncherModel.cpp	2012-08-31 20:16:18 +0000
@@ -387,6 +387,41 @@
   }
 }
 
+AbstractLauncherIcon::Ptr LauncherModel::GetClosestIcon(AbstractLauncherIcon::Ptr icon, bool& is_before) const
+{
+  AbstractLauncherIcon::Ptr prev, next;
+  bool found_target = false;
+
+  for (auto const& current : _inner)
+  {
+    if (current->GetIconType() != icon->GetIconType())
+      continue;
+
+    if (!found_target)
+    {
+      if (current == icon)
+      {
+        found_target = true;
+
+        if (prev)
+          break;
+      }
+      else
+      {
+        prev = current;
+      }
+    }
+    else
+    {
+      next = current;
+      break;
+    }
+  }
+
+  is_before = next.IsNull();
+
+  return is_before ? prev : next;
+}
 
 /* iterators */
 

=== modified file 'launcher/LauncherModel.h'
--- launcher/LauncherModel.h	2012-07-04 02:37:23 +0000
+++ launcher/LauncherModel.h	2012-08-31 20:16:18 +0000
@@ -62,6 +62,8 @@
   void SelectNext();
   void SelectPrevious();
 
+  AbstractLauncherIcon::Ptr GetClosestIcon(AbstractLauncherIcon::Ptr icon, bool& is_before) const;
+
   iterator begin();
   iterator end();
   iterator at(int index);

=== modified file 'launcher/MockLauncherIcon.h'
--- launcher/MockLauncherIcon.h	2012-08-15 02:51:33 +0000
+++ launcher/MockLauncherIcon.h	2012-08-31 20:16:18 +0000
@@ -130,11 +130,16 @@
     return false;
   }
 
-  void        SetCenter(nux::Point3 center, int monitor, nux::Geometry geo) {}
+  void SetCenter(nux::Point3 center, int monitor, nux::Geometry geo)
+  {
+    center.x += geo.x;
+    center.y += geo.y;
+    center_[monitor] = center;
+  }
 
   nux::Point3 GetCenter(int monitor)
   {
-    return nux::Point3();
+    return center_[monitor];
   }
 
   nux::Point3 GetSavedCenter(int monitor)
@@ -346,6 +351,7 @@
   IconType type_;
   bool quirks_[unsigned(Quirk::LAST)];
   timespec quirk_times_[unsigned(Quirk::LAST)];
+  std::map<int, nux::Point3> center_;
 };
 
 }

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-08-31 09:15:33 +0000
+++ tests/CMakeLists.txt	2012-08-31 20:16:18 +0000
@@ -213,6 +213,7 @@
                  test_icon_loader.cpp
                  test_im_text_entry.cpp
                  test_launcher_controller.cpp
+                 test_launcher_drag_window.cpp
                  test_keyboard_util.cpp
                  test_panel_style.cpp
                  test_previews_application.cpp

=== modified file 'tests/test_launcher.cpp'
--- tests/test_launcher.cpp	2012-08-21 17:45:42 +0000
+++ tests/test_launcher.cpp	2012-08-31 20:16:18 +0000
@@ -15,10 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Andrea Azzarone <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
  */
 
 #include <list>
 #include <gmock/gmock.h>
+#include "test_uscreen_mock.h"
 using namespace testing;
 
 #include <Nux/Nux.h>
@@ -29,6 +31,7 @@
 #include "launcher/Launcher.h"
 #include "unity-shared/PanelStyle.h"
 #include "unity-shared/UnitySettings.h"
+#include "unity-shared/IconRenderer.h"
 #include "test_utils.h"
 using namespace unity;
 
@@ -54,29 +57,76 @@
 class TestLauncher : public Test
 {
 public:
+  class MockLauncher : public launcher::Launcher
+  {
+  public:
+    MockLauncher(nux::BaseWindow* parent, nux::ObjectPtr<DNDCollectionWindow> const& collection_window)
+      : Launcher(parent, collection_window)
+    {}
+
+    AbstractLauncherIcon::Ptr MouseIconIntersection(int x, int y)
+    {
+      for (auto const& icon : *_model)
+      {
+        auto const& center = icon->GetCenter(monitor());
+
+        if (y > center.y - GetIconSize()/2.0f && y < center.y + GetIconSize()/2.0f)
+          return icon;
+      }
+
+      return AbstractLauncherIcon::Ptr();
+    }
+
+    float IconBackgroundIntensity(AbstractLauncherIcon::Ptr icon, timespec const& current) const
+    {
+      return Launcher::IconBackgroundIntensity(icon, current);
+    }
+
+    void StartIconDrag(AbstractLauncherIcon::Ptr icon)
+    {
+      Launcher::StartIconDrag(icon);
+    }
+
+    void ShowDragWindow()
+    {
+      Launcher::ShowDragWindow();
+    }
+
+    void UpdateDragWindowPosition(int x, int y)
+    {
+      Launcher::UpdateDragWindowPosition(x, y);
+    }
+
+    void HideDragWindow()
+    {
+      Launcher::HideDragWindow();
+    }
+
+    void ResetMouseDragState()
+    {
+      Launcher::ResetMouseDragState();
+    }
+  };
+
   TestLauncher()
     : parent_window_(new nux::BaseWindow("TestLauncherWindow"))
     , dnd_collection_window_(new DNDCollectionWindow)
     , model_(new LauncherModel)
     , options_(new Options)
-    , launcher_(new Launcher(parent_window_, dnd_collection_window_))
+    , launcher_(new MockLauncher(parent_window_, dnd_collection_window_))
   {
     launcher_->options = options_;
     launcher_->SetModel(model_);
   }
 
-  float IconBackgroundIntensity(AbstractLauncherIcon::Ptr icon, timespec const& current) const
-  {
-    return launcher_->IconBackgroundIntensity(icon, current);
-  }
-
+  MockUScreen uscreen;
   nux::BaseWindow* parent_window_;
   nux::ObjectPtr<DNDCollectionWindow> dnd_collection_window_;
   Settings settings;
   panel::Style panel_style;
   LauncherModel::Ptr model_;
   Options::Ptr options_;
-  nux::ObjectPtr<Launcher> launcher_;
+  nux::ObjectPtr<MockLauncher> launcher_;
 };
 
 TEST_F(TestLauncher, TestQuirksDuringDnd)
@@ -149,10 +199,70 @@
   timespec current;
   clock_gettime(CLOCK_MONOTONIC, &current);
 
-  EXPECT_THAT(IconBackgroundIntensity(first, current), Gt(0.0f));
-  EXPECT_THAT(IconBackgroundIntensity(second, current), Gt(0.0f));
-  EXPECT_EQ(IconBackgroundIntensity(third, current), 0.0f);
-}
-
-}
-}
+  EXPECT_THAT(launcher_->IconBackgroundIntensity(first, current), Gt(0.0f));
+  EXPECT_THAT(launcher_->IconBackgroundIntensity(second, current), Gt(0.0f));
+  EXPECT_EQ(launcher_->IconBackgroundIntensity(third, current), 0.0f);
+}
+
+TEST_F(TestLauncher, CancellingDragLauncherIcon)
+{
+  MockMockLauncherIcon::Ptr icon1(new MockMockLauncherIcon);
+  MockMockLauncherIcon::Ptr icon2(new MockMockLauncherIcon);
+  MockMockLauncherIcon::Ptr icon3(new MockMockLauncherIcon);
+
+  icon1->SetSortPriority(0);
+  icon2->SetSortPriority(1);
+  icon3->SetSortPriority(2);
+
+  model_->AddIcon(icon1);
+  model_->AddIcon(icon2);
+  model_->AddIcon(icon3);
+
+  // Set the icon centers
+  int icon_size = launcher_->GetIconSize();
+  icon1->SetCenter(nux::Point3(icon_size/2.0f, icon_size/2.0f * 1 + 1, 0), launcher_->monitor(), launcher_->GetGeometry());
+  icon2->SetCenter(nux::Point3(icon_size/2.0f, icon_size/2.0f * 2 + 1, 0), launcher_->monitor(), launcher_->GetGeometry());
+  icon3->SetCenter(nux::Point3(icon_size/2.0f, icon_size/2.0f * 3 + 1, 0), launcher_->monitor(), launcher_->GetGeometry());
+
+  // Start dragging icon2
+  launcher_->StartIconDrag(icon2);
+  launcher_->ShowDragWindow();
+
+  // Moving icon2 at the end
+  auto const& center3 = icon3->GetCenter(launcher_->monitor());
+  launcher_->UpdateDragWindowPosition(center3.x, center3.y);
+
+  auto it = model_->begin();
+  ASSERT_EQ(*it, icon1); it++;
+  ASSERT_EQ(*it, icon3); it++;
+  ASSERT_EQ(*it, icon2);
+
+  // Moving icon2 at the begin
+  auto const& center1 = icon1->GetCenter(launcher_->monitor());
+  launcher_->UpdateDragWindowPosition(center1.x, center1.y);
+
+  it = model_->begin();
+  ASSERT_EQ(*it, icon2); it++;
+  ASSERT_EQ(*it, icon1); it++;
+  ASSERT_EQ(*it, icon3);
+
+  bool model_saved = false;
+  model_->saved.connect([&model_saved] { model_saved = true; });
+
+  // Emitting the drag cancel request
+  launcher_->GetDraggedIcon()->drag_cancel_request.emit();
+
+  // The icon order should be reset
+  it = model_->begin();
+  ASSERT_EQ(*it, icon1); it++;
+  ASSERT_EQ(*it, icon2); it++;
+  ASSERT_EQ(*it, icon3);
+
+  EXPECT_FALSE(model_saved);
+
+  launcher_->HideDragWindow();
+}
+
+}
+}
+

=== added file 'tests/test_launcher_drag_window.cpp'
--- tests/test_launcher_drag_window.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_launcher_drag_window.cpp	2012-08-31 20:16:18 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Marco Trevisan (Treviño) <[e-mail]>
+ */
+
+#include <gmock/gmock.h>
+
+#include "LauncherDragWindow.h"
+
+using namespace unity::launcher;
+using namespace testing;
+
+namespace
+{
+const int ICON_WIDTH = 10;
+const int ICON_HEIGHT = 15;
+}
+
+namespace unity
+{
+namespace launcher
+{
+struct TestLauncherDragWindow : public testing::Test
+{
+  TestLauncherDragWindow()
+    : drag_window(nux::ObjectPtr<nux::IOpenGLBaseTexture>(new nux::IOpenGLBaseTexture(nux::RTTEXTURE, ICON_WIDTH, ICON_HEIGHT, 24, 1, nux::BITFMT_B8G8R8A8)))
+  {}
+
+  LauncherDragWindow drag_window;
+};
+}
+
+TEST_F(TestLauncherDragWindow, Construction)
+{
+  EXPECT_EQ(drag_window.GetBaseWidth(), ICON_WIDTH);
+  EXPECT_EQ(drag_window.GetBaseHeight(), ICON_HEIGHT);
+  EXPECT_FALSE(drag_window.Animating());
+  EXPECT_FALSE(drag_window.Cancelled());
+}
+
+TEST_F(TestLauncherDragWindow, EscapeRequestsCancellation)
+{
+  nux::Event cancel;
+  cancel.type = nux::NUX_KEYDOWN;
+  cancel.x11_keysym = NUX_VK_ESCAPE;
+  bool got_signal;
+
+  drag_window.drag_cancel_request.connect([&got_signal] { got_signal = true; });
+  drag_window.GrabKeyboard();
+  nux::GetWindowCompositor().ProcessEvent(cancel);
+
+  EXPECT_TRUE(got_signal);
+  EXPECT_TRUE(drag_window.Cancelled());
+}
+
+}

=== modified file 'tests/test_launcher_model.cpp'
--- tests/test_launcher_model.cpp	2012-02-12 10:43:11 +0000
+++ tests/test_launcher_model.cpp	2012-08-31 20:16:18 +0000
@@ -213,4 +213,48 @@
   EXPECT_EQ(fourth, *it);
 }
 
+TEST(TestLauncherModel, TestGetClosestIcon)
+{
+  LauncherModel::Ptr model(new LauncherModel());
+  AbstractLauncherIcon::Ptr first(new MockLauncherIcon());
+  AbstractLauncherIcon::Ptr second(new MockLauncherIcon());
+  AbstractLauncherIcon::Ptr third(new MockLauncherIcon());
+  AbstractLauncherIcon::Ptr fourth(new MockLauncherIcon());
+
+  first->SetSortPriority(0);
+  second->SetSortPriority(1);
+  third->SetSortPriority(2);
+  fourth->SetSortPriority(3);
+
+  model->AddIcon(first);
+  model->AddIcon(second);
+  model->AddIcon(third);
+  model->AddIcon(fourth);
+
+  bool before;
+  EXPECT_EQ(model->GetClosestIcon(first, before), second);
+  EXPECT_FALSE(before);
+
+  EXPECT_EQ(model->GetClosestIcon(second, before), first);
+  EXPECT_TRUE(before);
+
+  EXPECT_EQ(model->GetClosestIcon(third, before), second);
+  EXPECT_TRUE(before);
+
+  EXPECT_EQ(model->GetClosestIcon(fourth, before), third);
+  EXPECT_TRUE(before);
+}
+
+TEST(TestLauncherModel, TestGetClosestIconWithOneIcon)
+{
+  LauncherModel::Ptr model(new LauncherModel());
+  AbstractLauncherIcon::Ptr first(new MockLauncherIcon());
+
+  model->AddIcon(first);
+
+  bool before;
+  EXPECT_EQ(model->GetClosestIcon(first, before), nullptr);
+  EXPECT_TRUE(before);
+}
+
 }