Merge lp:~mir-team/qtmir/server-client-acceptance into lp:qtmir

[Robert Carr]

Add a small framework for creating tests which exercise the QPA MirServerConfiguration from an external client.

Add a small framework for creating tests which exercise the QPA MirServerConfiguration from an external client. Add 2 simple tests as proof of concept...more to come!

[Gerry Boland (gerboland)]

Could we have Mir exporting the Mir test frameworks & stubs somehow, instead of copypasting them here? The worry is if qtmir's copy goes out of date.

review: Needs Information

[Robert Carr (robertcarr)]

The stub platform may dissapear (some talk of Mir exporting a stub platform, or otherwise once mesa software + simple DRM is set up no reason to stub it out could just do real software in rendering in the acceptance tests).

I'm not sure about the test framework...I doubt exporting another library is going to go over happy on the Mir team so I thought just copying the code here was best, mostly just dependent on STL and pretty simple...

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:229
http://jenkins.qa.ubuntu.com/job/qtmir-ci/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-amd64-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/3/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/3/rebuild

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

I've just skimmed through it (so I might very well be wrong), but It all looks as a way to test mir itself and not the interaction between mir and qt, which is what qtmir is all about.

I think the directory structure should match (or at least resemble) what we see in /src. It's "platforms/mirserver" over there, not "qpa". Not saying that "platforms/mirserver" is a good one but I do think src and test should match, so that you can easily find where are the tests for some piece of code and vice-versa.

Unmerged revisions

229. By Robert Carr on 2014-08-07

Merge lp:qtmir

228. By Robert Carr on 2014-08-07

Add some tests

227. By Robert Carr on 2014-08-07

Work on mir acceptance

226. By Robert Carr on 2014-08-04

Stubbiest acceptance test

225. By Robert Carr on 2014-08-04

Begin mir test fixture

224. By Robert Carr on 2014-07-30

Add acceptance skeleton

223. By Robert Carr on 2014-07-30

Move common test directory to prepare for new test dir

=== renamed directory 'tests/modules/common' => 'tests/common'
=== modified file 'tests/common/common.pri'
--- tests/modules/common/common.pri	2014-07-23 08:19:28 +0000
+++ tests/common/common.pri	2014-08-07 21:45:29 +0000
@@ -1,21 +1,21 @@
 CONFIG += link_pkgconfig no_keywords # keywords clash with ProcessC++
-PKGCONFIG += mirserver process-cpp ubuntu-app-launch-2
+PKGCONFIG += mirserver mirclient process-cpp ubuntu-app-launch-2
 
 QT += quick testlib
 QMAKE_CXXFLAGS = -std=c++11
 
-HEADERS += ../common/mock_application_controller.h \
-    ../common/mock_desktop_file_reader.h \
-    ../common/mock_focus_controller.h \
-    ../common/mock_oom_controller.h \
-    ../common/mock_process_controller.h \
-    ../common/mock_proc_info.h \
-    ../common/mock_prompt_session.h
-    ../common/mock_prompt_session_manager.h
-    ../common/mock_session.h
+HEADERS += ../../common/mock_application_controller.h \
+    ../../common/mock_desktop_file_reader.h \
+    ../../common/mock_focus_controller.h \
+    ../../common/mock_oom_controller.h \
+    ../../common/mock_process_controller.h \
+    ../../common/mock_proc_info.h \
+    ../../common/mock_prompt_session.h
+    ../../common/mock_prompt_session_manager.h
+    ../../common/mock_session.h
 
 INCLUDEPATH += ../../../src/modules \
-    ../common
+    ../../common
 
 
 GMOCK_SOURCES = /usr/src/gmock/src/gmock-all.cc \

=== modified file 'tests/modules/ApplicationManager/ApplicationManager.pro'
--- tests/modules/ApplicationManager/ApplicationManager.pro	2014-07-07 19:33:56 +0000
+++ tests/modules/ApplicationManager/ApplicationManager.pro	2014-08-07 21:45:29 +0000
@@ -1,5 +1,5 @@
 include(../../test-includes.pri)
