← Back to branch summary

~alan-griffiths/mir/fix-1654023

« back to all changes in this revision

Viewing changes to tests/unit-tests/scene/test_session_manager.cpp

  • Committer: Daniel van Vugt
  • Date: 2015-04-28 07:54:10 UTC
  • mfrom: (2517 development-branch)
  • mto: This revision was merged to the branch mainline in revision 2673.
  • Revision ID: daniel.van.vugt@canonical.com-20150428075410-rwskshfuar7voesp
Merge latest trunk and fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/scene/test_session_manager.cpp
30
30
#include "mir_test_doubles/mock_surface_coordinator.h"
31
31
#include "mir_test_doubles/mock_session_listener.h"
32
32
#include "mir_test_doubles/stub_buffer_stream.h"
 
33
#include "mir_test_doubles/stub_buffer_stream_factory.h"
33
34
#include "mir_test_doubles/null_snapshot_strategy.h"
34
35
#include "mir_test_doubles/null_session_event_sink.h"
35
36
 
83
84
        std::shared_ptr<mi::InputSender>(),
84
85
        std::shared_ptr<mg::CursorImage>(),
85
86
        mir::report::null_scene_report());
86
 
    mtd::MockSurfaceCoordinator surface_coordinator;
 
87
    testing::NiceMock<mtd::MockSurfaceCoordinator> surface_coordinator;
87
88
    testing::NiceMock<MockSessionContainer> container;
88
89
    ms::NullSessionListener session_listener;
 
90
    mtd::StubBufferStreamFactory buffer_stream_factory;
89
91
 
90
92
    ms::SessionManager session_manager{mt::fake_shared(surface_coordinator),
 
93
        mt::fake_shared(buffer_stream_factory),
91
94
        mt::fake_shared(container),
92
95
        std::make_shared<mtd::NullSnapshotStrategy>(),
93
96
        std::make_shared<mtd::NullSessionEventSink>(),
141
144
 
142
145
    ms::SessionManager session_manager{
143
146
        mt::fake_shared(surface_coordinator),
 
147
        std::make_shared<mtd::StubBufferStreamFactory>(),
144
148
        mt::fake_shared(container),
145
149
        std::make_shared<mtd::NullSnapshotStrategy>(),
146
150
        std::make_shared<mtd::NullSessionEventSink>(),
176
180
 
177
181
    ms::SessionManager session_manager{
178
182
        mt::fake_shared(surface_coordinator),
 
183
        std::make_shared<mtd::StubBufferStreamFactory>(),
179
184
        mt::fake_shared(container),
180
185
        std::make_shared<mtd::NullSnapshotStrategy>(),
181
186
        mt::fake_shared(session_event_sink),