Merge lp:~alan-griffiths/mir/refactor-surfaces-cleanup into lp:~mir-team/mir/trunk

[Alan Griffiths]

surface, shell: Turn ProxySurface into shell::Surface

surface, shell: Turn ProxySurface into shell::Surface

This is the remaining part of the refactoring discussed on mir-devel

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:520
http://jenkins.qa.ubuntu.com/job/mir-ci/87/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/88/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/88/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/87/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:521
http://jenkins.qa.ubuntu.com/job/mir-ci/96/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/97/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/97/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/96/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

looks good.
493: setting expectations on a stub was off-putting on first glance, after reading a bit more, it looks ok

review: Approve

[Alan Griffiths (alan-griffiths)]

> looks good.
> 493: setting expectations on a stub was off-putting on first glance, after
> reading a bit more, it looks ok

It was like that when I arrived. ;)

Yes, this is some of the misuse of mocks as stubs that I keep muttering about.

[Alexandros Frantzis (afrantzis)]

Looks good overall.

The only thing that caught my eye is the need for a special deleter function:

296 + Surface(std::weak_ptr<mir::surfaces::Surface> const& surface, std::function<void(std::weak_ptr<mir::surfaces::Surface> const&)> const& deleter);

But since I haven't examined the situation properly I am going to provide a "weak" approval and revisit this later.

review: Approve

[Robert Carr (robertcarr)]

Like we talked about on IRC (Friday 11:05 am west coast time, maybe there are logs now that we use freenode?), the deleters are a little weird. I think it's a good step forward though as long as we work on the shell/surfaces interface next week.

review: Approve

=== modified file 'include/server/mir/default_server_configuration.h'
--- include/server/mir/default_server_configuration.h	2013-03-15 14:51:20 +0000
+++ include/server/mir/default_server_configuration.h	2013-03-15 14:51:20 +0000
@@ -48,11 +48,11 @@
 {
 class SessionManager;
 class SurfaceFactory;
+class SurfaceController;
 }
 namespace surfaces
 {
 class BufferBundleFactory;
-class SurfaceController;
 class SurfaceStackModel;
 class SurfaceStack;
 }
@@ -124,7 +124,7 @@
     CachedPtr<graphics::Renderer> renderer;
     CachedPtr<compositor::BufferBundleManager> buffer_bundle_manager;
     CachedPtr<surfaces::SurfaceStack> surface_stack;
-    CachedPtr<surfaces::SurfaceController> surface_controller;
+    CachedPtr<shell::SurfaceController> surface_controller;
     CachedPtr<compositor::Compositor> compositor;
     CachedPtr<logging::Logger> logger;
     CachedPtr<graphics::DisplayReport> display_report;

=== renamed file 'include/server/mir/surfaces/surface_controller.h' => 'include/server/mir/shell/surface_controller.h'
--- include/server/mir/surfaces/surface_controller.h	2013-03-15 14:51:20 +0000
+++ include/server/mir/shell/surface_controller.h	2013-03-15 14:51:20 +0000
@@ -16,8 +16,8 @@
  * Authored by: Thomas Voss <[e-mail]>
  */
 
-#ifndef MIR_SURFACES_SURFACE_CONTROLLER_H_
-#define MIR_SURFACES_SURFACE_CONTROLLER_H_
+#ifndef MIR_SHELL_SURFACE_CONTROLLER_H_
+#define MIR_SHELL_SURFACE_CONTROLLER_H_
 
 #include "mir/shell/surface_factory.h"
 
@@ -31,11 +31,14 @@
 namespace surfaces
 {
 class SurfaceStackModel;
+}
 
-class SurfaceController : public shell::SurfaceFactory
+namespace shell
+{
+class SurfaceController : public SurfaceFactory
 {
 public:
-    explicit SurfaceController(std::shared_ptr<SurfaceStackModel> const& surface_stack);
+    explicit SurfaceController(std::shared_ptr<surfaces::SurfaceStackModel> const& surface_stack);
     virtual ~SurfaceController() {}
 
     std::shared_ptr<frontend::Surface> create_surface(const frontend::SurfaceCreationParameters& params);
@@ -45,10 +48,10 @@
     SurfaceController& operator=(const SurfaceController&) = delete;
 
 private:
-    std::shared_ptr<SurfaceStackModel> const surface_stack;
+    std::shared_ptr<surfaces::SurfaceStackModel> const surface_stack;
 };
 
 }
 }
 