-include(../common/common.pri)
+include(../../common/common.pri)
 
 TARGET = application_manager_test
 

=== modified file 'tests/modules/TaskController/TaskController.pro'
--- tests/modules/TaskController/TaskController.pro	2014-07-07 19:33:56 +0000
+++ tests/modules/TaskController/TaskController.pro	2014-08-07 21:45:29 +0000
@@ -1,5 +1,5 @@
 include(../../test-includes.pri)
-include(../common/common.pri)
+include(../../common/common.pri)
 
 TARGET = taskcontroller_test
 

=== added directory 'tests/qpa'
=== added directory 'tests/qpa/acceptance-tests'
=== added file 'tests/qpa/acceptance-tests/acceptance-tests.pro'
--- tests/qpa/acceptance-tests/acceptance-tests.pro	1970-01-01 00:00:00 +0000
+++ tests/qpa/acceptance-tests/acceptance-tests.pro	2014-08-07 21:45:29 +0000
@@ -0,0 +1,20 @@
+include(../../test-includes.pri)
+include(../../common/common.pri)
+
+TARGET = qpa_mir_server_and_client_acceptance_tests
+
+INCLUDEPATH += \
+    ../../../src/platforms/mirserver
+
+SOURCES += \
+    acceptance_tests.cpp \
+    stub_graphics_platform.cpp \
+    mir_test_framework/server_runner.cpp
+
+#CONFIG += link_pkgconfig
+#PKG_CONFIG += mirclient
+
+# need to link in the QPA plugin too for access to MirServerConfiguration
+LIBS += -Wl,-rpath,$${PWD}/../../../src/platforms/mirserver \
+    -L../../../src/platforms/mirserver -lqpa-mirserver
+

=== added file 'tests/qpa/acceptance-tests/acceptance_tests.cpp'
--- tests/qpa/acceptance-tests/acceptance_tests.cpp	1970-01-01 00:00:00 +0000
+++ tests/qpa/acceptance-tests/acceptance_tests.cpp	2014-08-07 21:45:29 +0000
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser 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 warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#include <Unity/Application/application_manager.h>
+
+#include <Unity/Application/applicationcontroller.h>
+#include <Unity/Application/taskcontroller.h>
+#include <Unity/Application/proc_info.h>
+#include <mirserverconfiguration.h>
+#include <sessionauthorizer.h>
+#include <qmirserver.h>
+
+#include <mir_toolkit/mir_client_library.h>
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include "stub_graphics_platform.h"
+#include "mir_test_framework/deferred_in_process_server.h"
+
+namespace mg = mir::graphics;
+namespace mtf = mir_test_framework;
+
+namespace
+{
+
+static char const* argv[] = {
+    "acceptance-tests",
+};
+
+struct TestingServerConfiguration : public MirServerConfiguration
+{
+    TestingServerConfiguration()
+        : MirServerConfiguration(1, argv)
+    {
+    }
+    std::shared_ptr<mg::Platform> the_graphics_platform() override
+    {
+        return std::make_shared<StubPlatform>();
+    }
+};
+
+struct TestQPAServer : public mtf::DeferredInProcessServer
+{
+    TestingServerConfiguration conf;
+    mir::DefaultServerConfiguration& server_config() override
+    {
+        return conf;
+    }
+    
+    void launch_client(std::function<void(std::string)> const& client_exec)
+    {
+        auto thread = std::thread(client_exec, new_connection());
+        client_threads.push_back(std::move(thread));
+    }
+
+    void TearDown() override
+    {
+        for (auto &thread : client_threads)
+        {
+            if (thread.joinable())
+                thread.join();
+        }
+        DeferredInProcessServer::TearDown();
+    }
+
+    std::vector<std::thread> client_threads;
+};
+
+}
+
+TEST_F(TestQPAServer, client_may_connect_and_exit)
+{
+    using namespace testing;
+
+    start_server();
+    
+    launch_client([&](std::string const& connect_string) -> void
+    {
+        MirConnection *connection = mir_connect_sync(connect_string.c_str(),
+            __PRETTY_FUNCTION__);
+        ASSERT_TRUE(mir_connection_is_valid(connection));
+        mir_connection_release(connection);
+    });
+}
+
+namespace
+{
+
+class AuthorizationDenier : public QObject
+{
+    Q_OBJECT
+public:
+    AuthorizationDenier(QObject *parent = 0)
+        : QObject(parent)
+    {
+    }
+    ~AuthorizationDenier() = default;
+ 
+    void authorizeSession(quint64 const pid, bool& authorized)
+    {
+        (void) pid;
+        // Observe fail and toggle
+        authorized = false;
+    }
+};
+
+}
+
+TEST_F(TestQPAServer, session_authorizer_may_prevent_client_from_connecting)
+{
+    using namespace testing;
+
+    start_server();
+
+    AuthorizationDenier d(nullptr);
+    QObject::connect(conf.sessionAuthorizer(), &SessionAuthorizer::requestAuthorizationForSession,
+                     &d, &AuthorizationDenier::authorizeSession, Qt::DirectConnection);
+
+    launch_client([&](std::string const& connect_string) -> void
+    {
+        MirConnection *connection = mir_connect_sync(connect_string.c_str(),
+            __PRETTY_FUNCTION__);
+        // We should fail to connect!
+        ASSERT_FALSE(mir_connection_is_valid(connection));
+    });
+}
+
+// TODO: Could Test SessionListener and other things in server configuration
+// TODO: Test surface creation
+// TODO: Could add tests in a similar format with an active ApplicationManager instance
+
+// Must be at end
+#include "acceptance_tests.moc"

