Merge lp:~afrantzis/mir/fix-1342567-test-client-cursor-api into lp:mir

[Alexandros Frantzis]

tests: Refactor the TestClientCursorAPI tests to simplify them and fix races (LP: #1342567)

tests: Refactor the TestClientCursorAPI tests to simplify them and fix races

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1889
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2612/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1605
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1611
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1587
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1134/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/524
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/524/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2651
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12628

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2612/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1889
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2615/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1609
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1615
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1591
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1137
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1137/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/528
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/528/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2655
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12639

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2615/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

looks good to me

review: Approve

[Daniel van Vugt (vanvugt)]

Sure, why not.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-autolanding/1039/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1627
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1633
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1609/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-autolanding/423
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-autolanding/423/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/546
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/546/artifact/work/output/*zip*/output.zip
    ABORTED: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2666/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12731

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/acceptance-tests/test_client_cursor_api.cpp'
--- tests/acceptance-tests/test_client_cursor_api.cpp	2014-09-01 04:53:25 +0000
+++ tests/acceptance-tests/test_client_cursor_api.cpp	2014-09-04 08:51:10 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -14,40 +14,34 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Robert Carr <[e-mail]>
+ *              Alexandros Frantzis <[e-mail]>
  */
 
 #include "mir/graphics/cursor.h"
 #include "mir/graphics/cursor_image.h"
 #include "mir/input/cursor_images.h"
-#include "mir/scene/surface.h"
-#include "mir/scene/surface_factory.h"
-#include "mir/scene/null_observer.h"
-#include "mir/scene/null_surface_observer.h"
-
-#include "mir_toolkit/mir_client_library.h"
-
-#include "mir_test/barrier.h"
-#include "mir_test/fake_event_hub.h"
+
+#include "mir_test_framework/in_process_server.h"
+#include "mir_test_framework/fake_event_hub_server_configuration.h"
+#include "mir_test_framework/declarative_placement_strategy.h"
+#include "mir_test_framework/using_stub_client_platform.h"
+
 #include "mir_test/fake_shared.h"
+#include "mir_test/spin_wait.h"
 #include "mir_test/wait_condition.h"
-#include "mir_test_framework/input_testing_server_configuration.h"
-#include "mir_test_framework/testing_client_configuration.h"
-#include "mir_test_framework/declarative_placement_strategy.h"
-#include "mir_test_framework/deferred_in_process_server.h"
-#include "mir_test_framework/using_stub_client_platform.h"
+#include "mir_test/fake_event_hub.h"
+
+#include "mir_toolkit/mir_client_library.h"
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
+namespace mt = mir::test;
+namespace mtf = mir_test_framework;
+namespace geom = mir::geometry;
 namespace mg = mir::graphics;
-namespace ms = mir::scene;
-namespace msh = mir::shell;
 namespace mi = mir::input;
 namespace mis = mir::input::synthesis;
-namespace geom = mir::geometry;
-
-namespace mt = mir::test;
-namespace mtf = mir_test_framework;
 
 namespace
 {
@@ -59,9 +53,7 @@
 
     // We are not interested in mocking the motion in these tests as we
     // generate it ourself.
-    void move_to(geom::Point)
-    {
-    }
+    void move_to(geom::Point) override {}
 };
 
 struct NamedCursorImage : public mg::CursorImage
@@ -71,16 +63,17 @@
     {
     }
 
-    void const* as_argb_8888() const { return nullptr; }
-    geom::Size size() const { return geom::Size{}; }
-    geom::Displacement hotspot() const { return geom::Displacement{0, 0}; }
+    void const* as_argb_8888() const override { return nullptr; }
+    geom::Size size() const override { return geom::Size{}; }
+    geom::Displacement hotspot() const override { return geom::Displacement{0, 0}; }
 
     std::string const cursor_name;
 };
 
 struct NamedCursorImages : public mi::CursorImages
 {
-   std::shared_ptr<mg::CursorImage> image(std::string const& name, geom::Size const& /* size */)
+   std::shared_ptr<mg::CursorImage>
+       image(std::string const& name, geom::Size const& /* size */) override
    {
        return std::make_shared<NamedCursorImage>(name);
    }
@@ -90,7 +83,7 @@
 {
     auto image = dynamic_cast<NamedCursorImage const*>(&i);
     assert(image);
-    
+
     return image->cursor_name == name;
 }
 
@@ -104,84 +97,122 @@
     return cursor_is_named(arg, name);
 }
 
