Merge lp:~afrantzis/mir/base-stubs-on-null-platform into lp:~mir-team/mir/trunk

[Alexandros Frantzis]

tests: Base StubPlatforms on NullPlatform

tests: Base StubPlatforms on NullPlatform

Simplifies StubPlatform implementations and reduces churn when extending the Platform API.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:759
http://jenkins.qa.ubuntu.com/job/mir-ci/776/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/976
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/858
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/14/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/454

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/776/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Appears sane.

review: Approve

[Kevin DuBois (kdub)]

looks good!

review: Approve

[Alan Griffiths (alan-griffiths)]

ok

review: Approve

=== renamed file 'include/test/mir_test_doubles/stub_platform.h' => 'include/test/mir_test_doubles/null_platform.h'
--- include/test/mir_test_doubles/stub_platform.h	2013-05-17 18:18:20 +0000
+++ include/test/mir_test_doubles/null_platform.h	2013-06-20 08:30:36 +0000
@@ -16,8 +16,8 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#ifndef MIR_TEST_DOUBLES_STUB_PLATFORM_H_
-#define MIR_TEST_DOUBLES_STUB_PLATFORM_H_
+#ifndef MIR_TEST_DOUBLES_NULL_PLATFORM_H_
+#define MIR_TEST_DOUBLES_NULL_PLATFORM_H_
 
 #include "mir/graphics/platform.h"
 #include "mir/graphics/platform_ipc_package.h"
@@ -29,7 +29,7 @@
 {
 namespace doubles
 {
-class StubPlatform : public graphics::Platform
+class NullPlatform : public graphics::Platform
 {
  public:
     std::shared_ptr<compositor::GraphicBufferAllocator> create_buffer_allocator(
@@ -47,12 +47,12 @@
     {
         return std::make_shared<graphics::PlatformIPCPackage>();
     }
- 
+
     std::shared_ptr<graphics::InternalClient> create_internal_client()
     {
-        return std::shared_ptr<graphics::InternalClient>();   
+        return std::shared_ptr<graphics::InternalClient>();
     }
- 
+
     void fill_ipc_package(std::shared_ptr<compositor::BufferIPCPacker> const&,
                           std::shared_ptr<compositor::Buffer> const&) const
     {
@@ -62,4 +62,4 @@
 }
 } // namespace mir
 
-#endif // MIR_TEST_DOUBLES_STUB_INPUT_LISTENER_H_
+#endif // MIR_TEST_DOUBLES_NULL_PLATFORM_

=== modified file 'tests/integration-tests/graphics/gbm/test_buffer_integration.cpp'
--- tests/integration-tests/graphics/gbm/test_buffer_integration.cpp	2013-05-17 18:48:07 +0000
+++ tests/integration-tests/graphics/gbm/test_buffer_integration.cpp	2013-06-20 08:30:36 +0000
@@ -24,6 +24,7 @@
 #include "mir/compositor/buffer_properties.h"
 #include "mir/graphics/buffer_initializer.h"
 #include "mir_test_doubles/stub_buffer.h"
+#include "mir_test_doubles/null_platform.h"
 #include "mir/graphics/null_display_report.h"
 
 #include "mir_test_framework/testing_server_configuration.h"
@@ -81,33 +82,14 @@
     }
 };
 
-class StubGraphicPlatform : public mg::Platform
+class StubGraphicPlatform : public mtd::NullPlatform
 {
 public:
-    virtual std::shared_ptr<mc::GraphicBufferAllocator> create_buffer_allocator(
-            const std::shared_ptr<mg::BufferInitializer>& /*buffer_initializer*/)
+    std::shared_ptr<mc::GraphicBufferAllocator> create_buffer_allocator(
+        const std::shared_ptr<mg::BufferInitializer>& /*buffer_initializer*/) override
     {
         return std::make_shared<StubGraphicBufferAllocator>();
     }
-
-    virtual std::shared_ptr<mg::Display> create_display()
-    {
-        return std::shared_ptr<mg::Display>();
-    }
-
-    virtual std::shared_ptr<mg::PlatformIPCPackage> get_ipc_package()
-    {
-        return std::shared_ptr<mg::PlatformIPCPackage>();
-    }
-
-    std::shared_ptr<mg::InternalClient> create_internal_client()
-    {
-        return std::shared_ptr<mg::InternalClient>();
-    }
-    
-    void fill_ipc_package(std::shared_ptr<mc::BufferIPCPacker> const&, std::shared_ptr<mc::Buffer> const&) const
-    {
-    }
 };
 
 class GBMBufferIntegration : public ::testing::Test

=== modified file 'tests/integration-tests/test_display_info.cpp'
--- tests/integration-tests/test_display_info.cpp	2013-05-17 18:18:20 +0000
+++ tests/integration-tests/test_display_info.cpp	2013-06-20 08:30:36 +0000
@@ -17,14 +17,13 @@
  */
 
 #include "mir/graphics/display.h"
-#include "mir/graphics/platform.h"
-#include "mir/graphics/platform_ipc_package.h"
 #include "mir/compositor/buffer.h"
 #include "mir/compositor/graphic_buffer_allocator.h"
 
 #include "mir_test_framework/display_server_test_fixture.h"
 #include "mir_test_doubles/stub_buffer.h"
 #include "mir_test_doubles/null_display.h"
+#include "mir_test_doubles/null_platform.h"
 
 #include "mir_toolkit/mir_client_library.h"
 
@@ -85,34 +84,19 @@
     geom::PixelFormat::xbgr_8888
 };
 