=== added directory 'tests/qpa/acceptance-tests/mir_test_framework'
=== added file 'tests/qpa/acceptance-tests/mir_test_framework/deferred_in_process_server.h'
--- tests/qpa/acceptance-tests/mir_test_framework/deferred_in_process_server.h	1970-01-01 00:00:00 +0000
+++ tests/qpa/acceptance-tests/mir_test_framework/deferred_in_process_server.h	2014-08-07 21:45:29 +0000
@@ -0,0 +1,39 @@
+/*
+ * 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_DEFERRED_IN_PROCESS_SERVER_H_
+#define MIR_TEST_FRAMEWORK_DEFERRED_IN_PROCESS_SERVER_H_
+
+#include "mir_test_framework/server_runner.h"
+
+namespace mir_test_framework
+{
+/** Fixture for running Mir server in test process.
+ * The server startup is deferred until start_server() is called, to allows the
+ * test code to initialize the server environment with expectations or stubs.
+ */
+struct DeferredInProcessServer : testing::Test, private ServerRunner
+{
+    void TearDown() override { ServerRunner::stop_server(); }
+
+    using ServerRunner::start_server;
+    using ServerRunner::new_connection;
+};
+}
+
+#endif /* MIR_TEST_FRAMEWORK_DEFERRED_IN_PROCESS_SERVER_H_ */

=== added file 'tests/qpa/acceptance-tests/mir_test_framework/in_process_server.h'
--- tests/qpa/acceptance-tests/mir_test_framework/in_process_server.h	1970-01-01 00:00:00 +0000
+++ tests/qpa/acceptance-tests/mir_test_framework/in_process_server.h	2014-08-07 21:45:29 +0000
@@ -0,0 +1,47 @@
+/*
+ * 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 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_IN_PROCESS_SERVER_H_
+#define MIR_TEST_FRAMEWORK_IN_PROCESS_SERVER_H_
+
+#include "mir_test_framework/server_runner.h"
+
+#include <gtest/gtest.h>
+
+namespace mir_test_framework
+{
+/// Fixture for running Mir server in test process
+struct InProcessServer : testing::Test, private ServerRunner
+{
+    /// Starts the server
+    /// \warning don't forget to call this if you override SetUp()
+    void SetUp() override { ServerRunner::start_server(); }
+
+    /// Stops the server
+    /// \warning don't forget to call this if you override TearDown()
+    void TearDown() override { ServerRunner::stop_server(); }
+
+    /// \return a connection string for a new client to connect to the server
+    using ServerRunner::new_connection;
+
+    /// \return a connection string for a new client to connect to the prompt server
+    using ServerRunner::new_prompt_connection;
+};
+}
+
+#endif /* MIR_TEST_FRAMEWORK_IN_PROCESS_SERVER_H_ */

