Merge lp:~azzar1/unity/test-for-fix-1020891 into lp:unity

[Andrea Azzarone]

Add test for bug 1020891.

I used gtest because faking xdnd protocol with AP is not so easy.

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:2498
http://jenkins.qa.ubuntu.com/job/unity-ci/72/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=amd64/72/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=i386/72/console

review: Approve (continuous-integration)

[Gord Allott (gordallott)]

no problems that i can see

review: Approve

=== modified file 'launcher/CMakeLists.txt'
--- launcher/CMakeLists.txt	2012-07-06 10:20:29 +0000
+++ launcher/CMakeLists.txt	2012-07-12 19:07:42 +0000
@@ -57,6 +57,7 @@
      LauncherIcon.cpp
      LauncherModel.cpp
      LauncherOptions.cpp
+     MockLauncherIcon.cpp
      PointerBarrier.cpp
      QuicklistManager.cpp
      QuicklistMenuItem.cpp

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-07-11 05:46:00 +0000
+++ launcher/Launcher.cpp	2012-07-12 19:07:42 +0000
@@ -104,6 +104,7 @@
 const int Launcher::Launcher::ANIM_DURATION_SHORT = 125;
 
 Launcher::Launcher(nux::BaseWindow* parent,
+                   nux::ObjectPtr<DNDCollectionWindow> const& collection_window,
                    NUX_FILE_LINE_DECL)
   : View(NUX_FILE_LINE_PARAM)
   , monitor(0)
@@ -140,12 +141,12 @@
   , _drag_out_id(0)
   , _drag_out_delta_x(0.0f)
   , _last_reveal_progress(0.0f)
+  , _collection_window(collection_window)
   , _selection_atom(0)
   , _background_color(nux::color::DimGray)
 {
   m_Layout = new nux::HLayout(NUX_TRACKER_LOCATION);
 
-  _collection_window = new unity::DNDCollectionWindow();
   _collection_window->collected.connect(sigc::mem_fun(this, &Launcher::OnDNDDataCollected));
 
   _offscreen_drag_texture = nux::GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(2, 2, 1, nux::BITFMT_R8G8B8A8);

=== modified file 'launcher/Launcher.h'
--- launcher/Launcher.h	2012-06-18 02:57:23 +0000
+++ launcher/Launcher.h	2012-07-12 19:07:42 +0000
@@ -56,7 +56,7 @@
   NUX_DECLARE_OBJECT_TYPE(Launcher, nux::View);
 public:
 
-  Launcher(nux::BaseWindow* parent, NUX_FILE_LINE_PROTO);
+  Launcher(nux::BaseWindow* parent, nux::ObjectPtr<DNDCollectionWindow> const& collection_window, NUX_FILE_LINE_PROTO);
 
   nux::Property<Display*> display;
   nux::Property<int> monitor;

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2012-07-09 11:26:46 +0000
+++ launcher/LauncherController.cpp	2012-07-12 19:07:42 +0000
@@ -391,7 +391,7 @@
 {
   nux::BaseWindow* launcher_window = new nux::BaseWindow(TEXT("LauncherWindow"));
 
-  Launcher* launcher = new Launcher(launcher_window);
+  Launcher* launcher = new Launcher(launcher_window, nux::ObjectPtr<DNDCollectionWindow>(new DNDCollectionWindow));
   launcher->display = display_;
   launcher->monitor = monitor;
   launcher->options = parent_->options();

=== added file 'launcher/MockLauncherIcon.cpp'
--- launcher/MockLauncherIcon.cpp	1970-01-01 00:00:00 +0000
+++ launcher/MockLauncherIcon.cpp	2012-07-12 19:07:42 +0000
@@ -0,0 +1,31 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 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 warranty of
+ * MERCHANTABILITY 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ *
+ */
+
+#include "MockLauncherIcon.h"
+
+namespace unity
+{
+namespace launcher
+{
+
+NUX_IMPLEMENT_OBJECT_TYPE(MockLauncherIcon);
+
+}
+}

=== modified file 'launcher/MockLauncherIcon.h'
--- launcher/MockLauncherIcon.h	2012-05-28 16:16:06 +0000
+++ launcher/MockLauncherIcon.h	2012-07-12 19:07:42 +0000
@@ -50,6 +50,11 @@
     tooltip_text = "Mock Icon";
     sort_priority_ = 0;
     type_ = TYPE_APPLICATION;
+
+    for (int i = 0; i < QUIRK_LAST; ++i)
+    {
+      quirks_[i] = false;
+    }
   }
 
   std::string GetName() const { return "MockLauncherIcon"; }
@@ -201,10 +206,13 @@
 
   bool GetQuirk(Quirk quirk) const
   {
-    return false;
+    return quirks_[quirk];
   }
 
-  void SetQuirk(Quirk quirk, bool value) {}
+  void SetQuirk(Quirk quirk, bool value)
+  {
+    quirks_[quirk] = value;
+  }
 
   void ResetQuirkTime(Quirk quirk) {};
 
@@ -336,10 +344,9 @@
   nux::BaseTexture* icon_;
   int sort_priority_;
   IconType type_;
+  bool quirks_[QUIRK_LAST];
 };
 
-NUX_IMPLEMENT_OBJECT_TYPE(MockLauncherIcon);
-
 }
 }
 