-class StubPlatform : public mg::Platform
+class StubPlatform : public mtd::NullPlatform
 {
 public:
     std::shared_ptr<mc::GraphicBufferAllocator> create_buffer_allocator(
-            std::shared_ptr<mg::BufferInitializer> const& /*buffer_initializer*/)
+            std::shared_ptr<mg::BufferInitializer> const& /*buffer_initializer*/) override
     {
         return std::make_shared<StubGraphicBufferAllocator>();
     }
 
-    std::shared_ptr<mg::Display> create_display()
+    std::shared_ptr<mg::Display> create_display() override
     {
         return std::make_shared<StubDisplay>();
     }
-
-    std::shared_ptr<mg::PlatformIPCPackage> get_ipc_package()
-    {
-        return std::make_shared<mg::PlatformIPCPackage>();
-    }
-
-    std::shared_ptr<mg::InternalClient> create_internal_client()
-    {
-        return std::shared_ptr<mg::InternalClient>();   
-    }
-
-    void fill_ipc_package(std::shared_ptr<mc::BufferIPCPacker> const&,
-                          std::shared_ptr<mc::Buffer> const&) const
-    {
-    }
 };
 
 void connection_callback(MirConnection* connection, void* context)

=== modified file 'tests/integration-tests/test_drm_auth_magic.cpp'
--- tests/integration-tests/test_drm_auth_magic.cpp	2013-05-30 03:50:54 +0000
+++ tests/integration-tests/test_drm_auth_magic.cpp	2013-06-20 08:30:36 +0000
@@ -18,7 +18,6 @@
 
 #include "mir/graphics/display.h"
 #include "mir/graphics/drm_authenticator.h"
-#include "mir/graphics/platform.h"
 #include "mir/graphics/platform_ipc_package.h"
 #include "mir/compositor/buffer_basic.h"
 #include "mir/compositor/graphic_buffer_allocator.h"
@@ -27,7 +26,7 @@
 #include <boost/throw_exception.hpp>
 
 #include "mir_test_doubles/stub_buffer.h"
-#include "mir_test_doubles/null_display.h"
+#include "mir_test_doubles/null_platform.h"
 #include "mir_test_framework/display_server_test_fixture.h"
 
 #include "mir_toolkit/mir_client_library.h"
@@ -60,35 +59,15 @@
     }
 };
 
-class MockAuthenticatingPlatform : public mg::Platform, public mg::DRMAuthenticator
+class MockAuthenticatingPlatform : public mtd::NullPlatform, public mg::DRMAuthenticator
 {
 public:
     std::shared_ptr<mc::GraphicBufferAllocator> create_buffer_allocator(
-            std::shared_ptr<mg::BufferInitializer> const& /*buffer_initializer*/)
+        std::shared_ptr<mg::BufferInitializer> const& /*buffer_initializer*/) override
     {
         return std::make_shared<StubGraphicBufferAllocator>();
     }
 
