Commit 722f7db4 authored by Gonzalo Gomez's avatar Gonzalo Gomez
Browse files

implemented classes must match interfaces

parent fc378994

src/test/message_stream_test.cc

+6 −4
Original line number Diff line number Diff line
@@ -64,9 +64,9 @@ class ArrayByteStream : public ByteStreamInterface { 
        return new IncomingStringValue(value);

    }



    bool WriteValue(const OutgoingValueInterface &value) {

    bool WriteValue(const OutgoingValueInterface &value, int* err) {

        std::string s;

        if (!value.ToString(&s)) {

        if (!value.ToString(&s, err)) {

            return false;

        }

        return Write(s.data(), s.size());
@@ -137,8 +137,9 @@ TEST_F(MessageStreamTest, WriteMessageSendsCorrectDataForEmptyValue) { 
    uint8_t buffer[1024];

    ArrayByteStream* byte_stream = new ArrayByteStream(data, buffer);

    MessageStream message_stream(1000, byte_stream);

    int err;



    ASSERT_TRUE(message_stream.WriteMessage(message_, OutgoingStringValue("")));

    ASSERT_TRUE(message_stream.WriteMessage(message_, OutgoingStringValue(""), &err));



    EXPECT_EQ('F', buffer[0]) << "Incorrect magic value";

    EXPECT_EQ(0U, *(uint32_t*)(buffer + 1)) << "Wrong message length";
@@ -150,10 +151,11 @@ TEST_F(MessageStreamTest, WriteMessageSendsCorrectDataForNonemptyValue) { 
    uint8_t buffer[1024] = {0};

    ArrayByteStream* byte_stream = new ArrayByteStream(data, buffer);

    MessageStream message_stream(1000, byte_stream);

    int err;



    std::string message_value = "What";



    ASSERT_TRUE(message_stream.WriteMessage(message_, OutgoingStringValue(message_value)));

    ASSERT_TRUE(message_stream.WriteMessage(message_, OutgoingStringValue(message_value), &err));



    EXPECT_EQ('F', buffer[0]) << "Incorrect magic value";

    EXPECT_EQ(0U, *(uint32_t*)(buffer + 1)) << "Wrong message length";

src/test/string_value_test.cc

+4 −2
Original line number Diff line number Diff line
@@ -90,8 +90,9 @@ TEST(OutgoingStringValueTest, TransferToSocketWorks) { 
    // Write OutgoingStringValue into a pipe

    OutgoingStringValue value("a");

    int output_pipe[2];

    int err;

    ASSERT_EQ(0, pipe(output_pipe));

    ASSERT_TRUE(value.TransferToSocket(output_pipe[1]));

    ASSERT_TRUE(value.TransferToSocket(output_pipe[1], &err));



    // Check that the pipe contains the right value

    char result;
@@ -105,7 +106,8 @@ TEST(OutgoingStringValueTest, TransferToSocketWorks) { 
TEST(OutgoingStringValueTest, ToStringWorks) {

    OutgoingStringValue value("abc");

    std::string s;

    ASSERT_TRUE(value.ToString(&s));

    int err;

    ASSERT_TRUE(value.ToString(&s, &err));

    ASSERT_EQ("abc", s);

}