-struct ClientConfig : mtf::TestingClientConfiguration
+struct CursorClient
 {
-    std::string connect_string;
-
+    CursorClient(std::string const& connect_string, std::string const& client_name)
+        : connect_string{connect_string}, client_name{client_name}
+    {
+    }
+
+    virtual ~CursorClient()
+    {
+        teardown.wake_up_everyone();
+        if (client_thread.joinable())
+            client_thread.join();
+    }
+
+    void run()
+    {
+        mir::test::WaitCondition setup_done;
+
+        client_thread = std::thread{
+            [this,&setup_done]
+            {
+                auto const connection =
+                    mir_connect_sync(connect_string.c_str(), client_name.c_str());
+
+                MirSurfaceParameters const request_params =
+                {
+                    client_name.c_str(),
+                    // For this fixture, we force geometry on server side
+                    0, 0,
+                    mir_pixel_format_abgr_8888,
+                    mir_buffer_usage_hardware,
+                    mir_display_output_id_invalid
+                };
+                auto const surface =
+                    mir_connection_create_surface_sync(connection, &request_params);
+
+                mir_surface_swap_buffers_sync(surface);
+
+                wait_for_surface_to_become_focused_and_exposed(surface);
+
+                setup_cursor(surface);
+
+                setup_done.wake_up_everyone();
+
+                teardown.wait_for_at_most_seconds(10);
+                mir_surface_release_sync(surface);
+                mir_connection_release(connection);
+            }};
+
+        setup_done.wait_for_at_most_seconds(5);
+    }
+
+    virtual void setup_cursor(MirSurface*)
+    {
+    }
+
+    void wait_for_surface_to_become_focused_and_exposed(MirSurface* surface)
+    {
+        bool success = mt::spin_wait_for_condition_or_timeout(
+            [surface]
+            {
+                return mir_surface_get_visibility(surface) == mir_surface_visibility_exposed &&
+                       mir_surface_get_focus(surface) == mir_surface_focused;
+            },
+            std::chrono::seconds{5});
+
+        if (!success)
+            throw std::runtime_error("Timeout waiting for surface to become focused and exposed");
+    }
+
+    std::string const connect_string;
     std::string const client_name;
 
-    mt::Barrier& set_cursor_complete;
-    mt::Barrier& client_may_exit;
-    
-    std::function<void(MirSurface*)> set_cursor;
-
-    ClientConfig(std::string const& client_name,
-                        mt::Barrier& cursor_ready_fence,
-                        mt::Barrier& client_may_exit_fence)
-        : client_name(client_name),
-          set_cursor_complete(cursor_ready_fence),
-          client_may_exit(client_may_exit_fence)
-    {
-    }
-    
-    virtual void thread_exec()
-    {
-        auto connection = mir_connect_sync(connect_string.c_str(),
-                                           client_name.c_str());
-        
-        ASSERT_TRUE(connection != NULL);
-        MirSurfaceParameters const request_params =
-            {
-                client_name.c_str(),
-                // For this fixture, we force geometry on server side
-                0, 0,
-                mir_pixel_format_abgr_8888,
-                mir_buffer_usage_hardware,
-                mir_display_output_id_invalid
-            };
-        auto surface = mir_connection_create_surface_sync(connection, &request_params);
-        
-        set_cursor(surface);
-        set_cursor_complete.ready();
-        
-        client_may_exit.ready();
-        
-        mir_surface_release_sync(surface);
-        mir_connection_release(connection);
-    }
-    void tear_down() { if (thread.joinable()) thread.join(); }
-
-    void exec() override
-    {
-        thread = std::thread([this]{ thread_exec(); });
-    }
-private:
-    std::thread thread;
-};
-
-struct ServerConfiguration : mtf::InputTestingServerConfiguration
-{
-    mt::Barrier& cursor_configured_fence;
-    mt::Barrier& client_may_exit_fence;
-    
-    std::function<void(MockCursor&, mt::WaitCondition&)> expect_cursor_states;
-    std::function<void(ServerConfiguration*)> synthesize_cursor_motion;
-    
-    mtf::SurfaceGeometries client_geometries;
-    mtf::SurfaceDepths client_depths;
-
-    MockCursor cursor;
-    
-    ServerConfiguration(mt::Barrier& cursor_configured_fence, mt::Barrier& client_may_exit_fence)
-        : cursor_configured_fence(cursor_configured_fence),
-          client_may_exit_fence(client_may_exit_fence)
-    {
-    }
-
-    std::shared_ptr<ms::PlacementStrategy> the_placement_strategy() override
+    std::thread client_thread;
+    mir::test::WaitCondition teardown;
+};
+
+struct DisabledCursorClient : CursorClient
+{
+    using CursorClient::CursorClient;
+
+    void setup_cursor(MirSurface* surface) override
+    {
+        auto conf = mir_cursor_configuration_from_name(mir_disabled_cursor_name);
+        mir_wait_for(mir_surface_configure_cursor(surface, conf));
+        mir_cursor_configuration_destroy(conf);
+    }
+};
+
+struct NamedCursorClient : CursorClient
+{
+    NamedCursorClient(
+        std::string const& connect_string,
+        std::string const& client_name,
+        std::string const& cursor_name)
+        : CursorClient{connect_string, client_name},
+          cursor_name{cursor_name}
+    {
+    }
+
+    void setup_cursor(MirSurface* surface) override
+    {
+        auto conf = mir_cursor_configuration_from_name(cursor_name.c_str());
+        mir_wait_for(mir_surface_configure_cursor(surface, conf));
+        mir_cursor_configuration_destroy(conf);
+    }
+
+    std::string const cursor_name;
+};
+
+struct TestServerConfiguration : mtf::FakeEventHubServerConfiguration
+{
+    std::shared_ptr<mir::scene::PlacementStrategy> the_placement_strategy() override
     {
         return std::make_shared<mtf::DeclarativePlacementStrategy>(
-            InputTestingServerConfiguration::the_placement_strategy(),
+            FakeEventHubServerConfiguration::the_placement_strategy(),
             client_geometries, client_depths);
     }
 
@@ -189,83 +220,51 @@
     {
         return mt::fake_shared(cursor);
     }
-    
+
     std::shared_ptr<mi::CursorImages> the_cursor_images() override
     {
         return std::make_shared<NamedCursorImages>();
     }
-    
-    void inject_input()
-    {
-        using namespace ::testing;
-        cursor_configured_fence.ready();
-       
-        mt::WaitCondition expectations_satisfied;
-
-        // Clear any states applied during server initialization.
-        Mock::VerifyAndClearExpectations(&cursor);
-        expect_cursor_states(cursor, expectations_satisfied);
-        
-        // We are only interested in the cursor image changes, not
-        // the synthetic motion.
-
-        synthesize_cursor_motion(this);
-        expectations_satisfied.wait_for_at_most_seconds(60);
-        
-        Mock::VerifyAndClearExpectations(&cursor);
+
+    MockCursor cursor;
+    mtf::SurfaceGeometries client_geometries;
+    mtf::SurfaceDepths client_depths;
+};
+
+struct TestClientCursorAPI : mtf::InProcessServer
+{
+    mir::DefaultServerConfiguration& server_config() override
+    {
+        return server_configuration_;
+    }
+
+    TestServerConfiguration& test_server_config()
+    {
+        return server_configuration_;
+    }
+
+    mir::input::android::FakeEventHub* fake_event_hub()
+    {
+        return server_configuration_.fake_event_hub;
+    }
+
+    void client_shutdown_expectations()
+    {
+        using namespace testing;
+        Mock::VerifyAndClearExpectations(&test_server_config().cursor);
 
         // Client shutdown
-        EXPECT_CALL(cursor, show(_)).Times(AnyNumber());
-        EXPECT_CALL(cursor, hide()).Times(AnyNumber());
-        client_may_exit_fence.ready();
+        EXPECT_CALL(test_server_config().cursor, show(_)).Times(AnyNumber());
+        EXPECT_CALL(test_server_config().cursor, hide()).Times(AnyNumber());
     }
-    
-};
 
-struct TestClientCursorAPI : mtf::DeferredInProcessServer
-{
-    std::string const client_name_1 = "1";
-    std::string const client_name_2 = "2";
-    std::string const client_cursor_1 = "cursor-1";
-    std::string const client_cursor_2 = "cursor-2";
-    
-    // Reset to higher values for more clients.
-    mt::Barrier cursor_configured_fence{2};
-    mt::Barrier client_may_exit_fence{2};
-    
-    ServerConfiguration server_configuration{cursor_configured_fence, client_may_exit_fence};
-    mir::DefaultServerConfiguration& server_config() override { return server_configuration; }
+    std::string const client_name_1{"client-1"};
+    std::string const client_name_2{"client-2"};
+    std::string const client_cursor_1{"cursor-1"};
+    std::string const client_cursor_2{"cursor-2"};
+    TestServerConfiguration server_configuration_;
+    mir::test::WaitCondition expectations_satisfied;
     mtf::UsingStubClientPlatform using_stub_client_platform;
-    
-    ClientConfig client_config_1{client_name_1, cursor_configured_fence, client_may_exit_fence};
-    ClientConfig client_config_2{client_name_2, cursor_configured_fence, client_may_exit_fence};
-
-    // Default number allows one client.
-    void set_client_count(unsigned count)
-    {
-        cursor_configured_fence.reset(count + 1);
-        client_may_exit_fence.reset(count + 1);
-    }
-
-    void start_server()
-    {
-        DeferredInProcessServer::start_server();
-        server_configuration.exec();
-    }
-
-    void start_client(ClientConfig& config)
-    {
-        config.connect_string = new_connection();
-        config.exec();
-    }
-
-    void TearDown()
-    {
-        client_config_1.tear_down();
-        client_config_2.tear_down();
-        server_configuration.on_exit();
-        DeferredInProcessServer::TearDown();
-    }
 };
 
 }
