← Back to branch summary

~alan-griffiths/mir/fix-1654023

« back to all changes in this revision

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

  • Committer: Daniel van Vugt
  • Date: 2015-04-28 07:54:10 UTC
  • mfrom: (2517 development-branch)
  • mto: This revision was merged to the branch mainline in revision 2673.
  • Revision ID: daniel.van.vugt@canonical.com-20150428075410-rwskshfuar7voesp
Merge latest trunk and fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/client/test_protobuf_rpc_channel.cpp
106
106
    }
107
107
 
108
108
    MOCK_METHOD1(register_observer, void(std::shared_ptr<Observer> const&));
 
109
    MOCK_METHOD1(unregister_observer, void(std::shared_ptr<Observer> const&));
109
110
    MOCK_METHOD2(receive_data, void(void*, size_t));
110
111
    MOCK_METHOD3(receive_data, void(void*, size_t, std::vector<mir::Fd>&));
111
112
    MOCK_METHOD2(send_message, void(std::vector<uint8_t> const&, std::vector<mir::Fd> const&));