← Back to branch summary

~mir-team/mir/in-process-egl+input-conglomeration

« back to all changes in this revision

Viewing changes to tests/unit-tests/graphics/android/test_framebuffer_factory.cpp

Merged trunk and fixed issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/graphics/android/test_framebuffer_factory.cpp
41
41
{
42
42
public:
43
43
    MOCK_METHOD1(alloc_buffer, std::shared_ptr<mc::Buffer>(mc::BufferProperties const&)); 
44
 
    MOCK_METHOD3(alloc_buffer_platform, std::shared_ptr<mga::AndroidBuffer>(geom::Size, geom::PixelFormat, mga::BufferUsage));
 
44
    MOCK_METHOD3(alloc_buffer_platform, std::shared_ptr<mga::Buffer>(geom::Size, geom::PixelFormat, mga::BufferUsage));
45
45
    MOCK_METHOD0(supported_pixel_formats, std::vector<geom::PixelFormat>());
46
46
};
47
47
}
62
62
        ON_CALL(*mock_display_info_provider, number_of_framebuffers_available())
63
63
            .WillByDefault(Return(fake_fb_num));
64
64
        ON_CALL(*mock_buffer_allocator, alloc_buffer_platform(_,_,_))
65
 
            .WillByDefault(Return(std::shared_ptr<mga::AndroidBuffer>()));
 
65
            .WillByDefault(Return(std::shared_ptr<mga::Buffer>()));
66
66
    }
67
67
 
68
68
    std::shared_ptr<MockAndroidGraphicBufferAllocator> mock_buffer_allocator;