← Back to branch summary

~robertcarr/mir/client-focus-notifications

« back to all changes in this revision

Viewing changes to tests/integration-tests/shell/test_session.cpp

  • Committer: Robert Carr
  • Date: 2013-08-01 22:01:20 UTC
  • mfrom: (706.2.208 trunk)
  • Revision ID: robert.carr@canonical.com-20130801220120-6m230b3g6x0xflzd
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/integration-tests/shell/test_session.cpp
18
18
 
19
19
#include "mir/default_server_configuration.h"
20
20
#include "mir/input/null_input_configuration.h"
21
 
#include "mir/compositor/graphic_buffer_allocator.h"
 
21
#include "mir/graphics/graphic_buffer_allocator.h"
22
22
#include "mir/compositor/compositor.h"
23
23
#include "mir/shell/application_session.h"
24
24
#include "mir/shell/pixel_buffer.h"
33
33
 
34
34
#include "mir_test_doubles/stub_buffer.h"
35
35
#include "mir_test_doubles/null_display.h"
 
36
#include "mir_test_doubles/null_event_sink.h"
36
37
#include "mir_test_doubles/stub_display_buffer.h"
37
38
 
38
39
#include <gtest/gtest.h>
71
72
        return std::make_shared<NullCommunicator>();
72
73
    }
73
74
 
74
 
    std::shared_ptr<mc::GraphicBufferAllocator> the_buffer_allocator() override
 
75
    std::shared_ptr<mg::GraphicBufferAllocator> the_buffer_allocator() override
75
76
    {
76
 
        struct StubBufferAllocator : public mc::GraphicBufferAllocator
 
77
        struct StubBufferAllocator : public mg::GraphicBufferAllocator
77
78
        {
78
 
            std::shared_ptr<mg::Buffer> alloc_buffer(mc::BufferProperties const& buffer_properties)
 
79
            std::shared_ptr<mg::Buffer> alloc_buffer(mg::BufferProperties const& buffer_properties)
79
80
            {
80
81
                return std::make_shared<mtd::StubBuffer>(buffer_properties);
81
82
            }
175
176
        conf.the_shell_surface_factory(),
176
177
        "stress",
177
178
        conf.the_shell_snapshot_strategy(),
178
 
        std::make_shared<msh::NullSessionListener>()};
179
 
    session.create_surface(msh::a_surface().of_size({50,50}));
 
179
        std::make_shared<msh::NullSessionListener>(),
 
180
        std::make_shared<mtd::NullEventSink>()
 
181
    };
 
182
    session.create_surface(msh::a_surface());
180
183
 
181
184
    auto compositor = conf.the_compositor();
182
185