Merge lp:~smspillaz/unity/mock_switcher_view into lp:unity

[Sam Spilsbury]

Implement a MockSwitcherView in Google Mock.

Implement a MockSwitcherView in Google Mock.

[lp:~smspillaz/unity/mock_switcher_view]

3007. By Sam Spilsbury on 2012-12-20

Merged extract_switcher_view_interface into mock_switcher_view.

3008. By Sam Spilsbury on 2012-12-20

Update mock

3009. By Sam Spilsbury on 2012-12-23

Merged extract_switcher_view_interface into mock_switcher_view.

[Sam Spilsbury (smspillaz)]

Not working on this as we're not putting any more substantial effort into UnityNux. Somebody please reject this so it can be removed from the merge queue.

review: Disapprove

Unmerged revisions

3009. By Sam Spilsbury on 2012-12-23

Merged extract_switcher_view_interface into mock_switcher_view.

3008. By Sam Spilsbury on 2012-12-20

Update mock

3007. By Sam Spilsbury on 2012-12-20

Merged extract_switcher_view_interface into mock_switcher_view.

3006. By Sam Spilsbury on 2012-12-19

Merged extract_switcher_view_interface into mock_switcher_view.

3005. By Sam Spilsbury on 2012-12-19

Add switcher::View google mock

3004. By Sam Spilsbury on 2012-12-19

Pull a non-virtual interface out of SwitcherView

=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2012-12-23 10:03:25 +0000
+++ launcher/SwitcherController.cpp	2012-12-23 10:03:25 +0000
@@ -387,8 +387,6 @@
   last_active_selection_ = nullptr;
 
   view_.reset();
-  nux_view_ = nullptr;
-  introspectable_view_ = nullptr;
 
   if (view_window_)
   {
@@ -396,7 +394,15 @@
     view_window_->ShowWindow(false);
     view_window_->PushToBack();
     view_window_->EnableInputWindow(false);
+
+    /* We must do this here, as SetInputFocusArea causes the
+     * nux::BaseWindow to hang on to a reference to the
+     * nux::View when it is initially called */
+    view_window_->SetEnterFocusInputArea(nullptr);
   }
+
+  nux_view_ = nullptr;
+  introspectable_view_ = nullptr;
 }
 
 bool ShellController::Visible()
 
=== modified file 'launcher/SwitcherView.h'
--- launcher/SwitcherView.h	2012-12-23 10:03:25 +0000
+++ launcher/SwitcherView.h	2012-12-23 10:03:25 +0000
@@ -305,7 +305,7 @@
     unsigned int GetTileSize();
     unsigned int GetAnimationLength();
 
-    void SetupBackground(bool enabled = true);
+    void SetupBackground(bool enabled);
 
     nux::Area * GetTopLevelViewWindow();
   private:
 
=== modified file 'shortcuts/ShortcutController.cpp'
--- shortcuts/ShortcutController.cpp	2012-12-14 17:38:35 +0000
+++ shortcuts/ShortcutController.cpp	2012-12-23 10:03:25 +0000
@@ -99,6 +99,8 @@
   if (!enabled_)
     return false;
 
+  view_window_->ShowWindow(true);
+
   base_window_raiser_->Raise(view_window_);
 
   nux::Geometry geo;
@@ -146,7 +148,6 @@
   main_layout_->AddView(view_.GetPointer());
 
   view_->SetupBackground(false);
-  view_window_->ShowWindow(true);
   SetOpacity(0.0);
 }
 
@@ -206,6 +207,12 @@
 void Controller::SetOpacity(double value)
 {
   view_window_->SetOpacity(value);
+
+  double finish_value = fade_animator_.GetFinishValue();
+
+  if (finish_value == 0.0f &&
+      value == finish_value)
+    view_window_->ShowWindow(false);
 }
 
 //
 
=== added file 'tests/MockSwitcherView.h'
--- tests/MockSwitcherView.h	1970-01-01 00:00:00 +0000
+++ tests/MockSwitcherView.h	2012-12-23 10:03:25 +0000
@@ -0,0 +1,72 @@
+/*
+ * 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: Sam Spilsbury <[e-mail]>
+ *
+ */
+#ifndef _UNITY_MOCK_SWITCHER_VIEW_H
+#define _UNITY_MOCK_SWITCHER_VIEW_H
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <memory>
+
+#include <SwitcherView.h>
+#include <AbstractLauncherIcon.h>
+
+namespace unity
+{
+namespace switcher
+{
+class MockSwitcherView :
+  public View::Impl
+{
+  public:
+
+    MOCK_METHOD0(ExternalTargets, ui::LayoutWindow::Vector ());
+    MOCK_METHOD1(SetModel, void (SwitcherModel::Ptr));
+    MOCK_METHOD0(GetModel, SwitcherModel::Ptr ());
+    MOCK_METHOD3(ConnectToMouseEvents,
+                 View::MouseEventConnections (const View::MouseButtonCallback &mouse_down_callback,
+                                              const View::MouseButtonCallback &mouse_up_callback,
+                                              const View::MouseDragCallback   &mouse_drag_callback));
+    MOCK_METHOD0(QueueDraw, void ());
+    MOCK_CONST_METHOD0(GetAbsoluteGeometry, nux::Geometry ());
+    MOCK_METHOD2(IconIndexAt, int (int, int));
+    MOCK_METHOD1(SetBackgroundColor, void(nux::Color const&));
+    MOCK_METHOD1(SetupBackground, void(bool));
+
+    MOCK_METHOD1(SetMonitor, void(unsigned int));
+    MOCK_METHOD1(SetBorderSize, void(unsigned int));
+    MOCK_METHOD1(SetFlatSpacing, void(int));
+    MOCK_METHOD1(SetTextSize, void(unsigned int));
+    MOCK_METHOD1(SetTileSize, void(unsigned int));
+    MOCK_METHOD1(SetIconSize, void(unsigned int));
+    MOCK_METHOD1(SetAnimationLength, void(unsigned int));
+    MOCK_METHOD1(SetRenderBoxes, void(bool));
+
+    MOCK_METHOD0(GetBorderSize, unsigned int());
+    MOCK_METHOD0(GetFlatSpacing, unsigned int());
+    MOCK_METHOD0(GetTextSize, unsigned int());
+    MOCK_METHOD0(GetIconSize, unsigned int());
+    MOCK_METHOD0(GetTileSize, unsigned int());
+    MOCK_METHOD0(GetAnimationLength, unsigned int());
+};
+}
+}
+
+#endif
 
=== modified file 'tests/test_switcher_controller.cpp'
--- tests/test_switcher_controller.cpp	2012-12-23 10:03:25 +0000
+++ tests/test_switcher_controller.cpp	2012-12-23 10:03:25 +0000
@@ -24,6 +24,7 @@
 #include "test_utils.h"
 #include "StubSwitcherController.h"
 #include "MockSwitcherController.h"
+#include "MockSwitcherView.h"
 #include "SwitcherController.h"
 #include "DesktopLauncherIcon.h"
 #include "TimeUtil.h"
@@ -35,6 +36,19 @@
 
 unsigned int DEFAULT_LAZY_CONSTRUCT_TIMEOUT = 20;
 
+TEST(TestSwitcherView, InstantiateMock)
+{
+  MockSwitcherView mock;
+}
+
+TEST(TestSwitcherView, InstantiateMockThroughNVI)
+{
+  MockSwitcherView *mock = new MockSwitcherView;
+  View view ([&](){
+    return std::unique_ptr<View::Impl> (mock);
+  });
+}
+
 TEST(TestSwitcherController, InstantiateMock)
 {
   MockSwitcherController mock;