Commit 7175dea7 authored by Andrew Mitchell's avatar Andrew Mitchell
Browse files

Made response available to p2p success callback

parent 8f08c6ef

include/kinetic/nonblocking_kinetic_connection.h

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ class GetLogHandler : public HandlerInterface { 
class P2PPushCallbackInterface {

    public:

    virtual ~P2PPushCallbackInterface() {}

    virtual void Success(unique_ptr<vector<KineticStatus>> operation_statuses) = 0;

    virtual void Success(unique_ptr<vector<KineticStatus>> operation_statuses, const Message& response) = 0;

    virtual void Failure(KineticStatus error, Message const * const response) = 0;

};

src/main/blocking_kinetic_connection.cc

+1 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ class BlockingP2PPushCallback : public P2PPushCallbackInterface, public Blocking 
    public:

    explicit BlockingP2PPushCallback(unique_ptr<vector<KineticStatus>>& statuses)

    : statuses_(statuses) {}

    virtual void Success(unique_ptr<vector<KineticStatus>> statuses) {

    virtual void Success(unique_ptr<vector<KineticStatus>> statuses, const Message& response) {

        OnSuccess();

        statuses_ = std::move(statuses);

    }

src/main/nonblocking_kinetic_connection.cc

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ void P2PPushHandler::Handle(const Message& response, unique_ptr<const string> va 
                KineticStatus(ConvertFromProtoStatus(status.code()), status.statusmessage()));

    }



    callback_->Success(move(statuses));

    callback_->Success(move(statuses), response);

}



void P2PPushHandler::Error(KineticStatus error, Message const * const response) {

src/test/mock/mock_callbacks.h

+3 −3
Original line number Diff line number Diff line
@@ -90,11 +90,11 @@ class MockGetLogCallback : public GetLogCallbackInterface { 


class MockP2PPushCallback : public P2PPushCallbackInterface {

    public:

    void Success(unique_ptr<vector<KineticStatus>> statuses) {

        Success_(*statuses);

    void Success(unique_ptr<vector<KineticStatus>> statuses, const Message& response) {

        Success_(*statuses, response);

    }



    MOCK_METHOD1(Success_, void(vector<KineticStatus> statuses));

    MOCK_METHOD2(Success_, void(vector<KineticStatus> statuses, const Message& response));

    MOCK_METHOD2(Failure, void(KineticStatus error, Message const * const response));

};

src/test/nonblocking_kinetic_connection_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ TEST_F(NonblockingKineticConnectionTest, P2PHandlerInterpretsStatusCorrectly) { 


    vector<KineticStatus> statuses;



    EXPECT_CALL(*callback, Success_(_)).WillOnce(SaveArg<0>(&statuses));

    EXPECT_CALL(*callback, Success_(_, _)).WillOnce(SaveArg<0>(&statuses));



    unique_ptr<const string> empty_str(new string(""));

    handler.Handle(response, move(empty_str));