Merge lp:~alan-griffiths/mir/delete-dead-code into lp:mir

[Alan Griffiths]

[mirserver] Surface::set_keymap() is unused, so we don't need the code to support it

Unmerged revisions

4278. By Alan Griffiths on 2017-09-29

Delete dead code - Surface::set_keymap()

=== modified file 'include/server/mir/scene/null_surface_observer.h'
--- include/server/mir/scene/null_surface_observer.h	2017-07-28 17:00:43 +0000
+++ include/server/mir/scene/null_surface_observer.h	2017-09-29 20:07:10 +0000
@@ -42,7 +42,6 @@
     void cursor_image_set_to(graphics::CursorImage const& image) override;
     void reception_mode_set_to(input::InputReceptionMode mode) override;
     void client_surface_close_requested() override;
-    void keymap_changed(MirInputDeviceId id, std::string const& model, std::string const& layout, std::string const& variant, std::string const& options) override;
     void renamed(char const* name) override;
     void cursor_image_removed() override;
     void placed_relative(geometry::Rectangle const& placement) override;

=== modified file 'include/server/mir/scene/surface.h'
--- include/server/mir/scene/surface.h	2017-08-30 15:38:42 +0000
+++ include/server/mir/scene/surface.h	2017-09-29 20:07:10 +0000
@@ -63,7 +63,7 @@
     /// Size of the surface including window frame (if any)
     virtual geometry::Size size() const = 0;
 
-    virtual graphics::RenderableList generate_renderables(compositor::CompositorID id) const = 0; 
+    virtual graphics::RenderableList generate_renderables(compositor::CompositorID id) const = 0;
     virtual int buffers_ready_for_compositor(void const* compositor_id) const = 0;
 
     virtual MirWindowType type() const = 0;
@@ -89,7 +89,7 @@
     virtual void set_transformation(glm::mat4 const& t) = 0;
     virtual void set_alpha(float alpha) = 0;
     virtual void set_orientation(MirOrientation orientation) = 0;
-    
+
     virtual void set_cursor_image(std::shared_ptr<graphics::CursorImage> const& image) override = 0;
     virtual std::shared_ptr<graphics::CursorImage> cursor_image() const override = 0;
 
@@ -106,8 +106,6 @@
     // TODO a legacy of old interactions and needs removing
     virtual int query(MirWindowAttrib attrib) const = 0;
 
-    virtual void set_keymap(MirInputDeviceId id, std::string const& model, std::string const& layout,
-                            std::string const& variant, std::string const& options) = 0;
     virtual void rename(std::string const& title) = 0;
     virtual void set_streams(std::list<StreamInfo> const& streams) = 0;
 

=== modified file 'include/server/mir/scene/surface_observer.h'
--- include/server/mir/scene/surface_observer.h	2017-07-28 17:00:43 +0000
+++ include/server/mir/scene/surface_observer.h	2017-09-29 20:07:10 +0000
@@ -57,8 +57,6 @@
     virtual void reception_mode_set_to(input::InputReceptionMode mode) = 0;
     virtual void cursor_image_set_to(graphics::CursorImage const& image) = 0;
     virtual void client_surface_close_requested() = 0;
-    virtual void keymap_changed(MirInputDeviceId id, std::string const& model, std::string const& layout,
-                                std::string const& variant, std::string const& options) = 0;
     virtual void renamed(char const* name) = 0;
     virtual void cursor_image_removed() = 0;
     virtual void placed_relative(geometry::Rectangle const& placement) = 0;

=== modified file 'include/test/mir/test/doubles/stub_surface.h'
--- include/test/mir/test/doubles/stub_surface.h	2017-08-30 15:38:42 +0000
+++ include/test/mir/test/doubles/stub_surface.h	2017-09-29 20:07:10 +0000
@@ -63,8 +63,6 @@
     std::shared_ptr<Surface> parent() const override;
     void add_observer(std::shared_ptr<scene::SurfaceObserver> const& observer) override;
     void remove_observer(std::weak_ptr<scene::SurfaceObserver> const& observer) override;