-#endif // MIR_SURFACES_SURFACE_CONTROLLER_H_
+#endif // MIR_SHELL_SURFACE_CONTROLLER_H_

=== modified file 'src/server/default_server_configuration.cpp'
--- src/server/default_server_configuration.cpp	2013-03-15 14:51:20 +0000
+++ src/server/default_server_configuration.cpp	2013-03-15 14:51:20 +0000
@@ -45,7 +45,7 @@
 #include "mir/logging/dumb_console_logger.h"
 #include "mir/logging/session_mediator_report.h"
 #include "mir/logging/display_report.h"
-#include "mir/surfaces/surface_controller.h"
+#include "mir/shell/surface_controller.h"
 #include "mir/surfaces/surface_stack.h"
 
 namespace mc = mir::compositor;
@@ -329,7 +329,7 @@
     return surface_controller(
         [this]()
         {
-            return std::make_shared<ms::SurfaceController>(the_surface_stack_model());
+            return std::make_shared<msh::SurfaceController>(the_surface_stack_model());
         });
 }
 

=== modified file 'src/server/shell/CMakeLists.txt'
--- src/server/shell/CMakeLists.txt	2013-03-15 14:51:20 +0000
+++ src/server/shell/CMakeLists.txt	2013-03-15 14:51:20 +0000
@@ -8,6 +8,8 @@
   single_visibility_focus_mechanism.cpp
   consuming_placement_strategy.cpp
   organising_surface_factory.cpp
