← Back to branch summary

~vanvugt/mir/unique-id

« back to all changes in this revision

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

  • Committer: Daniel van Vugt
  • Date: 2013-04-16 06:59:13 UTC
  • mfrom: (578.1.12 trunk)
  • Revision ID: daniel.van.vugt@canonical.com-20130416065913-ihl399t0ud6t2uax
Merge latest lp:mir

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp
27
27
#include "mir_test/egl_mock.h"
28
28
#include "mir_test/gl_mock.h"
29
29
#include "mir_test_doubles/mock_buffer_initializer.h"
 
30
#include "mir_test_doubles/null_virtual_terminal.h"
30
31
#include "mir/graphics/null_display_report.h"
31
32
 
32
33
#include <memory>
67
68
        ON_CALL(mock_egl, eglGetProcAddress(StrEq("glEGLImageTargetTexture2DOES")))
68
69
            .WillByDefault(Return(reinterpret_cast<func_ptr_t>(glEGLImageTargetTexture2DOES)));
69
70
 
70
 
        platform = std::make_shared<mgg::GBMPlatform>(std::make_shared<mg::NullDisplayReport>());
 
71
        platform = std::make_shared<mgg::GBMPlatform>(std::make_shared<mg::NullDisplayReport>(),
 
72
                                                      std::make_shared<mtd::NullVirtualTerminal>());
71
73
        mock_buffer_initializer = std::make_shared<testing::NiceMock<mtd::MockBufferInitializer>>();
72
74
        allocator.reset(new mgg::GBMBufferAllocator(platform, mock_buffer_initializer));
73
75
    }