Merge lp:~robertcarr/mir/delete-some-test-code into lp:mir

[Robert Carr]

Factor out a bunch of "ClientConfigCommon".

Factor out a bunch of "ClientConfigCommon".

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1203
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~robertcarr/mir/delete-some-test-code/+merge/194393/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/353/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/145
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/82
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/82/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/82
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/82/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/353/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

review: Approve

[Alan Griffiths (alan-griffiths)]

OK

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/145/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/159
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/156
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-autolanding/48/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-autolanding/48
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-autolanding/48/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/acceptance-tests/test_client_authorization.cpp'
--- tests/acceptance-tests/test_client_authorization.cpp	2013-09-25 19:27:16 +0000
+++ tests/acceptance-tests/test_client_authorization.cpp	2013-11-07 18:01:35 +0000
@@ -43,62 +43,15 @@
 
 namespace
 {
-
-struct ClientConfigCommon : TestingClientConfiguration
-{
-    ClientConfigCommon() :
-        connection(0),
-        surface(0)
-    {
-    }
-
-    static void connection_callback(MirConnection* connection, void* context)
-    {
-        ClientConfigCommon* config = reinterpret_cast<ClientConfigCommon *>(context);
-        config->connection = connection;
-    }
-
-    static void create_surface_callback(MirSurface* surface, void* context)
-    {
-        ClientConfigCommon* config = reinterpret_cast<ClientConfigCommon *>(context);
-        config->surface_created(surface);
-    }
-
-    static void release_surface_callback(MirSurface* surface, void* context)
-    {
-        ClientConfigCommon* config = reinterpret_cast<ClientConfigCommon *>(context);
-        config->surface_released(surface);
-    }
-
-    virtual void connected(MirConnection* new_connection)
-    {
-        connection = new_connection;
-    }
-
-    virtual void surface_created(MirSurface* new_surface)
-    {
-        surface = new_surface;
-    }
-
-    virtual void surface_released(MirSurface* /*released_surface*/)
-    {
-        surface = NULL;
-    }
-
-    MirConnection* connection;
-    MirSurface* surface;
-};
-
-struct ConnectingClient : ClientConfigCommon
-{
+struct ConnectingClient : TestingClientConfiguration
+{
+    MirConnection *connection;
     void exec()
     {
-        mir_wait_for(mir_connect(
+        connection = mir_connect_sync(
             mir_test_socket,
-            __PRETTY_FUNCTION__,
-            connection_callback,
-            this));
-         mir_connection_release(connection);
+            __PRETTY_FUNCTION__);
+        mir_connection_release(connection);
     }
 };
 
@@ -235,11 +188,10 @@
             pid_t client_pid = getpid();
             shared_region->post_client_process_pid(client_pid);
 
-            mir_wait_for(mir_connect(
+            connection = mir_connect_sync(
                 mir_test_socket,
-                __PRETTY_FUNCTION__,
-                connection_callback,
-                this));
+                __PRETTY_FUNCTION__);
+
             MirSurfaceParameters const parameters =
             {
                 __PRETTY_FUNCTION__,

=== modified file 'tests/acceptance-tests/test_client_focus_notification.cpp'
--- tests/acceptance-tests/test_client_focus_notification.cpp	2013-09-25 18:39:57 +0000
+++ tests/acceptance-tests/test_client_focus_notification.cpp	2013-11-07 18:01:35 +0000
@@ -37,50 +37,12 @@
 
 namespace
 {
-struct ClientConfigCommon : TestingClientConfiguration
-{
-    ClientConfigCommon() :
-        connection(0),
-        surface(0)
-    {
-    }
-    static void connection_callback(MirConnection* connection, void* context)
-    {
-        ClientConfigCommon* config = reinterpret_cast<ClientConfigCommon *>(context);
-        config->connection = connection;
-    }
-    static void create_surface_callback(MirSurface* surface, void* context)
-    {
-        ClientConfigCommon* config = reinterpret_cast<ClientConfigCommon *>(context);
-        config->surface_created(surface);
-    }
-    static void release_surface_callback(MirSurface* surface, void* context)
-    {
-        ClientConfigCommon* config = reinterpret_cast<ClientConfigCommon *>(context);
-        config->surface_released(surface);
-    }
-    virtual void connected(MirConnection* new_connection)
-    {
-        connection = new_connection;
-    }
-    virtual void surface_created(MirSurface* new_surface)
-    {
-        surface = new_surface;
-    }
-    virtual void surface_released(MirSurface* /* released_surface */)
-    {
-        surface = nullptr;
-    }
-    MirConnection* connection;
-    MirSurface* surface;
-};
-
 struct MockEventObserver
 {
     MOCK_METHOD1(see, void(MirEvent const*));
 };
 
-struct EventObservingClient : ClientConfigCommon
+struct EventObservingClient : mtf::TestingClientConfiguration
 {
     EventObservingClient()
         : observer(std::make_shared<MockEventObserver>())
@@ -95,26 +57,28 @@
  
     virtual void expect_events(mt::WaitCondition* /* all_events_received */) = 0;
 
-    void surface_created(MirSurface *surface_) override
+    static void surface_created(MirSurface *surface_, void *ctx)
     {
+        auto client = static_cast<EventObservingClient*>(ctx);
+
+        client->surface = surface_;
         // We need to set the event delegate from the surface_created
         // callback so we can block the reading of new events
         // until we are ready
         MirEventDelegate const event_delegate =
             {
                 handle_event,
-                this
+                client
             };
-        surface = surface_;
-        mir_surface_set_event_handler(surface, &event_delegate);
+        mir_surface_set_event_handler(surface_, &event_delegate);
     }
 
     void exec()
     {
         mt::WaitCondition all_events_received;
         expect_events(&all_events_received);
-        mir_wait_for(mir_connect(mir_test_socket,
-            __PRETTY_FUNCTION__, connection_callback, this));
+        connection = mir_connect_sync(mir_test_socket,
+            __PRETTY_FUNCTION__);
         ASSERT_TRUE(connection != NULL);
         MirSurfaceParameters const request_params =
             {
@@ -124,7 +88,7 @@
                 mir_buffer_usage_hardware,
                 mir_display_output_id_invalid
             };
-        mir_wait_for(mir_connection_create_surface(connection, &request_params, create_surface_callback, this));
+        mir_wait_for(mir_connection_create_surface(connection, &request_params, surface_created, this));
         all_events_received.wait_for_at_most_seconds(60);
         mir_surface_release_sync(surface);
         mir_connection_release(connection);
@@ -136,6 +100,9 @@
     std::shared_ptr<MockEventObserver> observer;
     static int const surface_width = 100;
     static int const surface_height = 100;
+    
+    MirConnection *connection;
+    MirSurface *surface;
 };
 
 }

=== modified file 'tests/acceptance-tests/test_client_input.cpp'
--- tests/acceptance-tests/test_client_input.cpp	2013-10-28 21:41:27 +0000
+++ tests/acceptance-tests/test_client_input.cpp	2013-11-07 18:01:35 +0000
@@ -71,57 +71,12 @@
 namespace
 {
 
-struct ClientConfig : mtf::TestingClientConfiguration
-{
-    ClientConfig() :
-        connection(0),
-        surface(0)
-    {
-    }
-
-    static void connection_callback(MirConnection* connection, void* context)
-    {
-        ClientConfig* config = reinterpret_cast<ClientConfig *>(context);
-        config->connection = connection;
-    }
-
-    static void create_surface_callback(MirSurface* surface, void* context)
-    {
-        ClientConfig* config = reinterpret_cast<ClientConfig *>(context);
-        config->surface_created(surface);
-    }
-
-    static void release_surface_callback(MirSurface* surface, void* context)
-    {
-        ClientConfig* config = reinterpret_cast<ClientConfig *>(context);
-        config->surface_released(surface);
-    }
-
-    virtual void connected(MirConnection* new_connection)
-    {
-        connection = new_connection;
-    }
-
-    virtual void surface_created(MirSurface* new_surface)
-    {
-        surface = new_surface;
-    }
-
-    virtual void surface_released(MirSurface* /* released_surface */)
-    {
-        surface = NULL;
-    }
-
-    MirConnection* connection;
-    MirSurface* surface;
-};
-
 struct MockInputHandler
 {
     MOCK_METHOD1(handle_input, void(MirEvent const*));
 };
 
-struct InputClient : ClientConfig
+struct InputClient : mtf::TestingClientConfiguration
 {
     InputClient(const mtf::CrossProcessSync& input_cb_setup_fence, std::string const& client_name)
             : input_cb_setup_fence(input_cb_setup_fence),
@@ -129,29 +84,6 @@
     {
     }
 
-    virtual void surface_created(MirSurface* new_surface) override
-    {
-        ClientConfig::surface_created(new_surface);
-
-        MirEventDelegate const event_delegate =
-        {
-            handle_input,
-            this
-        };
-
-        // Set this in the callback, not main thread to avoid missing test events
-        mir_surface_set_event_handler(surface, &event_delegate);
-
-        try
-        {
-            input_cb_setup_fence.try_signal_ready_for();
-        } catch (const std::runtime_error& e)
-        {
-            std::cout << e.what() << std::endl;
-        }
-
-    }
-
     static void handle_input(MirSurface* /* surface */, MirEvent const* ev, void* context)
     {
         if (ev->type == mir_event_type_surface)
@@ -182,15 +114,30 @@
 
         expect_input(events_received);
 
-        mir_wait_for(mir_connect(
+        connection = mir_connect_sync(
             mir_test_socket,
-            client_name.c_str(),
-            connection_callback,
-            this));
+            client_name.c_str());
          ASSERT_TRUE(connection != NULL);
 
          auto request_params = parameters();
-         mir_wait_for(mir_connection_create_surface(connection, &request_params, create_surface_callback, this));
+         surface = mir_connection_create_surface_sync(connection, &request_params);
+
+         MirEventDelegate const event_delegate =
+             {
+                 handle_input,
+                 this
+             };
+         // Set this in the callback, not main thread to avoid missing test events
+         mir_surface_set_event_handler(surface, &event_delegate);
+         
+         try
+         {
+             input_cb_setup_fence.try_signal_ready_for();
+         } 
+         catch (const std::runtime_error& e)
+         {
+             std::cout << e.what() << std::endl;
+         }
 
          events_received.wait_for_at_most_seconds(60);
 
@@ -211,6 +158,9 @@
 
     static int const surface_width = 100;
     static int const surface_height = 100;
+
+    MirConnection* connection;
+    MirSurface* surface;
 };
 
 MATCHER(KeyDownEvent, "")

=== modified file 'tests/acceptance-tests/test_focus_selection.cpp'
--- tests/acceptance-tests/test_focus_selection.cpp	2013-11-04 05:59:29 +0000
+++ tests/acceptance-tests/test_focus_selection.cpp	2013-11-07 18:01:35 +0000
@@ -49,60 +49,13 @@
 namespace
 {
 
-struct ClientConfigCommon : TestingClientConfiguration
-{
-    ClientConfigCommon() :
-        connection(0),
-        surface(0)
-    {
-    }
-
-    static void connection_callback(MirConnection* connection, void* context)
-    {
-        ClientConfigCommon* config = reinterpret_cast<ClientConfigCommon *>(context);
-        config->connection = connection;
-    }
-
-    static void create_surface_callback(MirSurface* surface, void* context)
-    {
-        ClientConfigCommon* config = reinterpret_cast<ClientConfigCommon *>(context);
-        config->surface_created(surface);
-    }
-
-    static void release_surface_callback(MirSurface* surface, void* context)
-    {
-        ClientConfigCommon* config = reinterpret_cast<ClientConfigCommon *>(context);
-        config->surface_released(surface);
-    }
-
-    virtual void connected(MirConnection* new_connection)
-    {
-        connection = new_connection;
-    }
-
-    virtual void surface_created(MirSurface* new_surface)
-    {
-        surface = new_surface;
-    }
-
-    virtual void surface_released(MirSurface* /*released_surface*/)
-    {
-        surface = NULL;
-    }
-
-    MirConnection* connection;
-    MirSurface* surface;
-};
-
-struct SurfaceCreatingClient : ClientConfigCommon
+struct SurfaceCreatingClient : mtf::TestingClientConfiguration
 {
     void exec()
     {
-        mir_wait_for(mir_connect(
+        connection = mir_connect_sync(
             mir_test_socket,
-            __PRETTY_FUNCTION__,
-            connection_callback,
-            this));
+            __PRETTY_FUNCTION__);
          ASSERT_TRUE(connection != NULL);
          MirSurfaceParameters const request_params =
          {
@@ -112,9 +65,12 @@
             mir_buffer_usage_hardware,
             mir_display_output_id_invalid
          };
-         mir_wait_for(mir_connection_create_surface(connection, &request_params, create_surface_callback, this));
+         surface = mir_connection_create_surface_sync(connection, &request_params);
          mir_connection_release(connection);
     }
+
+    MirConnection* connection;
+    MirSurface* surface;
 };
 
 }