-    std::shared_ptr<mg::Display> create_display()
-    {
-        return std::make_shared<mtd::NullDisplay>();
-    }
-
-    std::shared_ptr<mg::PlatformIPCPackage> get_ipc_package()
-    {
-        return std::make_shared<mg::PlatformIPCPackage>();
-    }
-
-    std::shared_ptr<mg::InternalClient> create_internal_client()
-    {
-        return std::shared_ptr<mg::InternalClient>();
-    }
-
-    void fill_ipc_package(std::shared_ptr<mc::BufferIPCPacker> const&,
-                          std::shared_ptr<mc::Buffer> const&) const
-    {
-    }
-
     MOCK_METHOD1(drm_auth_magic, void(unsigned int));
 };
 

=== modified file 'tests/integration-tests/test_surfaceloop.cpp'
--- tests/integration-tests/test_surfaceloop.cpp	2013-06-14 16:03:46 +0000
+++ tests/integration-tests/test_surfaceloop.cpp	2013-06-20 08:30:36 +0000
@@ -24,8 +24,6 @@
 #include "mir/compositor/buffer_id.h"
 #include "mir/compositor/buffer_basic.h"
 #include "mir/graphics/display.h"
-#include "mir/graphics/platform.h"
-#include "mir/graphics/platform_ipc_package.h"
 
 #include "mir_toolkit/mir_client_library.h"
 
@@ -33,6 +31,7 @@
 #include "mir_test_doubles/stub_buffer.h"
 #include "mir_test_doubles/mock_swapper_factory.h"
 #include "mir_test_doubles/null_gl_context.h"
+#include "mir_test_doubles/null_platform.h"
 
 #include <thread>
 #include <atomic>
@@ -327,11 +326,11 @@
  */
 struct ServerConfigAllocatesBuffersOnServer : TestingServerConfiguration
 {
-    class StubPlatform : public mg::Platform
+    class StubPlatform : public mtd::NullPlatform
     {
      public:
         std::shared_ptr<mc::GraphicBufferAllocator> create_buffer_allocator(
-                const std::shared_ptr<mg::BufferInitializer>& /*buffer_initializer*/)
+            const std::shared_ptr<mg::BufferInitializer>& /*buffer_initializer*/) override
         {
             using testing::AtLeast;
 
@@ -340,25 +339,10 @@
             return buffer_allocator;
         }
 
-        std::shared_ptr<mg::Display> create_display()
+        std::shared_ptr<mg::Display> create_display() override
         {
             return std::make_shared<StubDisplay>();
         }
-
-        std::shared_ptr<mg::PlatformIPCPackage> get_ipc_package()
-        {
-            return std::make_shared<mg::PlatformIPCPackage>();
-        }
-
-        std::shared_ptr<mg::InternalClient> create_internal_client()
-        {
-            return std::shared_ptr<mg::InternalClient>();   
-        }
- 
-        void fill_ipc_package(std::shared_ptr<mc::BufferIPCPacker> const&,
-                              std::shared_ptr<mc::Buffer> const&) const
-        {
-        }
     };
 
     std::shared_ptr<mg::Platform> the_graphics_platform()
@@ -467,34 +451,19 @@
         }
     };
 
-    class StubPlatform : public mg::Platform
+    class StubPlatform : public mtd::NullPlatform
     {
     public:
         std::shared_ptr<mc::GraphicBufferAllocator> create_buffer_allocator(
-                const std::shared_ptr<mg::BufferInitializer>& /*buffer_initializer*/)
+            const std::shared_ptr<mg::BufferInitializer>& /*buffer_initializer*/) override
         {
             return std::make_shared<StubGraphicBufferAllocator>();
         }
 
-        std::shared_ptr<mg::Display> create_display()
+        std::shared_ptr<mg::Display> create_display() override
         {
             return std::make_shared<StubDisplay>();
         }
-
-        std::shared_ptr<mg::PlatformIPCPackage> get_ipc_package()
-        {
-            return std::make_shared<mg::PlatformIPCPackage>();
-        }
-
-        std::shared_ptr<mg::InternalClient> create_internal_client()
-        {
-            return std::shared_ptr<mg::InternalClient>();   
-        }
-
-        void fill_ipc_package(std::shared_ptr<mc::BufferIPCPacker> const&,
-                              std::shared_ptr<mc::Buffer> const&) const
-        {
-        }
     };
 
     std::shared_ptr<mg::Platform> the_graphics_platform()