+  surface_controller.cpp
+  surface.cpp
 )
 
 add_library(

=== modified file 'src/server/shell/application_session.cpp'
--- src/server/shell/application_session.cpp	2013-03-15 14:51:20 +0000
+++ src/server/shell/application_session.cpp	2013-03-15 14:51:20 +0000
@@ -19,7 +19,7 @@
 #include "mir/shell/application_session.h"
 #include "mir/frontend/surface.h"
 
-#include "mir/surfaces/surface_controller.h"
+#include "mir/shell/surface_controller.h"
 
 #include <boost/throw_exception.hpp>
 

=== renamed file 'src/server/surfaces/proxy_surface.cpp' => 'src/server/shell/surface.cpp'
--- src/server/surfaces/proxy_surface.cpp	2013-03-15 14:51:20 +0000
+++ src/server/shell/surface.cpp	2013-03-15 14:51:20 +0000
@@ -16,7 +16,7 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#include "proxy_surface.h"
+#include "surface.h"
 
 #include "mir/surfaces/surface_stack_model.h"
 
@@ -24,15 +24,30 @@
 
 #include <stdexcept>
 
-namespace ms = mir::surfaces;
+namespace msh = mir::shell;
 namespace mc = mir::compositor;
 
-ms::BasicProxySurface::BasicProxySurface(std::weak_ptr<mir::surfaces::Surface> const& surface) :
-    surface(surface)
-{
-}
-
-void ms::BasicProxySurface::hide()
+msh::Surface::Surface(std::weak_ptr<mir::surfaces::Surface> const& surface) :
+    surface(surface),
+    deleter([](std::weak_ptr<mir::surfaces::Surface> const&){})
+{
+}
+
+msh::Surface::Surface(
+    std::weak_ptr<mir::surfaces::Surface> const& surface,
+    std::function<void(std::weak_ptr<mir::surfaces::Surface> const&)> const& deleter)
+:
+    surface(surface),
+    deleter(deleter)
+{
+}
+
+msh::Surface::~Surface()
+{
+    destroy();
+}
+
+void msh::Surface::hide()
 {
     if (auto const& s = surface.lock())
     {
@@ -40,7 +55,7 @@
     }
 }
 
-void ms::BasicProxySurface::show()
+void msh::Surface::show()
 {
     if (auto const& s = surface.lock())
     {
@@ -48,11 +63,12 @@
     }
 }
 
-void ms::BasicProxySurface::destroy()
+void msh::Surface::destroy()
 {
+    deleter(surface);
 }
 
-void ms::BasicProxySurface::shutdown()
+void msh::Surface::shutdown()
 {
     if (auto const& s = surface.lock())
     {
@@ -60,7 +76,7 @@
     }
 }
 
-mir::geometry::Size ms::BasicProxySurface::size() const
+mir::geometry::Size msh::Surface::size() const
 {
     if (auto const& s = surface.lock())
     {
@@ -72,7 +88,7 @@
     }
 }
 
-mir::geometry::PixelFormat ms::BasicProxySurface::pixel_format() const
+mir::geometry::PixelFormat msh::Surface::pixel_format() const
 {
     if (auto const& s = surface.lock())
     {
@@ -84,7 +100,7 @@
     }
 }
 
-void ms::BasicProxySurface::advance_client_buffer()
+void msh::Surface::advance_client_buffer()
 {
     if (auto const& s = surface.lock())
     {
@@ -92,7 +108,7 @@
     }
 }
 
-std::shared_ptr<mc::Buffer> ms::BasicProxySurface::client_buffer() const
+std::shared_ptr<mc::Buffer> msh::Surface::client_buffer() const
 {
     if (auto const& s = surface.lock())
     {
@@ -103,27 +119,3 @@
         BOOST_THROW_EXCEPTION(std::runtime_error("Invalid surface"));
     }
 }
-
-void ms::BasicProxySurface::destroy_surface(SurfaceStackModel* const surface_stack) const
-{
-    surface_stack->destroy_surface(surface);
-}
-
-
-ms::ProxySurface::ProxySurface(
-        SurfaceStackModel* const surface_stack_,
-        frontend::SurfaceCreationParameters const& params) :
-    BasicProxySurface(surface_stack_->create_surface(params)),
-    surface_stack(surface_stack_)
-{
-}
-
-void ms::ProxySurface::destroy()
-{
-    destroy_surface(surface_stack);
-}
-
-ms::ProxySurface::~ProxySurface()
-{
-    destroy();
-}

=== renamed file 'src/server/surfaces/proxy_surface.h' => 'src/server/shell/surface.h'
--- src/server/surfaces/proxy_surface.h	2013-03-15 14:51:20 +0000
+++ src/server/shell/surface.h	2013-03-15 14:51:20 +0000
@@ -17,12 +17,14 @@
  */
 
 
-#ifndef PROXY_SURFACE_H_
-#define PROXY_SURFACE_H_
+#ifndef MIR_SHELL_SURFACE_H_
+#define MIR_SHELL_SURFACE_H_
 
 #include "mir/frontend/surface.h"
 #include "mir/surfaces/surface.h"
 
+#include <functional>
+
 namespace mir
 {
 namespace frontend
@@ -33,12 +35,18 @@
 namespace surfaces
 {
 class SurfaceStackModel;
-
-class BasicProxySurface : public frontend::Surface
+}
+
+namespace shell
+{
+
+class Surface : public frontend::Surface
 {
 public:
 
-    explicit BasicProxySurface(std::weak_ptr<mir::surfaces::Surface> const& surface);
+    explicit Surface(std::weak_ptr<mir::surfaces::Surface> const& surface);
+    Surface(std::weak_ptr<mir::surfaces::Surface> const& surface, std::function<void(std::weak_ptr<mir::surfaces::Surface> const&)> const& deleter);
+    ~Surface();
 
     void hide();
 
@@ -56,29 +64,12 @@
 
     std::shared_ptr<compositor::Buffer> client_buffer() const;
 
-protected:
-    void destroy_surface(SurfaceStackModel* const surface_stack) const;
-
 private:
     std::weak_ptr<mir::surfaces::Surface> const surface;
-};
-
-class ProxySurface : public BasicProxySurface
-{
-public:
-    ProxySurface(
-        SurfaceStackModel* const surface_stack_,
-        frontend::SurfaceCreationParameters const& params);
-
-    void destroy();
-
-    ~ProxySurface();
-
-private:
-    SurfaceStackModel* const surface_stack;
-};
-
-}
-}
-
-#endif /* PROXY_SURFACE_H_ */
+    std::function<void(std::weak_ptr<mir::surfaces::Surface> const&)> const deleter;
+};
+
+}
+}
+
+#endif /* MIR_SHELL_SURFACE_H_ */