@@ -277,238 +276,107 @@
 {
     using namespace ::testing;
 
-    server_configuration.client_geometries[client_name_1] = geom::Rectangle{geom::Point{geom::X{1}, geom::Y{0}},
-                                                                            geom::Size{geom::Width{1}, geom::Height{1}}};
-    
-
-    server_configuration.expect_cursor_states = [](MockCursor& cursor, mt::WaitCondition& expectations_satisfied)
-        {
-            EXPECT_CALL(cursor, hide()).Times(1)
-                .WillOnce(mt::WakeUp(&expectations_satisfied));
-        };
-    server_configuration.synthesize_cursor_motion = [](ServerConfiguration *server)
-        {
-            server->fake_event_hub->synthesize_event(mis::a_motion_event().with_movement(1, 0));
-        };
-    start_server();
-    
-    client_config_1.set_cursor = [](MirSurface *surface)
-        {
-            auto conf = mir_cursor_configuration_from_name(mir_disabled_cursor_name);
-            mir_wait_for(mir_surface_configure_cursor(surface, conf));
-            mir_cursor_configuration_destroy(conf);
-        };
-    start_client(client_config_1);
+    test_server_config().client_geometries[client_name_1] =
+        geom::Rectangle{{1, 0}, {1, 1}};
+
+    DisabledCursorClient client{new_connection(), client_name_1};
+    client.run();
+
+    EXPECT_CALL(test_server_config().cursor, hide())
+        .WillOnce(mt::WakeUp(&expectations_satisfied));
+
+    fake_event_hub()->synthesize_event(mis::a_motion_event().with_movement(1, 0));
+
+    expectations_satisfied.wait_for_at_most_seconds(5);
+
+    client_shutdown_expectations();
 }
 
 TEST_F(TestClientCursorAPI, cursor_restored_when_leaving_surface)
 {
     using namespace ::testing;
 
-    server_configuration.client_geometries[client_name_1] = geom::Rectangle{geom::Point{geom::X{1}, geom::Y{0}},
-                                                                            geom::Size{geom::Width{1}, geom::Height{1}}};
-    
-    mtf::CrossProcessSync client_ready_fence, client_may_exit_fence;
-
-    server_configuration.expect_cursor_states = [](MockCursor& cursor, mt::WaitCondition& expectations_satisfied)
-        {
-            InSequence seq;
-            EXPECT_CALL(cursor, hide()).Times(1);
-            EXPECT_CALL(cursor, show(DefaultCursorImage())).Times(1)
-                .WillOnce(mt::WakeUp(&expectations_satisfied));
-        };
-    server_configuration.synthesize_cursor_motion = [](ServerConfiguration *server)
-        {
-            server->fake_event_hub->synthesize_event(mis::a_motion_event().with_movement(1, 0));
-            server->fake_event_hub->synthesize_event(mis::a_motion_event().with_movement(2,0));
-        };
-    start_server();
-    
-
-    client_config_1.set_cursor = [](MirSurface *surface)
-        {
-            // Disable cursor
-            auto conf = mir_cursor_configuration_from_name(mir_disabled_cursor_name);
-            mir_wait_for(mir_surface_configure_cursor(surface, conf));
-            mir_cursor_configuration_destroy(conf);
-        };
-    start_client(client_config_1);
+    test_server_config().client_geometries[client_name_1] =
+        geom::Rectangle{{1, 0}, {1, 1}};
+
+    DisabledCursorClient client{new_connection(), client_name_1};
+    client.run();
+
+    InSequence seq;
+    EXPECT_CALL(test_server_config().cursor, hide());
+    EXPECT_CALL(test_server_config().cursor, show(DefaultCursorImage()))
+        .WillOnce(mt::WakeUp(&expectations_satisfied));
+
+    fake_event_hub()->synthesize_event(mis::a_motion_event().with_movement(1, 0));
+    fake_event_hub()->synthesize_event(mis::a_motion_event().with_movement(2, 0));
+
+    expectations_satisfied.wait_for_at_most_seconds(5);
+
+    client_shutdown_expectations();
 }
 
 TEST_F(TestClientCursorAPI, cursor_changed_when_crossing_surface_boundaries)
 {
     using namespace ::testing;
 
-    server_configuration.client_geometries[client_name_1] = geom::Rectangle{geom::Point{geom::X{1}, geom::Y{0}},
-                                                                            geom::Size{geom::Width{1}, geom::Height{1}}};
-    server_configuration.client_geometries[client_name_2] = geom::Rectangle{geom::Point{geom::X{2}, geom::Y{0}},
-                                                                            geom::Size{geom::Width{1}, geom::Height{1}}};
-    set_client_count(2);
-    
-    server_configuration.expect_cursor_states =
-        [this](MockCursor& cursor, mt::WaitCondition& expectations_satisfied)
-        {
-            InSequence seq;
-            EXPECT_CALL(cursor, show(CursorNamed(client_cursor_1))).Times(1);
-            EXPECT_CALL(cursor, show(CursorNamed(client_cursor_2))).Times(1)
-                .WillOnce(mt::WakeUp(&expectations_satisfied));
-        };
-    server_configuration.synthesize_cursor_motion = 
-        [](ServerConfiguration *server)
-        {
-            server->fake_event_hub->synthesize_event(mis::a_motion_event().with_movement(1, 0));
-            server->fake_event_hub->synthesize_event(mis::a_motion_event().with_movement(1, 0));
-        };
-    start_server();
-    
-    client_config_1.set_cursor =
-        [this](MirSurface *surface)
-        {
-            auto conf = mir_cursor_configuration_from_name(client_cursor_1.c_str());
-            mir_wait_for(mir_surface_configure_cursor(surface, conf));
-            mir_cursor_configuration_destroy(conf);
-        };
-    start_client(client_config_1);
-
-    client_config_2.set_cursor = 
-        [this](MirSurface *surface)
-        {
-            auto conf = mir_cursor_configuration_from_name(client_cursor_2.c_str());
-            mir_wait_for(mir_surface_configure_cursor(surface, conf));
-            mir_cursor_configuration_destroy(conf);
-        };
-    start_client(client_config_2);
+    test_server_config().client_geometries[client_name_1] =
+        geom::Rectangle{{1, 0}, {1, 1}};
+    test_server_config().client_geometries[client_name_2] =
+        geom::Rectangle{{2, 0}, {1, 1}};
+
+    NamedCursorClient client_1{new_connection(), client_name_1, client_cursor_1};
+    NamedCursorClient client_2{new_connection(), client_name_2, client_cursor_2};
+    client_1.run();
+    client_2.run();
+
+    InSequence seq;
+    EXPECT_CALL(test_server_config().cursor, show(CursorNamed(client_cursor_1)));
+    EXPECT_CALL(test_server_config().cursor, show(CursorNamed(client_cursor_2)))
+        .WillOnce(mt::WakeUp(&expectations_satisfied));
+
+    fake_event_hub()->synthesize_event(mis::a_motion_event().with_movement(1, 0));
+    fake_event_hub()->synthesize_event(mis::a_motion_event().with_movement(1, 0));
+
+    expectations_satisfied.wait_for_at_most_seconds(5);
+
+    client_shutdown_expectations();
 }
 
 TEST_F(TestClientCursorAPI, cursor_request_taken_from_top_surface)
 {
     using namespace ::testing;
 
-    server_configuration.client_geometries[client_name_1] = geom::Rectangle{geom::Point{geom::X{1}, geom::Y{0}},
-                                                                            geom::Size{geom::Width{1}, geom::Height{1}}};
-    server_configuration.client_geometries[client_name_2] = geom::Rectangle{geom::Point{geom::X{1}, geom::Y{0}},
-                                                                            geom::Size{geom::Width{1}, geom::Height{1}}};
-    server_configuration.client_depths[client_name_1] = ms::DepthId{0};
-    server_configuration.client_depths[client_name_2] = ms::DepthId{1};
-    
-    set_client_count(2);
-
-    server_configuration.expect_cursor_states = 
-        [this](MockCursor& cursor, mt::WaitCondition& expectations_satisfied)
-        {
-            InSequence seq;
-            EXPECT_CALL(cursor, show(CursorNamed(client_cursor_2))).Times(1)
-                .WillOnce(mt::WakeUp(&expectations_satisfied));
-        };
-    server_configuration.synthesize_cursor_motion = 
-        [](ServerConfiguration *server)
-        {
-            server->fake_event_hub->synthesize_event(mis::a_motion_event().with_movement(1, 0));
-        };
-    start_server();
-    
-    
-    client_config_1.set_cursor =
-        [this](MirSurface *surface)
-        {
-            auto conf = mir_cursor_configuration_from_name(client_cursor_1.c_str());
-            mir_wait_for(mir_surface_configure_cursor(surface, conf));
-            mir_cursor_configuration_destroy(conf);
-        };
-    client_config_2.set_cursor =
-        [this](MirSurface *surface)
-        {
-            auto conf = mir_cursor_configuration_from_name(client_cursor_2.c_str());
-            mir_wait_for(mir_surface_configure_cursor(surface, conf));
-            mir_cursor_configuration_destroy(conf);
-        };
-    start_client(client_config_1);
-    start_client(client_config_2);
-}
-
-namespace
-{
-
-// In the following test the cursor changes are not responsive
-// to cursor motion so we need a different synchronization model.
-struct WaitsToChangeCursorClient : ClientConfig
-{
-    WaitsToChangeCursorClient(std::string const& client_name,
-                              mt::Barrier& cursor_ready_fence,
-                              mt::Barrier& client_may_exit_fence)
-        : ClientConfig(client_name, cursor_ready_fence, client_may_exit_fence)
-    {
-    }
-
-    void thread_exec() override
-    {
-        auto connection = mir_connect_sync(connect_string.c_str(),
-                                           client_name.c_str());
-        
-        ASSERT_TRUE(connection != NULL);
-        MirSurfaceParameters const request_params =
-            {
-                client_name.c_str(),
-                // For this fixture, we force geometry on server side
-                0, 0,
-                mir_pixel_format_abgr_8888,
-                mir_buffer_usage_hardware,
-                mir_display_output_id_invalid
-            };
-        auto surface = mir_connection_create_surface_sync(connection, &request_params);
-
-        set_cursor_complete.ready();
-        set_cursor(surface);
-        
-        client_may_exit.ready();
-        
-        mir_surface_release_sync(surface);
-        mir_connection_release(connection);
-    }
-};
-
-struct TestClientCursorAPINoMotion : TestClientCursorAPI
-{
-    mt::Barrier client_may_change_cursor{2};
-    WaitsToChangeCursorClient waiting_client{client_name_1, cursor_configured_fence, client_may_exit_fence};
-    
-    void TearDown() override
-    {
-        waiting_client.tear_down();
-        TestClientCursorAPI::TearDown();
-    }
-};
-
-}
-
-TEST_F(TestClientCursorAPINoMotion, cursor_request_applied_without_cursor_motion)
+    test_server_config().client_geometries[client_name_1] =
+        geom::Rectangle{{1, 0}, {1, 1}};
+    test_server_config().client_geometries[client_name_2] =
+        geom::Rectangle{{1, 0}, {1, 1}};
+
+    NamedCursorClient client_1{new_connection(), client_name_1, client_cursor_1};
+    NamedCursorClient client_2{new_connection(), client_name_2, client_cursor_2};
+    client_1.run();
+    client_2.run();
+
+    EXPECT_CALL(test_server_config().cursor, show(CursorNamed(client_cursor_2)))
+        .WillOnce(mt::WakeUp(&expectations_satisfied));
+
+    fake_event_hub()->synthesize_event(mis::a_motion_event().with_movement(1, 0));
+
+    expectations_satisfied.wait_for_at_most_seconds(5);
+
+    client_shutdown_expectations();
+}
+
+TEST_F(TestClientCursorAPI, cursor_request_applied_without_cursor_motion)
 {
     using namespace ::testing;
 
-    server_configuration.client_geometries[client_name_1] = 
-        geom::Rectangle{geom::Point{geom::X{0}, geom::Y{0}},
-                        geom::Size{geom::Width{1}, geom::Height{1}}};
-    
-    server_configuration.expect_cursor_states =
-        [this](MockCursor& cursor, mt::WaitCondition& expectations_satisfied)
-        {
-            InSequence seq;
-            EXPECT_CALL(cursor, show(CursorNamed(client_cursor_1))).Times(1);
-            EXPECT_CALL(cursor, hide()).Times(1)
-            .WillOnce(mt::WakeUp(&expectations_satisfied));
-        };
-    server_configuration.synthesize_cursor_motion =
-        [this](ServerConfiguration * /* server */)
-        {
-            client_may_change_cursor.ready();
-        };
-    start_server();
+    struct ChangingCursorClient : NamedCursorClient
+    {
+        using NamedCursorClient::NamedCursorClient;
 
-    waiting_client.set_cursor = 
-        [this](MirSurface *surface)
+        void setup_cursor(MirSurface* surface) override
         {
-            client_may_change_cursor.ready();
-            auto conf1 = mir_cursor_configuration_from_name(client_cursor_1.c_str());
+            auto conf1 = mir_cursor_configuration_from_name(cursor_name.c_str());
             auto conf2 = mir_cursor_configuration_from_name(mir_disabled_cursor_name);
 
             mir_wait_for(mir_surface_configure_cursor(surface, conf1));
@@ -516,7 +384,22 @@
 
             mir_cursor_configuration_destroy(conf1);
             mir_cursor_configuration_destroy(conf2);
-        };
-    start_client(waiting_client);
+        }
+    };
+
+    test_server_config().client_geometries[client_name_1] =
+        geom::Rectangle{{0, 0}, {1, 1}};
+
+    ChangingCursorClient client{new_connection(), client_name_1, client_cursor_1};
+
+    InSequence seq;
+    EXPECT_CALL(test_server_config().cursor, show(CursorNamed(client_cursor_1)));
+    EXPECT_CALL(test_server_config().cursor, hide())
+        .WillOnce(mt::WakeUp(&expectations_satisfied));
+
+    client.run();
+
+    expectations_satisfied.wait_for_at_most_seconds(5);
+
+    client_shutdown_expectations();
 }
-