=== modified file 'tests/mir_test_framework/testing_server_options.cpp'
--- tests/mir_test_framework/testing_server_options.cpp	2013-06-12 10:27:50 +0000
+++ tests/mir_test_framework/testing_server_options.cpp	2013-06-20 08:30:36 +0000
@@ -19,7 +19,6 @@
 #include "mir_test_framework/testing_server_configuration.h"
 
 #include "mir/graphics/display.h"
-#include "mir/graphics/platform.h"
 #include "mir/graphics/platform_ipc_package.h"
 #include "mir/graphics/renderer.h"
 #include "mir/graphics/renderable.h"
@@ -32,8 +31,7 @@
 
 #include "mir_test_doubles/stub_buffer.h"
 #include "mir_test_doubles/stub_surface_builder.h"
-#include "mir_test_doubles/null_display.h"
-#include "mir_test_doubles/null_gl_context.h"
+#include "mir_test_doubles/null_platform.h"
 
 #include <gtest/gtest.h>
 #include <thread>
@@ -103,33 +101,18 @@
     }
 };
 
-class StubGraphicPlatform : public mg::Platform
+class StubGraphicPlatform : public mtd::NullPlatform
 {
-    virtual std::shared_ptr<mc::GraphicBufferAllocator> create_buffer_allocator(
-            const std::shared_ptr<mg::BufferInitializer>& /*buffer_initializer*/)
+    std::shared_ptr<mc::GraphicBufferAllocator> create_buffer_allocator(
+        const std::shared_ptr<mg::BufferInitializer>& /*buffer_initializer*/) override
     {
         return std::make_shared<StubGraphicBufferAllocator>();
     }
 
-    virtual std::shared_ptr<mg::Display> create_display()
+    std::shared_ptr<mg::Display> create_display() override
     {
         return std::make_shared<StubDisplay>();
     }
-
-    virtual std::shared_ptr<mg::PlatformIPCPackage> get_ipc_package()
-    {
-        return std::make_shared<mg::PlatformIPCPackage>();
-    }
-
-    std::shared_ptr<mg::InternalClient> create_internal_client()
-    {
-        return std::shared_ptr<mg::InternalClient>();   
-    }
-
-    void fill_ipc_package(std::shared_ptr<mc::BufferIPCPacker> const&,
-                          std::shared_ptr<mc::Buffer> const&) const
-    {
-    }
 };
 
 class StubRenderer : public mg::Renderer

=== modified file 'tests/unit-tests/frontend/test_session_mediator.cpp'
--- tests/unit-tests/frontend/test_session_mediator.cpp	2013-06-12 15:36:31 +0000
+++ tests/unit-tests/frontend/test_session_mediator.cpp	2013-06-20 08:30:36 +0000
@@ -25,6 +25,7 @@
 #include "mir/graphics/display.h"
 #include "mir/graphics/platform.h"
 #include "mir/graphics/platform_ipc_package.h"
+#include "mir/graphics/gl_context.h"
 #include "mir/surfaces/surface.h"
 #include "mir_test_doubles/null_display.h"
 #include "mir_test_doubles/mock_shell.h"
@@ -32,7 +33,6 @@
 #include "mir_test_doubles/mock_buffer.h"
 #include "mir_test_doubles/stub_session.h"
 #include "mir_test_doubles/stub_surface_builder.h"
-#include "mir_test_doubles/stub_platform.h"
 #include "mir_test/fake_shared.h"
 #include "mir/events/event_sink.h"
 #include "mir/shell/surface.h"

=== modified file 'tests/unit-tests/frontend/test_session_mediator_android.cpp'
--- tests/unit-tests/frontend/test_session_mediator_android.cpp	2013-05-30 03:50:54 +0000
+++ tests/unit-tests/frontend/test_session_mediator_android.cpp	2013-06-20 08:30:36 +0000
@@ -30,7 +30,7 @@
 #include "mir_test_doubles/null_display.h"
 #include "mir_test_doubles/mock_session.h"
 #include "mir_test_doubles/stub_shell.h"