=== renamed file 'src/server/surfaces/surface_controller.cpp' => 'src/server/shell/surface_controller.cpp'
--- src/server/surfaces/surface_controller.cpp	2013-03-15 14:51:20 +0000
+++ src/server/shell/surface_controller.cpp	2013-03-15 14:51:20 +0000
@@ -16,23 +16,26 @@
  * Authored by: Thomas Voss <[e-mail]>
  */
 
-#include "mir/surfaces/surface_controller.h"
+#include "mir/shell/surface_controller.h"
 #include "mir/surfaces/surface_stack_model.h"
 #include "mir/frontend/surface.h"
 
-#include "proxy_surface.h"
+#include "surface.h"
 
 #include <cassert>
 
 namespace ms = mir::surfaces;
+namespace msh = mir::shell;
 namespace mf = mir::frontend;
 
-ms::SurfaceController::SurfaceController(std::shared_ptr<SurfaceStackModel> const& surface_stack) : surface_stack(surface_stack)
+msh::SurfaceController::SurfaceController(std::shared_ptr<ms::SurfaceStackModel> const& surface_stack) : surface_stack(surface_stack)
 {
     assert(surface_stack);
 }
 
-std::shared_ptr<mf::Surface> ms::SurfaceController::create_surface(const mf::SurfaceCreationParameters& params)
+std::shared_ptr<mf::Surface> msh::SurfaceController::create_surface(const mf::SurfaceCreationParameters& params)
 {
-    return std::make_shared<ProxySurface>(surface_stack.get(), params);
+    return std::make_shared<Surface>(
+        surface_stack->create_surface(params),
+        [=] (std::weak_ptr<mir::surfaces::Surface> const& surface) { surface_stack->destroy_surface(surface); });
 }

=== modified file 'src/server/surfaces/CMakeLists.txt'
--- src/server/surfaces/CMakeLists.txt	2013-03-07 08:04:05 +0000
+++ src/server/surfaces/CMakeLists.txt	2013-03-15 14:51:20 +0000
@@ -3,6 +3,4 @@
 
   surface.cpp
   surface_stack.cpp
-  surface_controller.cpp
-  proxy_surface.cpp
 )

=== modified file 'tests/integration-tests/frontend/test_session_manager.cpp'
--- tests/integration-tests/frontend/test_session_manager.cpp	2013-03-15 14:51:20 +0000
+++ tests/integration-tests/frontend/test_session_manager.cpp	2013-03-15 14:51:20 +0000
@@ -18,7 +18,7 @@
 
 #include "mir/shell/session_manager.h"
 #include "mir/surfaces/buffer_bundle.h"
-#include "mir/surfaces/surface_controller.h"
+#include "mir/shell/surface_controller.h"
 #include "mir/surfaces/surface_stack.h"
 #include "mir/surfaces/surface.h"
 #include "mir/compositor/buffer_swapper.h"

=== modified file 'tests/unit-tests/frontend/test_session_mediator.cpp'
--- tests/unit-tests/frontend/test_session_mediator.cpp	2013-03-15 14:51:20 +0000
+++ tests/unit-tests/frontend/test_session_mediator.cpp	2013-03-15 14:51:20 +0000
@@ -34,7 +34,7 @@
 #include "mir_test_doubles/stub_session.h"
 #include "mir_test/fake_shared.h"
 
-#include "src/server/surfaces/proxy_surface.h"
+#include "src/server/shell/surface.h"
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>

=== modified file 'tests/unit-tests/shell/CMakeLists.txt'
--- tests/unit-tests/shell/CMakeLists.txt	2013-03-07 08:04:05 +0000
+++ tests/unit-tests/shell/CMakeLists.txt	2013-03-15 14:51:20 +0000
@@ -6,6 +6,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/test_single_visibility_focus_mechanism.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_consuming_placement_strategy.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_organising_surface_factory.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_surface.cpp
 )
 
 set(

=== modified file 'tests/unit-tests/shell/test_application_session.cpp'
--- tests/unit-tests/shell/test_application_session.cpp	2013-03-15 14:51:20 +0000
+++ tests/unit-tests/shell/test_application_session.cpp	2013-03-15 14:51:20 +0000
@@ -23,7 +23,7 @@
 #include "mir_test_doubles/mock_surface_factory.h"
 #include "mir_test_doubles/mock_surface.h"
 
-#include "src/server/surfaces/proxy_surface.h"
+#include "src/server/shell/surface.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>

=== modified file 'tests/unit-tests/shell/test_session_manager.cpp'
--- tests/unit-tests/shell/test_session_manager.cpp	2013-03-15 14:51:20 +0000
+++ tests/unit-tests/shell/test_session_manager.cpp	2013-03-15 14:51:20 +0000
@@ -29,7 +29,7 @@
 #include "mir_test_doubles/mock_surface_factory.h"
 #include "mir_test_doubles/null_buffer_bundle.h"
 
-#include "src/server/surfaces/proxy_surface.h"
+#include "src/server/shell/surface.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
@@ -111,7 +111,7 @@
             mf::a_surface().name,
             buffer_bundle));
     ON_CALL(surface_factory, create_surface(_)).WillByDefault(
-        Return(std::make_shared<ms::BasicProxySurface>(dummy_surface)));
+        Return(std::make_shared<msh::Surface>(dummy_surface)));
 
     EXPECT_CALL(container, insert_session(_)).Times(1);
     EXPECT_CALL(container, remove_session(_)).Times(1);

