← Back to branch summary

~kdub/mir/fix-1661521

« back to all changes in this revision

Viewing changes to tests/unit-tests/client/test_buffer_vault.cpp

  • Committer: Kevin DuBois
  • Date: 2017-02-03 19:36:17 UTC
  • Revision ID: kevin.dubois@canonical.com-20170203193617-p3d2ejusobp0xv72
port over fix for 1661521

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/client/test_buffer_vault.cpp
49
49
{
50
50
    MockClientBufferFactory()
51
51
    {
52
 
        ON_CALL(*this, create_buffer(_,_,_))
 
52
        ON_CALL(*this, create_buffer(_,An<geom::Size>(),_))
53
53
            .WillByDefault(Invoke([](
54
54
                    std::shared_ptr<MirBufferPackage> const&, geom::Size size, MirPixelFormat)
55
55
                {
61
61
    }
62
62
    MOCK_METHOD3(create_buffer, std::shared_ptr<mcl::ClientBuffer>(
63
63
        std::shared_ptr<MirBufferPackage> const&, geom::Size, MirPixelFormat));
 
64
    MOCK_METHOD3(create_buffer, std::shared_ptr<mcl::ClientBuffer>(
 
65
        std::shared_ptr<MirBufferPackage> const&, uint32_t, uint32_t));
64
66
};
65
67
 
66
68
struct MockServerRequests : mcl::ServerBufferRequests
272
274
    ON_CALL(*mock_buffer, size())
273
275
        .WillByDefault(Return(size));
274
276
    EXPECT_CALL(*mock_buffer, increment_age());
275
 
    ON_CALL(mock_platform_factory, create_buffer(_,_,_))
 
277
    ON_CALL(mock_platform_factory, create_buffer(_,An<uint32_t>(),_))
276
278
        .WillByDefault(Return(mock_buffer));
277
279
    auto b1 = std::make_shared<mcl::Buffer>(
278
280
        ignore, nullptr, package.buffer_id(), mock_buffer, nullptr, mir_buffer_usage_software);
289
291
    ON_CALL(*mock_buffer, size())
290
292
        .WillByDefault(Return(size));
291
293
    EXPECT_CALL(*mock_buffer, mark_as_submitted());
292
 
    ON_CALL(mock_platform_factory, create_buffer(_,_,_))
 
294
    ON_CALL(mock_platform_factory, create_buffer(_,An<uint32_t>(),_))
293
295
        .WillByDefault(Return(mock_buffer));
294
296
    auto b1 = std::make_shared<mcl::Buffer>(
295
297
        ignore, nullptr, package.buffer_id(), mock_buffer, nullptr, mir_buffer_usage_software);