Merge lp:~3v1n0/unity/alt+tab-background-load.tests into lp:unity

[Marco Trevisan (Treviño)]

Added tests for SwitcherController changes done in lp:~3v1n0/unity/alt+tab-background-load, enabled the SwitcherModel tests as well.

[Tim Penhey (thumper)]

I'm not a fan of having long sleeps in unit tests.

Can I suggest that you use perhaps a class level static value for the start time delay.

You can then change that to something small in the test. I'd say as small as possible to show what is going on.

review: Needs Fixing

[Andrea Azzarone (azzar1)]

Looks good to me even if I'd prefer to have an abstract class for the controller too. But it's ok.

review: Approve

[Tim Penhey (thumper)]

review: Approve

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

Thanks for approving, I set as approved also the depending branch.

[Unity Merger (unity-merger)]

No proposals found for merge of lp:~3v1n0/unity/alt+tab-background-load into lp:unity.

[Unity Merger (unity-merger)]

No proposals found for merge of lp:~3v1n0/unity/alt+tab-background-load into lp:unity.

=== modified file 'plugins/unityshell/src/SwitcherController.h'
--- plugins/unityshell/src/SwitcherController.h	2012-03-06 21:32:25 +0000
+++ plugins/unityshell/src/SwitcherController.h	2012-03-06 21:32:26 +0000
@@ -98,6 +98,10 @@
   std::string GetName() const;
   void AddProperties(GVariantBuilder* builder);
 
+  virtual void ConstructWindow();
+  virtual void ConstructView();
+  virtual void ShowView();
+
   unsigned int construct_timeout_;
 
 private:
@@ -108,10 +112,6 @@
     TAB_NEXT_TILE,
   };
 
-  void ConstructWindow();
-  void ConstructView();
-  void ShowView();
-
   void OnModelSelectionChanged(launcher::AbstractLauncherIcon::Ptr icon);
   void OnBackgroundUpdate(GVariant* data);
 

=== modified file 'plugins/unityshell/src/UnityWindowStyle.cpp'
--- plugins/unityshell/src/UnityWindowStyle.cpp	2012-02-08 19:54:15 +0000
+++ plugins/unityshell/src/UnityWindowStyle.cpp	2012-03-06 21:32:26 +0000
@@ -18,6 +18,7 @@
  */
 
 #include "UnityWindowStyle.h"
