Merge lp:~alan-griffiths/mir/basic-test-fixture into lp:mir

[Alan Griffiths]

test framework: a generic fixture for setting up server and getting a connection from the client

test framework: a generic fixture for setting up server and getting a connection from the client

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1634
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/1636/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/204
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/205
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/205
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/155
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/155/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/154
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/154/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/502
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/502/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/1458
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7212

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

review: Approve (continuous-integration)

[Alberto Aguirre (albaguirre)]

Looks good.

review: Approve

[Kevin DuBois (kdub)]

Seems handy

review: Approve

[Alexandros Frantzis (afrantzis)]

OK.

review: Approve

=== added file 'include/test/mir_test_framework/basic_client_server_fixture.h'
--- include/test/mir_test_framework/basic_client_server_fixture.h	1970-01-01 00:00:00 +0000
+++ include/test/mir_test_framework/basic_client_server_fixture.h	2014-05-15 13:59:27 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 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 published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored By: Alan Griffiths <[e-mail]>
+ */
+
+#ifndef MIR_TEST_FRAMEWORK_BASIC_CLIENT_SERVER_FIXTURE_H_
+#define MIR_TEST_FRAMEWORK_BASIC_CLIENT_SERVER_FIXTURE_H_
+
+#include "mir_toolkit/mir_client_library.h"
+
+#include "mir_test_framework/in_process_server.h"
+
+namespace mir_test_framework
+{
+/// Test fixture to create a server in process and allocate a client connection.
+/// There are a lot of tests that could use this context.
+template<class TestServerConfiguration>
+struct BasicClientServerFixture : InProcessServer
+{
+    TestServerConfiguration server_configuration;
+
+    mir::DefaultServerConfiguration& server_config() override { return server_configuration; }
+
+    void SetUp()
+    {
+        InProcessServer::SetUp();
+        connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
+    }
+
+    void TearDown()
+    {
+        mir_connection_release(connection);
+        InProcessServer::TearDown();
+    }
+
+    MirConnection* connection = nullptr;
+};
+}
+
+#endif /* MIR_TEST_FRAMEWORK_BASIC_CLIENT_SERVER_FIXTURE_H_ */

=== modified file 'tests/acceptance-tests/test_trust_session_helper.cpp'
--- tests/acceptance-tests/test_trust_session_helper.cpp	2014-05-14 08:31:54 +0000
+++ tests/acceptance-tests/test_trust_session_helper.cpp	2014-05-15 13:59:27 +0000
@@ -25,7 +25,7 @@
 #include "mir/graphics/graphic_buffer_allocator.h"
 
 #include "mir_test_framework/stubbed_server_configuration.h"
-#include "mir_test_framework/in_process_server.h"
+#include "mir_test_framework/basic_client_server_fixture.h"
 #include "mir_test_doubles/fake_ipc_factory.h"
 
 #include <gtest/gtest.h>
@@ -117,27 +117,17 @@
     }
 };
 
-struct TrustSessionHelper : mir_test_framework::InProcessServer
+using MyBasicClientServerFixture = mir_test_framework::BasicClientServerFixture<MyServerConfiguration>;
+
+struct TrustSessionHelper : MyBasicClientServerFixture
 {
-    MyServerConfiguration my_server_config;
-
-    mir::DefaultServerConfiguration& server_config() override { return my_server_config; }
-
-    void SetUp()
-    {
-        mir_test_framework::InProcessServer::SetUp();
-        connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
-    }
 
     void TearDown()
     {
         trusted_helper_mediator.reset();
-        mir_connection_release(connection);
-        mir_test_framework::InProcessServer::TearDown();
+        MyBasicClientServerFixture::TearDown();
     }
 
-    MirConnection* connection = nullptr;
-
     static std::size_t const arbritary_fd_request_count = 3;
 
     std::mutex mutex;