=== added file 'tests/qpa/acceptance-tests/mir_test_framework/server_runner.cpp'
--- tests/qpa/acceptance-tests/mir_test_framework/server_runner.cpp	1970-01-01 00:00:00 +0000
+++ tests/qpa/acceptance-tests/mir_test_framework/server_runner.cpp	2014-08-07 21:45:29 +0000
@@ -0,0 +1,103 @@
+/*
+ * 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 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]>
+ */
+
+#include "mir_test_framework/server_runner.h"
+
+#include <mir/default_server_configuration.h>
+#include <mir/display_server.h>
+#include <mir/frontend/connector.h>
+#include <mir/run_mir.h>
+#include <gtest/gtest.h>
+
+#include <condition_variable>
+#include <mutex>
+
+namespace mtf = mir_test_framework;
+
+namespace
+{
+char const* const env_no_file = "MIR_SERVER_NO_FILE";
+}
+
+mtf::ServerRunner::ServerRunner() :
+    old_env(getenv(env_no_file))
+{
+    if (!old_env) setenv(env_no_file, "", true);
+}
+
+void mtf::ServerRunner::start_server()
+{
+    display_server = start_mir_server();
+    ASSERT_TRUE(display_server);
+}
+
+std::string mtf::ServerRunner::new_connection()
+{
+    char connect_string[64] = {0};
+    sprintf(connect_string, "fd://%d", server_config().the_connector()->client_socket_fd());
+    return connect_string;
+}
+
+std::string mtf::ServerRunner::new_prompt_connection()
+{
+    char connect_string[64] = {0};
+    sprintf(connect_string, "fd://%d", server_config().the_prompt_connector()->client_socket_fd());
+    return connect_string;
+}
+
+void mtf::ServerRunner::stop_server()
+{
+    ASSERT_TRUE(display_server);
+    display_server->stop();
+}
+
+mtf::ServerRunner::~ServerRunner()
+{
+    if (server_thread.joinable()) server_thread.join();
+
+    if (!old_env) unsetenv(env_no_file);
+}
+
+mir::DisplayServer* mtf::ServerRunner::start_mir_server()
+{
+    std::mutex mutex;
+    std::condition_variable started;
+    mir::DisplayServer* result{nullptr};
+
+    server_thread = std::thread([&]
+    {
+        try
+        {
+            mir::run_mir(server_config(), [&](mir::DisplayServer& ds)
+            {
+                std::lock_guard<std::mutex> lock(mutex);
+                result = &ds;
+                started.notify_one();
+            });
+        }
+        catch (std::exception const& e)
+        {
+            FAIL() << e.what();
+        }
+    });
+
+    std::unique_lock<std::mutex> lock(mutex);
+    started.wait_for(lock, std::chrono::seconds(2), [&]{ return !!result; });
+
+    return result;
+}

