← Back to branch summary

~raof/mir/hack-hack-hack-remove-a-hack

« back to all changes in this revision

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

  • Committer: Tarmac
  • Author(s): Kevin DuBois
  • Date: 2013-11-26 19:06:17 UTC
  • mfrom: (1244.3.9 fix-1253486)
  • Revision ID: tarmac-20131126190617-42i8elpsm8exqbzj
clean up unit tests (ran under android) so there's no uninitialized value 
errors for the unit-tests/graphics/android tests, and make the tests run 
without gmock warning, unexpected call errors. (LP: #1172184). Fixes: https://bugs.launchpad.net/bugs/1172184, https://bugs.launchpad.net/bugs/1253486.

Approved by PS Jenkins bot, Alan Griffiths, Daniel van Vugt.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/graphics/android/test_fb_device.cpp
45
45
        fbnum = 4;
46
46
        format = HAL_PIXEL_FORMAT_RGBA_8888;
47
47
 
48
 
        fb_hal_mock = std::make_shared<mtd::MockFBHalDevice>(width, height, format, fbnum);
 
48
        fb_hal_mock = std::make_shared<NiceMock<mtd::MockFBHalDevice>>(width, height, format, fbnum); 
49
49
        mock_buffer = std::make_shared<NiceMock<mtd::MockBuffer>>();
50
50
        native_buffer = std::make_shared<mtd::StubAndroidNativeBuffer>();
51
51
        ON_CALL(*mock_buffer, native_buffer_handle())