=== renamed file 'tests/unit-tests/surfaces/test_proxy_surface.cpp' => 'tests/unit-tests/shell/test_surface.cpp'
--- tests/unit-tests/surfaces/test_proxy_surface.cpp	2013-03-15 14:51:20 +0000
+++ tests/unit-tests/shell/test_surface.cpp	2013-03-15 14:51:20 +0000
@@ -16,7 +16,7 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#include "src/server/surfaces/proxy_surface.h"
+#include "src/server/shell/surface.h"
 #include "mir/surfaces/surface.h"
 #include "mir/shell/surface_creation_parameters.h"
 #include "mir/surfaces/surface_stack_model.h"
@@ -30,6 +30,7 @@
 #include <gtest/gtest.h>
 
 namespace ms = mir::surfaces;
+namespace msh = mir::shell;
 namespace mf = mir::frontend;
 namespace mc = mir::compositor;
 namespace geom = mir::geometry;
@@ -73,9 +74,24 @@
 
     std::shared_ptr<ms::Surface> surface;
 };
+
+struct ShellSurface : testing::Test
+{
+    std::shared_ptr<StubBufferBundle> buffer_bundle;
+
+    ShellSurface() :
+        buffer_bundle(std::make_shared<StubBufferBundle>())
+    {
+        using namespace testing;
+
+        ON_CALL(*buffer_bundle, bundle_size()).WillByDefault(Return(geom::Size()));
+        ON_CALL(*buffer_bundle, get_bundle_pixel_format()).WillByDefault(Return(geom::PixelFormat::abgr_8888));
+        ON_CALL(*buffer_bundle, secure_client_buffer()).WillByDefault(Return(std::shared_ptr<mtd::StubBuffer>()));
+    }
+};
 }
 
-TEST(SurfaceProxy, creation_and_destruction)
+TEST_F(ShellSurface, creation_and_destruction)
 {
     MockSurfaceStackModel surface_stack;
     mf::SurfaceCreationParameters params;
@@ -85,17 +101,21 @@
     EXPECT_CALL(surface_stack, create_surface(_)).Times(1);
     EXPECT_CALL(surface_stack, destroy_surface(_)).Times(1);
 
-    ms::ProxySurface test(&surface_stack, params);
+    msh::Surface test(
+        surface_stack.create_surface(params),
+        [&](std::weak_ptr<mir::surfaces::Surface> const& s) {surface_stack.destroy_surface(s);});
 }
 
-TEST(SurfaceProxy, destroy)
+TEST_F(ShellSurface, destroy)
 {
     using namespace testing;
 
     NiceMock<MockSurfaceStackModel> surface_stack;
     mf::SurfaceCreationParameters params;
 
-    ms::ProxySurface test(&surface_stack, params);
+    msh::Surface test(
+        surface_stack.create_surface(params),
+        [&](std::weak_ptr<mir::surfaces::Surface> const& s) {surface_stack.destroy_surface(s);});
 
     EXPECT_CALL(surface_stack, destroy_surface(_)).Times(1);
 
@@ -104,148 +124,130 @@
     Mock::VerifyAndClearExpectations(&surface_stack);
 }
 
