Merge lp:~azzar1/unity/fix-1033866 into lp:unity

[Andrea Azzarone]

Switch on "backlight toggles" mode by default

== Test ==
Add a test for IconBackgroundItensity with the default option values for backlight mode and start animation.

[Brandon Schaefer (brandontschaefer)]

Everything looks good, and the tests pass for me.

review: Approve

[Unity Merger (unity-merger)]

Attempt to merge into lp:unity failed due to conflicts:

text conflict in launcher/MockLauncherIcon.h
text conflict in tests/test_launcher.cpp

=== modified file 'launcher/Launcher.h'
--- launcher/Launcher.h	2012-08-03 09:39:01 +0000
+++ launcher/Launcher.h	2012-08-13 09:47:28 +0000
@@ -389,6 +389,8 @@
 
   UBusManager ubus_;
   glib::SourceManager sources_;
+
+  friend class TestLauncher;
 };
 
 }

=== modified file 'launcher/LauncherOptions.cpp'
--- launcher/LauncherOptions.cpp	2012-07-19 00:00:43 +0000
+++ launcher/LauncherOptions.cpp	2012-08-13 09:47:28 +0000
@@ -31,7 +31,7 @@
   , launch_animation(LAUNCH_ANIMATION_PULSE)
   , urgent_animation(URGENT_ANIMATION_WIGGLE)
   , auto_hide_animation(FADE_AND_SLIDE)
-  , backlight_mode(BACKLIGHT_ALWAYS_ON)
+  , backlight_mode(BACKLIGHT_NORMAL)
   , reveal_trigger(RevealTrigger::EDGE)
   , icon_size(48)
   , tile_size(54)

=== modified file 'launcher/MockLauncherIcon.h'
--- launcher/MockLauncherIcon.h	2012-08-02 11:30:02 +0000
+++ launcher/MockLauncherIcon.h	2012-08-13 09:47:28 +0000
@@ -212,14 +212,14 @@
   void SetQuirk(Quirk quirk, bool value)
   {
     quirks_[unsigned(quirk)] = value;
+    clock_gettime(CLOCK_MONOTONIC, &(quirk_times_[unsigned(quirk)]));
   }
 
   void ResetQuirkTime(Quirk quirk) {};
 
   struct timespec GetQuirkTime(Quirk quirk)
   {
-    timespec tv;
-    return tv;
+    return quirk_times_[unsigned(quirk)];
   }
 
   IconType GetIconType()
@@ -345,6 +345,7 @@
   int sort_priority_;
   IconType type_;
   bool quirks_[unsigned(Quirk::LAST)];
+  timespec quirk_times_[unsigned(Quirk::LAST)];
 };
 
 }

=== modified file 'plugins/unityshell/unityshell.xml.in'
--- plugins/unityshell/unityshell.xml.in	2012-07-27 03:16:37 +0000
+++ plugins/unityshell/unityshell.xml.in	2012-08-13 09:47:28 +0000
@@ -205,7 +205,7 @@
                     <_long>Change how the icons are backlit</_long>
                     <min>0</min>
                     <max>4</max>
-                    <default>0</default>
+                    <default>1</default>
                     <desc>
                         <value>0</value>
                         <_name>Backlight Always On</_name>

=== modified file 'tests/test_launcher.cpp'
--- tests/test_launcher.cpp	2012-08-02 11:30:02 +0000
+++ tests/test_launcher.cpp	2012-08-13 09:47:28 +0000
@@ -24,15 +24,23 @@
 #include <Nux/Nux.h>
 #include <Nux/BaseWindow.h>
 
-#include "DNDCollectionWindow.h"
-#include "MockLauncherIcon.h"
-#include "Launcher.h"
+#include "launcher/DNDCollectionWindow.h"
+#include "launcher/MockLauncherIcon.h"
+#include "launcher/Launcher.h"
+#include "unity-shared/PanelStyle.h"
+#include "unity-shared/UnitySettings.h"
 #include "test_utils.h"
 using namespace unity;
 
+namespace unity
+{
+namespace launcher
+{
 namespace
 {
 
+const int STARTING_ANIMATION_DURATION = 150;
+
 class MockMockLauncherIcon : public launcher::MockLauncherIcon
 {
 public:
@@ -41,22 +49,34 @@
   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_))
+    , model_(new LauncherModel)
+    , options_(new Options)
+    , launcher_(new Launcher(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);
+  }
+
   nux::BaseWindow* parent_window_;
   nux::ObjectPtr<DNDCollectionWindow> dnd_collection_window_;
-  launcher::LauncherModel::Ptr model_;
-  nux::ObjectPtr<launcher::Launcher> launcher_;
+  Settings settings;
+  panel::Style panel_style;
+  LauncherModel::Ptr model_;
+  Options::Ptr options_;
+  nux::ObjectPtr<Launcher> launcher_;
 };
 
 TEST_F(TestLauncher, TestQuirksDuringDnd)
@@ -89,4 +109,34 @@
   EXPECT_TRUE(third->GetQuirk(launcher::AbstractLauncherIcon::Quirk::DESAT));
 }
 
-}
+
+TEST_F(TestLauncher, TestIconBackgroundIntensity)
+{
+  MockMockLauncherIcon::Ptr first(new MockMockLauncherIcon);
+  model_->AddIcon(first);
+
+  MockMockLauncherIcon::Ptr second(new MockMockLauncherIcon);
+  model_->AddIcon(second);
+
+  MockMockLauncherIcon::Ptr third(new MockMockLauncherIcon);
+  model_->AddIcon(third);
+
+  options_->backlight_mode = BACKLIGHT_NORMAL;
+  options_->launch_animation = LAUNCH_ANIMATION_PULSE;
+
+  first->SetQuirk(AbstractLauncherIcon::Quirk::RUNNING, true);
+  second->SetQuirk(AbstractLauncherIcon::Quirk::RUNNING, true);
+  third->SetQuirk(AbstractLauncherIcon::Quirk::RUNNING, false);
+
+  Utils::WaitForTimeoutMSec(STARTING_ANIMATION_DURATION);
+  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);
+}
+
+}
+}
+