Remove done notifications from incoming message handlers.

remoting/protocol/message_reader_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 12 matching lines @@
 using testing::DoAll;
 using testing::Mock;
 using testing::SaveArg;
 
 namespace remoting {
 namespace protocol {
 
 namespace {
 const char kTestMessage1[] = "Message1";
 const char kTestMessage2[] = "Message2";
-
-ACTION(CallDoneTask) {
-  arg0.Run();
-}
 }  // namespace
 
 class MockMessageReceivedCallback {
  public:
-  MOCK_METHOD1(OnMessage, void(const base::Closure&));
+  MOCK_METHOD0(OnMessage, void());
 };
 
 class MessageReaderTest : public testing::Test {
  public:
-  MessageReaderTest()
-      : in_callback_(false) {
-  }
-
   // Following two methods are used by the ReadFromCallback test.
-  void AddSecondMessage(const base::Closure& task) {
-    AddMessage(kTestMessage2);
-    in_callback_ = true;
-    task.Run();
-    in_callback_ = false;
-  }
-
-  void OnSecondMessage(const base::Closure& task) {
-    EXPECT_FALSE(in_callback_);
-    task.Run();
-  }
+  void AddSecondMessage() { AddMessage(kTestMessage2); }
 
   // Used by the DeleteFromCallback() test.
-  void DeleteReader(const base::Closure& task) {
-    reader_.reset();
-    task.Run();
-  }
+  void DeleteReader() { reader_.reset(); }
 
  protected:
   void SetUp() override {
     reader_.reset(new MessageReader());
   }
 
   void TearDown() override { STLDeleteElements(&messages_); }
 
   void InitReader() {
     reader_->SetMessageReceivedCallback(
@@ skipping 13 matching lines @@
     std::string result(buffer->total_bytes(), ' ');
     buffer->CopyTo(const_cast<char*>(result.data()), result.size());
     return result == expected;
   }
 
   void OnReadError(int error) {
     read_error_ = error;
     reader_.reset();
   }
 
-  void OnMessage(scoped_ptr<CompoundBuffer> buffer,
-                 const base::Closure& done_callback) {
+  void OnMessage(scoped_ptr<CompoundBuffer> buffer) {
     messages_.push_back(buffer.release());
-    callback_.OnMessage(done_callback);
+    callback_.OnMessage();
   }
 
   base::MessageLoop message_loop_;
   scoped_ptr<MessageReader> reader_;
   FakeStreamSocket socket_;
   MockMessageReceivedCallback callback_;
   int read_error_ = 0;
   std::vector<CompoundBuffer*> messages_;
-  bool in_callback_;
 };
 
-// Receive one message and process it with delay
-TEST_F(MessageReaderTest, OneMessage_Delay) {
-  base::Closure done_task;
-
+// Receive one message.
+TEST_F(MessageReaderTest, OneMessage) {
   AddMessage(kTestMessage1);
 
-  EXPECT_CALL(callback_, OnMessage(_))
-      .Times(1)
-      .WillOnce(SaveArg<0>(&done_task));
+  EXPECT_CALL(callback_, OnMessage()).Times(1);
 
   InitReader();
   base::RunLoop().RunUntilIdle();
-
-  Mock::VerifyAndClearExpectations(&callback_);
-  Mock::VerifyAndClearExpectations(&socket_);
-
-  EXPECT_TRUE(CompareResult(messages_[0], kTestMessage1));
-
-  // Verify that the reader starts reading again only after we've
-  // finished processing the previous message.
-  EXPECT_FALSE(socket_.read_pending());
-
-  done_task.Run();
-
-  EXPECT_TRUE(socket_.read_pending());
-}
-
-// Receive one message and process it instantly.
-TEST_F(MessageReaderTest, OneMessage_Instant) {
-  AddMessage(kTestMessage1);
-
-  EXPECT_CALL(callback_, OnMessage(_))
-      .Times(1)
-      .WillOnce(CallDoneTask());
-
-  InitReader();
-  base::RunLoop().RunUntilIdle();
 
   EXPECT_TRUE(socket_.read_pending());
   EXPECT_EQ(1U, messages_.size());
 }
 
 // Receive two messages in one packet.
 TEST_F(MessageReaderTest, TwoMessages_Together) {
-  base::Closure done_task1;
-  base::Closure done_task2;
-
   AddMessage(kTestMessage1);
   AddMessage(kTestMessage2);
 
-  EXPECT_CALL(callback_, OnMessage(_))
-      .Times(2)
-      .WillOnce(SaveArg<0>(&done_task1))
-      .WillOnce(SaveArg<0>(&done_task2));
+  EXPECT_CALL(callback_, OnMessage()).Times(2);
 
   InitReader();
   base::RunLoop().RunUntilIdle();
 
   Mock::VerifyAndClearExpectations(&callback_);
   Mock::VerifyAndClearExpectations(&socket_);
 
   EXPECT_TRUE(CompareResult(messages_[0], kTestMessage1));
   EXPECT_TRUE(CompareResult(messages_[1], kTestMessage2));
 
-  // Verify that the reader starts reading again only after we've
-  // finished processing the previous message.
-  EXPECT_FALSE(socket_.read_pending());
-
-  done_task1.Run();
-  base::RunLoop().RunUntilIdle();
-
-  EXPECT_FALSE(socket_.read_pending());
-
-  done_task2.Run();
-  base::RunLoop().RunUntilIdle();
-
-  EXPECT_TRUE(socket_.read_pending());
-}
-
-// Receive two messages in one packet, and process the first one
-// instantly.
-TEST_F(MessageReaderTest, TwoMessages_Instant) {
-  base::Closure done_task2;
-
-  AddMessage(kTestMessage1);
-  AddMessage(kTestMessage2);
-
-  EXPECT_CALL(callback_, OnMessage(_))
-      .Times(2)
-      .WillOnce(CallDoneTask())
-      .WillOnce(SaveArg<0>(&done_task2));
-
-  InitReader();
-  base::RunLoop().RunUntilIdle();
-
-  Mock::VerifyAndClearExpectations(&callback_);
-  Mock::VerifyAndClearExpectations(&socket_);
-
-  EXPECT_TRUE(CompareResult(messages_[1], kTestMessage2));
-
-  // Verify that the reader starts reading again only after we've
-  // finished processing the second message.
-  EXPECT_FALSE(socket_.read_pending());
-
-  done_task2.Run();
-
-  EXPECT_TRUE(socket_.read_pending());
-}
-
-// Receive two messages in one packet, and process both of them
-// instantly.
-TEST_F(MessageReaderTest, TwoMessages_Instant2) {
-  AddMessage(kTestMessage1);
-  AddMessage(kTestMessage2);
-
-  EXPECT_CALL(callback_, OnMessage(_))
-      .Times(2)
-      .WillOnce(CallDoneTask())
-      .WillOnce(CallDoneTask());
-
-  InitReader();
-  base::RunLoop().RunUntilIdle();
-
   EXPECT_TRUE(socket_.read_pending());
 }
 
 // Receive two messages in separate packets.
 TEST_F(MessageReaderTest, TwoMessages_Separately) {
-  base::Closure done_task;
-
   AddMessage(kTestMessage1);
 
-  EXPECT_CALL(callback_, OnMessage(_))
-      .Times(1)
-      .WillOnce(SaveArg<0>(&done_task));
+  EXPECT_CALL(callback_, OnMessage())
+      .Times(1);
 
   InitReader();
   base::RunLoop().RunUntilIdle();
 
   Mock::VerifyAndClearExpectations(&callback_);
   Mock::VerifyAndClearExpectations(&socket_);
 
   EXPECT_TRUE(CompareResult(messages_[0], kTestMessage1));
 
-  // Verify that the reader starts reading again only after we've
-  // finished processing the previous message.
-  EXPECT_FALSE(socket_.read_pending());
-
-  done_task.Run();
-  base::RunLoop().RunUntilIdle();
-
   EXPECT_TRUE(socket_.read_pending());
 
   // Write another message and verify that we receive it.
-  EXPECT_CALL(callback_, OnMessage(_))
-      .Times(1)
-      .WillOnce(SaveArg<0>(&done_task));
+  EXPECT_CALL(callback_, OnMessage())
+      .Times(1);
   AddMessage(kTestMessage2);
   base::RunLoop().RunUntilIdle();
 
   EXPECT_TRUE(CompareResult(messages_[1], kTestMessage2));
 
-  // Verify that the reader starts reading again only after we've
-  // finished processing the previous message.
-  EXPECT_FALSE(socket_.read_pending());
-
-  done_task.Run();
-
   EXPECT_TRUE(socket_.read_pending());
 }
 
 // Read() returns error.
 TEST_F(MessageReaderTest, ReadError) {
   socket_.AppendReadError(net::ERR_FAILED);
 
-  EXPECT_CALL(callback_, OnMessage(_)).Times(0);
+  EXPECT_CALL(callback_, OnMessage()).Times(0);
 
   InitReader();
 
   EXPECT_EQ(net::ERR_FAILED, read_error_);
   EXPECT_FALSE(reader_);
 }
 
 // Verify that we the OnMessage callback is not reentered.
 TEST_F(MessageReaderTest, ReadFromCallback) {
   AddMessage(kTestMessage1);
 
-  EXPECT_CALL(callback_, OnMessage(_))
+  EXPECT_CALL(callback_, OnMessage())
       .Times(2)
-      .WillOnce(Invoke(this, &MessageReaderTest::AddSecondMessage))
-      .WillOnce(Invoke(this, &MessageReaderTest::OnSecondMessage));
+      .WillOnce(Invoke(this, &MessageReaderTest::AddSecondMessage));
 
   InitReader();
   base::RunLoop().RunUntilIdle();
 
   EXPECT_TRUE(socket_.read_pending());
 }
 
 // Verify that we stop getting callbacks after deleting MessageReader.
 TEST_F(MessageReaderTest, DeleteFromCallback) {
-  base::Closure done_task1;
-  base::Closure done_task2;
-
   AddMessage(kTestMessage1);
   AddMessage(kTestMessage2);
 
   // OnMessage() should never be called for the second message.
-  EXPECT_CALL(callback_, OnMessage(_))
+  EXPECT_CALL(callback_, OnMessage())
       .Times(1)
       .WillOnce(Invoke(this, &MessageReaderTest::DeleteReader));
 
   InitReader();
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace protocol
 }  // namespace remoting