-namespace
-{
-struct BasicSurfaceProxy : testing::Test
-{
-    std::shared_ptr<StubBufferBundle> buffer_bundle;
-
-    BasicSurfaceProxy() :
-        buffer_bundle(std::make_shared<StubBufferBundle>())
-    {
-        using namespace testing;
-
-        ON_CALL(*buffer_bundle, bundle_size()).WillByDefault(Return(geom::Size()));
-        ON_CALL(*buffer_bundle, get_bundle_pixel_format()).WillByDefault(Return(geom::PixelFormat::abgr_8888));
-        ON_CALL(*buffer_bundle, secure_client_buffer()).WillByDefault(Return(std::shared_ptr<mtd::StubBuffer>()));
-    }
-};
-}
-
-TEST_F(BasicSurfaceProxy, client_buffer_throw_behavior)
-{
-    auto surface = std::make_shared<ms::Surface>(__PRETTY_FUNCTION__, buffer_bundle);
-
-    ms::BasicProxySurface proxy_surface(surface);
-
-    EXPECT_NO_THROW({
-        proxy_surface.client_buffer();
-    });
-
-    surface.reset();
-
-    EXPECT_THROW({
-        proxy_surface.client_buffer();
-    }, std::runtime_error);
-}
-
-TEST_F(BasicSurfaceProxy, size_throw_behavior)
-{
-    auto surface = std::make_shared<ms::Surface>(__PRETTY_FUNCTION__, buffer_bundle);
-
-    ms::BasicProxySurface proxy_surface(surface);
-
-    EXPECT_NO_THROW({
-        proxy_surface.size();
-    });
-
-    surface.reset();
-
-    EXPECT_THROW({
-        proxy_surface.size();
-    }, std::runtime_error);
-}
-
-TEST_F(BasicSurfaceProxy, pixel_format_throw_behavior)
-{
-    auto surface = std::make_shared<ms::Surface>(__PRETTY_FUNCTION__, buffer_bundle);
-
-    ms::BasicProxySurface proxy_surface(surface);
-
-    EXPECT_NO_THROW({
-        proxy_surface.pixel_format();
-    });
-
-    surface.reset();
-
-    EXPECT_THROW({
-        proxy_surface.pixel_format();
-    }, std::runtime_error);
-}
-
-TEST_F(BasicSurfaceProxy, hide_throw_behavior)
-{
-    auto surface = std::make_shared<ms::Surface>(__PRETTY_FUNCTION__, buffer_bundle);
-
-    ms::BasicProxySurface proxy_surface(surface);
-
-    EXPECT_NO_THROW({
-        proxy_surface.hide();
-    });
-
-    surface.reset();
-
-    EXPECT_NO_THROW({
-        proxy_surface.hide();
-    });
-}
-
-TEST_F(BasicSurfaceProxy, show_throw_behavior)
-{
-    auto surface = std::make_shared<ms::Surface>(__PRETTY_FUNCTION__, buffer_bundle);
-
-    ms::BasicProxySurface proxy_surface(surface);
-
-    EXPECT_NO_THROW({
-        proxy_surface.show();
-    });
-
-    surface.reset();
-
-    EXPECT_NO_THROW({
-        proxy_surface.show();
-    });
-}
-
-TEST_F(BasicSurfaceProxy, destroy_throw_behavior)
-{
-    auto surface = std::make_shared<ms::Surface>(__PRETTY_FUNCTION__, buffer_bundle);
-
-    ms::BasicProxySurface proxy_surface(surface);
-
-    EXPECT_NO_THROW({
-        proxy_surface.destroy();
-    });
-
-    surface.reset();
-
-    EXPECT_NO_THROW({
-        proxy_surface.destroy();
-    });
-}
-
-TEST_F(BasicSurfaceProxy, shutdown_throw_behavior)
-{
-    auto surface = std::make_shared<ms::Surface>(__PRETTY_FUNCTION__, buffer_bundle);
-
-    ms::BasicProxySurface proxy_surface(surface);
-
-    EXPECT_NO_THROW({
-        proxy_surface.shutdown();
-    });
-
-    surface.reset();
-
-    EXPECT_NO_THROW({
-        proxy_surface.shutdown();
-    });
-}
-
-TEST_F(BasicSurfaceProxy, advance_client_buffer_throw_behavior)
-{
-    auto surface = std::make_shared<ms::Surface>(__PRETTY_FUNCTION__, buffer_bundle);
-
-    ms::BasicProxySurface proxy_surface(surface);
+TEST_F(ShellSurface, client_buffer_throw_behavior)
+{
+    auto surface = std::make_shared<ms::Surface>(__PRETTY_FUNCTION__, buffer_bundle);
+
+    msh::Surface proxy_surface(surface);
+
+    EXPECT_NO_THROW({
+        proxy_surface.client_buffer();
+    });
+
+    surface.reset();
+
+    EXPECT_THROW({
+        proxy_surface.client_buffer();
+    }, std::runtime_error);
+}
+
+TEST_F(ShellSurface, size_throw_behavior)
+{
+    auto surface = std::make_shared<ms::Surface>(__PRETTY_FUNCTION__, buffer_bundle);
+
+    msh::Surface proxy_surface(surface);
+
+    EXPECT_NO_THROW({
+        proxy_surface.size();
+    });
+
+    surface.reset();
+
+    EXPECT_THROW({
+        proxy_surface.size();
+    }, std::runtime_error);
+}
+
+TEST_F(ShellSurface, pixel_format_throw_behavior)
+{
+    auto surface = std::make_shared<ms::Surface>(__PRETTY_FUNCTION__, buffer_bundle);
+
+    msh::Surface proxy_surface(surface);
+
+    EXPECT_NO_THROW({
+        proxy_surface.pixel_format();
+    });
+
+    surface.reset();
+
+    EXPECT_THROW({
+        proxy_surface.pixel_format();
+    }, std::runtime_error);
+}
+
+TEST_F(ShellSurface, hide_throw_behavior)
+{
+    auto surface = std::make_shared<ms::Surface>(__PRETTY_FUNCTION__, buffer_bundle);
+
+    msh::Surface proxy_surface(surface);
+
+    EXPECT_NO_THROW({
+        proxy_surface.hide();
+    });
+
+    surface.reset();
+
+    EXPECT_NO_THROW({
+        proxy_surface.hide();
+    });
+}
+
+TEST_F(ShellSurface, show_throw_behavior)
+{
+    auto surface = std::make_shared<ms::Surface>(__PRETTY_FUNCTION__, buffer_bundle);
+
+    msh::Surface proxy_surface(surface);
+
+    EXPECT_NO_THROW({
+        proxy_surface.show();
+    });
+
+    surface.reset();
+
+    EXPECT_NO_THROW({
+        proxy_surface.show();
+    });
+}
+
+TEST_F(ShellSurface, destroy_throw_behavior)
+{
+    auto surface = std::make_shared<ms::Surface>(__PRETTY_FUNCTION__, buffer_bundle);
+
+    msh::Surface proxy_surface(surface);
+
+    EXPECT_NO_THROW({
+        proxy_surface.destroy();
+    });
+
+    surface.reset();
+
+    EXPECT_NO_THROW({
+        proxy_surface.destroy();
+    });
+}
+
+TEST_F(ShellSurface, shutdown_throw_behavior)
+{
+    auto surface = std::make_shared<ms::Surface>(__PRETTY_FUNCTION__, buffer_bundle);
+
+    msh::Surface proxy_surface(surface);
+
+    EXPECT_NO_THROW({
+        proxy_surface.shutdown();
+    });
+
+    surface.reset();
+
+    EXPECT_NO_THROW({
+        proxy_surface.shutdown();
+    });
+}
+
+TEST_F(ShellSurface, advance_client_buffer_throw_behavior)
+{
+    auto surface = std::make_shared<ms::Surface>(__PRETTY_FUNCTION__, buffer_bundle);
+
+    msh::Surface proxy_surface(surface);
 
     EXPECT_NO_THROW({
         proxy_surface.advance_client_buffer();

=== modified file 'tests/unit-tests/surfaces/CMakeLists.txt'
--- tests/unit-tests/surfaces/CMakeLists.txt	2013-03-07 08:04:05 +0000
+++ tests/unit-tests/surfaces/CMakeLists.txt	2013-03-15 14:51:20 +0000
@@ -2,7 +2,6 @@
   APPEND UNIT_TEST_SOURCES
   ${CMAKE_CURRENT_SOURCE_DIR}/test_surface.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_surface_stack.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_proxy_surface.cpp
 )
 
 set(UNIT_TEST_SOURCES ${UNIT_TEST_SOURCES} PARENT_SCOPE)