← Back to branch summary

~ubuntu-branches/ubuntu/vivid/mir/vivid

« back to all changes in this revision

Viewing changes to tests/unit-tests/client/android/test_client_surface_interpreter.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2014-02-04 14:49:07 UTC
  • mto: This revision was merged to the branch mainline in revision 61.
  • Revision ID: package-import@ubuntu.com-20140204144907-o3ruhix0ey26lchl
Tags: upstream-0.1.4+14.04.20140204
Import upstream version 0.1.4+14.04.20140204

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/client/android/test_client_surface_interpreter.cpp
75
75
 
76
76
    MOCK_CONST_METHOD0(get_parameters, MirSurfaceParameters());
77
77
    MOCK_METHOD0(get_current_buffer, std::shared_ptr<mcl::ClientBuffer>());
78
 
    MOCK_METHOD2(next_buffer, MirWaitHandle*(mir_surface_callback callback, void * context));
79
 
    MOCK_METHOD2(configure, MirWaitHandle*(MirSurfaceAttrib, int));
 
78
    MOCK_METHOD0(request_and_wait_for_next_buffer, void());
 
79
    MOCK_METHOD2(request_and_wait_for_configure, void(MirSurfaceAttrib, int));
80
80
    MirSurfaceParameters params;
81
81
};
82
82
 
137
137
    testing::NiceMock<MockMirSurface> mock_surface{surf_params};
138
138
    mcla::ClientSurfaceInterpreter interpreter(mock_surface);
139
139
 
140
 
    EXPECT_CALL(mock_surface, next_buffer(_,_))
 
140
    EXPECT_CALL(mock_surface, request_and_wait_for_next_buffer())
141
141
        .Times(1);
142
142
 
143
143
    interpreter.driver_returns_buffer(&buffer, -1);