~mir-team/mir/development-branch

« back to all changes in this revision

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

merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
 */
18
18
 
19
19
#include "mir/graphics/android/sync_fence.h"
20
 
#include "src/platforms/android/framebuffer_bundle.h"
21
 
#include "src/platforms/android/hwc_device.h"
22
 
#include "src/platforms/android/hwc_layerlist.h"
23
 
#include "src/platforms/android/gl_context.h"
24
 
#include "src/platforms/android/hwc_configuration.h"
 
20
#include "src/platforms/android/server/framebuffer_bundle.h"
 
21
#include "src/platforms/android/server/hwc_device.h"
 
22
#include "src/platforms/android/server/hwc_layerlist.h"
 
23
#include "src/platforms/android/server/gl_context.h"
 
24
#include "src/platforms/android/server/hwc_configuration.h"
25
25
#include "mir_test_doubles/mock_android_native_buffer.h"
26
26
#include "mir_test_doubles/stub_renderable.h"
27
27
#include "mir_test_doubles/mock_framebuffer_bundle.h"
312
312
 
313
313
    EXPECT_CALL(*mock_native_buffer3, copy_fence())
314
314
        .Times(0);
315
 
    EXPECT_CALL(*mock_native_buffer3, update_usage(_,_))
316
 
        .Times(0);
 
315
    int invalid{-1};
 
316
    EXPECT_CALL(*mock_native_buffer3, update_usage(invalid,_))
 
317
        .Times(1);
317
318
 
318
319
    Sequence seq; 
319
320
    EXPECT_CALL(*mock_device, prepare(_))