Refactor BlimpConnection to TCPConnection

blimp/net/tcp_connection_unittest.cc

 // Copyright 2015 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 "blimp/net/blimp_connection.h"
+#include "blimp/net/tcp_connection.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
 
 #include "base/callback_helpers.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "blimp/common/create_blimp_message.h"
 #include "blimp/common/proto/blimp_message.pb.h"
 #include "blimp/net/common.h"
 #include "blimp/net/connection_error_observer.h"
 #include "blimp/net/message_port.h"
+#include "blimp/net/tcp_connection.h"
 #include "blimp/net/test_common.h"
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 using testing::InSequence;
 using testing::Return;
 using testing::SaveArg;
 
 namespace blimp {
 namespace {
 
+// NOTE: TCPConnection and BlimpConnection will soon be replaced with a
+// pure-gRPC implementation. So not adding more unit-tests here. Instead,
+// we are reusing TCPConnection as the implementation under test here.

[Garrett Casto, 2016/10/25 18:33:50]

Nit: Not sure if you need this disclaimer since you are specifically testing
TCPConnection here. This would make more sense if this were testing
BlimpConnection instead.

[perumaal, 2016/10/25 23:02:40]

I avoided renaming BlimpConnectionTest but you are right, it's not worth it. I
have now removed this comment and made it strictly TCP'y.

 class BlimpConnectionTest : public testing::Test {
  public:
   BlimpConnectionTest() {
     std::unique_ptr<MockPacketReader> mock_reader(new MockPacketReader);
     std::unique_ptr<MockPacketWriter> mock_writer(new MockPacketWriter);
     mock_reader_ = mock_reader.get();
     mock_writer_ = mock_writer.get();
-    connection_ =
-        base::MakeUnique<BlimpConnection>(base::MakeUnique<MessagePort>(
-            std::move(mock_reader), std::move(mock_writer)));
+    connection_ = base::MakeUnique<TCPConnection>(base::MakeUnique<MessagePort>(
+        std::move(mock_reader), std::move(mock_writer)));
 
     connection_->AddConnectionErrorObserver(&error_observer1_);
     connection_->AddConnectionErrorObserver(&error_observer2_);
     connection_->AddConnectionErrorObserver(&error_observer3_);
     connection_->RemoveConnectionErrorObserver(&error_observer3_);
   }
 
   ~BlimpConnectionTest() override {}
 
   void DropConnection() { connection_.reset(); }
@@ skipping 36 matching lines @@
               WritePacket(BufferEqualsProto(*CreateControlMessage()), _))
       .WillOnce(SaveArg<1>(&write_packet_cb))
       .RetiresOnSaturation();
   EXPECT_CALL(error_observer1_, OnConnectionError(_)).Times(0);
   EXPECT_CALL(error_observer2_, OnConnectionError(_)).Times(0);
   EXPECT_CALL(error_observer3_, OnConnectionError(_)).Times(0);
 
   BlimpMessageProcessor* sender = connection_->GetOutgoingMessageProcessor();
   net::TestCompletionCallback complete_cb_1;
   ASSERT_TRUE(write_packet_cb.is_null());
-  sender->ProcessMessage(CreateInputMessage(),
-                         complete_cb_1.callback());
+  sender->ProcessMessage(CreateInputMessage(), complete_cb_1.callback());
   ASSERT_FALSE(write_packet_cb.is_null());
   base::ResetAndReturn(&write_packet_cb).Run(net::OK);
   EXPECT_EQ(net::OK, complete_cb_1.WaitForResult());
 
   net::TestCompletionCallback complete_cb_2;
   ASSERT_TRUE(write_packet_cb.is_null());
-  sender->ProcessMessage(CreateControlMessage(),
-                         complete_cb_2.callback());
+  sender->ProcessMessage(CreateControlMessage(), complete_cb_2.callback());
   ASSERT_FALSE(write_packet_cb.is_null());
   base::ResetAndReturn(&write_packet_cb).Run(net::OK);
   EXPECT_EQ(net::OK, complete_cb_2.WaitForResult());
 }
 
 // Writer completes writing two packets asynchronously.
 // First write succeeds, second fails.
 TEST_F(BlimpConnectionTest, AsyncTwoPacketsWriteWithError) {
   net::CompletionCallback write_packet_cb;
 
   InSequence s;
   EXPECT_CALL(*mock_writer_,
               WritePacket(BufferEqualsProto(*CreateInputMessage()), _))
       .WillOnce(SaveArg<1>(&write_packet_cb))
       .RetiresOnSaturation();
   EXPECT_CALL(*mock_writer_,
               WritePacket(BufferEqualsProto(*CreateControlMessage()), _))
       .WillOnce(SaveArg<1>(&write_packet_cb))
       .RetiresOnSaturation();
   EXPECT_CALL(error_observer1_, OnConnectionError(net::ERR_FAILED));
   EXPECT_CALL(error_observer2_, OnConnectionError(net::ERR_FAILED));
   EXPECT_CALL(error_observer3_, OnConnectionError(_)).Times(0);
 
   BlimpMessageProcessor* sender = connection_->GetOutgoingMessageProcessor();
   net::TestCompletionCallback complete_cb_1;
-  sender->ProcessMessage(CreateInputMessage(),
-                         complete_cb_1.callback());
+  sender->ProcessMessage(CreateInputMessage(), complete_cb_1.callback());
   base::ResetAndReturn(&write_packet_cb).Run(net::OK);
   EXPECT_EQ(net::OK, complete_cb_1.WaitForResult());
 
   net::TestCompletionCallback complete_cb_2;
-  sender->ProcessMessage(CreateControlMessage(),
-                         complete_cb_2.callback());
+  sender->ProcessMessage(CreateControlMessage(), complete_cb_2.callback());
   base::ResetAndReturn(&write_packet_cb).Run(net::ERR_FAILED);
   EXPECT_EQ(net::ERR_FAILED, complete_cb_2.WaitForResult());
 }
 
 TEST_F(BlimpConnectionTest, DeleteHappyObserversAreOK) {
   net::CompletionCallback write_packet_cb;
 
   InSequence s;
   EXPECT_CALL(*mock_writer_,
               WritePacket(BufferEqualsProto(*CreateInputMessage()), _))
@@ skipping 66 matching lines @@
 
   // Put the EndConnection message in the buffer and invoke the read callback.
   read_packet_buffer->SetCapacity(message->ByteSize());
   ASSERT_TRUE(message->SerializeToArray(read_packet_buffer->data(),
                                         message->GetCachedSize()));
   base::ResetAndReturn(&read_packet_cb).Run(message->ByteSize());
 }
 
 }  // namespace
 }  // namespace blimp