-    void set_keymap(MirInputDeviceId id, std::string const& model, std::string const& layout,
-                    std::string const& variant, std::string const& options) override;
     void rename(std::string const& title) override;
     void set_confine_pointer_state(MirPointerConfinementState state) override;
     MirPointerConfinementState confine_pointer_state() const override;

=== modified file 'src/include/server/mir/scene/surface_event_source.h'
--- src/include/server/mir/scene/surface_event_source.h	2017-07-28 17:00:43 +0000
+++ src/include/server/mir/scene/surface_event_source.h	2017-09-29 20:07:10 +0000
@@ -47,8 +47,6 @@
     void moved_to(geometry::Point const& top_left) override;
     void orientation_set_to(MirOrientation orientation) override;
     void client_surface_close_requested() override;
-    void keymap_changed(MirInputDeviceId id, std::string const& model, std::string const& layout,
-                        std::string const& variant, std::string const& options) override;
     void placed_relative(geometry::Rectangle const& placement) override;
     void input_consumed(MirEvent const* event) override;
     void start_drag_and_drop(std::vector<uint8_t> const& handle) override;

=== modified file 'src/include/server/mir/scene/surface_observers.h'
--- src/include/server/mir/scene/surface_observers.h	2017-07-28 17:00:43 +0000
+++ src/include/server/mir/scene/surface_observers.h	2017-09-29 20:07:10 +0000
@@ -45,8 +45,6 @@
     void reception_mode_set_to(input::InputReceptionMode mode) override;
     void cursor_image_set_to(graphics::CursorImage const& image) override;
     void client_surface_close_requested() override;
-    void keymap_changed(MirInputDeviceId id, std::string const& model, std::string const& layout,
-                        std::string const& variant, std::string const& options) override;
     void renamed(char const*) override;
     void cursor_image_removed() override;
     void placed_relative(geometry::Rectangle const& placement) override;

=== modified file 'src/server/scene/basic_surface.cpp'
--- src/server/scene/basic_surface.cpp	2017-08-30 15:38:42 +0000
+++ src/server/scene/basic_surface.cpp	2017-09-29 20:07:10 +0000
@@ -113,13 +113,6 @@
         { observer->client_surface_close_requested(); });
 }
 
