Merge lp:~aacid/unity-2d/temp_disable_pointer_barrier_test into lp:unity-2d

[Albert Astals Cid]

[tests] Workaround x getting confused by a test by moving the test to be the last one

[lp:~aacid/unity-2d/temp_disable_pointer_barrier_test]

972. By Albert Astals Cid on 2012-03-12

Workaround x getting confused by a test by moving the test to be the last one

[Michał Sawicz (saviq)]

review: Approve

=== modified file 'libunity-2d-private/tests/pointerbarriertest.cpp'
--- libunity-2d-private/tests/pointerbarriertest.cpp	2012-03-02 10:39:07 +0000
+++ libunity-2d-private/tests/pointerbarriertest.cpp	2012-03-12 10:19:19 +0000
@@ -90,33 +90,6 @@
         QCOMPARE(triggeredSpy.count(), 0);
     }
 
-    void testStopArea()
-    {
-        Display *display = QX11Info::display();
-        PointerBarrierWrapper barrier;
-
-        QSignalSpy brokenSpy(&barrier, SIGNAL(broken()));
-        QSignalSpy triggeredSpy(&barrier, SIGNAL(triggered()));
-
-        XTestFakeMotionEvent(display, -1, 50, 150, 0);
-        QCOMPARE(QCursor::pos(), QPoint(50, 150));
-
-        barrier.setP1(QPointF(100, 0));
-        barrier.setP2(QPointF(100, 100));
-        barrier.setThreshold(6500);
-        barrier.setMaxVelocityMultiplier(2);
-        barrier.setDecayRate(1500);
-        barrier.setBreakPressure(2000);
-
-        XTestFakeRelativeMotionEvent(display, 300, 0, 0);
-        // We are not stopped by the barrier because it's above us
-        // and are in 350, 150
-        QCOMPARE(QCursor::pos(), QPoint(350, 150));
-
-        QCOMPARE(brokenSpy.count(), 0);
-        QCOMPARE(triggeredSpy.count(), 0);
-    }
-
     void testTrigger()
     {
         Display *display = QX11Info::display();
@@ -305,6 +278,33 @@
         QCOMPARE(brokenSpy.count(), 2);
         QCOMPARE(triggeredSpy.count(), 1);
     }
+
+    void testStopArea()
+    {
+        Display *display = QX11Info::display();
+        PointerBarrierWrapper barrier;
+
+        QSignalSpy brokenSpy(&barrier, SIGNAL(broken()));
+        QSignalSpy triggeredSpy(&barrier, SIGNAL(triggered()));
+
+        XTestFakeMotionEvent(display, -1, 50, 150, 0);
+        QCOMPARE(QCursor::pos(), QPoint(50, 150));
+
+        barrier.setP1(QPointF(100, 0));
+        barrier.setP2(QPointF(100, 100));
+        barrier.setThreshold(6500);
+        barrier.setMaxVelocityMultiplier(2);
+        barrier.setDecayRate(1500);
+        barrier.setBreakPressure(2000);
+
+        XTestFakeRelativeMotionEvent(display, 300, 0, 0);
+        // We are not stopped by the barrier because it's above us
+        // and are in 350, 150
+        QCOMPARE(QCursor::pos(), QPoint(350, 150));
+
+        QCOMPARE(brokenSpy.count(), 0);
+        QCOMPARE(triggeredSpy.count(), 0);
+    }
 };
 
 UAPP_TEST_MAIN(PointerBarrierTest)