← Back to branch summary

~mir-team/mir/0.26

« back to all changes in this revision

Viewing changes to tests/unit-tests/input/test_default_input_device_hub.cpp

  • Committer: Andreas Pokorny
  • Date: 2017-03-24 19:44:04 UTC
  • Revision ID: andreas.pokorny@canonical.com-20170324194404-sz3xjv6og7cdp73g
https://launchpad.net/bugs/1672955
Merge fix from lp:mir to 0.26 release branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/input/test_default_input_device_hub.cpp
236
236
    observer_loop.trigger_server_actions();
237
237
}
238
238
 
 
239
TEST_F(InputDeviceHubTest, no_device_config_action_after_device_removal)
 
240
{
 
241
    std::shared_ptr<mi::Device> dev_ptr;
 
242
    MirPointerConfig ptr_config;
 
243
    ptr_config.cursor_acceleration_bias(0.5);
 
244
 
 
245
    ON_CALL(mock_observer, device_added(WithName("mouse"))).WillByDefault(SaveArg<0>(&dev_ptr));
 
246
 
 
247
    hub.add_device(mt::fake_shared(mouse));
 
248
    hub.add_observer(mt::fake_shared(mock_observer));
 
249
    observer_loop.trigger_server_actions();
 
250
 
 
251
    EXPECT_CALL(mouse, apply_settings(Matcher<mi::PointerSettings const&>(_))).Times(0);
 
252
 
 
253
    dev_ptr->apply_pointer_configuration(ptr_config);
 
254
    hub.remove_device(mt::fake_shared(mouse));
 
255
    observer_loop.trigger_server_actions();
 
256
}