Merge lp:~azzar1/unity/fix-lc-failing-tests into lp:unity

[Andrea Azzarone]

First attempt to fix failing gtest tests.

[Brandon Schaefer (brandontschaefer)]

Looks good to me :)

review: Approve

=== modified file 'tests/test_launcher_controller.cpp'
--- tests/test_launcher_controller.cpp	2012-12-13 12:29:02 +0000
+++ tests/test_launcher_controller.cpp	2013-01-14 21:40:26 +0000
@@ -459,8 +459,12 @@
   uscreen.SetupFakeMultiMonitor();
   lc.options()->hide_mode = LAUNCHER_HIDE_NEVER;
 
+  auto check_fn = [this](int index) {
+    return lc.launchers()[index]->GetParent()->InputWindowStrutsEnabled();
+  };
+
   for (int i = 0; i < max_num_monitors; ++i)
-    ASSERT_TRUE(lc.launchers()[i]->GetParent()->InputWindowStrutsEnabled());
+    Utils::WaitUntil(std::bind(check_fn, i));
 }
 
 TEST_F(TestLauncherController, DisabledStrutsOnAutoHide)
@@ -469,8 +473,12 @@
   uscreen.SetupFakeMultiMonitor();
   lc.options()->hide_mode = LAUNCHER_HIDE_AUTOHIDE;
 
+  auto check_fn = [this](int index) {
+    return !(lc.launchers()[index]->GetParent()->InputWindowStrutsEnabled());
+  };
+
   for (int i = 0; i < max_num_monitors; ++i)
-    ASSERT_FALSE(lc.launchers()[i]->GetParent()->InputWindowStrutsEnabled());
+    Utils::WaitUntil(std::bind(check_fn, i));
 }
 
 TEST_F(TestLauncherController, EnabledStrutsAddingNewLaunchersOnAutoHide)
@@ -486,8 +494,12 @@
   // This makes the controller to add again new launchers
   lc.multiple_launchers = true;
 
+  auto check_fn = [this](int index) {
+    return lc.launchers()[index]->GetParent()->InputWindowStrutsEnabled();
+  };
+
   for (int i = 0; i < max_num_monitors; ++i)
-    ASSERT_TRUE(lc.launchers()[i]->GetParent()->InputWindowStrutsEnabled());
+    Utils::WaitUntil(std::bind(check_fn, i));
 }
 
 TEST_F(TestLauncherController, DisabledStrutsAddingNewLaunchersOnNeverHide)
@@ -503,8 +515,12 @@
   // This makes the controller to add again new launchers
   lc.multiple_launchers = true;
 
+  auto check_fn = [this](int index) {
+    return !(lc.launchers()[index]->GetParent()->InputWindowStrutsEnabled());
+  };
+
   for (int i = 0; i < max_num_monitors; ++i)
-    ASSERT_FALSE(lc.launchers()[i]->GetParent()->InputWindowStrutsEnabled());
+    Utils::WaitUntil(std::bind(check_fn, i));
 }
 
 TEST_F(TestLauncherController, CreateFavoriteInvalid)