Changed MessageReader so that it doesn't read from the socket if there are

remoting/protocol/message_decoder_unittest.cc

Index: remoting/protocol/message_decoder_unittest.cc
diff --git a/remoting/protocol/message_decoder_unittest.cc b/remoting/protocol/message_decoder_unittest.cc
index 81bb6992a42c741c274c066eee04b4b228b1cf4f..b4b95a04e3ba0092e385e3b84547c7dbe5e1c56d 100644
--- a/remoting/protocol/message_decoder_unittest.cc
+++ b/remoting/protocol/message_decoder_unittest.cc
@@ -29,16 +29,13 @@ static void PrepareData(uint8** buffer, int* size) {
   // Contains all encoded messages.
   std::string encoded_data;
 
-  EventMessage msg;
-
   // Then append 10 update sequences to the data.
   for (int i = 0; i < 10; ++i) {
-    Event* event = msg.add_event();
-    event->set_timestamp(i);
-    event->mutable_key()->set_keycode(kTestKey + i);
-    event->mutable_key()->set_pressed((i % 2) != 0);
+    EventMessage msg;
+    msg.set_timestamp(i);
+    msg.mutable_key()->set_keycode(kTestKey + i);
+    msg.mutable_key()->set_pressed((i % 2) != 0);
     AppendMessage(msg, &encoded_data);
-    msg.Clear();
   }
 
   *size = encoded_data.length();
@@ -71,12 +68,12 @@ void SimulateReadSequence(const int read_sequence[], int sequence_size) {
     memcpy(buffer->data(), test_data + i, read);
     decoder.AddData(buffer, read);
     while (true) {
-      CompoundBuffer message;
-      if (!decoder.GetNextMessage(&message))
+      scoped_ptr<CompoundBuffer> message(decoder.GetNextMessage());
+      if (!message.get())
         break;
 
       EventMessage* event = new EventMessage();
-      CompoundBufferInputStream stream(&message);
+      CompoundBufferInputStream stream(message.get());
       ASSERT_TRUE(event->ParseFromZeroCopyStream(&stream));
       message_list.push_back(event);
     }
@@ -92,13 +89,12 @@ void SimulateReadSequence(const int read_sequence[], int sequence_size) {
        it != message_list.end(); ++it) {

[awong, 2011/01/20 20:06:38]

Can you add a SCOPED_LOG in this, and the other for loops in this unittest file
to make sure we know which iteration we're on (or whatever other information is
required to pinpoint the failing input)?

[Sergey Ulanov, 2011/01/20 21:55:57]

Done.

     EventMessage* message = *it;
     // Partial update stream.
-    EXPECT_EQ(message->event_size(), 1);
-    EXPECT_TRUE(message->event(0).has_key());
+    EXPECT_TRUE(message->has_key());
 
     // TODO(sergeyu): Don't use index here. Instead store the expected values
     // in an array.
-    EXPECT_EQ(kTestKey + index, message->event(0).key().keycode());
-    EXPECT_EQ((index % 2) != 0, message->event(0).key().pressed());
+    EXPECT_EQ(kTestKey + index, message->key().keycode());
+    EXPECT_EQ((index % 2) != 0, message->key().pressed());
     ++index;
   }
   STLDeleteElements(&message_list);