=== added file 'tests/qpa/acceptance-tests/mir_test_framework/server_runner.h'
--- tests/qpa/acceptance-tests/mir_test_framework/server_runner.h	1970-01-01 00:00:00 +0000
+++ tests/qpa/acceptance-tests/mir_test_framework/server_runner.h	2014-08-07 21:45:29 +0000
@@ -0,0 +1,61 @@
+/*
+ * 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_SERVER_RUNNER_H_
+#define MIR_TEST_FRAMEWORK_SERVER_RUNNER_H_
+
+#include <string>
+#include <thread>
+
+namespace mir
+{
+class DisplayServer;
+class DefaultServerConfiguration;
+}
+
+namespace mir_test_framework
+{
+/// Utility for running Mir server in test process
+struct ServerRunner
+{
+    ServerRunner();
+    virtual ~ServerRunner();
+
+    /// Starts the server
+    void start_server();
+
+    /// Stops the server
+    void stop_server();
+
+    /// \return a connection string for a new client to connect to the server
+    std::string new_connection();
+
+    /// \return a connection string for a new client to connect to the prompt server
+    std::string new_prompt_connection();
+
+private:
+    mir::DisplayServer* start_mir_server();
+    virtual mir::DefaultServerConfiguration& server_config() = 0;
+
+    char const* const old_env;
+    std::thread server_thread;
+    mir::DisplayServer* display_server = 0;
+};
+}
+
+#endif /* MIR_TEST_FRAMEWORK_SERVER_RUNNER_H_ */

=== added file 'tests/qpa/acceptance-tests/stub_graphics_platform.cpp'
--- tests/qpa/acceptance-tests/stub_graphics_platform.cpp	1970-01-01 00:00:00 +0000
+++ tests/qpa/acceptance-tests/stub_graphics_platform.cpp	2014-08-07 21:45:29 +0000
@@ -0,0 +1,150 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser 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 Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <mir/graphics/graphic_buffer_allocator.h>
+#include <mir/graphics/display.h>
+#include <mir/graphics/gl_context.h>
+#include <mir/graphics/display_configuration.h>
+#include <mir/graphics/platform_ipc_package.h>
+
+#include "stub_graphics_platform.h"
+
+#include <thread>
+
+namespace mg = mir::graphics;
+
+namespace
+{
+
+struct StubBufferAllocator : public mg::GraphicBufferAllocator
+{
+    std::shared_ptr<mg::Buffer> alloc_buffer(
+        mg::BufferProperties const& properties)
+    {
+        (void) properties;
+        return nullptr;
+    }
+
+    std::vector<MirPixelFormat> supported_pixel_formats()
+    {
+        return {};
+    }
+};
+
+struct StubGLContext : public mg::GLContext
+{
+    void make_current() const
+    {
+    }
+
+    void release_current() const
+    {
+    }
+};
+
+class StubDisplayConfiguration : public mg::DisplayConfiguration
+{
+    void for_each_card(std::function<void(mg::DisplayConfigurationCard const&)>) const override
+    {
+    }
+    void for_each_output(std::function<void(mg::DisplayConfigurationOutput const&)>) const override
+    {
+    }
+    void for_each_output(std::function<void(mg::UserDisplayConfigurationOutput&)>) override
+    {
+    }
+};
+
+class StubDisplay : public mg::Display
+{
+ public:
+    void for_each_display_buffer(std::function<void(mg::DisplayBuffer&)> const&)
+    {
+        /* yield() is needed to ensure reasonable runtime under valgrind for some tests */
+        std::this_thread::yield();
+    }
+    std::unique_ptr<mg::DisplayConfiguration> configuration() const override
+    {
+        return std::unique_ptr<mg::DisplayConfiguration>(
+            new StubDisplayConfiguration
+        );
+    }
+    void configure(mg::DisplayConfiguration const&) {}
+    void register_configuration_change_handler(
+        mg::EventHandlerRegister&,
+        mg::DisplayConfigurationChangeHandler const&) override
+    {
+    }
+    void register_pause_resume_handlers(mg::EventHandlerRegister&,
+                                        mg::DisplayPauseHandler const&,
+                                        mg::DisplayResumeHandler const&) override
+    {
+    }
+    void pause() {}
+    void resume() {}
+    std::shared_ptr<mg::Cursor> create_hardware_cursor(std::shared_ptr<mg::CursorImage> const& /* initial_image */)
+    {
+         return {}; 
+    }
+    std::unique_ptr<mg::GLContext> create_gl_context()
+    {
+        return std::unique_ptr<StubGLContext>{new StubGLContext()};
+    }
+};
+
+}
+
+std::shared_ptr<mg::GraphicBufferAllocator> StubPlatform::create_buffer_allocator(
+    std::shared_ptr<mg::BufferInitializer> const& buffer_initializer)
+{
+    (void) buffer_initializer;
+    return std::make_shared<StubBufferAllocator>();
+}
+
+std::shared_ptr<mg::Display> StubPlatform::create_display(
+    std::shared_ptr<mg::DisplayConfigurationPolicy> const& initial_conf_policy,
+    std::shared_ptr<mg::GLProgramFactory> const& gl_program_factory,
+    std::shared_ptr<mg::GLConfig> const& gl_config)
+{
+    (void) initial_conf_policy;
+    (void) gl_program_factory;
+    (void) gl_config;
+    // TODO: Probably need some sizing...
+    return std::make_shared<StubDisplay>();
+}
+
+std::shared_ptr<mg::PlatformIPCPackage> StubPlatform::get_ipc_package()
+{
+    return std::make_shared<mg::PlatformIPCPackage>();
+}
+    
+void StubPlatform::fill_buffer_package(mg::BufferIPCPacker* packer, mg::Buffer const* buffer,
+    mg::BufferIpcMsgType msg_type) const
+{
+    (void) packer;
+    (void) buffer;
+    (void) msg_type;
+}
+    
+std::shared_ptr<mg::InternalClient> StubPlatform::create_internal_client()
+{
+    return nullptr;
+}
+
+EGLNativeDisplayType StubPlatform::egl_native_display() const
+{
+    return EGLNativeDisplayType();
+}

