diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-12-18 16:43:36 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-12-18 16:43:36 +1000 |
| commit | bded337617cb6bca4f6719b0cc8fa293376d3f70 (patch) | |
| tree | ef5f9c3ba64f1fdf5fac9565514158fa97a1a057 | |
| parent | 9873e2a0c2870692a2c4d1bfbef36a890ea448cd (diff) | |
server/grab: replace XPending() == 0 with NoEventPending()
Provides better debug output.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | tests/server/grab.cpp | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/tests/server/grab.cpp b/tests/server/grab.cpp index a73a8d7..d439241 100644 --- a/tests/server/grab.cpp +++ b/tests/server/grab.cpp @@ -106,7 +106,7 @@ TEST_F(PointerGrabTest, ImplicitGrabRawEvents) 1000)); XEvent ev; XNextEvent(dpy, &ev); - ASSERT_FALSE(XPending(dpy)); + ASSERT_TRUE(NoEventPending(dpy)); /* Now press button, make sure sure we still get raw events */ dev->PlayOne(EV_KEY, BTN_LEFT, 1, true); @@ -129,7 +129,7 @@ TEST_F(PointerGrabTest, ImplicitGrabRawEvents) XI_RawMotion, 1000)); XNextEvent(dpy, &ev); - ASSERT_FALSE(XPending(dpy)); + ASSERT_TRUE(NoEventPending(dpy)); } TEST_F(PointerGrabTest, GrabDisabledDevices) @@ -414,7 +414,7 @@ TEST_P(TouchGrabTestMultipleTaps, PassiveGrabPointerEmulationMultipleTouchesFast XSelectInput(dpy2, root, PointerMotionMask | ButtonPressMask | ButtonReleaseMask); XSync(dpy2, False); - ASSERT_FALSE(XPending(dpy2)); + ASSERT_TRUE(NoEventPending(dpy2)); int repeats = GetParam(); @@ -484,7 +484,7 @@ TEST_P(TouchGrabTestMultipleTaps, PassiveGrabPointerRelease) delete[] mask.mask; XSync(dpy2, False); - ASSERT_FALSE(XPending(dpy2)); + ASSERT_TRUE(NoEventPending(dpy2)); int repeats = GetParam(); @@ -508,12 +508,7 @@ TEST_P(TouchGrabTestMultipleTaps, PassiveGrabPointerRelease) ASSERT_EQ(ev.xcookie.evtype, XI_ButtonPress); } - if (XPending(dpy2)) { - XEvent ev; - XPeekEvent(dpy2, &ev); - ASSERT_FALSE(XPending(dpy2)) << "Event type " << ev.type << " (extension " << - ev.xcookie.extension << " evtype " << ev.xcookie.evtype << ")"; - } + ASSERT_TRUE(NoEventPending(dpy2)); } INSTANTIATE_TEST_CASE_P(, TouchGrabTestMultipleTaps, ::testing::Range(1, 11)); /* device num_touches is 5 */ @@ -756,7 +751,7 @@ TEST_F(TouchOwnershipTest, NoOwnershipAfterAcceptTouch) ASSERT_EQ(B_begin.ev->detail, touchid); /* A has not rejected yet, no ownership */ - ASSERT_EQ(XPending(dpy2), 0); + ASSERT_TRUE(NoEventPending(dpy2)); XIAllowTouchEvents(dpy, deviceid, touchid, root, XIAcceptTouch); @@ -810,7 +805,7 @@ TEST_F(TouchOwnershipTest, ActiveGrabOwnershipAcceptTouch) ASSERT_EQ(B_begin.ev->detail, touchid); /* A has not rejected yet, no ownership */ - ASSERT_EQ(XPending(dpy2), 0); + ASSERT_TRUE(NoEventPending(dpy2)); XIAllowTouchEvents(dpy, deviceid, touchid, root, XIAcceptTouch); @@ -864,7 +859,7 @@ TEST_F(TouchOwnershipTest, ActiveGrabOwnershipRejectTouch) ASSERT_EQ(B_begin.ev->detail, touchid); /* A has not rejected yet, no ownership */ - ASSERT_EQ(XPending(dpy2), 0); + ASSERT_TRUE(NoEventPending(dpy2)); XIAllowTouchEvents(dpy, deviceid, touchid, root, XIRejectTouch); @@ -921,7 +916,7 @@ TEST_F(TouchOwnershipTest, ActiveGrabOwnershipUngrabDevice) ASSERT_EQ(B_begin.ev->detail, touchid); /* A has not rejected yet, no ownership */ - ASSERT_EQ(XPending(dpy2), 0); + ASSERT_TRUE(NoEventPending(dpy2)); XIUngrabDevice(dpy, deviceid, CurrentTime); |