=== modified file 'plugins/unityshell/src/unitya11ytests.cpp'
--- plugins/unityshell/src/unitya11ytests.cpp	2012-03-14 06:24:18 +0000
+++ plugins/unityshell/src/unitya11ytests.cpp	2012-07-12 19:07:42 +0000
@@ -210,7 +210,7 @@
   AtkObject* launcher_icon_accessible = NULL;
 
   window = new nux::BaseWindow(TEXT(""));
-  launcher = new Launcher(window, NULL);
+  launcher = new Launcher(window, nux::ObjectPtr<unity::DNDCollectionWindow>(new unity::DNDCollectionWindow), NULL);
   launcher->SinkReference();
   launcher_accessible = unity_a11y_get_accessible(launcher);
 

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-07-04 02:37:23 +0000
+++ tests/CMakeLists.txt	2012-07-12 19:07:42 +0000
@@ -159,6 +159,7 @@
                  ${CMAKE_SOURCE_DIR}/unity-shared/IconTextureSource.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/LauncherModel.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/LauncherEntryRemote.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/MockLauncherIcon.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/FavoriteStorePrivate.cpp
                  ${CMAKE_SOURCE_DIR}/shortcuts/ShortcutModel.cpp
                  ${CMAKE_SOURCE_DIR}/shortcuts/ShortcutHintPrivate.cpp
@@ -205,6 +206,7 @@
                  test_dashview_impl.cpp
                  test_texture_cache.cpp
                  test_main.cpp
+                 test_launcher.cpp
                  test_lensview_impl.cpp
                  test_icon_loader.cpp
                  test_im_text_entry.cpp
@@ -245,6 +247,7 @@
                  ${CMAKE_SOURCE_DIR}/launcher/LauncherIcon.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/LauncherModel.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/LayoutSystem.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/MockLauncherIcon.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/PointerBarrier.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/QuicklistManager.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/QuicklistMenuItem.cpp

=== added file 'tests/test_launcher.cpp'
--- tests/test_launcher.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_launcher.cpp	2012-07-12 19:07:42 +0000
@@ -0,0 +1,92 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 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 warranty of
+ * MERCHANTABILITY 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ */
+
+#include <list>
+#include <gmock/gmock.h>
+using namespace testing;
+
+#include <Nux/Nux.h>
+#include <Nux/BaseWindow.h>
+
+#include "DNDCollectionWindow.h"
+#include "MockLauncherIcon.h"
+#include "Launcher.h"
+#include "test_utils.h"
+using namespace unity;
+
+namespace
+{
+
+class MockMockLauncherIcon : public launcher::MockLauncherIcon
+{
+public:
+  typedef nux::ObjectPtr<MockMockLauncherIcon> Ptr;
+
+  MOCK_METHOD1(ShouldHighlightOnDrag, bool(DndData const&));
+};
+
+class TestLauncher : public Test
+{
+public:
+  TestLauncher()
+    : parent_window_(new nux::BaseWindow("TestLauncherWindow"))
+    , dnd_collection_window_(new DNDCollectionWindow)
+    , model_(new launcher::LauncherModel)
+    , launcher_(new launcher::Launcher(parent_window_, dnd_collection_window_))
+  {
+    launcher_->SetModel(model_);
+  }
+
+  nux::BaseWindow* parent_window_;
+  nux::ObjectPtr<DNDCollectionWindow> dnd_collection_window_;
+  launcher::LauncherModel::Ptr model_;
+  nux::ObjectPtr<launcher::Launcher> launcher_;
+};
+
+TEST_F(TestLauncher, TestQuirksDuringDnd)
+{
+  MockMockLauncherIcon::Ptr first(new MockMockLauncherIcon);
+  model_->AddIcon(first);
+
+  MockMockLauncherIcon::Ptr second(new MockMockLauncherIcon);
+  model_->AddIcon(second);
+
+  MockMockLauncherIcon::Ptr third(new MockMockLauncherIcon);
+  model_->AddIcon(third);
+
+  EXPECT_CALL(*first, ShouldHighlightOnDrag(_))
+      .WillRepeatedly(Return(true));
+
+  EXPECT_CALL(*second, ShouldHighlightOnDrag(_))
+      .WillRepeatedly(Return(true));
+
+  EXPECT_CALL(*third, ShouldHighlightOnDrag(_))
+      .WillRepeatedly(Return(false));
+
+  std::list<char*> uris;
+  dnd_collection_window_->collected.emit(uris);
+
+  Utils::WaitForTimeout(1);
+
+  EXPECT_FALSE(first->GetQuirk(launcher::AbstractLauncherIcon::QUIRK_DESAT));
+  EXPECT_FALSE(second->GetQuirk(launcher::AbstractLauncherIcon::QUIRK_DESAT));
+  EXPECT_TRUE(third->GetQuirk(launcher::AbstractLauncherIcon::QUIRK_DESAT));
+}
+
+}

=== modified file 'tests/test_main.cpp'
--- tests/test_main.cpp	2012-06-21 06:55:53 +0000
+++ tests/test_main.cpp	2012-07-12 19:07:42 +0000
@@ -4,6 +4,7 @@
 #include <NuxCore/Logger.h>
 #include <Nux/Nux.h>
 
+#include "GestureEngine.h"
 #include "unity-shared/PluginAdapter.h"
 #include "unity-shared/WindowManager.h"
 
@@ -26,6 +27,7 @@
   // Setting the PluginAdapter to null, using the Standalone version at link time.
   PluginAdapter::Initialize(NULL);
   WindowManager::SetDefault(PluginAdapter::Default());
+  GeisAdapter geis_adapter;
 
   int ret = RUN_ALL_TESTS();