test: fix grab mode value tests for new XIGrabModeTouch

This test checks that last-valid-mode + 1 returns a BadValue. With the
addition of XIGrabModeTouch, that value has changed - sync it up again.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
This commit is contained in:
Peter Hutterer 2011-12-22 10:00:15 +10:00
parent e395efc25f
commit f75bdf7fbe

View File

@ -161,22 +161,31 @@ static void dix_check_grab_values(void)
rc = CheckGrabValues(&client, &param);
assert(rc == Success);
param.this_device_mode = GrabModeAsync + 1;
param.this_device_mode = XIGrabModeTouch;
rc = CheckGrabValues(&client, &param);
assert(rc == Success);
param.this_device_mode = XIGrabModeTouch + 1;
rc = CheckGrabValues(&client, &param);
assert(rc == BadValue);
assert(client.errorValue == param.this_device_mode);
assert(client.errorValue == GrabModeAsync + 1);
assert(client.errorValue == XIGrabModeTouch + 1);
param.this_device_mode = GrabModeSync;
param.other_devices_mode = GrabModeAsync;
rc = CheckGrabValues(&client, &param);
param.this_device_mode = GrabModeSync;
param.other_devices_mode = XIGrabModeTouch;
rc = CheckGrabValues(&client, &param);
assert(rc == Success);
assert(rc == Success);
param.other_devices_mode = GrabModeAsync + 1;
param.other_devices_mode = XIGrabModeTouch + 1;
rc = CheckGrabValues(&client, &param);
assert(rc == BadValue);
assert(client.errorValue == param.other_devices_mode);
assert(client.errorValue == GrabModeAsync + 1);
assert(client.errorValue == XIGrabModeTouch + 1);
param.other_devices_mode = GrabModeSync;