-#include "mir_test_doubles/stub_platform.h"
+#include "mir_test_doubles/null_platform.h"
 
 #include "mir/events/event_sink.h"
 
@@ -73,7 +73,7 @@
 {
     SessionMediatorAndroidTest()
         : shell{std::make_shared<mtd::StubShell>()},
-          graphics_platform{std::make_shared<mtd::StubPlatform>()},
+          graphics_platform{std::make_shared<mtd::NullPlatform>()},
           graphics_display{std::make_shared<mtd::NullDisplay>()},
           buffer_allocator{std::make_shared<StubGraphicBufferAllocator>()},
           report{std::make_shared<mf::NullSessionMediatorReport>()},
@@ -87,7 +87,7 @@
     }
 
     std::shared_ptr<mtd::StubShell> const shell;
-    std::shared_ptr<mtd::StubPlatform> const graphics_platform;
+    std::shared_ptr<mtd::NullPlatform> const graphics_platform;
     std::shared_ptr<mg::Display> const graphics_display;
     std::shared_ptr<mc::GraphicBufferAllocator> const buffer_allocator;
     std::shared_ptr<mf::SessionMediatorReport> const report;

=== modified file 'tests/unit-tests/frontend/test_session_mediator_gbm.cpp'
--- tests/unit-tests/frontend/test_session_mediator_gbm.cpp	2013-05-30 03:50:54 +0000
+++ tests/unit-tests/frontend/test_session_mediator_gbm.cpp	2013-06-20 08:30:36 +0000
@@ -24,14 +24,13 @@
 #include "mir/frontend/shell.h"
 #include "mir/graphics/display.h"
 #include "mir/graphics/drm_authenticator.h"
-#include "mir/graphics/platform.h"
-#include "mir/graphics/platform_ipc_package.h"
 #include "mir/events/event_sink.h"
 
 #include <boost/exception/errinfo_errno.hpp>
 #include <boost/throw_exception.hpp>
 
 #include "mir_test_doubles/null_display.h"
+#include "mir_test_doubles/null_platform.h"
 #include "mir_test_doubles/mock_session.h"
 #include "mir_test_doubles/stub_shell.h"
 
@@ -63,35 +62,15 @@
     }
 };
 
-class MockAuthenticatingPlatform : public mg::Platform, public mg::DRMAuthenticator
+class MockAuthenticatingPlatform : public mtd::NullPlatform, public mg::DRMAuthenticator
 {
  public:
     std::shared_ptr<mc::GraphicBufferAllocator> create_buffer_allocator(
-            const std::shared_ptr<mg::BufferInitializer>& /*buffer_initializer*/)
+        const std::shared_ptr<mg::BufferInitializer>& /*buffer_initializer*/) override
     {
         return std::shared_ptr<StubGraphicBufferAllocator>();
     }
 
-    std::shared_ptr<mg::Display> create_display()
-    {
-        return std::make_shared<mtd::NullDisplay>();
-    }
-
-    std::shared_ptr<mg::PlatformIPCPackage> get_ipc_package()
-    {
-        return std::make_shared<mg::PlatformIPCPackage>();
-    }
-
-    std::shared_ptr<mg::InternalClient> create_internal_client()
-    {
-        return std::shared_ptr<mg::InternalClient>();
-    }
-
-    void fill_ipc_package(std::shared_ptr<mc::BufferIPCPacker> const&,
-                          std::shared_ptr<mc::Buffer> const&) const
-    {
-    }
-
     MOCK_METHOD1(drm_auth_magic, void(drm_magic_t));
 };
 

=== modified file 'tests/unit-tests/graphics/gbm/test_internal_client.cpp'
--- tests/unit-tests/graphics/gbm/test_internal_client.cpp	2013-06-13 23:21:00 +0000
+++ tests/unit-tests/graphics/gbm/test_internal_client.cpp	2013-06-20 08:30:36 +0000
@@ -20,7 +20,6 @@
 #include "mir_toolkit/mesa/native_display.h"
 #include "src/server/graphics/gbm/internal_client.h"
 #include "src/server/graphics/gbm/internal_native_surface.h"
-#include "mir_test_doubles/stub_platform.h"
 #include "mir_test_doubles/stub_surface.h"
 
 #include <gtest/gtest.h>