← Back to branch summary

~robertcarr/mir/send-clients-input

« back to all changes in this revision

Viewing changes to tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp

  • Committer: Daniel van Vugt
  • Date: 2013-03-07 08:04:05 UTC
  • mfrom: (467.1.6 trunk)
  • mto: (467.1.21 trunk)
  • mto: This revision was merged to the branch mainline in revision 486.
  • Revision ID: daniel.van.vugt@canonical.com-20130307080405-vgn5g2ts7j08xekk
Merge latest lp:mir

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp
22
22
 
23
23
#include "mir_test/egl_mock.h"
24
24
#include "mir_test/gl_mock.h"
25
 
#include "mir_test_doubles/null_display_listener.h"
 
25
#include "mir/graphics/null_display_report.h"
26
26
 
27
27
#include "mock_drm.h"
28
28
#include "mock_gbm.h"
33
33
namespace mg = mir::graphics;
34
34
namespace mgg = mir::graphics::gbm;
35
35
namespace geom = mir::geometry;
36
 
namespace mtd = mir::test::doubles;
37
36
 
38
37
namespace
39
38
{
42
41
{
43
42
public:
44
43
    GBMDisplayMultiMonitorTest()
45
 
        : null_listener{std::make_shared<mtd::NullDisplayListener>()}
 
44
        : null_listener{std::make_shared<mg::NullDisplayReport>()}
46
45
    {
47
46
        using namespace testing;
48
47
 
118
117
    testing::NiceMock<mir::GLMock> mock_gl;
119
118
    testing::NiceMock<mgg::MockDRM> mock_drm;
120
119
    testing::NiceMock<mgg::MockGBM> mock_gbm;
121
 
    std::shared_ptr<mg::DisplayListener> const null_listener;
 
120
    std::shared_ptr<mg::DisplayReport> const null_listener;
122
121
 
123
122
    std::vector<drmModeModeInfo> modes0;
124
123
    std::vector<drmModeModeInfo> modes_empty;