=== added file 'tests/qpa/acceptance-tests/stub_graphics_platform.h'
--- tests/qpa/acceptance-tests/stub_graphics_platform.h	1970-01-01 00:00:00 +0000
+++ tests/qpa/acceptance-tests/stub_graphics_platform.h	2014-08-07 21:45:29 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser 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 Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef STUB_GRAPHICS_PLATFORM_H_
+#define STUB_GRAPHICS_PLATFORM_H_
+
+#include <mir/graphics/platform.h>
+
+struct StubPlatform : public mir::graphics::Platform
+{
+    StubPlatform() = default;
+    virtual ~StubPlatform() = default;
+    
+    std::shared_ptr<mir::graphics::GraphicBufferAllocator> create_buffer_allocator(
+        std::shared_ptr<mir::graphics::BufferInitializer> const& buffer_initializer) override;
+
+    std::shared_ptr<mir::graphics::Display> create_display(
+        std::shared_ptr<mir::graphics::DisplayConfigurationPolicy> const& initial_conf_policy,
+        std::shared_ptr<mir::graphics::GLProgramFactory> const& gl_program_factory,
+        std::shared_ptr<mir::graphics::GLConfig> const& gl_config) override;
+
+    std::shared_ptr<mir::graphics::PlatformIPCPackage> get_ipc_package() override;
+    
+    void fill_buffer_package(mir::graphics::BufferIPCPacker* packer, mir::graphics::Buffer const* buffer,
+        mir::graphics::BufferIpcMsgType msg_type) const override;
+    
+    std::shared_ptr<mir::graphics::InternalClient> create_internal_client() override;
+    
+    EGLNativeDisplayType egl_native_display() const override;
+};
+
+#endif // STUB_GRAPHICS_PLATFORM_H_
+

=== added file 'tests/qpa/qpa.pro'
--- tests/qpa/qpa.pro	1970-01-01 00:00:00 +0000
+++ tests/qpa/qpa.pro	2014-08-07 21:45:29 +0000
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS = acceptance-tests

=== modified file 'tests/tests.pro'
--- tests/tests.pro	2014-07-01 13:38:06 +0000
+++ tests/tests.pro	2014-08-07 21:45:29 +0000
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS = modules
+SUBDIRS = modules qpa