+#include "config.h"
 
 namespace unity {
 namespace ui {

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-02-21 15:17:18 +0000
+++ tests/CMakeLists.txt	2012-03-06 21:32:26 +0000
@@ -149,8 +149,6 @@
                  ${UNITY_SRC}/ShortcutModel.h
                  ${UNITY_SRC}/ShortcutHintPrivate.cpp
                  ${UNITY_SRC}/ShortcutHintPrivate.h
-                 ${UNITY_SRC}/SwitcherModel.cpp
-                 ${UNITY_SRC}/SwitcherModel.h
                  ${UNITY_SRC}/Introspectable.cpp
                  ${UNITY_SRC}/Introspectable.h
                  ${UNITY_SRC}/TextureCache.cpp
@@ -196,14 +194,27 @@
                  test_texture_cache.cpp
                  test_main.cpp
                  test_icon_loader.cpp
+                 test_switcher_controller.cpp
+                 test_switcher_model.cpp
+                 ${UNITY_SRC}/AbstractLauncherIcon.cpp
+                 ${UNITY_SRC}/BackgroundEffectHelper.cpp
                  ${UNITY_SRC}/DashViewPrivate.cpp
-                 ${UNITY_SRC}/DashViewPrivate.h
                  ${UNITY_SRC}/TextureCache.cpp
-                 ${UNITY_SRC}/TextureCache.h
                  ${UNITY_SRC}/IconLoader.cpp
-                 ${UNITY_SRC}/IconLoader.h
+                 ${UNITY_SRC}/IconRenderer.cpp
+                 ${UNITY_SRC}/IconTextureSource.cpp
+                 ${UNITY_SRC}/Introspectable.cpp
+                 ${UNITY_SRC}/LayoutSystem.cpp
+                 ${UNITY_SRC}/StaticCairoText.cpp
+                 ${UNITY_SRC}/SwitcherController.cpp
+                 ${UNITY_SRC}/SwitcherModel.cpp
+                 ${UNITY_SRC}/SwitcherView.cpp
                  ${UNITY_SRC}/Timer.cpp
-                 ${UNITY_SRC}/Timer.h
+                 ${UNITY_SRC}/UBusWrapper.cpp
+                 ${UNITY_SRC}/UnityWindowStyle.cpp
+                 ${UNITY_SRC}/UnityWindowView.cpp
+                 ${UNITY_SRC}/ubus-server.cpp
+                 ${UNITY_SRC}/WindowManager.cpp
                 )
   target_link_libraries(test-gtest ${GTEST_BOTH_LIBRARIES})
   add_test(UnityGTest test-gtest)

=== added file 'tests/test_switcher_controller.cpp'
--- tests/test_switcher_controller.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_switcher_controller.cpp	2012-03-06 21:32:26 +0000
@@ -0,0 +1,106 @@
+/*
+ * 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 <gtest/gtest.h>
+
+#include "SwitcherController.h"
+#include "test_utils.h"
+
+
+using namespace unity::switcher;
+
+namespace
+{
+
+unsigned int DEFAULT_LAZY_CONSTRUCT_TIMEOUT = 20;
+
+class MockSwitcherController : public Controller
+{
+public:
+  MockSwitcherController()
+    : Controller()
+    , window_constructed_(false)
+    , view_constructed_(false)
+    , view_shown_(false)
+  {};
+
+  MockSwitcherController(unsigned int load_timeout)
+    : Controller(load_timeout)
+    , window_constructed_(false)
+    , view_constructed_(false)
+    , view_shown_(false)
+  {};
+
+  virtual void ConstructWindow()
+  {
+    window_constructed_ = true;
+  }
+
+  virtual void ConstructView()
+  {
+    view_constructed_ = true;
+  }
+
+  virtual void ShowView()
+  {
+    view_shown_ = true;
+  }
+
+  unsigned int GetConstructTimeout() const
+  {
+    return construct_timeout_;
+  }
+
+  bool window_constructed_;
+  bool view_constructed_;
+  bool view_shown_;
+};
+
+TEST(TestSwitcherController, Construction)
+{
+  Controller controller;
+  EXPECT_FALSE(controller.Visible());
+}
+
+TEST(TestSwitcherController, LazyConstructionTimeoutLength)
+{
+  MockSwitcherController controller;
+  EXPECT_EQ(controller.GetConstructTimeout(), DEFAULT_LAZY_CONSTRUCT_TIMEOUT);
+}
+
+TEST(TestSwitcherController, LazyWindowConstruction)
+{
+  // Setting the timeout to a lower value to speed-up the test
+  MockSwitcherController controller(2);
+
+  EXPECT_EQ(controller.GetConstructTimeout(), 2);
+
+  g_timeout_add_seconds(controller.GetConstructTimeout()/2, [] (gpointer data) -> gboolean {
+    auto controller = static_cast<MockSwitcherController*>(data);
+    EXPECT_FALSE(controller->window_constructed_);
+
+    return FALSE;
+  }, &controller);
+
+  Utils::WaitUntil(controller.window_constructed_, controller.GetConstructTimeout() + 1);
+  EXPECT_TRUE(controller.window_constructed_);
+}
+
+}

=== renamed file 'tests/unit/TestSwitcherModel.cpp' => 'tests/test_switcher_model.cpp'
--- tests/unit/TestSwitcherModel.cpp	2011-07-21 14:59:25 +0000
+++ tests/test_switcher_model.cpp	2012-03-06 21:32:26 +0000
@@ -22,20 +22,23 @@
 
 #include "SwitcherModel.h"
 #include "MockLauncherIcon.h"
+#include "AbstractLauncherIcon.h"
 
 #include <vector>
 
 
 using namespace unity::switcher;
+using unity::launcher::AbstractLauncherIcon;
+using unity::launcher::MockLauncherIcon;
 
 namespace
 {
 
-TEST(TestSwitcher, TestConstructor)
+TEST(TestSwitcherModel, TestConstructor)
 {
-  AbstractLauncherIcon* first  = new MockLauncherIcon();
-  AbstractLauncherIcon* second = new MockLauncherIcon();
-  std::vector<AbstractLauncherIcon*> icons;
+  AbstractLauncherIcon::Ptr first(new MockLauncherIcon());
+  AbstractLauncherIcon::Ptr second(new MockLauncherIcon());
+  std::vector<AbstractLauncherIcon::Ptr> icons;
   icons.push_back(first);
   icons.push_back(second);
 
@@ -46,18 +49,15 @@
   EXPECT_EQ(model->LastSelection(), first);
   EXPECT_EQ(model->SelectionIndex(), 0);
   EXPECT_EQ(model->LastSelectionIndex(), 0);
-
-  delete first;
-  delete second;
 }
 
-TEST(TestSwitcher, TestSelection)
+TEST(TestSwitcherModel, TestSelection)
 {
-  std::vector<AbstractLauncherIcon*> icons;
-  AbstractLauncherIcon* first  = new MockLauncherIcon();
-  AbstractLauncherIcon* second = new MockLauncherIcon();
-  AbstractLauncherIcon* third  = new MockLauncherIcon();
-  AbstractLauncherIcon* fourth = new MockLauncherIcon();
+  std::vector<AbstractLauncherIcon::Ptr> icons;
+  AbstractLauncherIcon::Ptr first(new MockLauncherIcon());
+  AbstractLauncherIcon::Ptr second(new MockLauncherIcon());
+  AbstractLauncherIcon::Ptr third(new MockLauncherIcon());
+  AbstractLauncherIcon::Ptr fourth(new MockLauncherIcon());
 
   icons.push_back(first);
   icons.push_back(second);
@@ -98,11 +98,6 @@
   model->Select(first);
   EXPECT_EQ(model->Selection(), first);
   EXPECT_EQ(model->LastSelection(), third);
-
-  delete first;
-  delete second;
-  delete third;
-  delete fourth;
 }
 
 }