← Back to branch summary

~alan-griffiths/mir/fix-1654023

« back to all changes in this revision

Viewing changes to tests/acceptance-tests/test_client_input.cpp

  • Committer: Daniel van Vugt
  • Date: 2016-07-18 07:38:38 UTC
  • mfrom: (3595 development-branch)
  • mto: This revision was merged to the branch mainline in revision 3748.
  • Revision ID: daniel.van.vugt@canonical.com-20160718073838-tclt9c441h505wck
Merge latest trunk.  No conflicts in 7+ weeks?!

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/acceptance-tests/test_client_input.cpp
180
180
    std::string const mouse_unique_id = "mouse-uid";
181
181
    std::string const touchscreen_name = "touchscreen";
182
182
    std::string const touchscreen_unique_id = "touchscreen-uid";
183
 
    std::unique_ptr<mtf::FakeInputDevice> fake_keyboard{mtf::add_fake_input_device(
184
 
        mi::InputDeviceInfo{keyboard_name, keyboard_unique_id, mi::DeviceCapability::keyboard})};
 
183
    std::unique_ptr<mtf::FakeInputDevice> fake_keyboard{mtf::add_fake_input_device(mi::InputDeviceInfo{
 
184
        keyboard_name, keyboard_unique_id, mi::DeviceCapability::keyboard | mi::DeviceCapability::alpha_numeric})};
185
185
    std::unique_ptr<mtf::FakeInputDevice> fake_mouse{
186
186
        mtf::add_fake_input_device(mi::InputDeviceInfo{mouse_name, mouse_unique_id, mi::DeviceCapability::pointer})};
187
187
    std::unique_ptr<mtf::FakeInputDevice> fake_touch_screen{mtf::add_fake_input_device(
541
541
{
542
542
    float const minimum_touch = mtf::FakeInputDevice::minimum_touch_axis_value;
543
543
    float const maximum_touch = mtf::FakeInputDevice::maximum_touch_axis_value;
544
 
    auto const display_width = screen_geometry.size.width.as_float();
545
 
    auto const display_height = screen_geometry.size.height.as_float();
 
544
    auto const display_width = screen_geometry.size.width.as_int();
 
545
    auto const display_height = screen_geometry.size.height.as_int();
546
546
 
547
547
    // We place a click 10% in to the touchscreens space in both axis,
548
548
    // and a second at 0,0. Thus we expect to see a click at
858
858
 
859
859
    ASSERT_THAT(mir_input_config_device_count(config), Eq(expected_devices));
860
860
 
861
 
    EXPECT_THAT(config, ADeviceMatches(keyboard_name, keyboard_unique_id, mir_input_device_capability_keyboard));
 
861
    EXPECT_THAT(config, ADeviceMatches(keyboard_name, keyboard_unique_id,
 
862
                                       uint32_t(mir_input_device_capability_keyboard |
 
863
                                                mir_input_device_capability_alpha_numeric)));
862
864
    EXPECT_THAT(config, ADeviceMatches(mouse_name, mouse_unique_id, mir_input_device_capability_pointer));
863
865
    EXPECT_THAT(config, ADeviceMatches(touchscreen_name, touchscreen_unique_id,
864
866
                                        uint32_t(mir_input_device_capability_touchscreen |