Merge lp:~brandontschaefer/unity/lp.1199050-fix into lp:unity

[Brandon Schaefer]

Don't calculate the velocity if dtime is 0. This way we don't get a huge velocity on the initial barrier hit.

=== Problem ===
When we got an event we had to calculate the velocity of the event. If dtime was 0, I was assuming it was ok to just use 1. The problem is this would create a huge number when it was ever 0. Causing the barrier to break waay to easy, causing the launcher to not reveal as easy as it use to.

=== Fix ===
If dtime is 0, just return the velocity as 1, instead of calculating the velc and only dividing by 1...

=== Tests ===
Test we don't break the barrier if we have 0 dtime
Test we break the barrier if we have greater then 0 dtime and the velc is greater then the threshold.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3415
http://jenkins.qa.ubuntu.com/job/unity-ci/212/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/101
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/99
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/100

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/212/rebuild

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

Righteous catch.

review: Approve

=== modified file 'launcher/PointerBarrier.cpp'
--- launcher/PointerBarrier.cpp	2013-02-23 00:54:10 +0000
+++ launcher/PointerBarrier.cpp	2013-07-09 23:59:25 +0000
@@ -117,8 +117,11 @@
   dx = event->dx;
   dy = event->dy;
 
+  millis = event->dtime;
+
   // Sometimes dtime is 0, if so we don't want to divide by zero!
-  millis = event->dtime ?: 1;
+  if (!millis)
+    return 1;
 
   speed = sqrt(dx * dx + dy * dy) / millis * 1000;
 
 
=== modified file 'tests/test_pointer_barrier.cpp'
--- tests/test_pointer_barrier.cpp	2013-02-25 20:00:25 +0000
+++ tests/test_pointer_barrier.cpp	2013-07-09 23:59:25 +0000
@@ -20,6 +20,9 @@
  */
 
 #include <gtest/gtest.h>
+#include <gmock/gmock.h>
+using namespace testing;
+
 #include <limits>
 
 #include "test_utils.h"
@@ -34,6 +37,8 @@
 {
 public:
   bool HandleBarrierEvent(XIBarrierEvent* b_ev) { return PointerBarrierWrapper::HandleBarrierEvent(b_ev); }
+
+  MOCK_METHOD1(ReleaseBarrier, void(int));
 };
 
 XIBarrierEvent GetGenericEvent (unsigned int id)
@@ -162,4 +167,37 @@
   EXPECT_EQ(events_recived, 2);
 }
 
+TEST(TestPointerBarrier, DontReleaseBarrierOnEmptyDTime)
+{
+  MockPointerBarrier pb;
+  pb.threshold = 1000;
+  XIBarrierEvent ev = GetGenericEvent(0xabba);
+  ev.dtime = 0;
+
+  {
+    InSequence sequence;
+    EXPECT_CALL(pb, ReleaseBarrier(0xabba)).Times(0);
+  }
+
+  EXPECT_TRUE(pb.HandleBarrierEvent(&ev));
+
+  Utils::WaitForTimeoutMSec(pb.smoothing());
+}
+
+TEST(TestPointerBarrier, ReleaseBarrierIfOverThreshold)
+{
+  MockPointerBarrier pb;
+  pb.threshold = 500;
+  XIBarrierEvent ev = GetGenericEvent(0xabba);
+
+  {
+    InSequence sequence;
+    EXPECT_CALL(pb, ReleaseBarrier(0xabba)).Times(1);
+  }
+
+  EXPECT_TRUE(pb.HandleBarrierEvent(&ev));
+
+  Utils::WaitForTimeoutMSec(pb.smoothing());
+}
+
 }