-void ms::SurfaceObservers::keymap_changed(MirInputDeviceId id, std::string const& model, std::string const& layout,
-                                          std::string const& variant, std::string const& options)
-{
-    for_each([&](std::shared_ptr<SurfaceObserver> const& observer)
-        { observer->keymap_changed(id, model, layout, variant, options); });
-}
-
 void ms::SurfaceObservers::renamed(char const* name)
 {
     for_each([name](std::shared_ptr<SurfaceObserver> const& observer)
@@ -410,7 +403,7 @@
 bool ms::BasicSurface::visible() const
 {
     std::unique_lock<std::mutex> lk(guard);
-    return visible(lk); 
+    return visible(lk);
 }
 
 bool ms::BasicSurface::visible(std::unique_lock<std::mutex>&) const
@@ -436,7 +429,7 @@
 }
 
 MirWindowType ms::BasicSurface::type() const
-{    
+{
     std::unique_lock<std::mutex> lg(guard);
     return type_;
 }
@@ -444,7 +437,7 @@
 MirWindowType ms::BasicSurface::set_type(MirWindowType t)
 {
     std::unique_lock<std::mutex> lg(guard);
-    
+
     if (t < 0 || t > mir_window_types)
     {
         BOOST_THROW_EXCEPTION(std::logic_error("Invalid surface "
@@ -456,7 +449,7 @@
         type_ = t;
         lg.unlock();
 
-        observers.attrib_changed(mir_window_attrib_type, type_); 
+        observers.attrib_changed(mir_window_attrib_type, type_);
     }
 
     return t;
@@ -496,7 +489,7 @@
     {
         swapinterval_ = interval;
         bool allow_dropping = (interval == 0);
-        for (auto& info : layers) 
+        for (auto& info : layers)
             info.stream->allow_framedropping(allow_dropping);
 
         lg.unlock();
@@ -610,7 +603,7 @@
     {
         std::unique_lock<std::mutex> lock(guard);
         cursor_stream_adapter->reset();
-        
+
         cursor_image_ = image;
     }
 
@@ -722,7 +715,7 @@
         lg.unlock();
         observers.attrib_changed(mir_window_attrib_dpi, new_dpi);
     }
-    
+
     return new_dpi;
 }
 
@@ -753,7 +746,7 @@
 void ms::BasicSurface::add_observer(std::shared_ptr<SurfaceObserver> const& observer)
 {
     observers.add(observer);
-    for (auto& info : layers) 
+    for (auto& info : layers)
         info.stream->add_observer(observer);
 }
 
@@ -763,7 +756,7 @@
     if (!o)
         BOOST_THROW_EXCEPTION(std::runtime_error("Invalid observer (previously destroyed)"));
     observers.remove(o);
-    for (auto& info : layers) 
+    for (auto& info : layers)
         info.stream->remove_observer(observer);
 }
 
@@ -803,7 +796,7 @@
     {
         return underlying_buffer_stream->framedropping() ? 0 : 1;
     }
- 
+
     std::shared_ptr<mg::Buffer> buffer() const override
     {
         if (!compositor_buffer)
@@ -822,7 +815,7 @@
 
     bool shaped() const override
     { return mg::contains_alpha(underlying_buffer_stream->pixel_format()); }
- 
+
     mg::Renderable::ID id() const override
     { return id_; }
 private:
@@ -850,12 +843,6 @@
     observers.input_consumed(event);
 }
 
-void ms::BasicSurface::set_keymap(MirInputDeviceId id, std::string const& model, std::string const& layout,
-                                  std::string const& variant, std::string const& options)
-{
-    observers.keymap_changed(id, model, layout, variant, options);
-}
-
 void ms::BasicSurface::rename(std::string const& title)
 {
     if (surface_name != title)

=== modified file 'src/server/scene/basic_surface.h'
--- src/server/scene/basic_surface.h	2017-08-30 15:38:42 +0000
+++ src/server/scene/basic_surface.h	2017-09-29 20:07:10 +0000
@@ -103,7 +103,7 @@
     void set_transformation(glm::mat4 const&) override;
 
     bool visible() const override;
-    
+
     graphics::RenderableList generate_renderables(compositor::CompositorID id) const override;
     int buffers_ready_for_compositor(void const* compositor_id) const override;
 
@@ -113,7 +113,7 @@
     int query(MirWindowAttrib attrib) const override;
     void hide() override;
     void show() override;
-    
+
     void set_cursor_image(std::shared_ptr<graphics::CursorImage> const& image) override;
     std::shared_ptr<graphics::CursorImage> cursor_image() const override;
 
@@ -131,9 +131,6 @@
 
     int dpi() const;
 
-    void set_keymap(MirInputDeviceId id, std::string const& model, std::string const& layout,
-                    std::string const& variant, std::string const& options) override;
-
     void rename(std::string const& title) override;
 
     void set_confine_pointer_state(MirPointerConfinementState state) override;

=== modified file 'src/server/scene/legacy_surface_change_notification.cpp'
--- src/server/scene/legacy_surface_change_notification.cpp	2017-07-28 17:00:43 +0000
+++ src/server/scene/legacy_surface_change_notification.cpp	2017-09-29 20:07:10 +0000
@@ -94,12 +94,6 @@
 {
 }
 
-// A keymap change is not enough to trigger recomposition
-void ms::LegacySurfaceChangeNotification::keymap_changed(MirInputDeviceId, std::string const&, std::string const&,
-                                                         std::string const&, std::string const&)
-{
-}
-
 void ms::LegacySurfaceChangeNotification::renamed(char const*)
 {
     notify_scene_change();
@@ -111,4 +105,4 @@
 
 void ms::LegacySurfaceChangeNotification::start_drag_and_drop(std::vector<uint8_t> const& /*handle*/)
 {
-}
\ No newline at end of file
+}

=== modified file 'src/server/scene/legacy_surface_change_notification.h'
--- src/server/scene/legacy_surface_change_notification.h	2017-07-28 17:00:43 +0000
+++ src/server/scene/legacy_surface_change_notification.h	2017-09-29 20:07:10 +0000
@@ -45,8 +45,6 @@
     void reception_mode_set_to(input::InputReceptionMode mode) override;
     void cursor_image_set_to(graphics::CursorImage const& image) override;
     void client_surface_close_requested() override;
-    void keymap_changed(MirInputDeviceId id, std::string const& model, std::string const& layout,
-                        std::string const& variant, std::string const& options) override;
     void renamed(char const*) override;
     void cursor_image_removed() override;
     void placed_relative(geometry::Rectangle const& placement) override;

=== modified file 'src/server/scene/null_surface_observer.cpp'
--- src/server/scene/null_surface_observer.cpp	2017-07-28 17:00:43 +0000
+++ src/server/scene/null_surface_observer.cpp	2017-09-29 20:07:10 +0000
@@ -32,11 +32,6 @@
 void ms::NullSurfaceObserver::reception_mode_set_to(input::InputReceptionMode /*mode*/) {}
 void ms::NullSurfaceObserver::cursor_image_set_to(mg::CursorImage const& /*image*/) {}
 void ms::NullSurfaceObserver::client_surface_close_requested() {}
-void ms::NullSurfaceObserver::keymap_changed(MirInputDeviceId /* id */, std::string const& /*model*/,
-                                             std::string const& /*layout*/, std::string const& /*variant*/,
-                                             std::string const& /**/)
-{
-}
 void ms::NullSurfaceObserver::renamed(char const*) {}
 void ms::NullSurfaceObserver::cursor_image_removed() {}
 void ms::NullSurfaceObserver::placed_relative(geometry::Rectangle const& /*placement*/)  {}

=== modified file 'src/server/scene/surface_event_source.cpp'
--- src/server/scene/surface_event_source.cpp	2017-07-28 17:00:43 +0000
+++ src/server/scene/surface_event_source.cpp	2017-09-29 20:07:10 +0000
@@ -81,15 +81,6 @@
     event_sink->handle_event(*mev::make_event(id));
 }
 
-void ms::SurfaceEventSource::keymap_changed(MirInputDeviceId device_id,
-                                            std::string const& model,
-                                            std::string const& layout,
-                                            std::string const& variant,
-                                            std::string const& options)
-{
-    event_sink->handle_event(*mev::make_event(id, device_id, model, layout, variant, options));
-}
-
 void ms::SurfaceEventSource::placed_relative(geometry::Rectangle const& placement)
 {
     event_sink->handle_event(*mev::make_event(id, placement));

=== modified file 'tests/acceptance-tests/test_client_cursor_api.cpp'
--- tests/acceptance-tests/test_client_cursor_api.cpp	2017-09-24 21:17:51 +0000
+++ tests/acceptance-tests/test_client_cursor_api.cpp	2017-09-29 20:07:10 +0000
@@ -74,12 +74,6 @@
     MOCK_METHOD1(reception_mode_set_to, void(mi::InputReceptionMode mode));
     MOCK_METHOD1(cursor_image_set_to, void(mg::CursorImage const& image));
     MOCK_METHOD0(client_surface_close_requested, void());
-    MOCK_METHOD5(keymap_changed, void(
-        MirInputDeviceId id,
-        std::string const& model,
-        std::string const& layout,
-        std::string const& variant,
-        std::string const& options));
     MOCK_METHOD1(renamed, void(char const* name));
     MOCK_METHOD0(cursor_image_removed, void());
     MOCK_METHOD1(placed_relative, void(geom::Rectangle const& placement));

=== modified file 'tests/acceptance-tests/test_client_input.cpp'
--- tests/acceptance-tests/test_client_input.cpp	2017-07-28 17:00:43 +0000
+++ tests/acceptance-tests/test_client_input.cpp	2017-09-29 20:07:10 +0000
@@ -106,7 +106,7 @@
     set_callback(connection,
                  [](MirConnection*, void* context)
                  {
-                     static_cast<mt::Signal*>(context)->raise(); 
+                     static_cast<mt::Signal*>(context)->raise();
                  },
                  &change_complete
                 );
@@ -805,79 +805,6 @@
     first_client.all_events_received.wait_for(2s);
 }
 
-TEST_F(TestClientInput, clients_receive_keymap_change_events)
-{
-    Client first_client(new_connection(), first);
-
-    std::string const model = "pc105";
-    std::string const layout = "dvorak";
-    MirInputDeviceId const id = 1;
-
-    EXPECT_CALL(first_client, handle_keymap(mt::KeymapEventForDevice(id)))
-        .Times(1)
-        .WillOnce(mt::WakeUp(&first_client.all_events_received));
-
-    server.the_shell()->focused_surface()->set_keymap(id, model, layout, "", "");
-    first_client.all_events_received.wait_for(2s);
-}
-
-TEST_F(TestClientInput, keymap_changes_change_keycode_received)
-{
-    Client first_client(new_connection(), first);
-
-    MirInputDeviceId const id = 1;
-    std::string const model = "pc105";
-    std::string const layout = "us";
-    std::string const variant = "dvorak";
-
-    mt::Signal first_event_received,
-        client_sees_keymap_change;
-
-    InSequence seq;
-    EXPECT_CALL(first_client, handle_input(AllOf(mt::KeyDownEvent(), mt::KeyOfSymbol(XKB_KEY_n))));
-    EXPECT_CALL(first_client, handle_input(mt::KeyUpEvent()))
-         .WillOnce(mt::WakeUp(&first_event_received));
-    EXPECT_CALL(first_client, handle_keymap(mt::KeymapEventForDevice(id)))
-        .WillOnce(mt::WakeUp(&client_sees_keymap_change));
-
-    EXPECT_CALL(first_client, handle_input(AllOf(mt::KeyDownEvent(), mt::KeyOfSymbol(XKB_KEY_b))));
-    EXPECT_CALL(first_client, handle_input(mt::KeyUpEvent()))
-        .WillOnce(mt::WakeUp(&first_client.all_events_received));
-
-    fake_keyboard->emit_event(mis::a_key_down_event().of_scancode(KEY_N));
-    fake_keyboard->emit_event(mis::a_key_up_event().of_scancode(KEY_N));
-
-    first_event_received.wait_for(60s);
-
-    server.the_shell()->focused_surface()->set_keymap(id, model, layout, variant, "");
-
-    client_sees_keymap_change.wait_for(60s);
-
-    fake_keyboard->emit_event(mis::a_key_down_event().of_scancode(KEY_N));
-    fake_keyboard->emit_event(mis::a_key_up_event().of_scancode(KEY_N));
-
-    first_client.all_events_received.wait_for(5s);
-}
-
-
-TEST_F(TestClientInput, sends_no_wrong_keymaps_to_clients)
-{
-    Client first_client(new_connection(), first);
-
-    MirInputDeviceId const id = 1;
-    std::string const model = "thargoid207";
-    std::string const layout = "polaris";
-
-    mt::Signal first_event_received,
-        client_sees_keymap_change;
-
-    EXPECT_CALL(first_client, handle_keymap(mt::KeymapEventForDevice(id))).Times(0);
-
-    EXPECT_THROW(
-        {server.the_shell()->focused_surface()->set_keymap(id, model, layout, "", "");},
-        std::invalid_argument);
-}
-
 TEST_F(TestClientInput, event_filter_may_consume_events)
 {
     std::shared_ptr<MockEventFilter> mock_event_filter = std::make_shared<MockEventFilter>();
@@ -932,7 +859,7 @@
 TEST_F(TestClientInput, pointer_events_pass_through_shaped_out_regions_of_client)
 {
     positions[first] = {{0, 0}, {10, 10}};
-    
+
     Client client(new_connection(), first);
 
     MirRectangle input_rects[] = {{1, 1, 10, 10}};
@@ -1128,48 +1055,6 @@
     first_client.all_events_received.wait_for(10s);
 }
 
-TEST_F(TestClientInput, reestablishes_num_lock_state_in_client_with_surface_keymap)
-{
-    Client a_client_with_keymap(new_connection(), first);
-
-    mir::test::Signal keymap_received;
-    mir::test::Signal device_state_received;
-
-    EXPECT_CALL(a_client_with_keymap, handle_keymap(_))
-        .WillOnce(mt::WakeUp(&keymap_received));
-    EXPECT_CALL(a_client_with_keymap,
-                handle_input_device_state(
-                    mt::DeviceStateWithPressedKeys(std::vector<uint32_t>{KEY_NUMLOCK, KEY_NUMLOCK})))
-        .WillOnce(mt::WakeUp(&device_state_received));
-
-    get_surface(first)->set_keymap(MirInputDeviceId{0}, "pc105", "de", "", "");
-    keymap_received.wait_for(4s);
-
-    {
-        Client a_client(new_connection(), second);
-
-        EXPECT_CALL(a_client, handle_input(mt::KeyDownEvent()));
-        EXPECT_CALL(a_client, handle_input(mt::KeyUpEvent()));
-        EXPECT_CALL(a_client, handle_input(AllOf(mt::KeyDownEvent(),mt::KeyOfSymbol(XKB_KEY_KP_4))));
-        EXPECT_CALL(a_client, handle_input(AllOf(mt::KeyUpEvent(),mt::KeyOfSymbol(XKB_KEY_KP_4))))
-            .WillOnce(mt::WakeUp(&a_client.all_events_received));
-
-        fake_keyboard->emit_event(mis::a_key_down_event().of_scancode(KEY_NUMLOCK));
-        fake_keyboard->emit_event(mis::a_key_up_event().of_scancode(KEY_NUMLOCK));
-        fake_keyboard->emit_event(mis::a_key_down_event().of_scancode(KEY_KP4));
-        fake_keyboard->emit_event(mis::a_key_up_event().of_scancode(KEY_KP4));
-
-        a_client.all_events_received.wait_for(10s);
-    }
-    device_state_received.wait_for(4s);
-    EXPECT_CALL(a_client_with_keymap, handle_input(mt::KeyOfSymbol(XKB_KEY_KP_4)))
-        .WillOnce(mt::WakeUp(&a_client_with_keymap.all_events_received));
-
-    fake_keyboard->emit_event(mis::a_key_down_event().of_scancode(KEY_KP4));
-
-    a_client_with_keymap.all_events_received.wait_for(10s);
-}
-
 TEST_F(TestClientInput, initial_mouse_configuration_can_be_querried)
 {
     wait_for_input_devices();

=== modified file 'tests/acceptance-tests/test_nested_input.cpp'
--- tests/acceptance-tests/test_nested_input.cpp	2017-07-28 17:00:43 +0000
+++ tests/acceptance-tests/test_nested_input.cpp	2017-09-29 20:07:10 +0000
@@ -158,7 +158,7 @@
 {
     {{  0, 0}, {1920, 1080}}
 };
-    
+
 struct NestedServerWithMockEventFilter : mtf::HeadlessNestedServerRunner
 {
     NestedServerWithMockEventFilter(std::string const& connection_string,
@@ -571,45 +571,3 @@
 
     EXPECT_THAT(mir_pointer_config_get_acceleration_bias(ptr_conf), acceleration_bias);
 }
-
-TEST_F(NestedInput, pressed_keys_on_vt_switch_are_forgotten)
-{
-    mt::Signal keymap_received;
-    mt::Signal devices_ready;
-    mt::Signal initial_keys_received;
-    mt::Signal keys_without_modifier_received;
-    NiceMock<MockEventFilter> nested_event_filter;
-    ON_CALL(nested_event_filter, handle(
-            mt::InputDeviceStateEvent()))
-        .WillByDefault(mt::WakeUp(&devices_ready));
-
-    NestedServerWithMockEventFilter nested_mir{new_connection(), mt::fake_shared(nested_event_filter)};
-    ExposedSurface client_to_nested(nested_mir.new_connection(), "with_keymap");
-
-    ASSERT_TRUE(devices_ready.wait_for(10s));
-    EXPECT_CALL(client_to_nested, handle_keymap())
-        .WillOnce(mt::WakeUp(&keymap_received));
-    EXPECT_CALL(client_to_nested, handle_input(mt::KeyOfScanCode(KEY_RIGHTALT)));
-    EXPECT_CALL(client_to_nested, handle_input(mt::KeyOfScanCode(KEY_RIGHTCTRL)))
-        .WillOnce(mt::WakeUp(&initial_keys_received));
-
-    nested_mir.get_surface("with_keymap")->set_keymap(MirInputDeviceId{0}, "pc105", "de", "", "");
-
-    ASSERT_TRUE(client_to_nested.ready_to_accept_events.wait_for(10s));
-    EXPECT_TRUE(keymap_received.wait_for(10s));
-
-    fake_keyboard->emit_event(mis::a_key_down_event().of_scancode(KEY_RIGHTALT));
-    fake_keyboard->emit_event(mis::a_key_down_event().of_scancode(KEY_RIGHTCTRL));
-
-    EXPECT_TRUE(initial_keys_received.wait_for(10s));
-
-    display.trigger_pause();
-    display.trigger_resume();
-
-    EXPECT_CALL(client_to_nested,
-                handle_input(AllOf(mt::KeyOfScanCode(KEY_A), mt::KeyWithModifiers(mir_input_event_modifier_none))))
-        .WillOnce(mt::WakeUp(&keys_without_modifier_received));
-
-    fake_keyboard->emit_event(mis::a_key_down_event().of_scancode(KEY_A));
-    EXPECT_TRUE(keys_without_modifier_received.wait_for(10s));
-}

=== modified file 'tests/include/mir/test/doubles/stub_scene_surface.h'
--- tests/include/mir/test/doubles/stub_scene_surface.h	2017-08-30 15:38:42 +0000
+++ tests/include/mir/test/doubles/stub_scene_surface.h	2017-09-29 20:07:10 +0000
@@ -83,9 +83,6 @@
 
     std::shared_ptr<mir::scene::Surface> parent() const override { return nullptr; }
 
-    void set_keymap(MirInputDeviceId, std::string const&, std::string const&, std::string const&, std::string const&) override
-    {}
-
     void set_cursor_stream(std::shared_ptr<frontend::BufferStream> const&, geometry::Displacement const&) override {}
     void rename(std::string const&) override {}
     std::shared_ptr<frontend::BufferStream> primary_buffer_stream() const override { return nullptr; }

=== modified file 'tests/mir_test_framework/stub_surface.cpp'
--- tests/mir_test_framework/stub_surface.cpp	2017-08-30 15:38:42 +0000
+++ tests/mir_test_framework/stub_surface.cpp	2017-09-29 20:07:10 +0000
@@ -171,11 +171,6 @@
 {
 }
 
-void mtd::StubSurface::set_keymap(MirInputDeviceId /*id*/, std::string const& /*model*/, std::string const& /*layout*/,
-                                  std::string const& /*variant*/, std::string const& /*options*/)
-{
-}
-
 void mtd::StubSurface::rename(std::string const& /*title*/)
 {
 }