← Back to branch summary

~raof/mir/prober-drm-device-probe

« back to all changes in this revision

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

  • Committer: Christopher James Halse Rogers
  • Date: 2013-07-01 07:32:26 UTC
  • mfrom: (761.1.32 trunk)
  • Revision ID: raof@ubuntu.com-20130701073226-vqc2vq8jhe98v1vh
Merge trunk, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/compositor/test_switching_bundle.cpp
90
90
        .WillOnce(Return(stub_buffer));
91
91
    EXPECT_CALL(*mock_secondary_swapper, client_release(stub_buffer))
92
92
        .Times(1);
93
 
    EXPECT_CALL(*mock_swapper_factory, create_swapper_reuse_buffers(_,_,_))
 
93
    EXPECT_CALL(*mock_swapper_factory, create_swapper_reuse_buffers(_,_,_,_))
94
94
        .Times(1)
95
95
        .WillOnce(Return(mock_secondary_swapper));
96
96
 
126
126
        .WillOnce(Return(stub_buffer));
127
127
    EXPECT_CALL(*mock_secondary_swapper, compositor_release(stub_buffer))
128
128
        .Times(1);
129
 
    EXPECT_CALL(*mock_swapper_factory, create_swapper_reuse_buffers(_,_,_))
 
129
    EXPECT_CALL(*mock_swapper_factory, create_swapper_reuse_buffers(_,_,_,_))
130
130
        .Times(1)
131
131
        .WillOnce(Return(mock_secondary_swapper));
132
132
 
147
147
        .Times(1);
148
148
    EXPECT_CALL(*mock_default_swapper, end_responsibility(_,_))
149
149
        .Times(1);
150
 
    EXPECT_CALL(*mock_swapper_factory, create_swapper_reuse_buffers(_,_,mc::SwapperType::framedropping))
 
150
    EXPECT_CALL(*mock_swapper_factory, create_swapper_reuse_buffers(_,_,_,mc::SwapperType::framedropping))
151
151
        .Times(1)
152
152
        .WillOnce(Return(mock_secondary_swapper));
153
153