← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mir/utopic-proposed

« back to all changes in this revision

Viewing changes to tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2014-03-10 19:28:46 UTC
  • mto: This revision was merged to the branch mainline in revision 63.
  • Revision ID: package-import@ubuntu.com-20140310192846-rq9qm3ec26yrelo2
Tags: upstream-0.1.6+14.04.20140310
Import upstream version 0.1.6+14.04.20140310

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp
18
18
 
19
19
#include "src/server/compositor/default_display_buffer_compositor_factory.h"
20
20
#include "mir/compositor/display_buffer_compositor.h"
21
 
#include "mir/compositor/compositor_report.h"
 
21
#include "src/server/report/null_report_factory.h"
22
22
#include "mir/compositor/scene.h"
23
23
#include "src/server/compositor/renderer.h"
24
24
#include "src/server/compositor/renderer_factory.h"
25
25
#include "mir/compositor/compositing_criteria.h"
26
26
#include "mir/geometry/rectangle.h"
27
 
#include "mir_test_doubles/mock_surface_renderer.h"
 
27
#include "mir_test_doubles/mock_renderer.h"
28
28
#include "mir_test/fake_shared.h"
29
29
#include "mir_test_doubles/mock_display_buffer.h"
30
30
#include "mir_test_doubles/mock_buffer_stream.h"
43
43
namespace geom = mir::geometry;
44
44
namespace mt = mir::test;
45
45
namespace mtd = mir::test::doubles;
 
46
namespace mr = mir::report;
46
47
 
47
48
namespace
48
49
{
108
109
    {
109
110
    }
110
111
 
111
 
    void begin(float rotation) const override
112
 
    {
113
 
        renderer->begin(rotation);
 
112
    void set_viewport(geom::Rectangle const& rect) override
 
113
    {
 
114
        renderer->set_viewport(rect);
 
115
    }
 
116
 
 
117
    void set_rotation(float degrees) override
 
118
    {
 
119
        renderer->set_rotation(degrees);
 
120
    }
 
121
 
 
122
    void begin() const override
 
123
    {
 
124
        renderer->begin();
114
125
    }
115
126
 
116
127
    void render(mc::CompositingCriteria const& criteria, mg::Buffer& buffer) const override
139
150
            new WrappingRenderer{&mock_renderer});
140
151
    }
141
152
 
142
 
    testing::NiceMock<mtd::MockSurfaceRenderer> mock_renderer;
 
153
    testing::NiceMock<mtd::MockRenderer> mock_renderer;
143
154
};
144
155
 
145
156
ACTION_P(InvokeArgWithParam, param)
181
192
    mc::DefaultDisplayBufferCompositorFactory factory(
182
193
        mt::fake_shared(scene),
183
194
        mt::fake_shared(renderer_factory),
184
 
        std::make_shared<mc::NullCompositorReport>());
 
195
        mr::null_compositor_report());
185
196
 
186
197
    auto comp = factory.create_compositor_for(display_buffer);
187
198
 
226
237
    mc::DefaultDisplayBufferCompositorFactory factory(
227
238
        mt::fake_shared(scene),
228
239
        mt::fake_shared(renderer_factory),
229
 
        std::make_shared<mc::NullCompositorReport>());
 
240
        mr::null_compositor_report());
230
241
 
231
242
    auto comp = factory.create_compositor_for(display_buffer);
232
243
 
260
271
 
261
272
    EXPECT_CALL(renderer_factory.mock_renderer, suspend())
262
273
        .Times(1);
263
 
    EXPECT_CALL(renderer_factory.mock_renderer, begin(_))
 
274
    EXPECT_CALL(renderer_factory.mock_renderer, begin())
264
275
        .Times(0);
265
276
    EXPECT_CALL(renderer_factory.mock_renderer, render(Ref(small),_))
266
277
        .Times(0);
322
333
    EXPECT_CALL(display_buffer, orientation())
323
334
        .InSequence(render_seq)
324
335
        .WillOnce(Return(mir_orientation_normal));
325
 
    EXPECT_CALL(renderer_factory.mock_renderer, begin(_))
 
336
    EXPECT_CALL(renderer_factory.mock_renderer, set_rotation(_))
 
337
        .InSequence(render_seq);
 
338
    EXPECT_CALL(renderer_factory.mock_renderer, begin())
326
339
        .InSequence(render_seq);
327
340
    EXPECT_CALL(renderer_factory.mock_renderer, render(Ref(big),_))
328
341
        .InSequence(render_seq);
342
355
    mc::DefaultDisplayBufferCompositorFactory factory(
343
356
        mt::fake_shared(scene),
344
357
        mt::fake_shared(renderer_factory),
345
 
        std::make_shared<mc::NullCompositorReport>());
 
358
        mr::null_compositor_report());
346
359
 
347
360
    auto comp = factory.create_compositor_for(display_buffer);
348
361
 
442
455
    mc::DefaultDisplayBufferCompositorFactory factory(
443
456
        mt::fake_shared(scene),
444
457
        mt::fake_shared(renderer_factory),
445
 
        std::make_shared<mc::NullCompositorReport>());
 
458
        mr::null_compositor_report());
446
459
 
447
460
    auto comp = factory.create_compositor_for(display_buffer);
448
461
 
492
505
    mc::DefaultDisplayBufferCompositorFactory factory(
493
506
        mt::fake_shared(scene),
494
507
        mt::fake_shared(renderer_factory),
495
 
        std::make_shared<mc::NullCompositorReport>());
 
508
        mr::null_compositor_report());
496
509
 
497
510
    auto comp = factory.create_compositor_for(display_buffer);
498
511
 
540
553
    mc::DefaultDisplayBufferCompositorFactory factory(
541
554
        mt::fake_shared(scene),
542
555
        mt::fake_shared(renderer_factory),
543
 
        std::make_shared<mc::NullCompositorReport>());
 
556
        mr::null_compositor_report());
544
557
 
545
558
    auto comp = factory.create_compositor_for(display_buffer);
546
559
 
620
633
    mc::DefaultDisplayBufferCompositorFactory factory(
621
634
        mt::fake_shared(scene),
622
635
        mt::fake_shared(renderer_factory),
623
 
        std::make_shared<mc::NullCompositorReport>());
 
636
        mr::null_compositor_report());
624
637
 
625
638
    auto comp = factory.create_compositor_for(display_buffer);
626
639